diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-06-09 18:13:06 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-06-10 12:28:28 -0600 |
| commit | ccafb75577f9ea8f86243d26e80fb60e56af12d1 (patch) | |
| tree | fd8e0566118c217f0efa3c32b90d6f8870822233 /src/gui/chat.cpp | |
| parent | 35e024b85a5448cba235fa400f9412fd4e289ec0 (diff) | |
| download | Mana-ccafb75577f9ea8f86243d26e80fb60e56af12d1.tar.gz Mana-ccafb75577f9ea8f86243d26e80fb60e56af12d1.tar.bz2 Mana-ccafb75577f9ea8f86243d26e80fb60e56af12d1.tar.xz Mana-ccafb75577f9ea8f86243d26e80fb60e56af12d1.zip | |
Merge BeingManager and FloorItemManager as ActorSpriteManager
No need for two different classes to manage ActorSprites.
Reviewed-by: Chuck Miller
Diffstat (limited to 'src/gui/chat.cpp')
| -rw-r--r-- | src/gui/chat.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index 83aaed26..da1bd600 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -21,7 +21,7 @@ #include "chat.h" -#include "beingmanager.h" +#include "actorspritemanager.h" #include "configuration.h" #include "localplayer.h" #include "party.h" @@ -266,20 +266,20 @@ void ChatWindow::chatInput(const std::string &msg) void ChatWindow::doPresent() { - const Beings &beings = beingManager->getAll(); + const ActorSprites &actors = actorSpriteManager->getAll(); std::string response = ""; int playercount = 0; - for (Beings::const_iterator bi = beings.begin(), be = beings.end(); - bi != be; ++bi) + for (ActorSpritesConstIterator it = actors.begin(), it_end = actors.end(); + it != it_end; it++) { - if ((*bi)->getType() == ActorSprite::PLAYER) + if ((*it)->getType() == ActorSprite::PLAYER) { if (!response.empty()) { response += ", "; } - response += (*bi)->getName(); + response += static_cast<Being*>(*it)->getName(); ++playercount; } } @@ -531,7 +531,7 @@ void ChatWindow::autoComplete() if (newName == "") { - beingManager->getPlayerNames(nameList, true); + actorSpriteManager->getPlayerNames(nameList, true); newName = autoComplete(nameList, name); } if (newName == "") |