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/character.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/character.cpp')
| -rw-r--r-- | src/account-server/character.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/account-server/character.cpp b/src/account-server/character.cpp index 3219e3ce..eafae1c9 100644 --- a/src/account-server/character.cpp +++ b/src/account-server/character.cpp @@ -22,7 +22,7 @@ #include "account-server/account.h" -Character::Character(const std::string &name, int id): +CharacterData::CharacterData(const std::string &name, int id): mName(name), mDatabaseID(id), mCharacterSlot(0), @@ -39,14 +39,14 @@ Character::Character(const std::string &name, int id): { } -void Character::setAccount(Account *acc) +void CharacterData::setAccount(Account *acc) { mAccount = acc; mAccountID = acc->getID(); mAccountLevel = acc->getLevel(); } -void Character::giveSpecial(int id, int currentMana) +void CharacterData::giveSpecial(int id, int currentMana) { if (mSpecials.find(id) == mSpecials.end()) { |