1 files changed, 36 insertions, 3 deletions

diff --git a/src/BlockInfo.h b/src/BlockInfo.h
index e6ce566c5..1e4cf2ca0 100644
--- a/src/BlockInfo.h
+++ b/src/BlockInfo.h
@@ -11,14 +11,27 @@ class cBlockHandler;
 
 
 
-
 // tolua_begin
 class cBlockInfo
 {
 public:
 
 	/** Returns the associated BlockInfo structure for the specified block type. */
-	static cBlockInfo & Get(BLOCKTYPE a_Type);
+	
+	/** This accessor makes sure that the cBlockInfo structures are properly initialized exactly once.
+	It does so by using the C++ singleton approximation - storing the actual singleton as the function's static variable.
+	It works only if it is called for the first time before the app spawns other threads. */
+	static cBlockInfo & Get(BLOCKTYPE a_Type)
+	{
+		static cBlockInfo ms_Info[256];
+		static bool IsBlockInfoInitialized = false;
+		if (!IsBlockInfoInitialized)
+		{
+			cBlockInfo::Initialize(ms_Info);
+			IsBlockInfoInitialized = true;
+		}
+		return ms_Info[a_Type];
+	}
 
 
 	/** How much light do the blocks emit on their own? */
@@ -45,6 +58,12 @@ public:
 	/** Does this block fully occupy its voxel - is it a 'full' block? */
 	bool m_FullyOccupiesVoxel;
 
+	/** Can a finisher change it? */
+	bool m_CanBeTerraformed;
+
+	/** Sound when placing this block */
+	AString m_PlaceSound;
+
 	// tolua_end
 
 	/** Associated block handler. */
@@ -60,6 +79,8 @@ public:
 	inline static bool IsSnowable                 (BLOCKTYPE a_Type) { return Get(a_Type).m_IsSnowable;          }
 	inline static bool IsSolid                    (BLOCKTYPE a_Type) { return Get(a_Type).m_IsSolid;             }
 	inline static bool FullyOccupiesVoxel         (BLOCKTYPE a_Type) { return Get(a_Type).m_FullyOccupiesVoxel;  }
+	inline static bool CanBeTerraformed           (BLOCKTYPE a_Type) { return Get(a_Type).m_CanBeTerraformed;    }
+	inline static AString GetPlaceSound           (BLOCKTYPE a_Type) { return Get(a_Type).m_PlaceSound;          }
 
 	// tolua_end
 
@@ -70,7 +91,19 @@ protected:
 	typedef cBlockInfo cBlockInfoArray[256];
 
 	/** Creates a default BlockInfo structure, initializes all values to their defaults */
-	cBlockInfo();
+	cBlockInfo()
+		: m_LightValue(0x00)
+		, m_SpreadLightFalloff(0x0f)
+		, m_Transparent(false)
+		, m_OneHitDig(false)
+		, m_PistonBreakable(false)
+		, m_IsSnowable(false)
+		, m_IsSolid(true)
+		, m_FullyOccupiesVoxel(false)
+		, m_CanBeTerraformed(false)
+		, m_PlaceSound("")
+		, m_Handler(NULL)
+	{}
 
 	/** Cleans up the stored values */
 	~cBlockInfo();