[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.109,1.110

Max Horn fingolfin at users.sourceforge.net
Sat May 3 05:43:31 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv27032

Modified Files:
	sound.cpp 
Log Message:
slightly better hack because it will work with loaded games, too, and doesn't use any evil static vars

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- sound.cpp	3 May 2003 12:28:37 -0000	1.109
+++ sound.cpp	3 May 2003 12:41:35 -0000	1.110
@@ -431,11 +431,8 @@
 		// This hack relays on the fact that we currently don't support SFX
 		// in these games, only music. Once we add SFX support, we'll have to
 		// revise it / replace it by a proper fix.
-		static int lastSound = -1;
 		if (ptr) {
-			if (lastSound > 0)
-				stopSound(lastSound);
-			lastSound = soundID;
+			_scumm->_imuse->stop_all_sounds();
 		}
 	}
 





More information about the Scummvm-git-logs mailing list