summaryrefslogtreecommitdiffstats
path: root/source/DispenserEntity.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-01-12 05:46:01 +0100
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-01-12 05:46:01 +0100
commit43e684071933adef93040e8d4b830d5c6b71cf9a (patch)
tree014e5300feb1cdbbb8f24e4e42594eeb841f0be2 /source/DispenserEntity.cpp
parentFixed rclk in doublechests (diff)
downloadcuberite-43e684071933adef93040e8d4b830d5c6b71cf9a.tar
cuberite-43e684071933adef93040e8d4b830d5c6b71cf9a.tar.gz
cuberite-43e684071933adef93040e8d4b830d5c6b71cf9a.tar.bz2
cuberite-43e684071933adef93040e8d4b830d5c6b71cf9a.tar.lz
cuberite-43e684071933adef93040e8d4b830d5c6b71cf9a.tar.xz
cuberite-43e684071933adef93040e8d4b830d5c6b71cf9a.tar.zst
cuberite-43e684071933adef93040e8d4b830d5c6b71cf9a.zip
Diffstat (limited to 'source/DispenserEntity.cpp')
-rw-r--r--source/DispenserEntity.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/DispenserEntity.cpp b/source/DispenserEntity.cpp
index 09a847900..3ace4a1cf 100644
--- a/source/DispenserEntity.cpp
+++ b/source/DispenserEntity.cpp
@@ -121,7 +121,7 @@ void cDispenserEntity::Dispense()
else
{
cItems Pickups;
- Pickups.push_back(cItem(Drop.m_ItemType, 1, Drop.m_ItemHealth));
+ 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--;
}
@@ -138,7 +138,7 @@ void cDispenserEntity::Dispense()
else
{
cItems Pickups;
- Pickups.push_back(cItem(Drop.m_ItemType, 1, Drop.m_ItemHealth));
+ 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--;
}
@@ -155,7 +155,7 @@ void cDispenserEntity::Dispense()
else
{
cItems Pickups;
- Pickups.push_back(cItem(Drop.m_ItemType, 1, Drop.m_ItemHealth));
+ 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--;
}
@@ -172,7 +172,7 @@ void cDispenserEntity::Dispense()
default:
{
cItems Pickups;
- Pickups.push_back(cItem(Drop.m_ItemType, 1, Drop.m_ItemHealth));
+ 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;
@@ -280,9 +280,9 @@ bool cDispenserEntity::LoadFromFile(cFile & f)
for(unsigned int i = 0; i < NumSlots; i++)
{
cItem & Item = m_Items[i];
- READ(f, Item.m_ItemID);
+ READ(f, Item.m_ItemType);
READ(f, Item.m_ItemCount);
- READ(f, Item.m_ItemHealth);
+ READ(f, Item.m_ItemDamage);
}
return true;