diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-14 22:33:12 +0200 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-04-14 22:33:12 +0200 |
| commit | c0f674098878b171ace1b0cf884507a611b21de2 (patch) | |
| tree | 2a30487f384c3358e5e2f7e623def94b1d031a94 /src/localplayer.cpp | |
| parent | ff5dcb946d1efc9248a2f1b88015119d2f267b35 (diff) | |
| download | mana-c0f674098878b171ace1b0cf884507a611b21de2.tar.gz mana-c0f674098878b171ace1b0cf884507a611b21de2.tar.bz2 mana-c0f674098878b171ace1b0cf884507a611b21de2.tar.xz mana-c0f674098878b171ace1b0cf884507a611b21de2.zip | |
Put the remaining unnamespaced handlers in a namespace
Also fixed some initialization order warnings when compiling with
tmwserv support and made two getters const.
Diffstat (limited to 'src/localplayer.cpp')
| -rw-r--r-- | src/localplayer.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 7323008b..ecc6b25d 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -80,13 +80,6 @@ LocalPlayer *player_node = NULL; LocalPlayer::LocalPlayer(): Player(65535, 0, NULL), mEquipment(new Equipment), - mAttributeBase(NB_CHARACTER_ATTRIBUTES, -1), - mAttributeEffective(NB_CHARACTER_ATTRIBUTES, -1), - mExpCurrent(CHAR_SKILL_NB, -1), - mExpNext(CHAR_SKILL_NB, -1), - mCharacterPoints(-1), - mCorrectionPoints(-1), - mLevelProgress(0), #else LocalPlayer::LocalPlayer(int id, int job, Map *map): Player(id, job, map), @@ -108,6 +101,15 @@ LocalPlayer::LocalPlayer(int id, int job, Map *map): mTargetTime(-1), #endif mLastTarget(-1), +#ifdef TMWSERV_SUPPORT + mAttributeBase(NB_CHARACTER_ATTRIBUTES, -1), + mAttributeEffective(NB_CHARACTER_ATTRIBUTES, -1), + mExpCurrent(CHAR_SKILL_NB, -1), + mExpNext(CHAR_SKILL_NB, -1), + mCharacterPoints(-1), + mCorrectionPoints(-1), + mLevelProgress(0), +#endif mLevel(1), mMoney(0), mTotalWeight(1), mMaxWeight(1), @@ -120,9 +122,11 @@ LocalPlayer::LocalPlayer(int id, int job, Map *map): mInventory(new Inventory(INVENTORY_SIZE)), #ifdef TMWSERV_SUPPORT mLocalWalkTime(-1), - mExpMessageTime(0), #endif mStorage(new Inventory(STORAGE_SIZE)) +#ifdef TMWSERV_SUPPORT + , mExpMessageTime(0) +#endif { // Variable to keep the local player from doing certain actions before a map // is initialized. e.g. drawing a player's name using the TextManager, since |