diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-07-21 21:39:00 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-07-21 21:39:00 +0300 |
| commit | eed7ef561a9d590d507255118132676f868b1bd3 (patch) | |
| tree | 586f7f394c0d7678ed615525c6129fb9d787bf04 /src/gui | |
| parent | c41fcc1f637e76e5ff671b223ce6c151af89e7d3 (diff) | |
| download | mv-eed7ef561a9d590d507255118132676f868b1bd3.tar.gz mv-eed7ef561a9d590d507255118132676f868b1bd3.tar.bz2 mv-eed7ef561a9d590d507255118132676f868b1bd3.tar.xz mv-eed7ef561a9d590d507255118132676f868b1bd3.zip | |
move "change pickup type" option into gamemodifiers.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/popups/statuspopup.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/statuswindow.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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( |