diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-06 15:06:57 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-06 15:06:57 +0000 |
| commit | 2664f2a2d95dbc2122ff1f9b96e8569ae401892f (patch) | |
| tree | fb2112ce7a51edd259190186790bf00319a53510 /src/statusbar_gui.cpp | |
| parent | bb121a1510fbd3faea71b794b1f6bdaba1641665 (diff) | |
| download | openttd-2664f2a2d95dbc2122ff1f9b96e8569ae401892f.tar.xz | |
(svn r16242) -Codechange: rework pausing
-Fix [FS#2864]: autopause and manual pausing conflict with eachother
-Fix: new game + pause on new game + autopause make the game not unpause on the first join
Diffstat (limited to 'src/statusbar_gui.cpp')
| -rw-r--r-- | src/statusbar_gui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp index 11b401624..89b2680bd 100644 --- a/src/statusbar_gui.cpp +++ b/src/statusbar_gui.cpp @@ -97,7 +97,7 @@ struct StatusBarWindow : Window { this->DrawWidgets(); SetDParam(0, _date); - DrawString(this->widget[SBW_LEFT].left + 1, this->widget[SBW_LEFT].right - 1, 1, (_pause_game || _settings_client.gui.status_long_date) ? STR_DATE_LONG_WHITE : STR_DATE_SHORT_WHITE, TC_FROMSTRING, SA_CENTER); + DrawString(this->widget[SBW_LEFT].left + 1, this->widget[SBW_LEFT].right - 1, 1, (_pause_mode || _settings_client.gui.status_long_date) ? STR_DATE_LONG_WHITE : STR_DATE_SHORT_WHITE, TC_FROMSTRING, SA_CENTER); if (c != NULL) { /* Draw company money */ @@ -110,7 +110,7 @@ struct StatusBarWindow : Window { DrawString(this->widget[SBW_MIDDLE].left + 1, this->widget[SBW_MIDDLE].right - 1, 1, STR_STATUSBAR_SAVING_GAME, TC_FROMSTRING, SA_CENTER); } else if (_do_autosave) { DrawString(this->widget[SBW_MIDDLE].left + 1, this->widget[SBW_MIDDLE].right - 1, 1, STR_STATUSBAR_AUTOSAVE, TC_FROMSTRING, SA_CENTER); - } else if (_pause_game) { + } else if (_pause_mode != PM_UNPAUSED) { DrawString(this->widget[SBW_MIDDLE].left + 1, this->widget[SBW_MIDDLE].right - 1, 1, STR_STATUSBAR_PAUSED, TC_FROMSTRING, SA_CENTER); } else if (this->ticker_scroll > TICKER_STOP && FindWindowById(WC_NEWS_WINDOW, 0) == NULL && _statusbar_news_item.string_id != 0) { /* Draw the scrolling news text */ @@ -159,7 +159,7 @@ struct StatusBarWindow : Window { virtual void OnTick() { - if (_pause_game) return; + if (_pause_mode != PM_UNPAUSED) return; if (this->ticker_scroll > TICKER_STOP) { // Scrolling text this->ticker_scroll -= COUNTER_STEP; |