From b4908f449e0327516f5e1289f2651ede5da45274 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sat, 12 Nov 2005 06:01:24 +0000
Subject: Old targets will be auto updated. Many non-English versions will be
 broken until information is updated.

svn-id: r19563
---
 simon/debug.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'simon/debug.cpp')

diff --git a/simon/debug.cpp b/simon/debug.cpp
index 8ce2f3101a..b1e26cedb0 100644
--- a/simon/debug.cpp
+++ b/simon/debug.cpp
@@ -37,13 +37,13 @@ const byte *SimonEngine::dumpOpcode(const byte *p) {
 	opcode = *p++;
 	if (opcode == 255)
 		return NULL;
-	if (_game == GAME_FEEBLEFILES) {
+	if (getGameType() == GType_FF) {
 		st = s = feeblefiles_opcode_name_table[opcode];
-	} else if (_game & GF_SIMON2 && _game & GF_TALKIE) {
+	} else if (getGameType() == GType_SIMON2 && getFeatures() & GF_TALKIE) {
 		st = s = simon2talkie_opcode_name_table[opcode];
-	} else if (_game & GF_TALKIE) {
+	} else if (getFeatures() & GF_TALKIE) {
 		st = s = simon1talkie_opcode_name_table[opcode];
-	} else if (_game & GF_SIMON2) {
+	} else if (getGameType() == GType_SIMON2) {
 		st = s = simon2dos_opcode_name_table[opcode];
 	} else {
 		st = s = simon1dos_opcode_name_table[opcode];
@@ -176,7 +176,7 @@ void SimonEngine::dump_video_script(const byte *src, bool one_opcode_only) {
 	const char *str, *strn;
 
 	do {
-		if (_game & GF_SIMON1) {
+		if (getGameType() == GType_SIMON1) {
 			opcode = READ_BE_UINT16(src);
 			src += 2;
 		} else {
@@ -188,9 +188,9 @@ void SimonEngine::dump_video_script(const byte *src, bool one_opcode_only) {
 			return;
 		}
 
-		if (_game == GAME_FEEBLEFILES) {
+		if (getGameType() == GType_FF) {
 			strn = str = feeblefiles_video_opcode_name_table[opcode];
-		} else if (_game & GF_SIMON2) {
+		} else if (getGameType() == GType_SIMON2) {
 			strn = str = simon2_video_opcode_name_table[opcode];
 		} else {
 			strn = str = simon1_video_opcode_name_table[opcode];
@@ -200,7 +200,7 @@ void SimonEngine::dump_video_script(const byte *src, bool one_opcode_only) {
 			strn++;
 		fprintf(_dumpFile, "%.2d: %s ", opcode, strn + 1);
 
-		int end = (_game == GAME_FEEBLEFILES) ? 9999 : 999;
+		int end = (getGameType() == GType_FF) ? 9999 : 999;
 		for (; *str != '|'; str++) {
 			switch (*str) {
 			case 'x':
-- 
cgit v1.2.3