diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/game-server/character.hpp | 2 | ||||
| -rw-r--r-- | src/game-server/gamehandler.cpp | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2008-07-03 Roderic Morris <roderic@ccs.neu.edu> + + * src/game-server/character.cpp, src/game-server/gamehandler.cpp: + Fix errors in the last commit. + 2008-07-03 David Athay <ko2fan@gmail.com> * src/defines.h, src/game-server/character.cpp, diff --git a/src/game-server/character.hpp b/src/game-server/character.hpp index 220f5c38..d3b31276 100644 --- a/src/game-server/character.hpp +++ b/src/game-server/character.hpp @@ -189,7 +189,7 @@ class Character : public Being /** Gets the party id of the character */ int getParty() const - { return mPartyId; } + { return mParty; } /** Sets the party id of the character */ void setParty(int party) diff --git a/src/game-server/gamehandler.cpp b/src/game-server/gamehandler.cpp index 3afc4bed..0b0a795e 100644 --- a/src/game-server/gamehandler.cpp +++ b/src/game-server/gamehandler.cpp @@ -122,7 +122,7 @@ void GameHandler::updateCharacter(int charid, int partyid) i_end = clients.end(); i != i_end; ++i) { GameClient *c = static_cast< GameClient * >(*i); - if (c->character->getDatabaseID() == id) + if (c->character->getDatabaseID() == charid) { c->character->setParty(partyid); } |