ryansnewell
/
mcserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cItemGrid: Added IsSlotEmpty() functions 

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1585 0a769ca7-a7f5-676a-18bf-c427514a06d6
master
madmaxoft@gmail.com 2013-06-13 06:13:56 +00:00
parent 9cef5838a8
commit 5c38a831bf
6 changed files with 113 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
source/Bindings.cpp
View File

@ -1,6 +1,6 @@
/*
** Lua binding: AllToLua
** Generated automatically by tolua++-1.0.92 on 06/12/13 14:28:57.
** Generated automatically by tolua++-1.0.92 on 06/13/13 08:12:33.
*/
#ifndef __cplusplus
@ -15487,6 +15487,71 @@ tolua_lerror:
}
#endif //#ifndef TOLUA_DISABLE
/* method: IsSlotEmpty of class cItemGrid */
#ifndef TOLUA_DISABLE_tolua_AllToLua_cItemGrid_IsSlotEmpty00
static int tolua_AllToLua_cItemGrid_IsSlotEmpty00(lua_State* tolua_S)
{
#ifndef TOLUA_RELEASE
tolua_Error tolua_err;
if (
!tolua_isusertype(tolua_S,1,"const cItemGrid",0,&tolua_err) ||
!tolua_isnumber(tolua_S,2,0,&tolua_err) ||
!tolua_isnoobj(tolua_S,3,&tolua_err)
)
goto tolua_lerror;
else
#endif
{
const cItemGrid* self = (const cItemGrid*) tolua_tousertype(tolua_S,1,0);
int a_SlotNum = ((int) tolua_tonumber(tolua_S,2,0));
#ifndef TOLUA_RELEASE
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'IsSlotEmpty'", NULL);
#endif
{
bool tolua_ret = (bool) self->IsSlotEmpty(a_SlotNum);
tolua_pushboolean(tolua_S,(bool)tolua_ret);
}
}
return 1;
#ifndef TOLUA_RELEASE
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'IsSlotEmpty'.",&tolua_err);
return 0;
#endif
}
#endif //#ifndef TOLUA_DISABLE
/* method: IsSlotEmpty of class cItemGrid */
#ifndef TOLUA_DISABLE_tolua_AllToLua_cItemGrid_IsSlotEmpty01
static int tolua_AllToLua_cItemGrid_IsSlotEmpty01(lua_State* tolua_S)
{
tolua_Error tolua_err;
if (
!tolua_isusertype(tolua_S,1,"const cItemGrid",0,&tolua_err) ||
!tolua_isnumber(tolua_S,2,0,&tolua_err) ||
!tolua_isnumber(tolua_S,3,0,&tolua_err) ||
!tolua_isnoobj(tolua_S,4,&tolua_err)
)
goto tolua_lerror;
else
{
const cItemGrid* self = (const cItemGrid*) tolua_tousertype(tolua_S,1,0);
int a_X = ((int) tolua_tonumber(tolua_S,2,0));
int a_Y = ((int) tolua_tonumber(tolua_S,3,0));
#ifndef TOLUA_RELEASE
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'IsSlotEmpty'", NULL);
#endif
{
bool tolua_ret = (bool) self->IsSlotEmpty(a_X,a_Y);
tolua_pushboolean(tolua_S,(bool)tolua_ret);
}
}
return 1;
tolua_lerror:
return tolua_AllToLua_cItemGrid_IsSlotEmpty00(tolua_S);
}
#endif //#ifndef TOLUA_DISABLE
/* method: Clear of class cItemGrid */
#ifndef TOLUA_DISABLE_tolua_AllToLua_cItemGrid_Clear00
static int tolua_AllToLua_cItemGrid_Clear00(lua_State* tolua_S)
@ -27698,6 +27763,8 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S)
tolua_function(tolua_S,"SetSlot",tolua_AllToLua_cItemGrid_SetSlot03);
tolua_function(tolua_S,"EmptySlot",tolua_AllToLua_cItemGrid_EmptySlot00);
tolua_function(tolua_S,"EmptySlot",tolua_AllToLua_cItemGrid_EmptySlot01);
tolua_function(tolua_S,"IsSlotEmpty",tolua_AllToLua_cItemGrid_IsSlotEmpty00);
tolua_function(tolua_S,"IsSlotEmpty",tolua_AllToLua_cItemGrid_IsSlotEmpty01);
tolua_function(tolua_S,"Clear",tolua_AllToLua_cItemGrid_Clear00);
tolua_function(tolua_S,"HowManyCanFit",tolua_AllToLua_cItemGrid_HowManyCanFit00);
tolua_function(tolua_S,"AddItem",tolua_AllToLua_cItemGrid_AddItem00);

2
source/Bindings.h
View File

@ -1,6 +1,6 @@
/*
** Lua binding: AllToLua
** Generated automatically by tolua++-1.0.92 on 06/12/13 14:28:57.
** Generated automatically by tolua++-1.0.92 on 06/13/13 08:12:34.
*/
/* Exported function */

13
source/BlockEntities/ChestEntity.cpp
View File

@ -101,15 +101,20 @@ void cChestEntity::SendTo(cClientHandle & a_Client)
void cChestEntity::UsedBy(cPlayer * a_Player)
{
if (GetWindow() == NULL)
// If the window is not created, open it anew:
cWindow * Window = GetWindow();
if (Window == NULL)
{
OpenNewWindow();
Window = GetWindow();
}
if (GetWindow())
// Open the window for the player:
if (Window != NULL)
{
if( a_Player->GetWindow() != GetWindow() )
if (a_Player->GetWindow() != Window)
{
a_Player->OpenWindow( GetWindow() );
a_Player->OpenWindow(Window);
}
}

4
source/BlockEntities/ChestEntity.h
View File

@ -52,9 +52,9 @@ public:
// cBlockEntity overrides:
virtual void SaveToJson(Json::Value & a_Value) override;
virtual void SendTo(cClientHandle & a_Client) override;
virtual void UsedBy(cPlayer * a_Player);
virtual void UsedBy(cPlayer * a_Player) override;
/// Opens a new chest window for this chests. Scans for neighbors to open a double chest window, if appropriate.
/// Opens a new chest window for this chest. Scans for neighbors to open a double chest window, if appropriate.
void OpenNewWindow(void);
} ; // tolua_export

25
source/ItemGrid.cpp
View File

@ -175,6 +175,31 @@ void cItemGrid::EmptySlot(int a_SlotNum)
bool cItemGrid::IsSlotEmpty(int a_SlotNum) const
{
if ((a_SlotNum < 0) || (a_SlotNum >= m_NumSlots))
{
LOGWARNING("%s: Invalid slot number %d out of %d slots",
__FUNCTION__, a_SlotNum, m_NumSlots
);
return true;
}
return m_Slots[a_SlotNum].IsEmpty();
}
bool cItemGrid::IsSlotEmpty(int a_X, int a_Y) const
{
return IsSlotEmpty(GetSlotNum(a_X, a_Y));
}
void cItemGrid::Clear(void)
{
for (int i = 0; i < m_NumSlots; i++)

6
source/ItemGrid.h
View File

@ -62,6 +62,12 @@ public:
void EmptySlot(int a_X, int a_Y);
void EmptySlot(int a_SlotNum);
/// Returns true if the specified slot is empty or the slot doesn't exist
bool IsSlotEmpty(int a_SlotNum) const;
/// Returns true if the specified slot is empty or the slot doesn't exist
bool IsSlotEmpty(int a_X, int a_Y) const;
/// Sets all items as empty
void Clear(void);