diff options
author | Jared Adams <jaxad0127@gmail.com> | 2010-01-24 14:43:14 -0700 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2010-01-24 14:43:14 -0700 |
commit | 3730a6028626cfcdab9bd98aecfeadf6c884b505 (patch) | |
tree | f78d37fae95f74625a745f5e551c40ae337976d9 /src/player.h | |
parent | 889108ea9a75a0591cac7efb49bac65629b6fb86 (diff) | |
download | mana-3730a6028626cfcdab9bd98aecfeadf6c884b505.tar.gz mana-3730a6028626cfcdab9bd98aecfeadf6c884b505.tar.bz2 mana-3730a6028626cfcdab9bd98aecfeadf6c884b505.tar.xz mana-3730a6028626cfcdab9bd98aecfeadf6c884b505.zip |
Remove some more _SUPPORT ifdefs
Diffstat (limited to 'src/player.h')
-rw-r--r-- | src/player.h | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/src/player.h b/src/player.h index 5cdc35a7..78368b43 100644 --- a/src/player.h +++ b/src/player.h @@ -43,29 +43,6 @@ enum Gender class Player : public Being { public: - enum Sprite - { - BASE_SPRITE = 0, - SHOE_SPRITE, - BOTTOMCLOTHES_SPRITE, - TOPCLOTHES_SPRITE, -#ifdef EATHENA_SUPPORT - MISC1_SPRITE, - MISC2_SPRITE, -#endif - HAIR_SPRITE, - HAT_SPRITE, -#ifdef EATHENA_SUPPORT - CAPE_SPRITE, - GLOVES_SPRITE, -#endif - WEAPON_SPRITE, -#ifdef EATHENA_SUPPORT - SHIELD_SPRITE, -#endif - VECTOREND_SPRITE - }; - /** * Constructor. */ @@ -73,9 +50,7 @@ class Player : public Being ~Player(); -#ifdef EATHENA_SUPPORT virtual void logic(); -#endif virtual Type getType() const { return PLAYER; } @@ -100,7 +75,8 @@ class Player : public Being * Sets visible equipments for this player. */ virtual void setSprite(unsigned int slot, int id, - const std::string &color = ""); + const std::string &color = "", + bool isWeapon = false); virtual void setSpriteID(unsigned int slot, int id); |