From 57ae5040b2f2fcaed6b80f5a10573a0abaccdf5f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 27 Jan 2016 15:37:21 +0300 Subject: Add chat command for move selected item to craft slot. New chat command: /craft SLOT --- src/actions/commands.cpp | 13 ++++++++++++- src/actions/commands.h | 1 + src/dyetool/actions/commands.cpp | 2 ++ src/enums/input/inputaction.h | 1 + src/input/inputactionmap.h | 6 ++++++ 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp index a87db0a16..84011b3ec 100644 --- a/src/actions/commands.cpp +++ b/src/actions/commands.cpp @@ -41,9 +41,10 @@ #endif #include "gui/windows/chatwindow.h" +#include "gui/windows/inventorywindow.h" +#include "gui/windows/outfitwindow.h" #include "gui/windows/skilldialog.h" #include "gui/windows/socialwindow.h" -#include "gui/windows/outfitwindow.h" #include "gui/widgets/tabs/chat/whispertab.h" @@ -1122,4 +1123,14 @@ impHandler(skill) return true; } +impHandler(craft) +{ + const std::string args = event.args; + if (args.empty() || !inventoryWindow) + return false; + + inventoryWindow->moveItemToCraft(atoi(args.c_str())); + return true; +} + } // namespace Actions diff --git a/src/actions/commands.h b/src/actions/commands.h index 6eceaa208..d901683b1 100644 --- a/src/actions/commands.h +++ b/src/actions/commands.h @@ -92,6 +92,7 @@ namespace Actions decHandler(slide); decHandler(selectSkillLevel); decHandler(skill); + decHandler(craft); } // namespace Actions #undef decHandler diff --git a/src/dyetool/actions/commands.cpp b/src/dyetool/actions/commands.cpp index ccee0836e..44ff371d6 100644 --- a/src/dyetool/actions/commands.cpp +++ b/src/dyetool/actions/commands.cpp @@ -92,4 +92,6 @@ impHandlerVoid(serverConfGet) impHandlerVoid(slide) impHandlerVoid(selectSkillLevel) impHandlerVoid(skill) +impHandlerVoid(craft) + } // namespace Actions diff --git a/src/enums/input/inputaction.h b/src/enums/input/inputaction.h index 1b004f93b..f5fa6b675 100644 --- a/src/enums/input/inputaction.h +++ b/src/enums/input/inputaction.h @@ -616,6 +616,7 @@ enumStart(InputAction) CRAFT_7, CRAFT_8, CRAFT_9, + CRAFT, TOTAL } enumEnd(InputAction); diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index f76e8cb53..1daf6f856 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -5185,6 +5185,12 @@ static const InputActionData inputActionData "", UseArgs_false, Protected_true}, + {"keyCraft", + defaultAction(&Actions::craft), + InputCondition::INGAME, + "craft", + UseArgs_true, + Protected_true}, }; #undef defaultAction -- cgit v1.2.3-60-g2f50