diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-02-19 22:38:59 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-02-19 23:37:36 +0100 |
| commit | 363527d0f95963ba3f4a6d25c8eabc1bb3ad4efe (patch) | |
| tree | 117ce95d3587f913a64b71fe4dcdee716b8aea7e /src/player.cpp | |
| parent | 432d16435774cafd630e287321e882f3e8510d16 (diff) | |
| download | mana-363527d0f95963ba3f4a6d25c8eabc1bb3ad4efe.tar.gz mana-363527d0f95963ba3f4a6d25c8eabc1bb3ad4efe.tar.bz2 mana-363527d0f95963ba3f4a6d25c8eabc1bb3ad4efe.tar.xz mana-363527d0f95963ba3f4a6d25c8eabc1bb3ad4efe.zip | |
Fixed a crash when trying to switch servers
Ownership of the charInfo global variable wasn't well defined. It was
being locked, unlocked and generally modified from a lot of places, and
somewhere in this mess it ended up crashing when switching servers.
Now the CharHandler instances, for eAthena and manaserv respectively,
own this list of characters. A new class, Net::Character wraps up the
slot index in combination with the player dummy. The list is passed on
to the CharSelectDialog each time it changes.
Both related and unrelated cleanups were made as well.
Reviewed-by: Jared Adams
Diffstat (limited to 'src/player.cpp')
| -rw-r--r-- | src/player.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/player.cpp b/src/player.cpp index e537a2b9..2f6b14e9 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -49,7 +49,7 @@ Player::Player(int id, int job, Map *map, bool isNPC): { if (!isNPC) { - for (unsigned int i = 0; i < Net::getCharHandler()->maxSprite(); i++) + for (int i = 0; i < Net::getCharHandler()->maxSprite(); i++) { mSprites.push_back(NULL); mSpriteIDs.push_back(0); @@ -157,7 +157,7 @@ void Player::setGM(bool gm) updateColors(); } -void Player::setSprite(unsigned int slot, int id, const std::string &color, +void Player::setSprite(int slot, int id, const std::string &color, bool isWeapon) { if (getType() == NPC) |