diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-03-30 07:19:36 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-30 07:19:36 -0600 |
| commit | 2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a (patch) | |
| tree | 49fb5a1e363584800f967a4a163fb3e746228722 /src/resources/iteminfo.h | |
| parent | bbf4d657e77fd39887b9941af1fe75a5ec27d988 (diff) | |
| download | mana-2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a.tar.gz mana-2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a.tar.bz2 mana-2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a.tar.xz mana-2bf40f6f1f94cb85d95b8e9ce2942c9d4ce9bd1a.zip | |
Merge item types to remove more #ifdefs
Diffstat (limited to 'src/resources/iteminfo.h')
| -rw-r--r-- | src/resources/iteminfo.h | 11 |
1 files changed, 0 insertions, 11 deletions
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. */ |