From 744b9d6689b67779a1d17c6d3de7cd016ca1033b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 20 Jul 2014 20:58:31 +0300 Subject: move "change move" option into gamemodifiers. --- src/gui/popups/statuspopup.cpp | 6 ++++-- src/gui/windows/statuswindow.cpp | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src/gui') diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp index 688898afe..23c0f313f 100644 --- a/src/gui/popups/statuspopup.cpp +++ b/src/gui/popups/statuspopup.cpp @@ -23,6 +23,8 @@ #include "gui/viewport.h" +#include "gamemodifiers.h" + #include "gui/popups/statuspopup.h" #include "gui/widgets/label.h" @@ -135,10 +137,10 @@ void StatusPopup::setLabelText(const int num, void StatusPopup::updateLabels() const { - if (!player_node || !viewport) + if (!player_node || !viewport || !modifiers) return; - setLabelText(0, player_node->getMoveTypeString(), + setLabelText(0, modifiers->getMoveTypeString(), InputAction::INVERT_DIRECTION); setLabelText(1, player_node->getCrazyMoveTypeString(), InputAction::CHANGE_CRAZY_MOVES_TYPE); diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 029bfff1a..470028024 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -24,6 +24,7 @@ #include "configuration.h" #include "equipment.h" +#include "gamemodifiers.h" #include "inventory.h" #include "item.h" #include "units.h" @@ -641,7 +642,7 @@ void StatusWindow::updateStatusBar(ProgressBar *const bar, if (!player_node || !viewport) return; - bar->setText(translateLetter2(player_node->getMoveTypeString()) + bar->setText(translateLetter2(modifiers->getMoveTypeString()) .append(translateLetter2(player_node->getCrazyMoveTypeString())) .append(translateLetter2(player_node->getMoveToTargetTypeString())) .append(translateLetter2(player_node->getFollowModeString())) -- cgit v1.2.3-70-g09d2