From 23a89c57cbd36922fbcb92affa9546955591e9db Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 12 Dec 2014 23:08:49 +0300 Subject: Add chat command for drop item by id and amount dialog. New chat command: /dropitem ID --- src/actions/actions.cpp | 19 +++++++++++++++++++ src/actions/actions.h | 1 + src/input/inputaction.h | 1 + src/input/inputactionmap.h | 9 +++++++++ 4 files changed, 30 insertions(+) (limited to 'src') diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index 69c711e18..605a3ff06 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -50,6 +50,8 @@ #include "gui/windows/buyselldialog.h" #include "gui/windows/chatwindow.h" #include "gui/windows/helpwindow.h" +#include "gui/windows/inventorywindow.h" +#include "gui/windows/itemamountwindow.h" #include "gui/windows/npcdialog.h" #include "gui/windows/outfitwindow.h" #include "gui/windows/setupwindow.h" @@ -361,6 +363,23 @@ impHandler0(dropItem) return false; } +impHandler(dropItemId) +{ + const Inventory *const inv = PlayerInfo::getInventory(); + if (!inv) + return false; + + // +++ ignoring item color for now + Item *const item = inv->findItem(atoi(event.args.c_str()), 1); + + if (item && !PlayerInfo::isItemProtected(item->getId())) + { + ItemAmountWindow::showWindow(ItemAmountWindow::ItemDrop, + inventoryWindow, item); + } + return true; +} + impHandler(heal) { if (actorManager && localPlayer) diff --git a/src/actions/actions.h b/src/actions/actions.h index 642026d76..956183346 100644 --- a/src/actions/actions.h +++ b/src/actions/actions.h @@ -38,6 +38,7 @@ namespace Actions decHandler(quit); decHandler(dropItem0); decHandler(dropItem); + decHandler(dropItemId); decHandler(heal); decHandler(itenplz); decHandler(setHome); diff --git a/src/input/inputaction.h b/src/input/inputaction.h index fb5db9913..e46935ea2 100644 --- a/src/input/inputaction.h +++ b/src/input/inputaction.h @@ -500,6 +500,7 @@ namespace InputAction WHISPER_TEXT, NAVIGATE_TO, CAMERA_MOVE, + DROP_ITEM, TOTAL }; } // namespace InputAction diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 4b9d61047..8515dad5b 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -4243,6 +4243,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = { InputCondition::INGAME, "movecamera|cameramove", true}, + {"keyDropItem", + InputType::UNKNOWN, InputAction::NO_VALUE, + InputType::UNKNOWN, InputAction::NO_VALUE, + Input::GRP_DEFAULT, + &Actions::dropItemId, + InputAction::NO_VALUE, 50, + InputCondition::INGAME, + "dropitem", + true}, }; #endif // INPUT_INPUTACTIONMAP_H -- cgit v1.2.3-70-g09d2