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

Fixed cLuaWindow's binding.

Browse Source 
No longer exporting multiple inheritance.
This commit is contained in:
madmaxoft 2013-10-23 13:31:04 +02:00
parent 60abe99d5e
commit 88db43e8d3
3 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/Bindings.cpp
View File

@ -1,6 +1,6 @@
/*
** Lua binding: AllToLua
** Generated automatically by tolua++-1.0.92 on 10/23/13 12:07:27.
** Generated automatically by tolua++-1.0.92 on 10/23/13 13:30:23.
*/
#ifndef __cplusplus
@ -29178,23 +29178,6 @@ static int tolua_AllToLua_cLuaWindow_GetContents00(lua_State* tolua_S)
}
#endif //#ifndef TOLUA_DISABLE
/* get function: __cItemGrid of class cLuaWindow */
#ifndef TOLUA_DISABLE_tolua_get_cLuaWindow___cItemGrid__cListener__
static int tolua_get_cLuaWindow___cItemGrid__cListener__(lua_State* tolua_S)
{
cLuaWindow* self = (cLuaWindow*) tolua_tousertype(tolua_S,1,0);
#ifndef TOLUA_RELEASE
if (!self) tolua_error(tolua_S,"invalid 'self' in accessing variable '__cItemGrid'",NULL);
#endif
#ifdef __cplusplus
tolua_pushusertype(tolua_S,(void*)static_cast<cItemGrid::cListener*>(self), "cItemGrid::cListener");
#else
tolua_pushusertype(tolua_S,(void*)((cItemGrid::cListener*)self), "cItemGrid::cListener");
#endif
return 1;
}
#endif //#ifndef TOLUA_DISABLE
/* method: GetMobType of class cMonster */
#ifndef TOLUA_DISABLE_tolua_AllToLua_cMonster_GetMobType00
static int tolua_AllToLua_cMonster_GetMobType00(lua_State* tolua_S)
@ -31441,7 +31424,6 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
tolua_function(tolua_S,".call",tolua_AllToLua_cLuaWindow_new00_local);
tolua_function(tolua_S,"delete",tolua_AllToLua_cLuaWindow_delete00);
tolua_function(tolua_S,"GetContents",tolua_AllToLua_cLuaWindow_GetContents00);
tolua_variable(tolua_S,"__cItemGrid__cListener__",tolua_get_cLuaWindow___cItemGrid__cListener__,NULL);
tolua_endmodule(tolua_S);
tolua_cclass(tolua_S,"cMonster","cMonster","cPawn",NULL);
tolua_beginmodule(tolua_S,"cMonster");

2
source/Bindings.h
View File

@ -1,6 +1,6 @@
/*
** Lua binding: AllToLua
** Generated automatically by tolua++-1.0.92 on 10/23/13 12:07:28.
** Generated automatically by tolua++-1.0.92 on 10/23/13 13:30:24.
*/
/* Exported function */

9
source/LuaWindow.h
View File

@ -23,8 +23,6 @@ class cPluginLua;
// tolua_begin
/** A window that has been created by a Lua plugin and is handled entirely by that plugin
This object needs extra care with its lifetime management:
- It is created by Lua, so Lua expects to garbage-collect it later
@ -35,9 +33,10 @@ Additionally, to forbid Lua from deleting this object while it is used by player
cPlayer:OpenWindow check if the window is of this class, and if so, make a global Lua reference for this object.
This reference needs to be unreferenced in the Destroy() function.
*/
class cLuaWindow :
public cWindow,
public cItemGrid::cListener
class cLuaWindow : // tolua_export
public cItemGrid::cListener,
// tolua_begin
public cWindow
{
typedef cWindow super;