[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.127,1.128

[Travis Howell]

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

Modified Files:
	simon.cpp 
Log Message:

Add default skip cut scene keys from original games.
Fix error in last commit


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- simon.cpp	22 Dec 2002 08:08:53 -0000	1.127
+++ simon.cpp	22 Dec 2002 09:04:27 -0000	1.128
@@ -3077,6 +3077,11 @@
 			_exit_cutscene = true;
 			break;
 
+		case 63: // F5
+			if (_game & GAME_SIMON2)
+				_exit_cutscene = true;
+			break;
+
 		case 't':
 			_vk_t_toggle ^= 1;
 			break;
@@ -4569,7 +4574,10 @@
 					break;
 
 				case OSystem::EVENT_RBUTTONDOWN:
+					if (_game & GAME_SIMON2)
 					_skip_speech = true;
+					else
+					_exit_cutscene = true;
 					break;
 			}
 		}
@@ -4812,8 +4820,9 @@
 			_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music - 1], SEEK_SET);
 			midi.read_all_songs(_game_file, music);
 			_midi_unk1 = music;
-		} else
-			warning ("XMI music not supported");
+		} else {
+			/* TODO Add XMI midi format support for simon2dos/talkie */
+		}
 		_vc72_var1 = music_unk;
 		_vc70_var1 = 0xFFFF;
 		_vc72_var3 = 0xFFFF;