From 6c3974a46c659e558b2b5f249b7b000a5b39fe25 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 19 Oct 2013 16:27:33 +0300 Subject: Rename actorspritemanager into actormanager. --- src/gui/windows/botcheckerwindow.cpp | 10 +++++----- src/gui/windows/chatwindow.cpp | 18 +++++++++--------- src/gui/windows/killstats.cpp | 6 +++--- src/gui/windows/minimap.cpp | 6 +++--- src/gui/windows/npcdialog.cpp | 6 +++--- src/gui/windows/questswindow.cpp | 6 +++--- src/gui/windows/shopwindow.cpp | 10 +++++----- src/gui/windows/socialwindow.cpp | 24 ++++++++++++------------ src/gui/windows/whoisonline.cpp | 18 +++++++++--------- 9 files changed, 52 insertions(+), 52 deletions(-) (limited to 'src/gui/windows') diff --git a/src/gui/windows/botcheckerwindow.cpp b/src/gui/windows/botcheckerwindow.cpp index 2ce0bce25..b502dd01d 100644 --- a/src/gui/windows/botcheckerwindow.cpp +++ b/src/gui/windows/botcheckerwindow.cpp @@ -27,7 +27,7 @@ #include "gui/widgets/label.h" #include "gui/widgets/guitable.h" -#include "actorspritemanager.h" +#include "actormanager.h" #include "configuration.h" #include "being/localplayer.h" @@ -100,10 +100,10 @@ public: freeWidgets(); mPlayers.clear(); - if (actorSpriteManager && botCheckerWindow + if (actorManager && botCheckerWindow && botCheckerWindow->mEnabled) { - std::set beings = actorSpriteManager->getAll(); + std::set beings = actorManager->getAll(); FOR_EACH (ActorSprites::iterator, i, beings) { Being *const being = dynamic_cast(*i); @@ -389,9 +389,9 @@ void BotCheckerWindow::updateList() void BotCheckerWindow::reset() { - if (actorSpriteManager) + if (actorManager) { - std::set beings = actorSpriteManager->getAll(); + std::set beings = actorManager->getAll(); FOR_EACH (ActorSprites::iterator, i, beings) { Being *const being = dynamic_cast(*i); diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index f50ea6876..2c254ad62 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -22,7 +22,7 @@ #include "gui/windows/chatwindow.h" -#include "actorspritemanager.h" +#include "actormanager.h" #include "client.h" #include "commandhandler.h" #include "configuration.h" @@ -671,10 +671,10 @@ void ChatWindow::localChatInput(const std::string &msg) const void ChatWindow::doPresent() const { - if (!actorSpriteManager) + if (!actorManager) return; - const ActorSprites &actors = actorSpriteManager->getAll(); + const ActorSprites &actors = actorManager->getAll(); std::string response; int playercount = 0; @@ -1255,9 +1255,9 @@ void ChatWindow::autoComplete() if (!newName.empty()) needSecure = true; - if (newName.empty() && actorSpriteManager) + if (newName.empty() && actorManager) { - actorSpriteManager->getPlayerNames(nameList, true); + actorManager->getPlayerNames(nameList, true); newName = autoComplete(nameList, name); if (!newName.empty()) needSecure = true; @@ -1268,9 +1268,9 @@ void ChatWindow::autoComplete() newName = spellManager->autoComplete(name); if (newName.empty()) newName = autoComplete(name, &mCommands); - if (newName.empty() && actorSpriteManager) + if (newName.empty() && actorManager) { - actorSpriteManager->getMobNames(nameList); + actorManager->getMobNames(nameList); newName = autoComplete(nameList, name); } if (newName.empty()) @@ -1523,9 +1523,9 @@ void ChatWindow::updateOnline(std::set &onlinePlayers) const else { const std::string nick = tab->getNick(); - if (actorSpriteManager) + if (actorManager) { - const Being *const being = actorSpriteManager->findBeingByName( + const Being *const being = actorManager->findBeingByName( nick, ActorSprite::PLAYER); if (being) { diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp index ee265e2b9..821577d25 100644 --- a/src/gui/windows/killstats.cpp +++ b/src/gui/windows/killstats.cpp @@ -26,7 +26,7 @@ #include "gui/widgets/label.h" #include "gui/widgets/layout.h" -#include "actorspritemanager.h" +#include "actormanager.h" #include "game.h" #include "being/localplayer.h" @@ -453,7 +453,7 @@ void KillStats::jackoAlive(const int id) void KillStats::validateJacko() { - if (!actorSpriteManager || !player_node) + if (!actorManager || !player_node) return; const Map *const currentMap = Game::instance()->getCurrentMap(); @@ -468,7 +468,7 @@ void KillStats::validateJacko() && player_node->getTileY() <= 46) { const Being *const dstBeing - = actorSpriteManager->findBeingByName( + = actorManager->findBeingByName( "Jack O", Being::MONSTER); if (mIsJackoAlive && !dstBeing) { diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index d268addf6..9ac4a9e26 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -22,7 +22,7 @@ #include "gui/windows/minimap.h" -#include "actorspritemanager.h" +#include "actormanager.h" #include "client.h" #include "configuration.h" #include "party.h" @@ -249,7 +249,7 @@ void Minimap::draw(gcn::Graphics *graphics) graphics->pushClipArea(a); - if (!actorSpriteManager) + if (!actorManager) { BLOCK_END("Minimap::draw") return; @@ -288,7 +288,7 @@ void Minimap::draw(gcn::Graphics *graphics) graph->drawImage(mMapImage, mMapOriginX, mMapOriginY); } - const ActorSprites &actors = actorSpriteManager->getAll(); + const ActorSprites &actors = actorManager->getAll(); FOR_EACH (ActorSpritesConstIterator, it, actors) { if (!(*it) || (*it)->getType() == ActorSprite::FLOOR_ITEM) diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index e8caa0722..3b5d0d772 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -22,7 +22,7 @@ #include "gui/windows/npcdialog.h" -#include "actorspritemanager.h" +#include "actormanager.h" #include "configuration.h" #include "client.h" #include "inventory.h" @@ -193,9 +193,9 @@ void NpcDialog::postInit() enableVisibleSound(true); soundManager.playGuiSound(SOUND_SHOW_WINDOW); - if (actorSpriteManager) + if (actorManager) { - const Being *const being = actorSpriteManager->findBeing(mNpcId); + const Being *const being = actorManager->findBeing(mNpcId); if (being) { showAvatar(NPCDB::getAvatarFor(being->getSubType())); diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index ce0c1a796..42a7b0bf4 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -20,7 +20,7 @@ #include "gui/windows/questswindow.h" -#include "actorspritemanager.h" +#include "actormanager.h" #include "configuration.h" #include "effectmanager.h" @@ -509,7 +509,7 @@ void QuestsWindow::updateEffects() } } } - if (!actorSpriteManager) + if (!actorManager) return; std::set removeEffects; @@ -549,7 +549,7 @@ void QuestsWindow::updateEffects() addEffects[id] = effect->effectId; } if (!removeEffects.empty() || !addEffects.empty()) - actorSpriteManager->updateEffects(addEffects, removeEffects); + actorManager->updateEffects(addEffects, removeEffects); } void QuestsWindow::addEffect(Being *const being) diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index aceb872fc..c4facdc02 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -37,7 +37,7 @@ #include "gui/widgets/tabs/chattab.h" -#include "actorspritemanager.h" +#include "actormanager.h" #include "auctionmanager.h" #include "client.h" #include "configuration.h" @@ -287,10 +287,10 @@ void ShopWindow::action(const gcn::ActionEvent &event) void ShopWindow::startTrade() { - if (!actorSpriteManager || !tradeWindow) + if (!actorManager || !tradeWindow) return; - const Being *const being = actorSpriteManager->findBeingByName( + const Being *const being = actorManager->findBeingByName( mTradeNick, Being::PLAYER); tradeWindow->clear(); if (mTradeMoney) @@ -694,8 +694,8 @@ void ShopWindow::processRequest(const std::string &nick, std::string data, const int mode) { if (!player_node || !mTradeNick.empty() || PlayerInfo::isTrading() - || !actorSpriteManager - || !actorSpriteManager->findBeingByName(nick, Being::PLAYER)) + || !actorManager + || !actorManager->findBeingByName(nick, Being::PLAYER)) { return; } diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index 97f0211d8..aa9d4d328 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -21,7 +21,7 @@ #include "gui/windows/socialwindow.h" -#include "actorspritemanager.h" +#include "actormanager.h" #include "configuration.h" #include "guild.h" #include "guildmanager.h" @@ -572,7 +572,7 @@ public: void updateAvatar(const std::string &name) override { - if (!actorSpriteManager) + if (!actorManager) return; Avatar *const avatar = findAvatarbyName(name); @@ -587,7 +587,7 @@ public: avatar->setHp(pm->getHp()); } } - const Being *const being = actorSpriteManager->findBeingByName( + const Being *const being = actorManager->findBeingByName( name, Being::PLAYER); if (being) { @@ -600,14 +600,14 @@ public: void resetDamage(const std::string &name) override { - if (!actorSpriteManager) + if (!actorManager) return; Avatar *const avatar = findAvatarbyName(name); if (!avatar) return; avatar->setDamageHp(0); - Being *const being = actorSpriteManager->findBeingByName( + Being *const being = actorManager->findBeingByName( name, Being::PLAYER); if (being) @@ -642,10 +642,10 @@ public: if (!avatars) return; - if (actorSpriteManager) + if (actorManager) { StringVect names; - actorSpriteManager->getPlayerNames(names, false); + actorManager->getPlayerNames(names, false); std::vector::iterator ai = avatars->begin(); while (ai != avatars->end()) @@ -792,7 +792,7 @@ public: if (config.getBoolValue("drawHotKeys") && idx < 80 && outfitWindow) { - Being *const being = actorSpriteManager + Being *const being = actorManager ->findPortalByTile(x, y); if (being) { @@ -985,7 +985,7 @@ private: ava->setX(0);\ ava->setY(0);\ avatars->push_back(ava);\ - mobs = actorSpriteManager->get##mob##s();\ + mobs = actorManager->get##mob##s();\ i = mobs.begin();\ i_end = mobs.end();\ while (i != i_end)\ @@ -1013,7 +1013,7 @@ private: } #define updateAtkListStart() \ - if (!socialWindow || !player_node || !actorSpriteManager)\ + if (!socialWindow || !player_node || !actorManager)\ return;\ std::vector *const avatars = mBeings->getMembers();\ std::vector::iterator ia = avatars->begin();\ @@ -1160,7 +1160,7 @@ public: void getPlayersAvatars() { - if (!actorSpriteManager) + if (!actorManager) return; std::vector *const avatars = mBeings->getMembers(); @@ -1189,7 +1189,7 @@ public: FOR_EACHP (StringVectCIter, it, players) { Avatar *const ava = new Avatar(*it); - if (actorSpriteManager->findBeingByName(*it, Being::PLAYER) + if (actorManager->findBeingByName(*it, Being::PLAYER) || players2.find(*it) != players2.end()) { ava->setOnline(true); diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index e97ae3095..c4f096c72 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -34,7 +34,7 @@ #include "gui/widgets/browserbox.h" #include "gui/widgets/scrollarea.h" -#include "actorspritemanager.h" +#include "actormanager.h" #include "client.h" #include "configuration.h" #include "main.h" @@ -183,10 +183,10 @@ void WhoIsOnline::handleLink(const std::string& link, gcn::MouseEvent *event) if (viewport) { - if (actorSpriteManager) + if (actorManager) { const std::string text = decodeLinkText(link); - Being *const being = actorSpriteManager->findBeingByName( + Being *const being = actorManager->findBeingByName( text, Being::PLAYER); if (being && viewport) @@ -408,9 +408,9 @@ void WhoIsOnline::loadWebList() if (!lineStr.empty()) level = atoi(lineStr.c_str()); - if (actorSpriteManager) + if (actorManager) { - Being *const being = actorSpriteManager->findBeingByName( + Being *const being = actorManager->findBeingByName( nick, Being::PLAYER); if (being) { @@ -762,7 +762,7 @@ void WhoIsOnline::setNeutralColor(OnlinePlayer *const player) if (!player) return; - if (actorSpriteManager && player_node) + if (actorManager && player_node) { const std::string &nick = player->getNick(); if (nick == player_node->getName()) @@ -783,7 +783,7 @@ void WhoIsOnline::setNeutralColor(OnlinePlayer *const player) } } - const Being *const being = actorSpriteManager->findBeingByName(nick); + const Being *const being = actorManager->findBeingByName(nick); if (being) { const Guild *const guild2 = player_node->getGuild(); @@ -827,9 +827,9 @@ void OnlinePlayer::setText(std::string color) { mText.clear(); - if (mStatus != 255 && actorSpriteManager) + if (mStatus != 255 && actorManager) { - Being *const being = actorSpriteManager->findBeingByName( + Being *const being = actorManager->findBeingByName( mNick, Being::PLAYER); if (being) { -- cgit v1.2.3-60-g2f50