From dc878898f36473c4df54457d2738562df4dec908 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Wed, 10 Apr 2013 21:40:30 +0000 Subject: Dispensers rewritten to use ItemGrid git-svn-id: http://mc-server.googlecode.com/svn/trunk@1383 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/DispenserEntity.cpp | 249 +++++++++++++++++++++------------------------ 1 file changed, 117 insertions(+), 132 deletions(-) (limited to 'source/DispenserEntity.cpp') diff --git a/source/DispenserEntity.cpp b/source/DispenserEntity.cpp index 5b0af8e42..1c95172e2 100644 --- a/source/DispenserEntity.cpp +++ b/source/DispenserEntity.cpp @@ -31,10 +31,10 @@ -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_Items( new cItem[9] ) - , m_CanDispense( 0 ) +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), + m_ShouldDispense(false) { SetBlockEntity(this); // cBlockEntityWindowOwner } @@ -46,15 +46,10 @@ cDispenserEntity::cDispenserEntity(int a_X, int a_Y, int a_Z, cWorld * a_World) cDispenserEntity::~cDispenserEntity() { // Tell window its owner is destroyed - if( GetWindow() ) + cWindow * Window = GetWindow(); + if (Window != NULL) { - GetWindow()->OwnerDestroyed(); - } - - // Clean up items - if( m_Items ) - { - delete [] m_Items; + Window->OwnerDestroyed(); } } @@ -62,18 +57,12 @@ cDispenserEntity::~cDispenserEntity() -void cDispenserEntity::Destroy() +void cDispenserEntity::Destroy(void) { // Drop items cItems Pickups; - for( int i = 0; i < 9; i++) - { - if( !m_Items[i].IsEmpty() ) - { - Pickups.push_back(m_Items[i]); - m_Items[i].Empty(); - } - } + m_Contents.CopyToItems(Pickups); + m_Contents.Clear(); m_World->SpawnItemPickups(Pickups, m_PosX, m_PosY, m_PosZ); } @@ -81,122 +70,131 @@ void cDispenserEntity::Destroy() -void cDispenserEntity::Dispense() +void cDispenserEntity::Dispense(void) { int Disp_X = m_PosX; int Disp_Y = m_PosY; int Disp_Z = m_PosZ; - NIBBLETYPE Meta = m_World->GetBlockMeta( m_PosX, m_PosY, m_PosZ ); - AddDispenserDir( Disp_X, Disp_Y, Disp_Z, Meta ); - char OccupiedSlots[9]; - char SlotsCnt = 0; - for( int i = 0; i < 9; i++) + NIBBLETYPE Meta = m_World->GetBlockMeta(m_PosX, m_PosY, m_PosZ); + AddDispenserDir(Disp_X, Disp_Y, Disp_Z, Meta); + int OccupiedSlots[9]; + int SlotsCnt = 0; + for (int i = m_Contents.GetNumSlots() - 1; i >= 0; i--) { - if( !m_Items[i].IsEmpty() ) + if (!m_Contents.GetSlot(i).IsEmpty()) { OccupiedSlots[SlotsCnt] = i; SlotsCnt++; } + } // for i - m_Contents[] + + if (SlotsCnt == 0) + { + // Nothing in the dispenser, play the click sound + m_World->BroadcastSoundEffect("random.click", m_PosX * 8, m_PosY * 8, m_PosZ * 8, 1.0f, 1.2f); + return; } - if(SlotsCnt > 0) + + // Pick an item to dispense: + MTRand r1; + int RandomSlot = r1.randInt(SlotsCnt); + cItem & Drop = m_Contents.GetSlot(OccupiedSlots[RandomSlot]); + + // Dispense the item: + switch (Drop.m_ItemType) { - MTRand r1; - char RandomSlot = r1.randInt() % SlotsCnt; - cItem Drop = m_Items[OccupiedSlots[RandomSlot]]; - switch( m_Items[OccupiedSlots[RandomSlot]].m_ItemType ) + case E_ITEM_BUCKET: { - case E_ITEM_BUCKET: + BLOCKTYPE DispBlock = m_World->GetBlock(Disp_X, Disp_Y, Disp_Z); + if (DispBlock == E_BLOCK_STATIONARY_WATER) + { + m_World->SetBlock(Disp_X, Disp_Y, Disp_Z, E_BLOCK_AIR, 0); + Drop.m_ItemType = E_ITEM_WATER_BUCKET; // TODO: Duplication glitch - bucket stacking allows you to duplicate water + } + else if (DispBlock == E_BLOCK_STATIONARY_LAVA) { - BLOCKTYPE DispBlock = m_World->GetBlock( Disp_X, Disp_Y, Disp_Z ); - if( DispBlock == E_BLOCK_STATIONARY_WATER ) - { - m_World->SetBlock( Disp_X, Disp_Y, Disp_Z, E_BLOCK_AIR, 0 ); - m_Items[OccupiedSlots[RandomSlot]].m_ItemType = E_ITEM_WATER_BUCKET; - } - else if( DispBlock == E_BLOCK_STATIONARY_LAVA ) - { - m_World->SetBlock( Disp_X, Disp_Y, Disp_Z, E_BLOCK_AIR, 0 ); - m_Items[OccupiedSlots[RandomSlot]].m_ItemType = E_ITEM_LAVA_BUCKET; - } - else - { - cItems Pickups; - Pickups.push_back(cItem(Drop.m_ItemType, 1, Drop.m_ItemDamage)); - m_World->SpawnItemPickups(Pickups, Disp_X, Disp_Y, Disp_Z); - m_Items[OccupiedSlots[RandomSlot]].m_ItemCount--; - } - break; + m_World->SetBlock(Disp_X, Disp_Y, Disp_Z, E_BLOCK_AIR, 0); + Drop.m_ItemType = E_ITEM_LAVA_BUCKET; // TODO: Duplication glitch - bucket stacking allows you to duplicate lava } - case E_ITEM_WATER_BUCKET: + else + { + cItems Pickups; + Pickups.push_back(Drop.CopyOne()); + m_World->SpawnItemPickups(Pickups, Disp_X, Disp_Y, Disp_Z); + Drop.m_ItemCount--; + } + break; + } + + case E_ITEM_WATER_BUCKET: + { + BLOCKTYPE DispBlock = m_World->GetBlock(Disp_X, Disp_Y, Disp_Z); + if ((DispBlock == E_BLOCK_AIR) || IsBlockLiquid(DispBlock) || cFluidSimulator::CanWashAway(DispBlock)) { - BLOCKTYPE DispBlock = m_World->GetBlock( Disp_X, Disp_Y, Disp_Z ); - if( DispBlock == E_BLOCK_AIR || IsBlockLiquid(DispBlock) || cFluidSimulator::CanWashAway(DispBlock) ) - { - m_World->SetBlock( Disp_X, Disp_Y, Disp_Z, E_BLOCK_STATIONARY_WATER, 0 ); - m_Items[OccupiedSlots[RandomSlot]].m_ItemType = E_ITEM_BUCKET; - } - else - { - cItems Pickups; - Pickups.push_back(cItem(Drop.m_ItemType, 1, Drop.m_ItemDamage)); - m_World->SpawnItemPickups(Pickups, Disp_X, Disp_Y, Disp_Z); - m_Items[OccupiedSlots[RandomSlot]].m_ItemCount--; - } - break; + m_World->SetBlock(Disp_X, Disp_Y, Disp_Z, E_BLOCK_STATIONARY_WATER, 0); + Drop.m_ItemType = E_ITEM_BUCKET; } - case E_ITEM_LAVA_BUCKET: + else { - BLOCKTYPE DispBlock = m_World->GetBlock( Disp_X, Disp_Y, Disp_Z ); - if( DispBlock == E_BLOCK_AIR || IsBlockLiquid(DispBlock) || cFluidSimulator::CanWashAway(DispBlock) ) - { - m_World->SetBlock( Disp_X, Disp_Y, Disp_Z, E_BLOCK_STATIONARY_LAVA, 0 ); - m_Items[OccupiedSlots[RandomSlot]].m_ItemType = E_ITEM_BUCKET; - } - else - { - cItems Pickups; - Pickups.push_back(cItem(Drop.m_ItemType, 1, Drop.m_ItemDamage)); - m_World->SpawnItemPickups(Pickups, Disp_X, Disp_Y, Disp_Z); - m_Items[OccupiedSlots[RandomSlot]].m_ItemCount--; - } - break; + cItems Pickups; + Pickups.push_back(Drop.CopyOne()); + m_World->SpawnItemPickups(Pickups, Disp_X, Disp_Y, Disp_Z); + Drop.m_ItemCount--; } - case E_ITEM_SPAWN_EGG: + break; + } + + case E_ITEM_LAVA_BUCKET: + { + BLOCKTYPE DispBlock = m_World->GetBlock( Disp_X, Disp_Y, Disp_Z ); + if ((DispBlock == E_BLOCK_AIR) || IsBlockLiquid(DispBlock) || cFluidSimulator::CanWashAway(DispBlock)) { - if (m_World->SpawnMob(Disp_X + 0.5, Disp_Y, Disp_Z + 0.5, m_Items[OccupiedSlots[RandomSlot]].m_ItemDamage) >= 0) - { - m_Items[OccupiedSlots[RandomSlot]].m_ItemCount--; - } - break; + m_World->SetBlock(Disp_X, Disp_Y, Disp_Z, E_BLOCK_STATIONARY_LAVA, 0); + Drop.m_ItemType = E_ITEM_BUCKET; } - default: + else { cItems Pickups; - Pickups.push_back(cItem(Drop.m_ItemType, 1, Drop.m_ItemDamage)); + Pickups.push_back(Drop.CopyOne()); m_World->SpawnItemPickups(Pickups, Disp_X, Disp_Y, Disp_Z); - m_Items[OccupiedSlots[RandomSlot]].m_ItemCount--; - break; + Drop.m_ItemCount--; } + break; } - char SmokeDir; - switch( Meta ) + + case E_ITEM_SPAWN_EGG: { - case 2: SmokeDir = 1; break; - case 3: SmokeDir = 7; break; - case 4: SmokeDir = 3; break; - case 5: SmokeDir = 5; break; + if (m_World->SpawnMob(Disp_X + 0.5, Disp_Y, Disp_Z + 0.5, Drop.m_ItemDamage) >= 0) + { + Drop.m_ItemCount--; + } + break; } - m_World->BroadcastSoundParticleEffect(2000, m_PosX * 8, m_PosY * 8, m_PosZ * 8, SmokeDir); - m_World->BroadcastSoundEffect("random.click", m_PosX * 8, m_PosY * 8, m_PosZ * 8, 1.0f, 1.0f); - cWindow * Window = GetWindow(); - if ( Window != NULL ) + + default: { - Window->BroadcastWholeWindow(); + cItems Pickups; + Pickups.push_back(Drop.CopyOne()); + m_World->SpawnItemPickups(Pickups, Disp_X, Disp_Y, Disp_Z); + Drop.m_ItemCount--; + break; } + } // switch (ItemType) + + char SmokeDir = 0; + switch (Meta) + { + case 2: SmokeDir = 1; break; + case 3: SmokeDir = 7; break; + case 4: SmokeDir = 3; break; + case 5: SmokeDir = 5; break; } - else + m_World->BroadcastSoundParticleEffect(2000, m_PosX * 8, m_PosY * 8, m_PosZ * 8, SmokeDir); + m_World->BroadcastSoundEffect("random.click", m_PosX * 8, m_PosY * 8, m_PosZ * 8, 1.0f, 1.0f); + cWindow * Window = GetWindow(); + if (Window != NULL) { - m_World->BroadcastSoundEffect("random.click", m_PosX * 8, m_PosY * 8, m_PosZ * 8, 1.0f, 1.2f); + Window->BroadcastWholeWindow(); } } @@ -224,20 +222,20 @@ void cDispenserEntity::UsedBy(cPlayer * a_Player) -void cDispenserEntity::Activate() +void cDispenserEntity::Activate(void) { - m_CanDispense = 1; + m_ShouldDispense = true; } -bool cDispenserEntity::Tick( float a_Dt ) +bool cDispenserEntity::Tick(float a_Dt) { - if(m_CanDispense) + if (m_ShouldDispense) { - m_CanDispense = 0; + m_ShouldDispense = false; Dispense(); } return false; @@ -247,21 +245,7 @@ bool cDispenserEntity::Tick( float a_Dt ) -void cDispenserEntity::SetSlot(int a_Slot, const cItem & a_Item) -{ - if ((a_Slot < 0) || (a_Slot >= 9)) - { - ASSERT(!"Dispenser: slot number out of range"); - return; - } - m_Items[a_Slot] = a_Item; -} - - - - - -bool cDispenserEntity::LoadFromJson( const Json::Value& a_Value ) +bool cDispenserEntity::LoadFromJson(const Json::Value & a_Value) { m_PosX = a_Value.get("x", 0).asInt(); m_PosY = a_Value.get("y", 0).asInt(); @@ -269,9 +253,9 @@ bool cDispenserEntity::LoadFromJson( const Json::Value& a_Value ) Json::Value AllSlots = a_Value.get("Slots", 0); int SlotIdx = 0; - for( Json::Value::iterator itr = AllSlots.begin(); itr != AllSlots.end(); ++itr ) + for (Json::Value::iterator itr = AllSlots.begin(); itr != AllSlots.end(); ++itr) { - m_Items[ SlotIdx ].FromJson( *itr ); + m_Contents.GetSlot(SlotIdx).FromJson(*itr); SlotIdx++; } @@ -282,18 +266,19 @@ bool cDispenserEntity::LoadFromJson( const Json::Value& a_Value ) -void cDispenserEntity::SaveToJson( Json::Value& a_Value ) +void cDispenserEntity::SaveToJson(Json::Value & a_Value) { a_Value["x"] = m_PosX; a_Value["y"] = m_PosY; a_Value["z"] = m_PosZ; Json::Value AllSlots; - for(unsigned int i = 0; i < 3; i++) + int NumSlots = m_Contents.GetNumSlots(); + for (int i = 0; i < NumSlots; i++) { Json::Value Slot; - m_Items[ i ].GetJson( Slot ); - AllSlots.append( Slot ); + m_Contents.GetSlot(i).GetJson(Slot); + AllSlots.append(Slot); } a_Value["Slots"] = AllSlots; } -- cgit v1.2.3