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/Item.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source/Item.cpp') diff --git a/source/Item.cpp b/source/Item.cpp index 7d8a18f98..759b23042 100644 --- a/source/Item.cpp +++ b/source/Item.cpp @@ -10,21 +10,21 @@ void cItem::GetJson( Json::Value & a_OutValue ) const { - a_OutValue["ID"] = m_ItemID; - if( m_ItemID > 0 ) + a_OutValue["ID"] = m_ItemType; + if( m_ItemType > 0 ) { a_OutValue["Count"] = m_ItemCount; - a_OutValue["Health"] = m_ItemHealth; + a_OutValue["Health"] = m_ItemDamage; } } void cItem::FromJson( const Json::Value & a_Value ) { - m_ItemID = (ENUM_ITEM_ID)a_Value.get("ID", -1 ).asInt(); - if( m_ItemID > 0 ) + m_ItemType = (ENUM_ITEM_ID)a_Value.get("ID", -1 ).asInt(); + if( m_ItemType > 0 ) { m_ItemCount = (char)a_Value.get("Count", -1 ).asInt(); - m_ItemHealth = (short)a_Value.get("Health", -1 ).asInt(); + m_ItemDamage = (short)a_Value.get("Health", -1 ).asInt(); } } -- cgit v1.2.3