diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-11-07 11:47:24 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-11-07 11:47:24 -0700 |
| commit | 99be9859a30e84e758ee3bfe7dcc3de33dfa2391 (patch) | |
| tree | 49354012582a4c9e9218ebafad429b07b19b2539 /src/player.cpp | |
| parent | 9c1cc1e46fd21ec48809fbb8f64853fcecef2439 (diff) | |
| download | mana-99be9859a30e84e758ee3bfe7dcc3de33dfa2391.tar.gz mana-99be9859a30e84e758ee3bfe7dcc3de33dfa2391.tar.bz2 mana-99be9859a30e84e758ee3bfe7dcc3de33dfa2391.tar.xz mana-99be9859a30e84e758ee3bfe7dcc3de33dfa2391.zip | |
More eAthena guild stuff
Also some related chenges elsewhere
Diffstat (limited to 'src/player.cpp')
| -rw-r--r-- | src/player.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/player.cpp b/src/player.cpp index abcfffe9..7e390b84 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -22,9 +22,7 @@ #include "animatedsprite.h" #include "configuration.h" #include "game.h" -#ifdef MANASERV_SUPPORT #include "guild.h" -#endif #include "localplayer.h" #include "particle.h" #include "player.h" @@ -209,10 +207,10 @@ void Player::setSpriteColor(unsigned int slot, const std::string &color) setSprite(slot, mSpriteIDs[slot], color); } -#ifdef MANASERV_SUPPORT Guild* Player::addGuild(short guildId, short rights) { - Guild *guild = new Guild(guildId, rights); + Guild *guild = Guild::getGuild(guildId); + guild->setRights(rights); mGuilds.insert(std::pair<int, Guild*>(guildId, guild)); return guild; } @@ -254,8 +252,6 @@ short Player::getNumberOfGuilds() return mGuilds.size(); } -#endif - void Player::setInParty(bool inParty) { mInParty = inParty; |