diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-11-13 10:57:55 +0200 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:40 +0200 |
commit | 64996422c00ddb70cfc8aee7da7b62485b8b0416 (patch) | |
tree | fdaa59ba3c52069f8935cf5d8d1cd63752edb149 /src/content_mapnode.cpp | |
parent | f8c9b703798873c6e958560341105069dca8f86c (diff) | |
download | hax-minetest-server-64996422c00ddb70cfc8aee7da7b62485b8b0416.tar.gz hax-minetest-server-64996422c00ddb70cfc8aee7da7b62485b8b0416.zip |
Move ContentFeatures to mapnode_contentfeatures.{h,cpp} and clean stuff
Diffstat (limited to 'src/content_mapnode.cpp')
-rw-r--r-- | src/content_mapnode.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp index f10b941ba..a365f2ae9 100644 --- a/src/content_mapnode.cpp +++ b/src/content_mapnode.cpp @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapnode.h" #include "content_nodemeta.h" #include "settings.h" +#include "mapnode_contentfeatures.h" #define WATER_ALPHA 160 @@ -101,8 +102,18 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version) return result; } +// See header for description void content_mapnode_init() { + if(g_texturesource == NULL) + dstream<<"INFO: Initial run of content_mapnode_init with " + "g_texturesource=NULL. If this segfaults, " + "there is a bug with something not checking for " + "the NULL value."<<std::endl; + else + dstream<<"INFO: Full run of content_mapnode_init with " + "g_texturesource!=NULL"<<std::endl; + // Read some settings bool new_style_water = g_settings->getBool("new_style_water"); bool new_style_leaves = g_settings->getBool("new_style_leaves"); |