diff options
Diffstat (limited to '')
| -rw-r--r-- | src/BlockInfo.h | 129 |
1 files changed, 64 insertions, 65 deletions
diff --git a/src/BlockInfo.h b/src/BlockInfo.h index e8bf9142e..9ba89858f 100644 --- a/src/BlockInfo.h +++ b/src/BlockInfo.h @@ -15,12 +15,70 @@ class cBlockHandler; class cBlockInfo { public: + // tolua_end - /** Returns the associated BlockInfo structure for the specified block type. */ + /** The block type associated with this cBlockInfo. Needed for DeprecatedBindings.cpp */ + BLOCKTYPE m_BlockType; - /** This accessor makes sure that the cBlockInfo structures are properly initialized exactly once. + /** Returns the associated BlockInfo structure for the specified block 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. */ - static cBlockInfo & Get(BLOCKTYPE a_Type); + inline static const cBlockInfo & Get(BLOCKTYPE a_Type); + + // tolua_begin + + inline static NIBBLETYPE GetLightValue (BLOCKTYPE a_Type) { return Get(a_Type).m_LightValue; } + inline static NIBBLETYPE GetSpreadLightFalloff(BLOCKTYPE a_Type) { return Get(a_Type).m_SpreadLightFalloff; } + inline static bool IsTransparent (BLOCKTYPE a_Type) { return Get(a_Type).m_Transparent; } + inline static bool IsOneHitDig (BLOCKTYPE a_Type) { return Get(a_Type).m_OneHitDig; } + inline static bool IsPistonBreakable (BLOCKTYPE a_Type) { return Get(a_Type).m_PistonBreakable; } + inline static bool IsRainBlocker (BLOCKTYPE a_Type) { return Get(a_Type).m_IsRainBlocker; } + inline static bool IsSkylightDispersant (BLOCKTYPE a_Type) + { + return ((Get(a_Type).m_IsSkylightDispersant) || (Get(a_Type).m_SpreadLightFalloff > 1)); + } + inline static bool IsSnowable (BLOCKTYPE a_Type) + { + return ( + (a_Type == E_BLOCK_ICE) || + (a_Type == E_BLOCK_LEAVES) || + (!IsTransparent(a_Type) && (a_Type != E_BLOCK_PACKED_ICE)) + ); + } + inline static bool IsSolid (BLOCKTYPE a_Type) { return Get(a_Type).m_IsSolid; } + inline static bool IsUseableBySpectator (BLOCKTYPE a_Type) { return Get(a_Type).m_UseableBySpectator; } + 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 float GetBlockHeight (BLOCKTYPE a_Type) { return Get(a_Type).m_BlockHeight; } + inline static float GetHardness (BLOCKTYPE a_Type) { return Get(a_Type).m_Hardness; } + + // tolua_end + + inline static cBlockHandler * GetHandler (BLOCKTYPE a_Type) { return Get(a_Type).m_Handler.get(); } + + /** Creates a default BlockInfo structure, initializes all values to their defaults */ + cBlockInfo(): + m_BlockType(E_BLOCK_STONE), + m_LightValue(0x00), + m_SpreadLightFalloff(0x0f), + m_Transparent(false), + m_OneHitDig(false), + m_PistonBreakable(false), + m_IsRainBlocker(false), + m_IsSkylightDispersant(false), + m_IsSolid(true), + m_UseableBySpectator(false), + m_FullyOccupiesVoxel(false), + m_CanBeTerraformed(false), + m_BlockHeight(1.0), + m_Hardness(0.0f), + m_Handler() + { + } + +private: + /** Storage for all the BlockInfo structures. */ + class cBlockInfoArray; /** How much light do the blocks emit on their own? */ NIBBLETYPE m_LightValue; @@ -61,8 +119,6 @@ public: /** Block's hardness. The greater the value the longer the player needs to break the block. */ float m_Hardness; - // tolua_end - /** Custom deleter allows cBlockHandler to be an incomplete type. */ struct sHandlerDeleter { @@ -71,63 +127,6 @@ public: /** Associated block handler. */ std::unique_ptr<cBlockHandler, sHandlerDeleter> m_Handler; - - /** The block type associated with this cBlockInfo. Needed for DeprecatedBindings.cpp */ - BLOCKTYPE m_BlockType; - - // tolua_begin - - inline static NIBBLETYPE GetLightValue (BLOCKTYPE a_Type) { return Get(a_Type).m_LightValue; } - inline static NIBBLETYPE GetSpreadLightFalloff(BLOCKTYPE a_Type) { return Get(a_Type).m_SpreadLightFalloff; } - inline static bool IsTransparent (BLOCKTYPE a_Type) { return Get(a_Type).m_Transparent; } - inline static bool IsOneHitDig (BLOCKTYPE a_Type) { return Get(a_Type).m_OneHitDig; } - inline static bool IsPistonBreakable (BLOCKTYPE a_Type) { return Get(a_Type).m_PistonBreakable; } - inline static bool IsRainBlocker (BLOCKTYPE a_Type) { return Get(a_Type).m_IsRainBlocker; } - inline static bool IsSkylightDispersant (BLOCKTYPE a_Type) - { - return ((Get(a_Type).m_IsSkylightDispersant) || (Get(a_Type).m_SpreadLightFalloff > 1)); - } - inline static bool IsSnowable (BLOCKTYPE a_Type) - { - return ( - (a_Type == E_BLOCK_ICE) - || (a_Type == E_BLOCK_LEAVES) - || (!Get(a_Type).m_Transparent && (a_Type != E_BLOCK_PACKED_ICE)) - ); - } - inline static bool IsSolid (BLOCKTYPE a_Type) { return Get(a_Type).m_IsSolid; } - inline static bool IsUseableBySpectator (BLOCKTYPE a_Type) { return Get(a_Type).m_UseableBySpectator; } - 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 float GetBlockHeight (BLOCKTYPE a_Type) { return Get(a_Type).m_BlockHeight; } - inline static float GetHardness (BLOCKTYPE a_Type) { return Get(a_Type).m_Hardness; } - - // tolua_end - - inline static cBlockHandler * GetHandler (BLOCKTYPE a_Type) { return Get(a_Type).m_Handler.get(); } - - /** Creates a default BlockInfo structure, initializes all values to their defaults */ - cBlockInfo() - : m_LightValue(0x00) - , m_SpreadLightFalloff(0x0f) - , m_Transparent(false) - , m_OneHitDig(false) - , m_PistonBreakable(false) - , m_IsRainBlocker(false) - , m_IsSkylightDispersant(false) - , m_IsSolid(true) - , m_UseableBySpectator(false) - , m_FullyOccupiesVoxel(false) - , m_CanBeTerraformed(false) - , m_BlockHeight(1.0) - , m_Hardness(0.0f) - , m_Handler() - , m_BlockType(E_BLOCK_AIR) - {} - -private: - /** Storage for all the BlockInfo structures. */ - class cBlockInfoArray; }; // tolua_export @@ -146,9 +145,9 @@ public: -inline cBlockInfo & cBlockInfo::Get(BLOCKTYPE a_Type) +inline const cBlockInfo & cBlockInfo::Get(BLOCKTYPE a_Type) { - static cBlockInfoArray ms_Info; + static const cBlockInfoArray ms_Info; return ms_Info[a_Type]; } @@ -159,5 +158,5 @@ inline cBlockInfo & cBlockInfo::Get(BLOCKTYPE a_Type) // Shortcut to get the blockhandler for a specific block inline cBlockHandler * BlockHandler(BLOCKTYPE a_BlockType) { - return cBlockInfo::Get(a_BlockType).m_Handler.get(); + return cBlockInfo::GetHandler(a_BlockType); } |