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

31
source/DispenserEntity.cpp
View File

@@ -31,9 +31,19 @@
cDispenserEntity::cDispenserEntity(int a_X, int a_Y, int a_Z, cWorld * a_World) :
cBlockEntity(E_BLOCK_DISPENSER, a_X, a_Y, a_Z, a_World),
m_Contents(3, 3),
cDispenserEntity::cDispenserEntity(int a_BlockX, int a_BlockY, int a_BlockZ) :
super(E_BLOCK_DISPENSER, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, NULL),
m_ShouldDispense(false)
{
SetBlockEntity(this); // cBlockEntityWindowOwner
}
cDispenserEntity::cDispenserEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :
super(E_BLOCK_DISPENSER, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, a_World),
m_ShouldDispense(false)
{
SetBlockEntity(this); // cBlockEntityWindowOwner
@@ -57,19 +67,6 @@ cDispenserEntity::~cDispenserEntity()
void cDispenserEntity::Destroy(void)
{
// Drop items
cItems Pickups;
m_Contents.CopyToItems(Pickups);
m_Contents.Clear();
m_World->SpawnItemPickups(Pickups, m_PosX, m_PosY, m_PosZ);
}
void cDispenserEntity::Dispense(void)
{
int Disp_X = m_PosX;
@@ -97,7 +94,7 @@ void cDispenserEntity::Dispense(void)
// Pick an item to dispense:
MTRand r1;
int RandomSlot = r1.randInt(SlotsCnt);
int RandomSlot = r1.randInt(SlotsCnt - 1);
cItem & Drop = m_Contents.GetSlot(OccupiedSlots[RandomSlot]);
// Dispense the item: