[Scummvm-cvs-logs] SF.net SVN: scummvm: [21469] scummvm/trunk/engines/kyra/scene.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Mon Mar 27 10:29:04 CEST 2006


Revision: 21469
Author:   lordhoto
Date:     2006-03-27 10:20:19 -0800 (Mon, 27 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21469&view=rev

Log Message:
-----------
Comments out unneeded code in enterNewScene (only used for cd audio version).
Fixes bug with stopping pegasus music before the animation finished.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/scene.cpp
Modified: scummvm/trunk/engines/kyra/scene.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene.cpp	2006-03-27 16:56:08 UTC (rev 21468)
+++ scummvm/trunk/engines/kyra/scene.cpp	2006-03-27 18:20:19 UTC (rev 21469)
@@ -43,7 +43,8 @@
 	_handleInput = false;
 	_abortWalkFlag = false;
 	_abortWalkFlag2 = false;
-	if (_currentCharacter->sceneId == 7 && sceneId == 24) {
+	// just used for cd audio version, it should only load the sfx music file there
+	/*if (_currentCharacter->sceneId == 7 && sceneId == 24) {
 		_newMusicTheme = 3;
 	} else if (_currentCharacter->sceneId == 25 && sceneId == 109) {
 		_newMusicTheme = 4;
@@ -60,7 +61,7 @@
 	}
 	if (_newMusicTheme != _curMusicTheme) {
 		snd_playTheme(_newMusicTheme);
-	}
+	}*/
 	
 	switch (_currentCharacter->sceneId) {
 		case 1:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list