[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.9,1.10 simon.cpp,1.55,1.56

Travis Howell kirben at users.sourceforge.net
Tue Nov 5 06:29:07 CET 2002


Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv15433/simon

Modified Files:
	items.cpp simon.cpp 
Log Message:

Remove two pointless game checks


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- items.cpp	5 Nov 2002 10:36:31 -0000	1.9
+++ items.cpp	5 Nov 2002 14:28:19 -0000	1.10
@@ -386,7 +386,7 @@
 			break;
 
 		case 67:{									/* set array 3 and 4 */
-				if (_game & GAME_TALKIE || _game & GAME_WIN) {
+				if (_game & GAME_TALKIE) {
 					uint var = getVarOrByte();
 					uint string_id = getNextStringID();
 					uint value = getNextWord();

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- simon.cpp	5 Nov 2002 13:55:04 -0000	1.55
+++ simon.cpp	5 Nov 2002 14:28:19 -0000	1.56
@@ -4679,7 +4679,7 @@
 void SimonState::initSound()
 {
 	/* only read voice file in windows game */
-	if (_game & GAME_TALKIE || _game & GAME_WIN) {
+	if (_game & GAME_TALKIE) {
 		const char *m = gss->mp3_filename;
 		const char *s = gss->wav_filename;
 		const char *s2 = gss->voc_filename;





More information about the Scummvm-git-logs mailing list