From b039f3cd6139769463dc5afe894e3098bc5c2c8c Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Mon, 4 Dec 2017 18:45:21 +0200
Subject: [PATCH] Added: /loot command and keyboard shortcut

--HG--
branch : develop
---
 code/ryzom/client/data/gamedev/interfaces_v3/actions.xml  | 1 +
 code/ryzom/client/data/gamedev/interfaces_v3/commands.xml | 2 ++
 code/ryzom/client/data/gamedev/interfaces_v3/keys.xml     | 1 +
 code/ryzom/client/src/interface_v3/inventory_manager.cpp  | 3 +++
 4 files changed, 7 insertions(+)

diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/actions.xml b/code/ryzom/client/data/gamedev/interfaces_v3/actions.xml
index d628a6996..42c931e29 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/actions.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/actions.xml
@@ -235,6 +235,7 @@
 			<value value="guild"	   hardtext="uimMtGuild" />
 		</parameter>
 	</action>
+	<action name="inv_temp_all" hardtext="uittTakeAll" contexts="game" />
 </action_category>
 
 <action_category name="chat" hardtext="uiChat" contexts="game, r2ed, r2ed_anim_test"> <!-- not available in r2ed for now -->
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/commands.xml b/code/ryzom/client/data/gamedev/interfaces_v3/commands.xml
index d7aabccae..31a1a7099 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/commands.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/commands.xml
@@ -120,6 +120,8 @@
 	<command name="showonline" action="command" params="a showOnline $"/>
 	<command name="showOnline" action="command" params="a showOnline $"/>
 
+	<command name="loot" action="inv_temp_all" params="" />
+
 	<!-- WebIG -->
 	<command name="go" action="browse" params="name=ui:interface:webig:content:html|url=home"/>
 	<command name="webdev" action="browse" params="name=ui:interface:webig:content:html|url=http://localhost/index.html"/>
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/keys.xml b/code/ryzom/client/data/gamedev/interfaces_v3/keys.xml
index ae212a589..40ecd1c75 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/keys.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/keys.xml
@@ -278,6 +278,7 @@
   <key name="KeyB" action="show_hide" params="phrase_book" /> 
   <key name="N/A" action="show_hide" params="gestionsets" /> 
   <key name="KeyP" shift="1" action="show_hide" params="animal_global" /> 
+  <key name="N/A" action="inv_temp_all" params="" />
   
   
   <!--  Map
diff --git a/code/ryzom/client/src/interface_v3/inventory_manager.cpp b/code/ryzom/client/src/interface_v3/inventory_manager.cpp
index 746ad9ea4..ea233b530 100644
--- a/code/ryzom/client/src/interface_v3/inventory_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/inventory_manager.cpp
@@ -2993,6 +2993,9 @@ class CHandlerInvTempAll : public IActionHandler
 {
 	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
 	{
+		if (!CTempInvManager::getInstance()->isOpened()) return;
+		if (NLGUI::CDBManager::getInstance()->getDbProp("UI:TEMP_INV:ALL_EMPTY")->getValue32() != 0) return;
+
 		CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		CInventoryManager *pInv = CInventoryManager::getInstance();