From 3b4e7795c9ab3036988a1a7dfe6f5ed2ad12199d Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 17 May 2010 19:16:11 -0600 Subject: 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 --- src/guild.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/guild.cpp') 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(b)->removeGuild(getId()); + b->removeGuild(getId()); ++itr; } } -- cgit v1.2.3-70-g09d2