[Scummvm-cvs-logs] CVS: scummvm/sword1 logic.cpp,1.34.2.1,1.34.2.2

[Torbj?rn Andersson]

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

Modified Files:
      Tag: branch-0-6-0
	logic.cpp 
Log Message:
Always start the "current music" when restoring a game, even if it's 0. If
it is, all that will happen is that it silences the music. This prevents
the current music that was running before restoring the game from playing
afterwards.


Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/logic.cpp,v
retrieving revision 1.34.2.1
retrieving revision 1.34.2.2
diff -u -d -r1.34.2.1 -r1.34.2.2
--- logic.cpp	5 Mar 2004 07:39:08 -0000	1.34.2.1
+++ logic.cpp	12 Mar 2004 08:19:21 -0000	1.34.2.2
@@ -88,8 +88,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);