From c7833cb8a08cf705e9e67124d746f6f7af2e93c3 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 13 Dec 2014 16:08:08 +0300
Subject: Remove chat command variation invtostorage*.
---
src/actions/actions.cpp | 54 --------------------------------------------
src/actions/actions.h | 4 ----
src/gui/popups/popupmenu.cpp | 8 +++----
src/input/inputaction.h | 4 ----
src/input/inputactionmap.h | 36 -----------------------------
5 files changed, 4 insertions(+), 102 deletions(-)
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index dce003cc0..db2a864e5 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -1435,58 +1435,4 @@ impHandler(invToStorage)
return true;
}
-impHandler(invToStorage10)
-{
- Item *const item = getItemByInvIndex(event);
- if (!item)
- return true;
-
- int cnt = 10;
- if (cnt > item->getQuantity())
- cnt = item->getQuantity();
- inventoryHandler->moveItem2(Inventory::INVENTORY,
- item->getInvIndex(), cnt,
- Inventory::STORAGE);
- return true;
-}
-
-impHandler(invToStorageHalf)
-{
- Item *const item = getItemByInvIndex(event);
- if (!item)
- return true;
-
- inventoryHandler->moveItem2(Inventory::INVENTORY,
- item->getInvIndex(),
- item->getQuantity() / 2,
- Inventory::STORAGE);
- return true;
-}
-
-impHandler(invToStorageAll1)
-{
- Item *const item = getItemByInvIndex(event);
- if (!item)
- return true;
-
- inventoryHandler->moveItem2(Inventory::INVENTORY,
- item->getInvIndex(),
- item->getQuantity() - 1,
- Inventory::STORAGE);
- return true;
-}
-
-impHandler(invToStorageAll)
-{
- Item *const item = getItemByInvIndex(event);
- if (!item)
- return true;
-
- inventoryHandler->moveItem2(Inventory::INVENTORY,
- item->getInvIndex(),
- item->getQuantity(),
- Inventory::STORAGE);
- return true;
-}
-
} // namespace Actions
diff --git a/src/actions/actions.h b/src/actions/actions.h
index 14027bca9..eaf900fbe 100644
--- a/src/actions/actions.h
+++ b/src/actions/actions.h
@@ -99,10 +99,6 @@ namespace Actions
decHandler(useItem);
decHandler(useItemInv);
decHandler(invToStorage);
- decHandler(invToStorage10);
- decHandler(invToStorageHalf);
- decHandler(invToStorageAll1);
- decHandler(invToStorageAll);
} // namespace Actions
#undef decHandler
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 1cd774dbe..56b478125 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -1803,20 +1803,20 @@ void PopupMenu::showPopup(Window *const parent, const int x, const int y,
{
// TRANSLATORS: popup menu item
// TRANSLATORS: add 10 item amount to storage
- mBrowserBox->addRow("/invtostorage10 'INVINDEX'",
+ mBrowserBox->addRow("/invtostorage 'INVINDEX' 10",
_("Store 10"));
}
// TRANSLATORS: popup menu item
// TRANSLATORS: add half item amount to storage
- mBrowserBox->addRow("/invtostoragehalf 'INVINDEX'",
+ mBrowserBox->addRow("/invtostorage 'INVINDEX' /",
_("Store half"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add all except one item amount to storage
- mBrowserBox->addRow("/invtostorageall1 'INVINDEX'",
+ mBrowserBox->addRow("/invtostorage 'INVINDEX' -1",
_("Store all-1"));
// TRANSLATORS: popup menu item
// TRANSLATORS: add all item amount to storage
- mBrowserBox->addRow("/invtostorageall 'INVINDEX'",
+ mBrowserBox->addRow("/invtostorage 'INVINDEX' all",
_("Store all"));
}
mBrowserBox->addRow("##3---");
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index f5c4c927f..dc63508d3 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -506,10 +506,6 @@ namespace InputAction
DROP_INV_ALL,
USE_INV,
INV_TO_STORAGE,
- INV_TO_STORAGE_10,
- INV_TO_STORAGE_HALF,
- INV_TO_STORAGE_ALL_1,
- INV_TO_STORAGE_ALL,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index a96353857..b23032728 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -4297,42 +4297,6 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputCondition::INGAME,
"invtostorage|invstorage",
true},
- {"keyInvToStorage10",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::invToStorage10,
- InputAction::NO_VALUE, 50,
- InputCondition::INGAME,
- "invtostorage10|invstorage10",
- true},
- {"keyInvToStorageHalf",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::invToStorageHalf,
- InputAction::NO_VALUE, 50,
- InputCondition::INGAME,
- "invtostoragehalf|invstoragehalf",
- true},
- {"keyInvToStorageAll1",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::invToStorageAll1,
- InputAction::NO_VALUE, 50,
- InputCondition::INGAME,
- "invtostorageall1|invstorageall1",
- true},
- {"keyInvToStorageAll",
- InputType::UNKNOWN, InputAction::NO_VALUE,
- InputType::UNKNOWN, InputAction::NO_VALUE,
- Input::GRP_DEFAULT,
- &Actions::invToStorageAll,
- InputAction::NO_VALUE, 50,
- InputCondition::INGAME,
- "invtostorageall|invstorageall",
- true},
};
#endif // INPUT_INPUTACTIONMAP_H
--
cgit v1.2.3-70-g09d2