summaryrefslogtreecommitdiff
path: root/src/video
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2007-03-06 20:59:52 +0000
committertruelight <truelight@openttd.org>2007-03-06 20:59:52 +0000
commit43133c766c850ac4be15c9d357183d21aa765cc0 (patch)
tree589dd69d82d0ad95f4e1c72216940e55d6208cf8 /src/video
parent5bb9aed844e4c37f9c7bcb01772c409289c2ef86 (diff)
downloadopenttd-43133c766c850ac4be15c9d357183d21aa765cc0.tar.xz
(svn r9034) -Codechange: renamed _pause to _pause_game, as some targets already have
a symbol called _pause (and therefor our variable conflicts with thatone. We shouldn't be using _ as global indicator.....)
Diffstat (limited to 'src/video')
-rw-r--r--src/video/sdl_v.cpp2
-rw-r--r--src/video/win32_v.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp
index 628ffaf63..2fc625d17 100644
--- a/src/video/sdl_v.cpp
+++ b/src/video/sdl_v.cpp
@@ -452,7 +452,7 @@ static void SdlVideoMainLoop(void)
}
cur_ticks = SDL_CALL SDL_GetTicks();
- if (cur_ticks >= next_tick || (_fast_forward && !_pause) || cur_ticks < prev_cur_ticks) {
+ if (cur_ticks >= next_tick || (_fast_forward && !_pause_game) || cur_ticks < prev_cur_ticks) {
next_tick = cur_ticks + 30;
_ctrl_pressed = !!(mod & KMOD_CTRL);
diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp
index b23d57ac5..4f8cfec8b 100644
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -835,7 +835,7 @@ static void Win32GdiMainLoop(void)
}
cur_ticks = GetTickCount();
- if (cur_ticks >= next_tick || (_fast_forward && !_pause) || cur_ticks < prev_cur_ticks) {
+ if (cur_ticks >= next_tick || (_fast_forward && !_pause_game) || cur_ticks < prev_cur_ticks) {
next_tick = cur_ticks + 30;
_ctrl_pressed = _wnd.has_focus && GetAsyncKeyState(VK_CONTROL)<0;
_shift_pressed = _wnd.has_focus && GetAsyncKeyState(VK_SHIFT)<0;