From 623c0127e4ad5170e9ee003475ed566cec55cfeb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 21 Jul 2014 13:24:00 +0300 Subject: move "change attack weapon 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 85a5e9570..5a5c27e12 100644 --- a/src/gui/popups/statuspopup.cpp +++ b/src/gui/popups/statuspopup.cpp @@ -148,7 +148,7 @@ void StatusPopup::updateLabels() const InputAction::CHANGE_MOVE_TO_TARGET); setLabelText(3, modifiers->getFollowModeString(), InputAction::CHANGE_FOLLOW_MODE); - setLabelText(4, player_node->getAttackWeaponTypeString(), + setLabelText(4, modifiers->getAttackWeaponTypeString(), InputAction::CHANGE_ATTACK_WEAPON_TYPE); setLabelText(5, player_node->getAttackTypeString(), InputAction::CHANGE_ATTACK_TYPE); diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index f85c77b7e..718234814 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -647,7 +647,7 @@ void StatusWindow::updateStatusBar(ProgressBar *const bar, .append(translateLetter2(modifiers->getMoveToTargetTypeString())) .append(translateLetter2(modifiers->getFollowModeString())) .append(" ").append(translateLetter2( - player_node->getAttackWeaponTypeString())) + modifiers->getAttackWeaponTypeString())) .append(translateLetter2(player_node->getAttackTypeString())) .append(translateLetter2(player_node->getMagicAttackString())) .append(translateLetter2(player_node->getPvpAttackString())) -- cgit v1.2.3-70-g09d2