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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Thu Apr 10 17:41:07 CEST 2008


Revision: 31464
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31464&view=rev
Author:   lordhoto
Date:     2008-04-10 08:41:06 -0700 (Thu, 10 Apr 2008)

Log Message:
-----------
- Updated debug output for KyraEngine::snd_playTheme
- cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra.h
    scummvm/trunk/engines/kyra/kyra_v1.cpp
    scummvm/trunk/engines/kyra/script_v2.cpp
    scummvm/trunk/engines/kyra/sound.cpp

Modified: scummvm/trunk/engines/kyra/kyra.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra.h	2008-04-10 15:05:59 UTC (rev 31463)
+++ scummvm/trunk/engines/kyra/kyra.h	2008-04-10 15:41:06 UTC (rev 31464)
@@ -151,7 +151,7 @@
 	int resetGameFlag(int flag);
 
 	// sound
-	virtual void snd_playTheme(int file, int track = 0);
+	virtual void snd_playTheme(int file, int track);
 	virtual void snd_playSoundEffect(int id);
 	virtual void snd_playWanderScoreViaMap(int command, int restart);
 	virtual void snd_playVoiceFile(int id) = 0;

Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp	2008-04-10 15:05:59 UTC (rev 31463)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp	2008-04-10 15:41:06 UTC (rev 31464)
@@ -401,7 +401,7 @@
 	if (!_scriptInterpreter->loadScript("_NPC.EMC", _npcScriptData, &_opcodes))
 		error("Could not load \"_NPC.EMC\" script");
 
-	snd_playTheme(1);
+	snd_playTheme(1, 0);
 	if (_gameToLoad == -1) {
 		enterNewScene(_currentCharacter->sceneId, _currentCharacter->facing, 0, 0, 1);
 		if (_abortIntroFlag && _skipIntroFlag) {

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-04-10 15:05:59 UTC (rev 31463)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-04-10 15:41:06 UTC (rev 31464)
@@ -459,7 +459,7 @@
 int KyraEngine_v2::o2_loadSoundFile(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_loadSoundFile(%p) (%d)", (const void *)script, stackPos(0));
 	if (_sound->hasSoundFile(stackPos(0)))
-		snd_playTheme(stackPos(0));
+		snd_playTheme(stackPos(0), -1);
 	return 0;
 }
 

Modified: scummvm/trunk/engines/kyra/sound.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound.cpp	2008-04-10 15:05:59 UTC (rev 31463)
+++ scummvm/trunk/engines/kyra/sound.cpp	2008-04-10 15:41:06 UTC (rev 31464)
@@ -460,13 +460,14 @@
 #pragma mark -
 
 void KyraEngine::snd_playTheme(int file, int track) {
-	debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine::snd_playTheme(%d)", file);
+	debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine::snd_playTheme(%d, %d)", file, track);
 	if (_curMusicTheme == file)
 		return;
 
 	_curSfxFile = _curMusicTheme = file;
 	_sound->loadSoundFile(_curMusicTheme);
-	_sound->playTrack(track);
+	if (track != -1)
+		_sound->playTrack(track);
 }
 
 void KyraEngine::snd_playSoundEffect(int track) {
@@ -492,7 +493,7 @@
 		assert(command*2+1 < _trackMapSize);
 		if (_curMusicTheme != _trackMap[command*2]) {
 			if (_trackMap[command*2] != -1 && _trackMap[command*2] != -2)
-				snd_playTheme(_trackMap[command*2]);
+				snd_playTheme(_trackMap[command*2], -1);
 		}
 
 		if (command != 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