petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r16242) -Codechange: rework pausing

Browse Source 
-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
This commit is contained in:
rubidium
2009-05-06 15:06:57 +00:00
parent bb121a1510
commit 2664f2a2d9
29 changed files with 110 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/toolbar_gui.cpp
View File

@@ -249,7 +249,7 @@ static void ToolbarPauseClick(Window *w)
{
if (_networking && !_network_server) return; // only server can pause the game
if (DoCommandP(0, _pause_game ? 0 : 1, 0, CMD_PAUSE)) SndPlayFx(SND_15_BEEP);
if (DoCommandP(0, PM_PAUSED_NORMAL, _pause_mode == PM_UNPAUSED, CMD_PAUSE)) SndPlayFx(SND_15_BEEP);
}
/* --- Fast forwarding --- */
@@ -1106,7 +1106,7 @@ struct MainToolbarWindow : Window {
virtual void OnTick()
{
if (this->IsWidgetLowered(TBN_PAUSE) != !!_pause_game) {
if (this->IsWidgetLowered(TBN_PAUSE) != !!_pause_mode) {
this->ToggleWidgetLoweredState(TBN_PAUSE);
this->InvalidateWidget(TBN_PAUSE);
}
@@ -1379,7 +1379,7 @@ public:
virtual void OnTick()
{
if (this->IsWidgetLowered(TBSE_PAUSE) != !!_pause_game) {
if (this->IsWidgetLowered(TBSE_PAUSE) != !!_pause_mode) {
this->ToggleWidgetLoweredState(TBSE_PAUSE);
this->SetDirty();
}