diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-07-22 01:41:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-07-22 01:41:19 +0300 |
| commit | d569dc78b5b50c0e6cbe84e48164e5774fd36de7 (patch) | |
| tree | abe4bf6e0822fe0d1ee2149f88cd0e6e4452c396 /src/gui | |
| parent | aaa50f7ef8de21ea1f32065beb15a7a58faf28a5 (diff) | |
| download | manaplus-d569dc78b5b50c0e6cbe84e48164e5774fd36de7.tar.gz manaplus-d569dc78b5b50c0e6cbe84e48164e5774fd36de7.tar.bz2 manaplus-d569dc78b5b50c0e6cbe84e48164e5774fd36de7.tar.xz manaplus-d569dc78b5b50c0e6cbe84e48164e5774fd36de7.zip | |
move "change game modifiers" 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 | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp index 69aec1f8a..b1fcb2b20 100644 --- a/src/gui/popups/statuspopup.cpp +++ b/src/gui/popups/statuspopup.cpp @@ -162,7 +162,7 @@ void StatusPopup::updateLabels() const InputAction::SWITCH_MAGIC_ATTACK); setLabelText(10, modifiers->getPvpAttackTypeString(), InputAction::SWITCH_PVP_ATTACK); - setLabelText(11, player_node->getGameModifiersString(), + setLabelText(11, modifiers->getGameModifiersString(), InputAction::DISABLE_GAME_MODIFIERS); setLabelText(12, modifiers->getImitationModeString(), InputAction::CHANGE_IMITATION_MODE); diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index b2d2c2ff8..aac148d42 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -27,6 +27,7 @@ #include "gamemodifiers.h" #include "inventory.h" #include "item.h" +#include "settings.h" #include "units.h" #include "gui/windows/chatwindow.h" @@ -639,7 +640,7 @@ std::string StatusWindow::translateLetter2(const std::string &letters) void StatusWindow::updateStatusBar(ProgressBar *const bar, const bool percent A_UNUSED) const { - if (!player_node || !viewport) + if (!player_node || !viewport || !modifiers) return; bar->setText(translateLetter2(modifiers->getMoveTypeString()) @@ -662,7 +663,7 @@ void StatusWindow::updateStatusBar(ProgressBar *const bar, .append(translateLetter2(player_node->getAwayModeString()))); bar->setProgress(50); - if (player_node->getDisableGameModifiers()) + if (settings.disableGameModifiers) bar->setBackgroundColor(getThemeColor(Theme::STATUSBAR_ON)); else bar->setBackgroundColor(getThemeColor(Theme::STATUSBAR_OFF)); |