[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.520.2.1,1.520.2.2

kirben kirben at users.sourceforge.net
Sun Oct 23 06:46:20 CEST 2005


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

Modified Files:
      Tag: branch-0-8-0
	simon.cpp 
Log Message:

Fix no sound effects regression in simon1.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.520.2.1
retrieving revision 1.520.2.2
diff -u -d -r1.520.2.1 -r1.520.2.2
--- simon.cpp	18 Oct 2005 02:11:25 -0000	1.520.2.1
+++ simon.cpp	23 Oct 2005 13:45:10 -0000	1.520.2.2
@@ -1405,9 +1405,9 @@
 				readSubroutineBlock(in);
 				closeTablesFile(in);
 
-				if (_game == GAME_SIMON2DOS || _game == GAME_SIMON2TALKIE || _game == GAME_SIMON2WIN) {
+				if (_game & GF_SIMON2) {
 					_sound->loadSfxTable(_gameFile, _gameOffsetsPtr[atoi(filename + 6) - 1 + SOUND_INDEX_BASE]);
-				} else if (_game == GAME_SIMON1TALKIE) {
+				} else if (_game & GF_TALKIE) {
 					memcpy(filename, "SFXXXX", 6);
 					_sound->readSfxFile(filename);
 				}





More information about the Scummvm-git-logs mailing list