From e70704f2b1609b49319e34f466afaf4454d92382 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 27 Aug 2014 16:57:34 +0300 Subject: Move method replaceVars into chatutils.cpp. --- src/commands.cpp | 75 -------------------------------------------------------- 1 file changed, 75 deletions(-) (limited to 'src/commands.cpp') diff --git a/src/commands.cpp b/src/commands.cpp index ac854bc39..15f76351d 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -159,79 +159,4 @@ static void uploadFile(const std::string &str, upload->start(); } -void replaceVars(std::string &str) -{ - if (!localPlayer || !actorManager) - return; - - if (str.find("") != std::string::npos) - { - const Being *target = localPlayer->getTarget(); - if (!target || target->getType() != ActorType::PLAYER) - { - target = actorManager->findNearestLivingBeing( - localPlayer, 20, ActorType::PLAYER, true); - } - if (target) - replaceAll(str, "", target->getName()); - else - replaceAll(str, "", ""); - } - if (str.find("") != std::string::npos) - { - const Being *target = localPlayer->getTarget(); - if (!target || target->getType() != ActorType::MONSTER) - { - target = actorManager->findNearestLivingBeing( - localPlayer, 20, ActorType::MONSTER, true); - } - if (target) - replaceAll(str, "", target->getName()); - else - replaceAll(str, "", ""); - } - if (str.find("") != std::string::npos) - { - StringVect names; - std::string newStr; - actorManager->getPlayerNames(names, false); - FOR_EACH (StringVectCIter, it, names) - { - if (*it != localPlayer->getName()) - newStr.append(*it).append(","); - } - if (newStr[newStr.size() - 1] == ',') - newStr = newStr.substr(0, newStr.size() - 1); - if (!newStr.empty()) - replaceAll(str, "", newStr); - else - replaceAll(str, "", ""); - } - if (str.find("") != std::string::npos) - { - StringVect names; - std::string newStr; - const Party *party = nullptr; - if (localPlayer->isInParty() && (party = localPlayer->getParty())) - { - party->getNames(names); - FOR_EACH (StringVectCIter, it, names) - { - if (*it != localPlayer->getName()) - newStr.append(*it).append(","); - } - if (newStr[newStr.size() - 1] == ',') - newStr = newStr.substr(0, newStr.size() - 1); - if (!newStr.empty()) - replaceAll(str, "", newStr); - else - replaceAll(str, "", ""); - } - else - { - replaceAll(str, "", ""); - } - } -} - } // namespace Commands -- cgit v1.2.3-70-g09d2