[Scummvm-cvs-logs] CVS: scummvm/sky logic.cpp,1.133,1.134 sky.cpp,1.110,1.111

Joost Peters joostp at users.sourceforge.net
Fri Sep 12 18:46:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv9496/sky

Modified Files:
	logic.cpp sky.cpp 
Log Message:
proper fix for bug #791207

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/logic.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- logic.cpp	21 Aug 2003 13:39:20 -0000	1.133
+++ logic.cpp	13 Sep 2003 01:45:12 -0000	1.134
@@ -66,6 +66,7 @@
 		_moduleList[i] = 0;
 	_stackPtr = 0;
 	
+	_currentSection = 0xFF; //force music & sound reload
 	initScriptVariables();
 }
 

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- sky.cpp	13 Sep 2003 01:08:45 -0000	1.110
+++ sky.cpp	13 Sep 2003 01:45:12 -0000	1.111
@@ -200,12 +200,6 @@
 
 	if (introSkipped)
 		_skyControl->restartGame();
-	else {	//workaround for bug #791207
-		_skySound->loadSection(1);
-		_skyMusic->loadSection(1);
-		_skyMusic->startMusic(2);
-		_systemVars.currentMusic = 2;
-	}
 	
 	_lastSaveTime = _system->get_msecs();
 





More information about the Scummvm-git-logs mailing list