[Scummvm-cvs-logs] CVS: scummvm/sword1 logic.cpp,1.37,1.38

[Torbj?rn Andersson]

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

Modified Files:
	logic.cpp 
Log Message:
Always play the "current music" after restoring a savegame, even if it's 0.
If it is, all that happens is that it silences the music. Otherwise, the
current music that was playing before the game was restored will keep
playing afterwards.

(One example of this: I went into the Hotel Ubu and restored a savegame at
the hospital. The piano music kept playing in the background.)


Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/logic.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- logic.cpp	7 Mar 2004 19:24:41 -0000	1.37
+++ logic.cpp	12 Mar 2004 08:21:01 -0000	1.38
@@ -98,8 +98,7 @@
 			_scriptVars[GEORGE_WALKING] = 0;
 		}
 		SwordEngine::_systemVars.justRestoredGame = 0;
-		if (_scriptVars[CURRENT_MUSIC])
-			_music->startMusic(_scriptVars[CURRENT_MUSIC], 1);
+		_music->startMusic(_scriptVars[CURRENT_MUSIC], 1);
 	} else { // if we haven't just restored a game, set George to stand, etc
 		compact->o_screen = _scriptVars[NEW_SCREEN]; //move the mega/player at this point between screens
 		fnStandAt(compact, PLAYER, _scriptVars[CHANGE_X], _scriptVars[CHANGE_Y], _scriptVars[CHANGE_DIR], _scriptVars[CHANGE_STANCE], 0,0);