[Scummvm-cvs-logs] CVS: scummvm/simon debug.cpp,1.15,1.16

[Travis Howell]

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

Modified Files:
	debug.cpp 
Log Message:

Add simon1amiga to debug


Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debug.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- debug.cpp	1 May 2003 07:55:55 -0000	1.15
+++ debug.cpp	17 May 2003 08:54:46 -0000	1.16
@@ -37,14 +37,14 @@
 	opcode = *p++;
 	if (opcode == 255)
 		return NULL;
-	if (_game == GAME_SIMON1DOS || _game == GAME_SIMON1DEMO) {
-	st = s = simon1dos_opcode_name_table[opcode];
-	} else if (_game == GAME_SIMON1CD32 || _game == GAME_SIMON1TALKIE || _game == GAME_SIMON1WIN) {
-	st = s = simon1talkie_opcode_name_table[opcode];
-	} else if (_game == GAME_SIMON2TALKIE || _game == GAME_SIMON2WIN) {
+	if (_game & GF_SIMON2 && _game & GF_TALKIE) {
 	st = s = simon2talkie_opcode_name_table[opcode];
-	} else {
+	} else if (_game & GF_TALKIE) {
+	st = s = simon1talkie_opcode_name_table[opcode];
+	} else if (_game & GF_SIMON2) {
 	st = s = simon2dos_opcode_name_table[opcode];
+	} else {
+	st = s = simon1dos_opcode_name_table[opcode];
 	}
 	if (s == NULL) {
 		error("INVALID OPCODE %d\n", opcode);