From c544a5ebb53d51fa98392188d2b44dc6ec27c390 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 21 Jul 2014 23:04:11 +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 0c7dc3bae..4612844a8 100644 --- a/src/gui/popups/statuspopup.cpp +++ b/src/gui/popups/statuspopup.cpp @@ -158,7 +158,7 @@ void StatusPopup::updateLabels() const InputAction::CHANGE_PICKUP_TYPE); setLabelText(8, LocalPlayer::getMapDrawTypeString(), InputAction::PATHFIND); - setLabelText(9, player_node->getMagicAttackString(), + setLabelText(9, modifiers->getMagicAttackString(), InputAction::SWITCH_MAGIC_ATTACK); setLabelText(10, player_node->getPvpAttackString(), InputAction::SWITCH_PVP_ATTACK); diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 29d899711..27e47e1ad 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -649,7 +649,7 @@ void StatusWindow::updateStatusBar(ProgressBar *const bar, .append(" ").append(translateLetter2( modifiers->getAttackWeaponTypeString())) .append(translateLetter2(modifiers->getAttackTypeString())) - .append(translateLetter2(player_node->getMagicAttackString())) + .append(translateLetter2(modifiers->getMagicAttackString())) .append(translateLetter2(player_node->getPvpAttackString())) .append(" ").append(translateLetter2( modifiers->getQuickDropCounterString())) -- cgit v1.2.3-70-g09d2