diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-05-17 19:16:11 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-05-17 21:49:16 -0600 |
| commit | 3b4e7795c9ab3036988a1a7dfe6f5ed2ad12199d (patch) | |
| tree | ed0e8cc5b608c31ac79e6d1de03d9ddfc74fa339 /src/guild.cpp | |
| parent | 51945aa1af6f2a6dc15027ef40cf0ccf424d46e1 (diff) | |
| download | mana-3b4e7795c9ab3036988a1a7dfe6f5ed2ad12199d.tar.gz mana-3b4e7795c9ab3036988a1a7dfe6f5ed2ad12199d.tar.bz2 mana-3b4e7795c9ab3036988a1a7dfe6f5ed2ad12199d.tar.xz mana-3b4e7795c9ab3036988a1a7dfe6f5ed2ad12199d.zip | |
Remove Monster, Player, and NPC classes
Instead of having these three subclasses with minor differences, this
commit merges them back into Being. In the future, we can make Beings
that are talkable to some, attackable by others, etc. This also puts
back support for monster equipment.
Also changes remaining references to Being::Type and the constants to
refer to ActorSprite::Type.
Reviewed-by: Freeyorp
Diffstat (limited to 'src/guild.cpp')
| -rw-r--r-- | src/guild.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/guild.cpp b/src/guild.cpp index 029cde7f..602e2306 100644 --- a/src/guild.cpp +++ b/src/guild.cpp @@ -22,7 +22,6 @@ #include "guild.h" #include "beingmanager.h" -#include "player.h" GuildMember::GuildMember(Guild *guild, int id, const std::string &name): Avatar(name), mId(id), mGuild(guild) @@ -151,9 +150,7 @@ void Guild::removeFromMembers() while(itr != itr_end) { Being *b = beingManager->findBeing((*itr)->getID()); - - if (b->getType() == Being::PLAYER) - static_cast<Player*>(b)->removeGuild(getId()); + b->removeGuild(getId()); ++itr; } } |