diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-07-23 00:39:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-07-23 00:39:12 +0300 |
| commit | 6336dabcb33ca6b4d417b352fa0b12651b6f4c57 (patch) | |
| tree | a84879f46ee80d2f98d0418cbcbbb81e28da8e76 /src/gui | |
| parent | 1995e723df5d5aef32b289c0122493ee6fe18b0e (diff) | |
| download | manaplus-6336dabcb33ca6b4d417b352fa0b12651b6f4c57.tar.gz manaplus-6336dabcb33ca6b4d417b352fa0b12651b6f4c57.tar.bz2 manaplus-6336dabcb33ca6b4d417b352fa0b12651b6f4c57.tar.xz manaplus-6336dabcb33ca6b4d417b352fa0b12651b6f4c57.zip | |
move "change away type" option into gamemodifiers.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/popups/statuspopup.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/chatwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/statuswindow.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp index 476871e0b..776845bfa 100644 --- a/src/gui/popups/statuspopup.cpp +++ b/src/gui/popups/statuspopup.cpp @@ -166,7 +166,7 @@ void StatusPopup::updateLabels() const InputAction::DISABLE_GAME_MODIFIERS); setLabelText(12, modifiers->getImitationModeString(), InputAction::CHANGE_IMITATION_MODE); - setLabelText(13, player_node->getAwayModeString(), + setLabelText(13, modifiers->getAwayModeString(), InputAction::AWAY); setLabelText(14, LocalPlayer::getCameraModeString(), InputAction::CAMERA); diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 776ad9501..d4ae8ed14 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -1711,7 +1711,7 @@ void ChatWindow::loadCustomList() void ChatWindow::addToAwayLog(const std::string &line) { - if (!player_node || !player_node->getAway()) + if (!settings.awayMode) return; if (mAwayLog.size() > 20) diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index a371f9b52..c4b645424 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -660,7 +660,7 @@ void StatusWindow::updateStatusBar(ProgressBar *const bar, .append(" ").append(translateLetter2( modifiers->getImitationModeString())) .append(translateLetter2(LocalPlayer::getCameraModeString())) - .append(translateLetter2(player_node->getAwayModeString()))); + .append(translateLetter2(modifiers->getAwayModeString()))); bar->setProgress(50); if (settings.disableGameModifiers) |