summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorandrew <xdotftw@gmail.com>2014-03-02 09:50:24 +0100
committerandrew <xdotftw@gmail.com>2014-03-02 09:50:24 +0100
commit3ca56b39bce5ad59625d2ffb5ae730858fed8bcd (patch)
treee7d3611cdaf34fcb87d63c0fef4183592058663c /src
parentg_BlockXXX => cBlockInfo::XXX (diff)
downloadcuberite-3ca56b39bce5ad59625d2ffb5ae730858fed8bcd.tar
cuberite-3ca56b39bce5ad59625d2ffb5ae730858fed8bcd.tar.gz
cuberite-3ca56b39bce5ad59625d2ffb5ae730858fed8bcd.tar.bz2
cuberite-3ca56b39bce5ad59625d2ffb5ae730858fed8bcd.tar.lz
cuberite-3ca56b39bce5ad59625d2ffb5ae730858fed8bcd.tar.xz
cuberite-3ca56b39bce5ad59625d2ffb5ae730858fed8bcd.tar.zst
cuberite-3ca56b39bce5ad59625d2ffb5ae730858fed8bcd.zip
Diffstat (limited to 'src')
-rw-r--r--src/Bindings/AllToLua.pkg1
-rw-r--r--src/BlockInfo.h11
2 files changed, 9 insertions, 3 deletions
diff --git a/src/Bindings/AllToLua.pkg b/src/Bindings/AllToLua.pkg
index 1a2140771..6b067b1e5 100644
--- a/src/Bindings/AllToLua.pkg
+++ b/src/Bindings/AllToLua.pkg
@@ -26,6 +26,7 @@ $cfile "WebPlugin.h"
$cfile "LuaWindow.h"
$cfile "../BlockID.h"
+$cfile "../BlockInfo.h"
$cfile "../StringUtils.h"
$cfile "../Defines.h"
$cfile "../ChatColor.h"
diff --git a/src/BlockInfo.h b/src/BlockInfo.h
index a06c47a47..57092ca54 100644
--- a/src/BlockInfo.h
+++ b/src/BlockInfo.h
@@ -5,16 +5,19 @@
-
+// tolua_begin
class cBlockInfo
{
public:
+ // tolua_end
cBlockInfo();
/** (Re-)Initializes the internal BlockInfo structures. */
static void Initialize(void);
+ // tolua_begin
+
/** Returns the associated BlockInfo structure. */
static cBlockInfo & GetById(unsigned int a_ID);
@@ -43,7 +46,7 @@ public:
/** Is this block solid (player cannot walk through)? */
bool m_IsSolid;
- /** Does this block fully occupy it's voxel - is it a 'full' block? */
+ /** Does this block fully occupy its voxel - is it a 'full' block? */
bool m_FullyOccupiesVoxel;
@@ -57,6 +60,8 @@ public:
inline static bool IsSolid (unsigned int a_ID) { return GetById(a_ID).m_IsSolid; }
inline static bool FullyOccupiesVoxel (unsigned int a_ID) { return GetById(a_ID).m_FullyOccupiesVoxel; }
+ // tolua_end
+
protected:
@@ -64,7 +69,7 @@ protected:
static cBlockInfo ms_Info[256];
-};
+}; // tolua_export