[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.89,1.90

Travis Howell kirben at users.sourceforge.net
Fri Nov 22 18:23:02 CET 2002


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv26175/simon

Modified Files:
	simon.cpp 
Log Message:

Music volume just uses + and - now, key mapping works


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- simon.cpp	20 Nov 2002 08:17:31 -0000	1.89
+++ simon.cpp	23 Nov 2002 02:22:54 -0000	1.90
@@ -4595,21 +4595,21 @@
 		while (_system->poll_event(&event)) {
 			switch (event.event_code) {
 				case OSystem::EVENT_KEYDOWN:
-				if (event.kbd.keycode == 'o') {
+				if (event.kbd.ascii == 'o') {
 					_mainscript_toggle ^= 1;
-				} else if (event.kbd.keycode == 'v') {
+				} else if (event.kbd.ascii == 'v') {
 					_vgascript_toggle ^= 1;
-				} else if (event.kbd.keycode == 't') {
+				} else if (event.kbd.ascii == 't') {
 					_vk_t_toggle ^= 1;
-				} else if (event.kbd.keycode == ']' || event.kbd.keycode == '+') {
+				} else if (event.kbd.ascii == '+') {
 					midi.set_volume(midi.get_volume() + 16);
-				} else if (event.kbd.keycode == '[' || event.kbd.keycode == '-') {
+				} else if (event.kbd.ascii == '-') {
 					midi.set_volume(midi.get_volume() - 16);
-				} else if (event.kbd.keycode == 'm') {
+				} else if (event.kbd.ascii == 'm') {
 					midi.pause(_music_paused ^= 1);
-				} else if (event.kbd.keycode == 's') {
+				} else if (event.kbd.ascii == 's') {
 					_effects_paused ^= 1;
-				} else if (event.kbd.keycode == 'b') {
+				} else if (event.kbd.ascii == 'b') {
 					_ambient_paused ^= 1;
 					if (_ambient_paused && _ambient_playing) {
 						_mixer->stop(_ambient_index);
@@ -4619,7 +4619,7 @@
 						playAmbient(tmp);
 					}
 				} else if (event.kbd.flags == OSystem::KBD_CTRL) {
-					if (event.kbd.keycode == 'f') {
+					if (event.kbd.ascii == 'f') {
 						_fast_mode ^= 1;
 					}
 				}





More information about the Scummvm-git-logs mailing list