From 64996422c00ddb70cfc8aee7da7b62485b8b0416 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 13 Nov 2011 10:57:55 +0200
Subject: Move ContentFeatures to mapnode_contentfeatures.{h,cpp} and clean
 stuff

---
 src/content_mapnode.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/content_mapnode.cpp')

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");
-- 
cgit v1.2.3