From 2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 30 Mar 2009 07:19:36 -0600
Subject: Merge item types to remove more #ifdefs

---
 src/resources/iteminfo.h | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'src/resources/iteminfo.h')

diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index bcee1fbd..327d0e9f 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -158,18 +158,11 @@ class ItemInfo
 
         const std::string &getEffect() const { return mEffect; }
 
-#ifdef TMWSERV_SUPPORT
         void setType(short type)
         { mType = type; }
 
         short getType() const
         { return mType; }
-#else
-        void setType(const std::string &type)
-        { mType = type; }
-
-        const std::string &getType() const { return mType; }
-#endif
 
         void setWeight(short weight)
         { mWeight = weight; }
@@ -205,11 +198,7 @@ class ItemInfo
         std::string mName;
         std::string mDescription;    /**< Short description. */
         std::string mEffect;         /**< Description of effects. */
-#ifdef TMWSERV_SUPPORT
         char mType;                  /**< Item type. */
-#else
-        std::string mType;           /**< Item type. */
-#endif
         std::string mParticle;       /**< Particle effect used with this item */
         short mWeight;               /**< Weight in grams. */
         int mView;                   /**< Item ID of how this item looks. */
-- 
cgit v1.2.3-60-g2f50