From 99b516c9b20e696ddf3897bff9bc6686debf0f5a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 12 Dec 2014 13:22:09 +0300 Subject: Remove "pickup" popup menu handler. --- src/actions/actions.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/actions/actions.cpp') diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index 86191d51c..93e160750 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -451,12 +451,21 @@ impHandler0(copyEquippedToOutfit) impHandler0(pickup) { - if (localPlayer) + if (!localPlayer) + return false; + + const std::string args = event.args; + if (args.empty()) { localPlayer->pickUpItems(); - return true; } - return false; + else + { + FloorItem *const item = actorManager->findItem(atoi(args.c_str())); + if (item) + localPlayer->pickUp(item); + } + return true; } static void doSit() -- cgit v1.2.3-60-g2f50