fix gcc warnings

--HG--
branch : novattd150
This commit is contained in:
Pavel Stupnikov
2015-03-16 03:29:23 +03:00
parent e48d2d58e0
commit a92b2bbbd6
3 changed files with 2 additions and 4 deletions

View File

@@ -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

View File

@@ -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);

View File

@@ -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;