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/FurnaceEntity.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source/FurnaceEntity.cpp') diff --git a/source/FurnaceEntity.cpp b/source/FurnaceEntity.cpp index ce33dbcc6..d464749d8 100644 --- a/source/FurnaceEntity.cpp +++ b/source/FurnaceEntity.cpp @@ -138,8 +138,8 @@ bool cFurnaceEntity::Tick( float a_Dt ) m_Items[0].m_ItemCount--; if( m_Items[0].IsEmpty() ) m_Items[0].Empty(); - m_Items[2].m_ItemHealth = m_CookingItem->m_ItemHealth; - m_Items[2].m_ItemID = m_CookingItem->m_ItemID; + m_Items[2].m_ItemDamage = m_CookingItem->m_ItemDamage; + m_Items[2].m_ItemType = m_CookingItem->m_ItemType; m_Items[2].m_ItemCount += m_CookingItem->m_ItemCount; delete m_CookingItem; m_CookingItem = NULL; @@ -299,14 +299,14 @@ bool cFurnaceEntity::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); } cItem CookingItem; - READ(f, CookingItem.m_ItemID); + READ(f, CookingItem.m_ItemType); READ(f, CookingItem.m_ItemCount); - READ(f, CookingItem.m_ItemHealth); + READ(f, CookingItem.m_ItemDamage); if (!CookingItem.IsEmpty()) { m_CookingItem = new cItem(CookingItem); -- cgit v1.2.3