flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed error while compiling.

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1464 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
nielsbreu@gmail.com 2013-05-09 15:08:20 +00:00
parent 4e44c4b33a
commit 7dc9b2ce8d
1 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
source/Bindings.cpp
View File

@ -1,10 +1,6 @@
/* /*
** Lua binding: AllToLua ** Lua binding: AllToLua
<<<<<<< .mine ** Generated automatically by tolua++-1.0.92 on 05/09/13 16:34:30.
** Generated automatically by tolua++-1.0.92 on 05/09/13 14:14:47.
=======
** Generated automatically by tolua++-1.0.92 on 05/08/13 11:35:08.
>>>>>>> .r1462
*/ */
#ifndef __cplusplus #ifndef __cplusplus
@ -89,17 +85,9 @@ static int tolua_collect_cPickup (lua_State* tolua_S)
return 0; return 0;
} }
<<<<<<< .mine
static int tolua_collect_cItems (lua_State* tolua_S) static int tolua_collect_cItems (lua_State* tolua_S)
=======
static int tolua_collect_cChestEntity (lua_State* tolua_S)
>>>>>>> .r1462
{ {
<<<<<<< .mine
cItems* self = (cItems*) tolua_tousertype(tolua_S,1,0); cItems* self = (cItems*) tolua_tousertype(tolua_S,1,0);
=======
cChestEntity* self = (cChestEntity*) tolua_tousertype(tolua_S,1,0);
>>>>>>> .r1462
Mtolua_delete(self); Mtolua_delete(self);
return 0; return 0;
} }
@ -11606,6 +11594,45 @@ static int tolua_AllToLua_cWorld_GetSpawnZ00(lua_State* tolua_S)
} }
#endif //#ifndef TOLUA_DISABLE #endif //#ifndef TOLUA_DISABLE
/* method: DoExplosiontAt of class cWorld */
#ifndef TOLUA_DISABLE_tolua_AllToLua_cWorld_DoExplosiontAt00
static int tolua_AllToLua_cWorld_DoExplosiontAt00(lua_State* tolua_S)
{
#ifndef TOLUA_RELEASE
tolua_Error tolua_err;
if (
!tolua_isusertype(tolua_S,1,"cWorld",0,&tolua_err) ||
!tolua_isnumber(tolua_S,2,0,&tolua_err) ||
!tolua_isnumber(tolua_S,3,0,&tolua_err) ||
!tolua_isnumber(tolua_S,4,0,&tolua_err) ||
!tolua_isnumber(tolua_S,5,0,&tolua_err) ||
!tolua_isnoobj(tolua_S,6,&tolua_err)
)
goto tolua_lerror;
else
#endif
{
cWorld* self = (cWorld*) tolua_tousertype(tolua_S,1,0);
float a_ExplosionSzie = ((float) tolua_tonumber(tolua_S,2,0));
int a_BlockX = ((int) tolua_tonumber(tolua_S,3,0));
int a_BlockY = ((int) tolua_tonumber(tolua_S,4,0));
int a_BlockZ = ((int) tolua_tonumber(tolua_S,5,0));
#ifndef TOLUA_RELEASE
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'DoExplosiontAt'", NULL);
#endif
{
self->DoExplosiontAt(a_ExplosionSzie,a_BlockX,a_BlockY,a_BlockZ);
}
}
return 0;
#ifndef TOLUA_RELEASE
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'DoExplosiontAt'.",&tolua_err);
return 0;
#endif
}
#endif //#ifndef TOLUA_DISABLE
/* method: GetSignLines of class cWorld */ /* method: GetSignLines of class cWorld */
#ifndef TOLUA_DISABLE_tolua_AllToLua_cWorld_GetSignLines00 #ifndef TOLUA_DISABLE_tolua_AllToLua_cWorld_GetSignLines00
static int tolua_AllToLua_cWorld_GetSignLines00(lua_State* tolua_S) static int tolua_AllToLua_cWorld_GetSignLines00(lua_State* tolua_S)
@ -25015,6 +25042,7 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
tolua_function(tolua_S,"GetSpawnX",tolua_AllToLua_cWorld_GetSpawnX00); tolua_function(tolua_S,"GetSpawnX",tolua_AllToLua_cWorld_GetSpawnX00);
tolua_function(tolua_S,"GetSpawnY",tolua_AllToLua_cWorld_GetSpawnY00); tolua_function(tolua_S,"GetSpawnY",tolua_AllToLua_cWorld_GetSpawnY00);
tolua_function(tolua_S,"GetSpawnZ",tolua_AllToLua_cWorld_GetSpawnZ00); tolua_function(tolua_S,"GetSpawnZ",tolua_AllToLua_cWorld_GetSpawnZ00);
tolua_function(tolua_S,"DoExplosiontAt",tolua_AllToLua_cWorld_DoExplosiontAt00);
tolua_function(tolua_S,"GetSignLines",tolua_AllToLua_cWorld_GetSignLines00); tolua_function(tolua_S,"GetSignLines",tolua_AllToLua_cWorld_GetSignLines00);
tolua_function(tolua_S,"GrowTree",tolua_AllToLua_cWorld_GrowTree00); tolua_function(tolua_S,"GrowTree",tolua_AllToLua_cWorld_GrowTree00);
tolua_function(tolua_S,"GrowTreeFromSapling",tolua_AllToLua_cWorld_GrowTreeFromSapling00); tolua_function(tolua_S,"GrowTreeFromSapling",tolua_AllToLua_cWorld_GrowTreeFromSapling00);