[Scummvm-cvs-logs] CVS: scummvm/simon debug.cpp,1.10,1.11 intern.h,1.8,1.9 items.cpp,1.44,1.45 res.cpp,1.14,1.15 simon.cpp,1.137,1.138

Travis Howell kirben at users.sourceforge.net
Sat Jan 11 07:39:04 CET 2003


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

Modified Files:
	debug.cpp intern.h items.cpp res.cpp simon.cpp 
Log Message:

More simon 2 targets (amiga/mac ports)


Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debug.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- debug.cpp	29 Nov 2002 16:06:15 -0000	1.10
+++ debug.cpp	11 Jan 2003 15:38:37 -0000	1.11
@@ -42,7 +42,7 @@
 	st = s = simon1dos_opcode_name_table[opcode];
 	} else if (_game == GAME_SIMON1TALKIE || _game == GAME_SIMON1WIN) {
 	st = s = simon1talkie_opcode_name_table[opcode];
-	} else if (_game == GAME_SIMON2TALKIE || _game == GAME_SIMON2WIN) {
+	} else if (_game == GAME_SIMON2TALKIE || _game & GAME_SIMON2WIN) {
 	st = s = simon2talkie_opcode_name_table[opcode];
 	} else {
 	st = s = simon2dos_opcode_name_table[opcode];

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/intern.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- intern.h	25 Dec 2002 00:48:13 -0000	1.8
+++ intern.h	11 Jan 2003 15:38:37 -0000	1.9
@@ -137,6 +137,7 @@
 	GAME_WIN = 2,
 	GAME_TALKIE = 4,
 	GAME_DEMO = 8,
+	GAME_MAC = 16,
 
 	GAME_SIMON1DOS = 0,
 	GAME_SIMON2DOS = GAME_SIMON2,
@@ -144,7 +145,8 @@
 	GAME_SIMON2TALKIE = GAME_SIMON2 + GAME_TALKIE,
 	GAME_SIMON1WIN = GAME_WIN + GAME_TALKIE,
 	GAME_SIMON2WIN = GAME_SIMON2 + GAME_WIN + GAME_TALKIE,
-	GAME_SIMON1DEMO = GAME_DEMO
+	GAME_SIMON1DEMO = GAME_DEMO,
+	GAME_SIMON2MAC = GAME_SIMON2WIN + GAME_MAC
 };
 
 #endif

Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- items.cpp	4 Jan 2003 08:46:09 -0000	1.44
+++ items.cpp	11 Jan 2003 15:38:37 -0000	1.45
@@ -996,7 +996,7 @@
 					ThreeValues *tv = getThreeValues(b);
 
 					talk_with_text(b, c, s, tv->a, tv->b, tv->c);
-				} else if (_game == GAME_SIMON2TALKIE || _game == GAME_SIMON2WIN) {
+				} else if (_game == GAME_SIMON2TALKIE || _game & GAME_SIMON2WIN) {
 					const char *s = (const char *)getStringPtrByID(_stringid_array_3[a]);
 					ThreeValues *tv = getThreeValues(b);
 					uint d = _array_4[a];
@@ -1258,7 +1258,7 @@
 
 			talk_with_text(a, b, s, tv->a, tv->b, tv->c);
 		}
-	} else if (_game == GAME_SIMON2TALKIE || _game == GAME_SIMON2WIN) {
+	} else if (_game == GAME_SIMON2TALKIE || _game & GAME_SIMON2WIN) {
 		const char *s = NULL;
 		ThreeValues *tv = NULL;
 		char buf[256];

Index: res.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/res.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- res.cpp	3 Jan 2003 12:33:52 -0000	1.14
+++ res.cpp	11 Jan 2003 15:38:37 -0000	1.15
@@ -272,6 +272,7 @@
 		break;
 	case GAME_SIMON2TALKIE:
 	case GAME_SIMON2WIN:
+	case GAME_SIMON2MAC:
 		table = opcode_arg_table_simon2win;
 		break;
 	case GAME_SIMON1DOS:

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- simon.cpp	5 Jan 2003 12:38:04 -0000	1.137
+++ simon.cpp	11 Jan 2003 15:38:37 -0000	1.138
@@ -1782,6 +1782,7 @@
 
 	case GAME_SIMON2TALKIE:
 	case GAME_SIMON2WIN:
+	case GAME_SIMON2MAC:
 		if (speech_id != 0 && num_1 == 1 && !_vk_t_toggle)
 			talk_with_speech(speech_id, num_1);
 
@@ -4495,7 +4496,7 @@
 	_sdl_buf = (byte *)calloc(320 * 200, 1);
 	_sdl_buf_attached = (byte *)calloc(320 * 200, 1);
 
-	if (_game == GAME_SIMON2TALKIE || _game == GAME_SIMON2WIN) {
+	if (_game == GAME_SIMON2TALKIE || _game & GAME_SIMON2WIN) {
 		gss = &simon2win_settings;
 	} else if (_game == GAME_SIMON2DOS) {
 		gss = &simon2dos_settings;
@@ -4534,7 +4535,7 @@
 	if (_sound->hasVoice()) {
 		_vk_t_toggle = false;
 	} else {
-		_vk_t_toggle = true;
+		_vk_t_toggle = false;
 	}
 
 	midi._midi_sfx_toggle = false;





More information about the Scummvm-git-logs mailing list