[Scummvm-cvs-logs] CVS: scummvm/simon intern.h,1.34,1.35 simon.cpp,1.496,1.497 sound.cpp,1.81,1.82

kirben kirben at users.sourceforge.net
Sat May 7 22:56:25 CEST 2005


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7551/simon

Modified Files:
	intern.h simon.cpp sound.cpp 
Log Message:

No need to check for speech file in non-talkie versions.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/intern.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- intern.h	6 May 2005 03:09:50 -0000	1.34
+++ intern.h	8 May 2005 05:56:08 -0000	1.35
@@ -164,7 +164,6 @@
 	GAME_SIMON2DOS = GF_SIMON2,
 	GAME_SIMON1TALKIE = GF_SIMON1 | GF_TALKIE,
 	GAME_SIMON2TALKIE = GF_SIMON2 | GF_TALKIE,
-	GAME_SIMON1WIN = GF_SIMON1 | GF_WIN | GF_TALKIE,
 	GAME_SIMON2WIN = GF_SIMON2 | GF_WIN | GF_TALKIE,
 	GAME_SIMON1DEMO = GF_SIMON1 | GF_DEMO | GF_OLD_BUNDLE,
 	GAME_SIMON1AMIGA = GF_SIMON1 | GF_AMIGA | GF_OLD_BUNDLE,

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -d -r1.496 -r1.497
--- simon.cpp	8 May 2005 05:23:30 -0000	1.496
+++ simon.cpp	8 May 2005 05:56:08 -0000	1.497
@@ -1343,7 +1343,7 @@
 
 				if (_game & GF_SIMON2) {
 					_sound->loadSfxTable(_gameFile, _gameOffsetsPtr[atoi(filename + 6) - 1 + SOUND_INDEX_BASE]);
-				} else {
+				} else if (_game & GF_TALKIE) {
 					memcpy(filename, "SFXXXX", 6);
 					_sound->readSfxFile(filename);
 				}

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- sound.cpp	8 May 2005 05:23:31 -0000	1.81
+++ sound.cpp	8 May 2005 05:56:09 -0000	1.82
@@ -245,13 +245,11 @@
 	_voice_file = false;
 	_ambient_playing = 0;
 
-	if (_game == GAME_SIMON1CD32) {
-		// Uses separate voice files
+	// simon1cd32 uses separate speech files
+	if (!(_game & GF_TALKIE) || (_game == GAME_SIMON1CD32))
 		return;
-	}
 
 	File *file = new File();
-	const char *s;
 
 #ifdef USE_FLAC
 	if (!_voice && gss->flac_filename && gss->flac_filename[0]) {





More information about the Scummvm-git-logs mailing list