From a92b2bbbd6f6a7013c1395d9745db7595185c4aa Mon Sep 17 00:00:00 2001 From: Pavel Stupnikov Date: Mon, 16 Mar 2015 03:29:23 +0300 Subject: [PATCH] fix gcc warnings --HG-- branch : novattd150 --- src/rev.cpp | 4 ++-- src/video/sdl_v.cpp | 1 - src/video/win32_v.cpp | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/rev.cpp b/src/rev.cpp index 7bf02574a3..c8e4a5de49 100644 --- a/src/rev.cpp +++ b/src/rev.cpp @@ -72,11 +72,11 @@ const byte _openttd_revision_modified = 0; * final release will always have a lower version number than the released * version, thus making comparisons on specific revisions easy. */ -const uint32 _openttd_newgrf_version = 1 << 28 | 5 << 24 | 0 << 20 | 0 << 19 | (27170 & ((1 << 19) - 1)); +const uint32 _openttd_newgrf_version = 1 << 28 | 5 << 24 | 0 << 20 | 0 << 19 | (0 & ((1 << 19) - 1)); #ifdef __MORPHOS__ /** * Variable used by MorphOS to show the version. */ -extern const char morphos_versions_tag[] = "$VER: OpenTTD 1.5.0-beta2 (16.03.15) OpenTTD Team [MorphOS, PowerPC]"; +extern const char morphos_versions_tag[] = "$VER: OpenTTD h04f549e1M-novattd150 (16.03.15) OpenTTD Team [MorphOS, PowerPC]"; #endif diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp index 4e5c3a311f..8c03abdad2 100644 --- a/src/video/sdl_v.cpp +++ b/src/video/sdl_v.cpp @@ -748,7 +748,6 @@ void VideoDriver_SDL::MainLoop() next_tick = cur_ticks + MILLISECONDS_PER_TICK; bool old_ctrl_pressed = _ctrl_pressed; - bool old_alt_pressed = _alt_pressed; _ctrl_pressed = !!(mod & KMOD_CTRL); _alt_pressed = !!(mod & KMOD_ALT); diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index f60548a000..0947a1bfe3 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -1249,7 +1249,6 @@ void VideoDriver_Win32::MainLoop() next_tick = cur_ticks + MILLISECONDS_PER_TICK; bool old_ctrl_pressed = _ctrl_pressed; - bool old_alt_pressed = _alt_pressed; _ctrl_pressed = _wnd.has_focus && GetAsyncKeyState(VK_CONTROL)<0; _alt_pressed = _wnd.has_focus && GetAsyncKeyState(VK_MENU)<0;