summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-21 13:14:09 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-21 13:14:09 +0300
commit684e041568932a651aaeb09a1247f42860871a59 (patch)
treec1398692d694b01150b204a19199776b06a919a5 /src/gui
parentcfffcc941898c4163e1bd62b8e514d3535511666 (diff)
downloadmanaverse-684e041568932a651aaeb09a1247f42860871a59.tar.gz
manaverse-684e041568932a651aaeb09a1247f42860871a59.tar.bz2
manaverse-684e041568932a651aaeb09a1247f42860871a59.tar.xz
manaverse-684e041568932a651aaeb09a1247f42860871a59.zip
move "change follow mode" option into gamemodifiers.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popups/statuspopup.cpp2
-rw-r--r--src/gui/windows/statuswindow.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp
index 9c5869ad9..85a5e9570 100644
--- a/src/gui/popups/statuspopup.cpp
+++ b/src/gui/popups/statuspopup.cpp
@@ -146,7 +146,7 @@ void StatusPopup::updateLabels() const
InputAction::CHANGE_CRAZY_MOVES_TYPE);
setLabelText(2, modifiers->getMoveToTargetTypeString(),
InputAction::CHANGE_MOVE_TO_TARGET);
- setLabelText(3, player_node->getFollowModeString(),
+ setLabelText(3, modifiers->getFollowModeString(),
InputAction::CHANGE_FOLLOW_MODE);
setLabelText(4, player_node->getAttackWeaponTypeString(),
InputAction::CHANGE_ATTACK_WEAPON_TYPE);
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index c035f9759..f85c77b7e 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -645,7 +645,7 @@ void StatusWindow::updateStatusBar(ProgressBar *const bar,
bar->setText(translateLetter2(modifiers->getMoveTypeString())
.append(translateLetter2(modifiers->getCrazyMoveTypeString()))
.append(translateLetter2(modifiers->getMoveToTargetTypeString()))
- .append(translateLetter2(player_node->getFollowModeString()))
+ .append(translateLetter2(modifiers->getFollowModeString()))
.append(" ").append(translateLetter2(
player_node->getAttackWeaponTypeString()))
.append(translateLetter2(player_node->getAttackTypeString()))