petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r13151) -Codechange: use an enum instead of bool as return type of OnKeyPress/OnCTRLStateChange to make it obvious what the return values mean.

Browse Source
This commit is contained in:
rubidium
2008-05-17 23:11:06 +00:00
parent c1713c9ab7
commit f5681547ef
13 changed files with 85 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main_gui.cpp
View File

@@ -239,34 +239,34 @@ struct MainWindow : Window
}
}
virtual bool OnKeyPress(uint16 key, uint16 keycode)
virtual EventState OnKeyPress(uint16 key, uint16 keycode)
{
switch (keycode) {
case 'Q' | WKC_CTRL:
case 'Q' | WKC_META:
HandleExitGameRequest();
return true;
return ES_HANDLED;
}
/* Disable all key shortcuts, except quit shortcuts when
* generating the world, otherwise they create threading
* problem during the generating, resulting in random
* assertions that are hard to trigger and debug */
if (IsGeneratingWorld()) return true;
if (IsGeneratingWorld()) return ES_NOT_HANDLED;
if (keycode == WKC_BACKQUOTE) {
IConsoleSwitch();
return false;
return ES_HANDLED;
}
if (keycode == ('B' | WKC_CTRL)) {
extern bool _draw_bounding_boxes;
_draw_bounding_boxes = !_draw_bounding_boxes;
MarkWholeScreenDirty();
return false;
return ES_HANDLED;
}
if (_game_mode == GM_MENU) return true;
if (_game_mode == GM_MENU) return ES_NOT_HANDLED;
switch (keycode) {
case 'C':
@@ -372,9 +372,9 @@ struct MainWindow : Window
break;
#endif
default: return true;
default: return ES_NOT_HANDLED;
}
return false;
return ES_HANDLED;
}
virtual void OnScroll(Point delta)