From 0a39e956218ca15bf78803f89141c7c9dfcec0d9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 10 Sep 2014 23:58:39 +0300 Subject: Change format in ActorType enum. --- src/gui/models/userstablemodel.h | 2 +- src/gui/popups/beingpopup.cpp | 2 +- src/gui/popups/popupmenu.cpp | 80 ++++++++++++++++----------------- src/gui/viewport.cpp | 32 ++++++------- src/gui/widgets/avatarlistbox.cpp | 4 +- src/gui/widgets/tabs/socialfriendstab.h | 2 +- src/gui/widgets/tabs/socialplayerstab.h | 4 +- src/gui/windows/botcheckerwindow.cpp | 2 +- src/gui/windows/charcreatedialog.cpp | 2 +- src/gui/windows/chatwindow.cpp | 8 ++-- src/gui/windows/killstats.cpp | 2 +- src/gui/windows/minimap.cpp | 18 ++++---- src/gui/windows/npcdialog.cpp | 2 +- src/gui/windows/shopwindow.cpp | 4 +- src/gui/windows/whoisonline.cpp | 6 +-- 15 files changed, 85 insertions(+), 85 deletions(-) (limited to 'src/gui') diff --git a/src/gui/models/userstablemodel.h b/src/gui/models/userstablemodel.h index e84333087..45fb8b0bd 100644 --- a/src/gui/models/userstablemodel.h +++ b/src/gui/models/userstablemodel.h @@ -107,7 +107,7 @@ class UsersTableModel final : public TableModel, { Being *const being = dynamic_cast(*i); - if (being && being->getType() == ActorType::PLAYER + if (being && being->getType() == ActorType::Player && being != localPlayer && !being->getName().empty()) { mPlayers.push_back(being); diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp index 089e51ea0..01051a9e8 100644 --- a/src/gui/popups/beingpopup.cpp +++ b/src/gui/popups/beingpopup.cpp @@ -97,7 +97,7 @@ void BeingPopup::show(const int x, const int y, Being *const b) b->updateComment(); - if (b->getType() == ActorType::NPC && b->getComment().empty()) + if (b->getType() == ActorType::Npc && b->getComment().empty()) { setVisible(false); return; diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index d478719b2..bcc0b92ef 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -118,7 +118,7 @@ PopupMenu::PopupMenu() : mButton(nullptr), mNick(), mTextField(nullptr), - mType(static_cast(ActorType::UNKNOWN)), + mType(static_cast(ActorType::Unknown)), mX(0), mY(0) { @@ -128,7 +128,7 @@ PopupMenu::PopupMenu() : mRenameListener.setDialog(nullptr); mPlayerListener.setNick(""); mPlayerListener.setDialog(nullptr); - mPlayerListener.setType(static_cast(ActorType::UNKNOWN)); + mPlayerListener.setType(static_cast(ActorType::Unknown)); mScrollArea = new ScrollArea(this, mBrowserBox, false); mScrollArea->setVerticalScrollPolicy(ScrollArea::SHOW_AUTO); } @@ -155,7 +155,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) switch (being->getType()) { - case ActorType::PLAYER: + case ActorType::Player: { // TRANSLATORS: popup menu item // TRANSLATORS: trade with player @@ -240,7 +240,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) break; } - case ActorType::NPC: + case ActorType::Npc: // NPCs can be talked to (single option, candidate for removal // unless more options would be added) // TRANSLATORS: popup menu item @@ -261,7 +261,7 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) mBrowserBox->addRow("addcomment", _("Add comment")); break; - case ActorType::MONSTER: + case ActorType::Monster: { // Monsters can be attacked // TRANSLATORS: popup menu item @@ -299,11 +299,11 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being) break; } - case ActorType::AVATAR: - case ActorType::UNKNOWN: - case ActorType::FLOOR_ITEM: - case ActorType::PORTAL: - case ActorType::LOCAL_PET: + case ActorType::Avatar: + case ActorType::Unknown: + case ActorType::FloorItem: + case ActorType::Portal: + case ActorType::LocalPet: default: break; } @@ -350,7 +350,7 @@ void PopupMenu::showPopup(const int x, const int y, static_cast(being->getId()), (being->getName() + being->getGenderSignWithSpace()).c_str())); } - else if (actor->getType() == ActorType::FLOOR_ITEM) + else if (actor->getType() == ActorType::FloorItem) { const FloorItem *const floorItem = static_cast(actor); @@ -374,7 +374,7 @@ void PopupMenu::showPlayerPopup(const std::string &nick) setMousePos(); mNick = nick; mBeingId = 0; - mType = static_cast(ActorType::PLAYER); + mType = static_cast(ActorType::Player); mBrowserBox->clearRows(); const std::string &name = mNick; @@ -472,7 +472,7 @@ void PopupMenu::showPopup(const int x, const int y, mX = x; mY = y; mFloorItemId = floorItem->getId(); - mType = static_cast(ActorType::FLOOR_ITEM); + mType = static_cast(ActorType::FloorItem); mBrowserBox->clearRows(); const std::string name = floorItem->getName(); mNick = name; @@ -705,7 +705,7 @@ void PopupMenu::showChatPopup(const int x, const int y, ChatTab *const tab) std::string name = wTab->getNick(); const Being* const being = actorManager->findBeingByName( - name, ActorType::PLAYER); + name, ActorType::Player); if (being) { @@ -774,7 +774,7 @@ void PopupMenu::showChatPopup(const int x, const int y, ChatTab *const tab) else { mNick = name; - mType = static_cast(ActorType::PLAYER); + mType = static_cast(ActorType::Player); addPlayerRelation(name); mBrowserBox->addRow("##3---"); addFollow(); @@ -841,7 +841,7 @@ void PopupMenu::showChangePos(const int x, const int y) mItem = nullptr; mMapItem = nullptr; mNick.clear(); - mType = static_cast(ActorType::UNKNOWN); + mType = static_cast(ActorType::Unknown); mX = 0; mY = 0; setVisible(false); @@ -908,7 +908,7 @@ void PopupMenu::handleLink(const std::string &link, } // Trade action else if (link == "trade" && being && - being->getType() == ActorType::PLAYER) + being->getType() == ActorType::Player) { Net::getTradeHandler()->request(being); tradePartnerName = being->getName(); @@ -917,9 +917,9 @@ void PopupMenu::handleLink(const std::string &link, } else if (link == "buy" && being && mBeingId != 0) { - if (being->getType() == ActorType::NPC) + if (being->getType() == ActorType::Npc) Net::getNpcHandler()->buy(mBeingId); - else if (being->getType() == ActorType::PLAYER) + else if (being->getType() == ActorType::Player) Net::getBuySellHandler()->requestSellList(being->getName()); } else if (link == "buy" && !mNick.empty()) @@ -928,9 +928,9 @@ void PopupMenu::handleLink(const std::string &link, } else if (link == "sell" && being && mBeingId != 0) { - if (being->getType() == ActorType::NPC) + if (being->getType() == ActorType::Npc) Net::getNpcHandler()->sell(mBeingId); - else if (being->getType() == ActorType::PLAYER) + else if (being->getType() == ActorType::Player) Net::getBuySellHandler()->requestBuyList(being->getName()); } else if (link == "sell" && !mNick.empty()) @@ -942,13 +942,13 @@ void PopupMenu::handleLink(const std::string &link, if (localPlayer) localPlayer->attack(being, true); } - else if (link == "heal" && being && being->getType() != ActorType::MONSTER) + else if (link == "heal" && being && being->getType() != ActorType::Monster) { if (actorManager) actorManager->heal(being); } else if (link == "unignore" && being && - being->getType() == ActorType::PLAYER) + being->getType() == ActorType::Player) { player_relations.setRelation(being->getName(), PlayerRelation::NEUTRAL); @@ -958,7 +958,7 @@ void PopupMenu::handleLink(const std::string &link, player_relations.setRelation(mNick, PlayerRelation::NEUTRAL); } else if (link == "ignore" && being && - being->getType() == ActorType::PLAYER) + being->getType() == ActorType::Player) { player_relations.setRelation(being->getName(), PlayerRelation::IGNORED); @@ -969,7 +969,7 @@ void PopupMenu::handleLink(const std::string &link, } else if (link == "blacklist" && being && - being->getType() == ActorType::PLAYER) + being->getType() == ActorType::Player) { player_relations.setRelation(being->getName(), PlayerRelation::BLACKLISTED); @@ -979,7 +979,7 @@ void PopupMenu::handleLink(const std::string &link, player_relations.setRelation(mNick, PlayerRelation::BLACKLISTED); } else if (link == "enemy" && being && - being->getType() == ActorType::PLAYER) + being->getType() == ActorType::Player) { player_relations.setRelation(being->getName(), PlayerRelation::ENEMY2); @@ -989,7 +989,7 @@ void PopupMenu::handleLink(const std::string &link, player_relations.setRelation(mNick, PlayerRelation::ENEMY2); } else if (link == "erase" && being && - being->getType() == ActorType::PLAYER) + being->getType() == ActorType::Player) { player_relations.setRelation(being->getName(), PlayerRelation::ERASED); being->updateName(); @@ -999,7 +999,7 @@ void PopupMenu::handleLink(const std::string &link, player_relations.setRelation(mNick, PlayerRelation::ERASED); } else if (link == "disregard" && being && - being->getType() == ActorType::PLAYER) + being->getType() == ActorType::Player) { player_relations.setRelation(being->getName(), PlayerRelation::DISREGARDED); @@ -1009,7 +1009,7 @@ void PopupMenu::handleLink(const std::string &link, player_relations.setRelation(mNick, PlayerRelation::DISREGARDED); } else if (link == "friend" && being && - being->getType() == ActorType::PLAYER) + being->getType() == ActorType::Player) { player_relations.setRelation(being->getName(), PlayerRelation::FRIEND); } @@ -1292,12 +1292,12 @@ void PopupMenu::handleLink(const std::string &link, PlayerInfo::unprotectItem(mItemId); } else if (link == "party" && being && - being->getType() == ActorType::PLAYER) + being->getType() == ActorType::Player) { Net::getPartyHandler()->invite(being->getName()); } else if (link == "kick party" && being - && being->getType() == ActorType::PLAYER) + && being->getType() == ActorType::Player) { Net::getPartyHandler()->kick(being); } @@ -1318,8 +1318,8 @@ void PopupMenu::handleLink(const std::string &link, chatWindow->addInputText(name); } else if (link == "admin-kick" && being && - (being->getType() == ActorType::PLAYER || - being->getType() == ActorType::MONSTER)) + (being->getType() == ActorType::Player || + being->getType() == ActorType::Monster)) { Net::getAdminHandler()->kick(being->getId()); } @@ -1486,7 +1486,7 @@ void PopupMenu::handleLink(const std::string &link, } else if (link == "remove attack" && being) { - if (actorManager && being->getType() == ActorType::MONSTER) + if (actorManager && being->getType() == ActorType::Monster) { actorManager->removeAttackMob(being->getName()); if (socialWindow) @@ -1495,7 +1495,7 @@ void PopupMenu::handleLink(const std::string &link, } else if (link == "add attack" && being) { - if (actorManager && being->getType() == ActorType::MONSTER) + if (actorManager && being->getType() == ActorType::Monster) { actorManager->addAttackMob(being->getName()); if (socialWindow) @@ -1504,7 +1504,7 @@ void PopupMenu::handleLink(const std::string &link, } else if (link == "add attack priority" && being) { - if (actorManager && being->getType() == ActorType::MONSTER) + if (actorManager && being->getType() == ActorType::Monster) { actorManager->addPriorityAttackMob(being->getName()); if (socialWindow) @@ -1513,7 +1513,7 @@ void PopupMenu::handleLink(const std::string &link, } else if (link == "add attack ignore" && being) { - if (actorManager && being->getType() == ActorType::MONSTER) + if (actorManager && being->getType() == ActorType::Monster) { actorManager->addIgnoreAttackMob(being->getName()); if (socialWindow) @@ -1910,7 +1910,7 @@ void PopupMenu::handleLink(const std::string &link, mButton = nullptr; mNick.clear(); mTextField = nullptr; - mType = static_cast(ActorType::UNKNOWN); + mType = static_cast(ActorType::Unknown); mX = 0; mY = 0; } @@ -2275,7 +2275,7 @@ void PopupMenu::showAttackMonsterPopup(const int x, const int y, return; mNick = name; - mType = static_cast(ActorType::MONSTER); + mType = static_cast(ActorType::Monster); mX = x; mY = y; @@ -2353,7 +2353,7 @@ void PopupMenu::showPickupItemPopup(const int x, const int y, return; mNick = name; - mType = static_cast(ActorType::FLOOR_ITEM); + mType = static_cast(ActorType::FloorItem); mX = x; mY = y; diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 8d9fcd958..73cb5b884 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -254,7 +254,7 @@ void Viewport::draw(Graphics *graphics) const ActorSprites &actors = actorManager->getAll(); FOR_EACH (ActorSpritesIterator, it, actors) { - if ((*it)->getType() == ActorType::FLOOR_ITEM) + if ((*it)->getType() == ActorType::FloorItem) continue; Being *const b = static_cast(*it); b->drawSpeech(mPixelViewX, mPixelViewY); @@ -428,7 +428,7 @@ bool Viewport::leftMouseAction() else { const ActorType::Type type = mHoverBeing->getType(); - if (type == ActorType::PLAYER) + if (type == ActorType::Player) { validateSpeed(); if (actorManager) @@ -440,7 +440,7 @@ bool Viewport::leftMouseAction() return true; } } - else if (type == ActorType::MONSTER || type == ActorType::NPC) + else if (type == ActorType::Monster || type == ActorType::Npc) { if (localPlayer->withinAttackRange(mHoverBeing) || inputManager.isActionActive(static_cast( @@ -542,7 +542,7 @@ void Viewport::mousePressed(MouseEvent &event) if (actorManager) { Being *const target = actorManager->findNearestLivingBeing( - pixelX, pixelY, 20, ActorType::MONSTER, nullptr); + pixelX, pixelY, 20, ActorType::Monster, nullptr); if (target) localPlayer->setTarget(target); @@ -755,14 +755,14 @@ void Viewport::mouseMoved(MouseEvent &event A_UNUSED) const int x = mMouseX + mPixelViewX; const int y = mMouseY + mPixelViewY; - ActorType::Type type = ActorType::UNKNOWN; + ActorType::Type type = ActorType::Unknown; mHoverBeing = actorManager->findBeingByPixel(x, y, true); if (mHoverBeing) type = mHoverBeing->getType(); if (mHoverBeing - && (type == ActorType::PLAYER - || type == ActorType::NPC - || type == ActorType::LOCAL_PET)) + && (type == ActorType::Player + || type == ActorType::Npc + || type == ActorType::LocalPet)) { popupManager->hideTextPopup(); if (mShowBeingPopup && beingPopup) @@ -815,23 +815,23 @@ void Viewport::mouseMoved(MouseEvent &event A_UNUSED) { switch (type) { - case ActorType::NPC: + case ActorType::Npc: gui->setCursorType(mHoverBeing->getHoverCursor()); break; - case ActorType::MONSTER: + case ActorType::Monster: gui->setCursorType(mHoverBeing->getHoverCursor()); break; - case ActorType::PORTAL: + case ActorType::Portal: gui->setCursorType(mHoverBeing->getHoverCursor()); break; - case ActorType::AVATAR: - case ActorType::FLOOR_ITEM: - case ActorType::UNKNOWN: - case ActorType::PLAYER: - case ActorType::LOCAL_PET: + case ActorType::Avatar: + case ActorType::FloorItem: + case ActorType::Unknown: + case ActorType::Player: + case ActorType::LocalPet: default: gui->setCursorType(Cursor::CURSOR_POINTER); break; diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index e0fbc4d4b..a351c7199 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -373,7 +373,7 @@ void AvatarListBox::mousePressed(MouseEvent &event) if (type == MapItemType::EMPTY) { const Being *const being = actorManager->findBeingByName( - ava->getName(), ActorType::PLAYER); + ava->getName(), ActorType::Player); if (being) actorManager->heal(being); } @@ -392,7 +392,7 @@ void AvatarListBox::mousePressed(MouseEvent &event) if (avatar) { const Being *const being = actorManager->findBeingByName( - avatar->getName(), ActorType::PLAYER); + avatar->getName(), ActorType::Player); if (being) { popupMenu->showPopup(viewport->mMouseX, diff --git a/src/gui/widgets/tabs/socialfriendstab.h b/src/gui/widgets/tabs/socialfriendstab.h index f483a73ca..baaa57595 100644 --- a/src/gui/widgets/tabs/socialfriendstab.h +++ b/src/gui/widgets/tabs/socialfriendstab.h @@ -103,7 +103,7 @@ class SocialFriendsTab final : public SocialTab FOR_EACHP (StringVectCIter, it, players) { Avatar *const ava = new Avatar(*it); - if (actorManager->findBeingByName(*it, ActorType::PLAYER) + if (actorManager->findBeingByName(*it, ActorType::Player) || players2.find(*it) != players2.end()) { ava->setOnline(true); diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h index 78c03feb4..56580300b 100644 --- a/src/gui/widgets/tabs/socialplayerstab.h +++ b/src/gui/widgets/tabs/socialplayerstab.h @@ -87,7 +87,7 @@ class SocialPlayersTab final : public SocialTab } } const Being *const being = actorManager->findBeingByName( - name, ActorType::PLAYER); + name, ActorType::Player); if (being) { avatar->setDamageHp(being->getDamageTaken()); @@ -108,7 +108,7 @@ class SocialPlayersTab final : public SocialTab return; avatar->setDamageHp(0); Being *const being = actorManager->findBeingByName( - name, ActorType::PLAYER); + name, ActorType::Player); if (being) being->setDamageTaken(0); diff --git a/src/gui/windows/botcheckerwindow.cpp b/src/gui/windows/botcheckerwindow.cpp index d0130ed7a..25df25a69 100644 --- a/src/gui/windows/botcheckerwindow.cpp +++ b/src/gui/windows/botcheckerwindow.cpp @@ -193,7 +193,7 @@ void BotCheckerWindow::reset() { Being *const being = dynamic_cast(*i); - if (being && being->getType() == ActorType::PLAYER + if (being && being->getType() == ActorType::Player && being != localPlayer && being->getName() != "") { being->resetCounters(); diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index e1c1cd7ed..890abfe22 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -128,7 +128,7 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, mCreateButton(new Button(this, _("Create"), "create", this)), // TRANSLATORS: char create dialog button mCancelButton(new Button(this, _("Cancel"), "cancel", this)), - mPlayer(new Being(0, ActorType::PLAYER, static_cast(0U), + mPlayer(new Being(0, ActorType::Player, static_cast(0U), nullptr)), mPlayerBox(new PlayerBox(this, mPlayer, "charcreate_playerbox.xml", "charcreate_selectedplayerbox.xml")), diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 0efa9c08d..9644b5a7c 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -623,7 +623,7 @@ void ChatWindow::doPresent() const FOR_EACH (ActorSpritesIterator, it, actors) { - if ((*it)->getType() == ActorType::PLAYER) + if ((*it)->getType() == ActorType::Player) { if (!response.empty()) response.append(", "); @@ -1508,7 +1508,7 @@ void ChatWindow::battleChatLog(const std::string &line, ChatMsgType::Type own, void ChatWindow::localPetSay(const std::string &nick, const std::string &text) { Being *const being = actorManager->findBeingByName( - nick, ActorType::PLAYER); + nick, ActorType::Player); Being *pet = nullptr; if (being) { @@ -1533,7 +1533,7 @@ void ChatWindow::localPetSay(const std::string &nick, const std::string &text) void ChatWindow::localPetEmote(const std::string &nick, const uint8_t emoteId) { Being *const being = actorManager->findBeingByName( - nick, ActorType::PLAYER); + nick, ActorType::Player); if (being) { Being *const pet = being->getFirstPet(); @@ -1595,7 +1595,7 @@ void ChatWindow::updateOnline(const std::set &onlinePlayers) const if (actorManager) { const Being *const being = actorManager->findBeingByName( - nick, ActorType::PLAYER); + nick, ActorType::Player); if (being) { tab->setWhisperTabColors(); diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp index 6ec3df5a0..677023c8b 100644 --- a/src/gui/windows/killstats.cpp +++ b/src/gui/windows/killstats.cpp @@ -484,7 +484,7 @@ void KillStats::validateJacko() { const Being *const dstBeing = actorManager->findBeingByName( - "Jack O", ActorType::MONSTER); + "Jack O", ActorType::Monster); if (mIsJackoAlive && !dstBeing) { mIsJackoAlive = false; diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 048b4350e..e242b7401 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -291,7 +291,7 @@ void Minimap::draw(Graphics *graphics) const ActorSprites &actors = actorManager->getAll(); FOR_EACH (ActorSpritesConstIterator, it, actors) { - if (!(*it) || (*it)->getType() == ActorType::FLOOR_ITEM) + if (!(*it) || (*it)->getType() == ActorType::FloorItem) continue; const Being *const being = static_cast(*it); @@ -319,20 +319,20 @@ void Minimap::draw(Graphics *graphics) { switch (being->getType()) { - case ActorType::MONSTER: + case ActorType::Monster: type = UserPalette::MONSTER; break; - case ActorType::NPC: + case ActorType::Npc: type = UserPalette::NPC; break; - case ActorType::AVATAR: - case ActorType::UNKNOWN: - case ActorType::PLAYER: - case ActorType::FLOOR_ITEM: - case ActorType::PORTAL: - case ActorType::LOCAL_PET: + case ActorType::Avatar: + case ActorType::Unknown: + case ActorType::Player: + case ActorType::FloorItem: + case ActorType::Portal: + case ActorType::LocalPet: default: continue; } diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index ef6a1b1ad..d528e22aa 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -852,7 +852,7 @@ void NpcDialog::showAvatar(const uint16_t avatarId) if (needShow) { delete mAvatarBeing; - mAvatarBeing = new Being(0, ActorType::AVATAR, avatarId, nullptr); + mAvatarBeing = new Being(0, ActorType::Avatar, avatarId, nullptr); mPlayerBox->setPlayer(mAvatarBeing); if (!mAvatarBeing->empty()) { diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 96ac002fa..3645ccc9b 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -299,7 +299,7 @@ void ShopWindow::startTrade() return; const Being *const being = actorManager->findBeingByName( - mTradeNick, ActorType::PLAYER); + mTradeNick, ActorType::Player); tradeWindow->clear(); if (mTradeMoney) { @@ -703,7 +703,7 @@ void ShopWindow::processRequest(const std::string &nick, std::string data, { if (!localPlayer || !mTradeNick.empty() || PlayerInfo::isTrading() || !actorManager - || !actorManager->findBeingByName(nick, ActorType::PLAYER)) + || !actorManager->findBeingByName(nick, ActorType::Player)) { return; } diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index 2b5210775..eb44a0081 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -206,7 +206,7 @@ void WhoIsOnline::handleLink(const std::string& link, MouseEvent *event) { const std::string text = decodeLinkText(link); Being *const being = actorManager->findBeingByName( - text, ActorType::PLAYER); + text, ActorType::Player); if (being && popupManager) { @@ -430,7 +430,7 @@ void WhoIsOnline::loadWebList() if (actorManager) { Being *const being = actorManager->findBeingByName( - nick, ActorType::PLAYER); + nick, ActorType::Player); if (being) { if (level > 0) @@ -824,7 +824,7 @@ void OnlinePlayer::setText(std::string color) if (mStatus != 255 && actorManager) { Being *const being = actorManager->findBeingByName( - mNick, ActorType::PLAYER); + mNick, ActorType::Player); if (being) { being->setState(mStatus); -- cgit v1.2.3-60-g2f50