diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-07-21 17:53:41 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-07-21 17:53:41 +0300 |
| commit | 8b6afd0d756b9fc66c9f4de3ef452c24f64c87d1 (patch) | |
| tree | 61f95032eb06210d145b3f1f704c2f60a396974a /src/gui | |
| parent | 623c0127e4ad5170e9ee003475ed566cec55cfeb (diff) | |
| download | manaplus-8b6afd0d756b9fc66c9f4de3ef452c24f64c87d1.tar.gz manaplus-8b6afd0d756b9fc66c9f4de3ef452c24f64c87d1.tar.bz2 manaplus-8b6afd0d756b9fc66c9f4de3ef452c24f64c87d1.tar.xz manaplus-8b6afd0d756b9fc66c9f4de3ef452c24f64c87d1.zip | |
move "change attack 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 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( |