summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-03-19 21:26:38 +0100
committerMattes D <github@xoft.cz>2015-03-19 21:26:38 +0100
commit2d1d4ae3e39908237c1f2fd5315e4786cec5d781 (patch)
treeb27992ab5de96d2c791155c9e0866ed84e930146 /src
parentAllToLua: Fixed cMonster inheritance. (diff)
downloadcuberite-2d1d4ae3e39908237c1f2fd5315e4786cec5d781.tar
cuberite-2d1d4ae3e39908237c1f2fd5315e4786cec5d781.tar.gz
cuberite-2d1d4ae3e39908237c1f2fd5315e4786cec5d781.tar.bz2
cuberite-2d1d4ae3e39908237c1f2fd5315e4786cec5d781.tar.lz
cuberite-2d1d4ae3e39908237c1f2fd5315e4786cec5d781.tar.xz
cuberite-2d1d4ae3e39908237c1f2fd5315e4786cec5d781.tar.zst
cuberite-2d1d4ae3e39908237c1f2fd5315e4786cec5d781.zip
Diffstat (limited to '')
-rw-r--r--src/Bindings/LuaWindow.h6
-rw-r--r--src/BlockEntities/BlockEntityWithItems.h2
-rw-r--r--src/Inventory.h2
-rw-r--r--src/WebAdmin.h2
4 files changed, 10 insertions, 2 deletions
diff --git a/src/Bindings/LuaWindow.h b/src/Bindings/LuaWindow.h
index 76530d99d..d4fc58660 100644
--- a/src/Bindings/LuaWindow.h
+++ b/src/Bindings/LuaWindow.h
@@ -35,8 +35,10 @@ This reference needs to be unreferenced in the Destroy() function.
*/
// tolua_begin
class cLuaWindow :
- public cWindow,
- public cItemGrid::cListener
+ public cWindow
+ // tolua_end
+ , public cItemGrid::cListener
+ // tolua_begin
{
typedef cWindow super;
diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h
index 2c2ced1cb..740dbca51 100644
--- a/src/BlockEntities/BlockEntityWithItems.h
+++ b/src/BlockEntities/BlockEntityWithItems.h
@@ -21,7 +21,9 @@
// tolua_begin
class cBlockEntityWithItems :
public cBlockEntity,
+ // tolua_end
public cItemGrid::cListener,
+ // tolua_begin
public cBlockEntityWindowOwner
{
typedef cBlockEntity super;
diff --git a/src/Inventory.h b/src/Inventory.h
index 4e76bc0d3..311f64562 100644
--- a/src/Inventory.h
+++ b/src/Inventory.h
@@ -31,7 +31,9 @@ You can use the invArmorOffset, invInventoryOffset and invHotbarOffset constants
*/
class cInventory :
+ // tolua_end
public cItemGrid::cListener
+ // tolua_begin
{
public:
diff --git a/src/WebAdmin.h b/src/WebAdmin.h
index 86a8a9a4b..1e1a9bfa9 100644
--- a/src/WebAdmin.h
+++ b/src/WebAdmin.h
@@ -95,7 +95,9 @@ struct sWebAdminPage
// tolua_begin
class cWebAdmin :
+ // tolua_end
public cHTTPServer::cCallbacks
+ // tolua_begin
{
public:
// tolua_end