diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-15 22:15:31 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-15 22:15:31 +0200 |
| commit | c53bc90dbaa876a86f762a3d864b1f920e2b8071 (patch) | |
| tree | 1a8174f4d1745a4799210db970aa2230df622d34 /src/account-server/account.cpp | |
| parent | b89e404f85358f2e3ff87d7731376dbeacdf9778 (diff) | |
| parent | 81be8dc99ba7558c8915310eed095df43e3bdbf7 (diff) | |
| download | manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.gz manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.bz2 manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.xz manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.zip | |
Merge branch 'master' into lpc2012
Conflicts:
src/account-server/accounthandler.cpp
src/game-server/character.cpp
Diffstat (limited to 'src/account-server/account.cpp')
| -rw-r--r-- | src/account-server/account.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/account-server/account.cpp b/src/account-server/account.cpp index ed7c5df4..10869294 100644 --- a/src/account-server/account.cpp +++ b/src/account-server/account.cpp @@ -41,7 +41,7 @@ void Account::setCharacters(const Characters &characters) mCharacters = characters; } -void Account::addCharacter(Character *character) +void Account::addCharacter(CharacterData *character) { unsigned slot = (unsigned) character->getCharacterSlot(); assert(isSlotEmpty(slot)); |