diff options
| author | Darkvater <Darkvater@openttd.org> | 2006-11-15 19:49:16 +0000 |
|---|---|---|
| committer | Darkvater <Darkvater@openttd.org> | 2006-11-15 19:49:16 +0000 |
| commit | 3328ceea9e8dd9f270a9f7e9cc72ea5ab3397a0e (patch) | |
| tree | 127efefd7a8dd0e7a066c8ff9994c1375571ca91 /video | |
| parent | 7ba7bd0a498a17253310ba0f0e34722d8e34310d (diff) | |
| download | openttd-3328ceea9e8dd9f270a9f7e9cc72ea5ab3397a0e.tar.xz | |
(svn r7156) -Codechange: Remove obsolete variable, localize global variable, use GB and change logic
of the win32: TAB speeds up, but ALT+TAB doesn't code.
Diffstat (limited to 'video')
| -rw-r--r-- | video/sdl_v.c | 3 | ||||
| -rw-r--r-- | video/win32_v.c | 15 |
2 files changed, 7 insertions, 11 deletions
diff --git a/video/sdl_v.c b/video/sdl_v.c index b0630b27d..f72d620fe 100644 --- a/video/sdl_v.c +++ b/video/sdl_v.c @@ -423,7 +423,6 @@ static void SdlVideoMainLoop(void) uint32 next_tick = SDL_CALL SDL_GetTicks() + 30; uint32 cur_ticks; uint32 pal_tick = 0; - int i; uint32 mod; int numkeys; Uint8 *keys; @@ -431,7 +430,7 @@ static void SdlVideoMainLoop(void) for (;;) { InteractiveRandom(); // randomness - while ((i = PollEvent()) == -1) {} + while (PollEvent() == -1) {} if (_exit_game) return; mod = SDL_CALL SDL_GetModState(); diff --git a/video/win32_v.c b/video/win32_v.c index 747b6ef81..bef30e271 100644 --- a/video/win32_v.c +++ b/video/win32_v.c @@ -358,7 +358,7 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP scancode = GB(lParam, 16, 8); if (scancode == 41) pressed_key = w | WKC_BACKQUOTE << 16; - if ((pressed_key >> 16) == ('D' | WKC_CTRL) && !_wnd.fullscreen) { + if (GB(pressed_key, 16, 16) == ('D' | WKC_CTRL) && !_wnd.fullscreen) { _double_size ^= 1; _wnd.double_size = _double_size; ClientSizeChanged(_wnd.width, _wnd.height); @@ -785,16 +785,13 @@ static void Win32GdiMainLoop(void) if (_exit_game) return; #if defined(_DEBUG) - if (_wnd.has_focus && GetAsyncKeyState(VK_SHIFT) < 0) { - if ( + if (_wnd.has_focus && GetAsyncKeyState(VK_SHIFT) < 0 && #else - if (_wnd.has_focus && GetAsyncKeyState(VK_TAB) < 0) { - /* Disable speeding up game with ALT+TAB (if syskey is pressed, the - * real key is in the upper 16 bits (see WM_SYSKEYDOWN in WndProcGdi()) */ - if (GetAsyncKeyState(VK_MENU) >= 0 && + /* Speed up using TAB, but disable for ALT+TAB of course */ + if (_wnd.has_focus && GetAsyncKeyState(VK_TAB) < 0 && GetAsyncKeyState(VK_MENU) >= 0 && #endif - !_networking && _game_mode != GM_MENU) - _fast_forward |= 2; + !_networking && _game_mode != GM_MENU) { + _fast_forward |= 2; } else if (_fast_forward & 2) { _fast_forward = 0; } |