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

cChestEntity and cDispenserEntity now inherit from a common ancestor, cBlockEntityWithItems

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1507 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2013-05-25 11:59:13 +00:00
parent e3136c2d0f
commit c640e9346c
9 changed files with 246 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/ChestEntity.cpp
View File

@@ -24,8 +24,7 @@ class cRoot;
cChestEntity::cChestEntity(int a_BlockX, int a_BlockY, int a_BlockZ) :
super(E_BLOCK_CHEST, a_BlockX, a_BlockY, a_BlockZ),
m_Contents(c_ChestWidth, c_ChestHeight)
super(E_BLOCK_CHEST, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, NULL)
{
cBlockEntityWindowOwner::SetBlockEntity(this);
}
@@ -35,8 +34,7 @@ cChestEntity::cChestEntity(int a_BlockX, int a_BlockY, int a_BlockZ) :
cChestEntity::cChestEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :
super(E_BLOCK_CHEST, a_BlockX, a_BlockY, a_BlockZ, a_World),
m_Contents(c_ChestWidth, c_ChestHeight)
super(E_BLOCK_CHEST, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, a_World)
{
cBlockEntityWindowOwner::SetBlockEntity(this);
}
@@ -58,19 +56,6 @@ cChestEntity::~cChestEntity()
void cChestEntity::Destroy(void)
{
// Drop items
cItems Pickups;
m_Contents.CopyToItems(Pickups);
m_Contents.Clear();
m_World->SpawnItemPickups(Pickups, m_PosX, m_PosY, m_PosZ);
}
bool cChestEntity::LoadFromJson(const Json::Value & a_Value)
{
m_PosX = a_Value.get("x", 0).asInt();