From eed7ef561a9d590d507255118132676f868b1bd3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 21 Jul 2014 21:39:00 +0300 Subject: move "change pickup type" option into gamemodifiers. --- src/gui/popups/statuspopup.cpp | 2 +- src/gui/windows/statuswindow.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui') diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp index 3a3e15b1c..0c7dc3bae 100644 --- a/src/gui/popups/statuspopup.cpp +++ b/src/gui/popups/statuspopup.cpp @@ -154,7 +154,7 @@ void StatusPopup::updateLabels() const InputAction::CHANGE_ATTACK_TYPE); setLabelText(6, modifiers->getQuickDropCounterString(), InputAction::SWITCH_QUICK_DROP); - setLabelText(7, player_node->getPickUpTypeString(), + setLabelText(7, modifiers->getPickUpTypeString(), InputAction::CHANGE_PICKUP_TYPE); setLabelText(8, LocalPlayer::getMapDrawTypeString(), InputAction::PATHFIND); diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 2517239f5..29d899711 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -653,7 +653,7 @@ void StatusWindow::updateStatusBar(ProgressBar *const bar, .append(translateLetter2(player_node->getPvpAttackString())) .append(" ").append(translateLetter2( modifiers->getQuickDropCounterString())) - .append(translateLetter2(player_node->getPickUpTypeString())) + .append(translateLetter2(modifiers->getPickUpTypeString())) .append(" ").append(translateLetter2( LocalPlayer::getMapDrawTypeString())) .append(" ").append(translateLetter2( -- cgit v1.2.3-70-g09d2