From 92c59963f82f81aa3202657e7fdbb2592924ede3 Mon Sep 17 00:00:00 2001 From: "cedeel@gmail.com" Date: Thu, 14 Jun 2012 13:06:06 +0000 Subject: Attempt to bring sanity to newlines across systems. git-svn-id: http://mc-server.googlecode.com/svn/trunk@606 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cItem.cpp | 102 +++++++++++++++++++++++++++---------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'source/cItem.cpp') diff --git a/source/cItem.cpp b/source/cItem.cpp index acb51611a..f13b9cbf3 100644 --- a/source/cItem.cpp +++ b/source/cItem.cpp @@ -1,51 +1,51 @@ - -#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules - -#include "cItem.h" -#include - - - - - -void cItem::GetJson( Json::Value & a_OutValue ) const -{ - a_OutValue["ID"] = m_ItemID; - if( m_ItemID > 0 ) - { - a_OutValue["Count"] = m_ItemCount; - a_OutValue["Health"] = m_ItemHealth; - } -} - -void cItem::FromJson( const Json::Value & a_Value ) -{ - m_ItemID = (ENUM_ITEM_ID)a_Value.get("ID", -1 ).asInt(); - if( m_ItemID > 0 ) - { - m_ItemCount = (char)a_Value.get("Count", -1 ).asInt(); - m_ItemHealth = (short)a_Value.get("Health", -1 ).asInt(); - } -} - -bool cItem::IsEnchantable(ENUM_ITEM_ID item) -{ - if(item >= 256 && item <= 259) - return true; - if(item >= 267 && item <= 279) - return true; - if(item >= 283 && item <= 286) - return true; - if(item >= 290 && item <= 294) - return true; - if(item >= 298 && item <= 317) - return true; - if(item >= 290 && item <= 294) - return true; - - if(item == 346 || item == 359 || item == 261) - return true; - - - return false; -} + +#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules + +#include "cItem.h" +#include + + + + + +void cItem::GetJson( Json::Value & a_OutValue ) const +{ + a_OutValue["ID"] = m_ItemID; + if( m_ItemID > 0 ) + { + a_OutValue["Count"] = m_ItemCount; + a_OutValue["Health"] = m_ItemHealth; + } +} + +void cItem::FromJson( const Json::Value & a_Value ) +{ + m_ItemID = (ENUM_ITEM_ID)a_Value.get("ID", -1 ).asInt(); + if( m_ItemID > 0 ) + { + m_ItemCount = (char)a_Value.get("Count", -1 ).asInt(); + m_ItemHealth = (short)a_Value.get("Health", -1 ).asInt(); + } +} + +bool cItem::IsEnchantable(ENUM_ITEM_ID item) +{ + if(item >= 256 && item <= 259) + return true; + if(item >= 267 && item <= 279) + return true; + if(item >= 283 && item <= 286) + return true; + if(item >= 290 && item <= 294) + return true; + if(item >= 298 && item <= 317) + return true; + if(item >= 290 && item <= 294) + return true; + + if(item == 346 || item == 359 || item == 261) + return true; + + + return false; +} -- cgit v1.2.3