From 8b6afd0d756b9fc66c9f4de3ef452c24f64c87d1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 21 Jul 2014 17:53:41 +0300 Subject: move "change attack 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 5a5c27e12..8275e1748 100644 --- a/src/gui/popups/statuspopup.cpp +++ b/src/gui/popups/statuspopup.cpp @@ -150,7 +150,7 @@ void StatusPopup::updateLabels() const InputAction::CHANGE_FOLLOW_MODE); setLabelText(4, modifiers->getAttackWeaponTypeString(), InputAction::CHANGE_ATTACK_WEAPON_TYPE); - setLabelText(5, player_node->getAttackTypeString(), + setLabelText(5, modifiers->getAttackTypeString(), InputAction::CHANGE_ATTACK_TYPE); setLabelText(6, player_node->getQuickDropCounterString(), InputAction::SWITCH_QUICK_DROP); diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 718234814..5be44f76b 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -648,7 +648,7 @@ void StatusWindow::updateStatusBar(ProgressBar *const bar, .append(translateLetter2(modifiers->getFollowModeString())) .append(" ").append(translateLetter2( modifiers->getAttackWeaponTypeString())) - .append(translateLetter2(player_node->getAttackTypeString())) + .append(translateLetter2(modifiers->getAttackTypeString())) .append(translateLetter2(player_node->getMagicAttackString())) .append(translateLetter2(player_node->getPvpAttackString())) .append(" ").append(translateLetter2( -- cgit v1.2.3-70-g09d2