[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.48,1.49

Robert G?ffringmann lavosspawn at users.sourceforge.net
Mon Jul 14 02:27:28 CEST 2003


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

Modified Files:
	control.cpp 
Log Message:
fixed toggling music on/off after savegame restore

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- control.cpp	14 Jul 2003 09:16:12 -0000	1.48
+++ control.cpp	14 Jul 2003 09:26:50 -0000	1.49
@@ -1452,7 +1452,9 @@
 		_skyLogic->fnEnterSection(SkyLogic::_scriptVariables[CUR_SECTION], 0, 0);
 	}
 	_skyDisk->refreshFilesList(reloadList);
-	_skyMusic->startMusic((uint16)music);
+	SkyState::_systemVars.currentMusic = (uint16)music;
+	if (!(SkyState::_systemVars.systemFlags & SF_MUS_OFF))
+		_skyMusic->startMusic((uint16)music);
 	_savedMouse = (uint16)mouseType;
 	SkyState::_systemVars.currentPalette = palette; // will be set when doControlPanel ends
 	SkyState::_systemVars.systemFlags |= SF_GAME_RESTORED; // what's that for?





More information about the Scummvm-git-logs mailing list