added ctrl-z quit option

svn-id: r3920

2 files changed, 9 insertions, 4 deletions

diff --git a/simon/simon.cpp b/simon/simon.cpp
index a6d2232884..31eedd20c5 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -7570,16 +7570,21 @@ void SimonState::delay(uint delay) {
 		while (_system->poll_event(&event)) {
 			switch(event.event_code) {
 			case OSystem::EVENT_KEYDOWN:
-				if (event.kbd.keycode=='f' && event.kbd.flags==OSystem::KBD_CTRL) {
-					_fast_mode^=1;
-				} else if (event.kbd.keycode=='t') {
+				if (event.kbd.keycode=='t') {
 					_vk_t_toggle ^= 1;
 				}	else if (event.kbd.keycode>='0' && event.kbd.keycode<='9' && 
 										event.kbd.flags == OSystem::KBD_ALT|OSystem::KBD_CTRL) {
 						if (!_system->set_param(OSystem::PARAM_HOTSWAP_GFX_MODE, event.kbd.keycode - '1'))
 							warning("Unable to hotswap graphics mode");
+				} else if (event.kbd.flags==OSystem::KBD_CTRL) {
+					if (event.kbd.keycode=='z')
+						_system->quit();
+					else if (event.kbd.keycode=='f') {
+						_fast_mode^=1;
+					}
 				}
 
+
 				break;
 			case OSystem::EVENT_MOUSEMOVE:
 				sdl_mouse_x = event.mouse.x;
diff --git a/simon/simon.h b/simon/simon.h
index ead19c42cb..a4ac6b55b6 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -439,7 +439,7 @@ public:
 	bool _hitarea_unk_3;
 	bool _mortal_flag;
 	bool _sync_flag_1;
-	bool _video_var_8;
+	byte _video_var_8;
 	bool _use_palette_delay;
 	bool _sync_flag_2;
 	bool _hitarea_unk_6;