diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-07-21 13:24:00 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-07-21 13:24:00 +0300 |
| commit | 623c0127e4ad5170e9ee003475ed566cec55cfeb (patch) | |
| tree | 269181626445874223a4b450ea65d6dbc46fb3c3 /src/gui | |
| parent | 684e041568932a651aaeb09a1247f42860871a59 (diff) | |
| download | mv-623c0127e4ad5170e9ee003475ed566cec55cfeb.tar.gz mv-623c0127e4ad5170e9ee003475ed566cec55cfeb.tar.bz2 mv-623c0127e4ad5170e9ee003475ed566cec55cfeb.tar.xz mv-623c0127e4ad5170e9ee003475ed566cec55cfeb.zip | |
move "change attack weapon 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 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())) |