diff options
Diffstat (limited to 'src/gui/popupmenu.cpp')
| -rw-r--r-- | src/gui/popupmenu.cpp | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 8404fad1..520b4005 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -203,16 +203,13 @@ void PopupMenu::handleLink(const std::string &link) Being *being = beingManager->findBeing(mBeingId); // Talk To action - if (link == "talk" && - being && being->getType() == Being::NPC) + if (link == "talk" && being && being->getType() == Being::NPC) { - dynamic_cast<NPC*>(being)->talk(); + static_cast<NPC*>(being)->talk(); } // Trade action - else if (link == "trade" && - being && - being->getType() == Being::PLAYER) + else if (link == "trade" && being && being->getType() == Being::PLAYER) { Net::getTradeHandler()->request(being); tradePartnerName = being->getName(); @@ -226,37 +223,27 @@ void PopupMenu::handleLink(const std::string &link) { chatWindow->addInputText("/w \"" + being->getName() + "\" "); } - else if (link == "unignore" && - being && - being->getType() == Being::PLAYER) + else if (link == "unignore" && being && being->getType() == Being::PLAYER) { player_relations.setRelation(being->getName(), PlayerRelation::NEUTRAL); } - else if (link == "ignore" && - being && - being->getType() == Being::PLAYER) + else if (link == "ignore" && being && being->getType() == Being::PLAYER) { player_relations.setRelation(being->getName(), PlayerRelation::IGNORED); } - else if (link == "disregard" && - being && - being->getType() == Being::PLAYER) + else if (link == "disregard" && being && being->getType() == Being::PLAYER) { player_relations.setRelation(being->getName(), PlayerRelation::DISREGARDED); } - else if (link == "friend" && - being && - being->getType() == Being::PLAYER) + else if (link == "friend" && being && being->getType() == Being::PLAYER) { player_relations.setRelation(being->getName(), PlayerRelation::FRIEND); } // Guild action - else if (link == "guild" && - being != NULL && - being->getType() == Being::PLAYER) + else if (link == "guild" && being && being->getType() == Being::PLAYER) { player_node->inviteToGuild(being); } @@ -325,7 +312,7 @@ void PopupMenu::handleLink(const std::string &link) else if (link == "party" && being && being->getType() == Being::PLAYER) { - Net::getPartyHandler()->invite(dynamic_cast<Player*>(being)); + Net::getPartyHandler()->invite(static_cast<Player*>(being)); } else if (link == "name" && being) |