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/video | |
| 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/video')
| -rw-r--r-- | src/video/allegro_v.cpp | 2 | ||||
| -rw-r--r-- | src/video/cocoa/event.mm | 2 | ||||
| -rw-r--r-- | src/video/sdl_v.cpp | 2 | ||||
| -rw-r--r-- | src/video/win32_v.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/video/allegro_v.cpp b/src/video/allegro_v.cpp index e0509aa52..cbcda9f34 100644 --- a/src/video/allegro_v.cpp +++ b/src/video/allegro_v.cpp @@ -483,7 +483,7 @@ void VideoDriver_Allegro::MainLoop() } cur_ticks = GetTime(); - if (cur_ticks >= next_tick || (_fast_forward && !_pause_game) || cur_ticks < prev_cur_ticks) { + if (cur_ticks >= next_tick || (_fast_forward && !_pause_mode) || cur_ticks < prev_cur_ticks) { _realtime_tick += cur_ticks - last_cur_ticks; last_cur_ticks = cur_ticks; next_tick = cur_ticks + 30; diff --git a/src/video/cocoa/event.mm b/src/video/cocoa/event.mm index ca90009db..dea4eb8b5 100644 --- a/src/video/cocoa/event.mm +++ b/src/video/cocoa/event.mm @@ -664,7 +664,7 @@ void QZ_GameLoop() } cur_ticks = GetTick(); - if (cur_ticks >= next_tick || (_fast_forward && !_pause_game) || cur_ticks < prev_cur_ticks) { + if (cur_ticks >= next_tick || (_fast_forward && !_pause_mode) || cur_ticks < prev_cur_ticks) { _realtime_tick += cur_ticks - last_cur_ticks; last_cur_ticks = cur_ticks; next_tick = cur_ticks + 30; diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp index e9068bd7e..932832699 100644 --- a/src/video/sdl_v.cpp +++ b/src/video/sdl_v.cpp @@ -476,7 +476,7 @@ void VideoDriver_SDL::MainLoop() } cur_ticks = SDL_CALL SDL_GetTicks(); - if (cur_ticks >= next_tick || (_fast_forward && !_pause_game) || cur_ticks < prev_cur_ticks) { + if (cur_ticks >= next_tick || (_fast_forward && !_pause_mode) || cur_ticks < prev_cur_ticks) { _realtime_tick += cur_ticks - last_cur_ticks; last_cur_ticks = cur_ticks; next_tick = cur_ticks + 30; diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index f4d61c431..d3adb5723 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -848,7 +848,7 @@ void VideoDriver_Win32::MainLoop() } cur_ticks = GetTickCount(); - if (cur_ticks >= next_tick || (_fast_forward && !_pause_game) || cur_ticks < prev_cur_ticks) { + if (cur_ticks >= next_tick || (_fast_forward && !_pause_mode) || cur_ticks < prev_cur_ticks) { _realtime_tick += cur_ticks - last_cur_ticks; last_cur_ticks = cur_ticks; next_tick = cur_ticks + 30; |