From 43e684071933adef93040e8d4b830d5c6b71cf9a Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 12 Jan 2013 04:46:01 +0000 Subject: Merged branch "branches/hooks" into "trunk". git-svn-id: http://mc-server.googlecode.com/svn/trunk@1139 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/DispenserEntity.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source/DispenserEntity.cpp') 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; -- cgit v1.2.3