diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-12-09 15:26:27 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-12-09 15:26:27 +0300 |
commit | 6737c33ffb89262a76bee80cdc9afeeebddbc2f7 (patch) | |
tree | 561ff4493ec0b49bb88ff4d9ee66f989ed2a1d0d /src/actions/commands.cpp | |
parent | 7dcc42c841005c5e475bfcb37e78bc7bc15b4a9d (diff) | |
download | manaplus-6737c33ffb89262a76bee80cdc9afeeebddbc2f7.tar.gz manaplus-6737c33ffb89262a76bee80cdc9afeeebddbc2f7.tar.bz2 manaplus-6737c33ffb89262a76bee80cdc9afeeebddbc2f7.tar.xz manaplus-6737c33ffb89262a76bee80cdc9afeeebddbc2f7.zip |
move buy and sell actions from commands.c to actions.c file.
Diffstat (limited to 'src/actions/commands.cpp')
-rw-r--r-- | src/actions/commands.cpp | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp index eafd0b82b..c8d4f2b21 100644 --- a/src/actions/commands.cpp +++ b/src/actions/commands.cpp @@ -37,11 +37,9 @@ #include "gui/widgets/tabs/chat/whispertab.h" #include "net/adminhandler.h" -#include "net/buysellhandler.h" #include "net/chathandler.h" #include "net/guildhandler.h" #include "net/homunculushandler.h" -#include "net/npchandler.h" #include "net/pethandler.h" #include "net/serverfeatures.h" @@ -713,67 +711,4 @@ impHandler0(fireHomunculus) return true; } -static Being *findBeing(const std::string &name) -{ - Being *being = nullptr; - if (name.empty()) - { - being = localPlayer->getTarget(); - } - else - { - being = actorManager->findBeingByName( - name, ActorType::Unknown); - } - if (!being) - { - being = actorManager->findNearestLivingBeing( - localPlayer, 1, ActorType::Npc, true); - } - if (!being) - { - being = actorManager->findNearestLivingBeing( - localPlayer, 1, ActorType::Player, true); - } - return being; -} - -impHandler(buy) -{ - Being *being = findBeing(event.args); - if (!being) - return false; - - if (being->getType() == ActorType::Npc) - { - npcHandler->buy(being->getId()); - return true; - } - else if (being->getType() == ActorType::Player) - { - buySellHandler->requestSellList(being->getName()); - return true; - } - return false; -} - -impHandler(sell) -{ - Being *being = findBeing(event.args); - if (!being) - return false; - - if (being->getType() == ActorType::Npc) - { - npcHandler->sell(being->getId()); - return true; - } - else if (being->getType() == ActorType::Player) - { - buySellHandler->requestBuyList(being->getName()); - return true; - } - return false; -} - } // namespace Actions |