From a91b28848c5336b7395fab7fb0083d2cd05ff6fb Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sat, 17 May 2003 08:54:46 +0000
Subject: Add simon1amiga to debug

svn-id: r7602
---
 simon/debug.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'simon/debug.cpp')

diff --git a/simon/debug.cpp b/simon/debug.cpp
index df8b73280b..227587ed87 100644
--- a/simon/debug.cpp
+++ b/simon/debug.cpp
@@ -37,14 +37,14 @@ byte *SimonState::dumpOpcode(byte *p) {
 	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);
-- 
cgit v1.2.3