diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-20 10:50:00 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-20 10:50:00 +0000 |
| commit | 5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc (patch) | |
| tree | 95684590a32266b28f046475cfa1926c99f67e52 /src/localplayer.cpp | |
| parent | cf36850d2bdda67cb472d938ed58053a92fa6935 (diff) | |
| download | mana-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.gz mana-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.bz2 mana-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.tar.xz mana-5a7abdafdac8f6ddd7972cadbc7e20563a0a29fc.zip | |
Merged revisions 3629-3630 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
(but kept looks in Being class, since eAthena works that way)
........
r3629 | gmelquio | 2007-10-18 21:00:38 +0200 (Thu, 18 Oct 2007) | 1 line
Removed player looks from generic beings. Prevented client termination on missing sprites. Merged weapon-type and attack-type fields for items.
........
r3630 | gmelquio | 2007-10-18 21:30:57 +0200 (Thu, 18 Oct 2007) | 1 line
Fixed changelog message.
........
Diffstat (limited to 'src/localplayer.cpp')
| -rw-r--r-- | src/localplayer.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 47ad5309..af047775 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -44,7 +44,7 @@ LocalPlayer *player_node = NULL; LocalPlayer::LocalPlayer(Uint32 id, Uint16 job, Map *map): Player(id, job, map), mAttackRange(0), - mInventory(new Inventory()), + mInventory(new Inventory), mXp(0), mTarget(NULL), mPickUpTarget(NULL), mTrading(false), mLastAction(-1) @@ -106,11 +106,6 @@ void LocalPlayer::nextStep() Player::nextStep(); } -Being::Type LocalPlayer::getType() const -{ - return LOCALPLAYER; -} - void LocalPlayer::clearInventory() { mInventory->clear(); |