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

[lordhoto at users.sourceforge.net]

Revision: 31426
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31426&view=rev
Author:   lordhoto
Date:     2008-04-06 07:13:14 -0700 (Sun, 06 Apr 2008)

Log Message:
-----------
Cleanup.

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

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-04-06 14:11:43 UTC (rev 31425)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-04-06 14:13:14 UTC (rev 31426)
@@ -458,7 +458,7 @@
 
 int KyraEngine_v2::o2_loadSoundFile(ScriptState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o2_loadSoundFile(%p) (%d)", (const void *)script, stackPos(0));
-	if (_sound->hasTrack(stackPos(0)))
+	if (_sound->hasSoundFile(stackPos(0)))
 		snd_playTheme(stackPos(0));
 	return 0;
 }

Modified: scummvm/trunk/engines/kyra/sound.h
===================================================================
--- scummvm/trunk/engines/kyra/sound.h	2008-04-06 14:11:43 UTC (rev 31425)
+++ scummvm/trunk/engines/kyra/sound.h	2008-04-06 14:13:14 UTC (rev 31426)
@@ -110,7 +110,7 @@
 	 * @param track	track number
 	 * @return true if available, false otherwise
 	 */
-	virtual bool hasTrack(uint file) { return (fileListEntry(file) != 0); }
+	virtual bool hasSoundFile(uint file) { return (fileListEntry(file) != 0); }
 
 	/**
 	 * Load a specifc sound file for use of
@@ -460,6 +460,7 @@
 	void updateVolumeSettings() { _music->updateVolumeSettings(); _sfx->updateVolumeSettings(); }
 
 	void setSoundList(const AudioDataStruct * list) { _music->setSoundList(list); _sfx->setSoundList(list); }
+	bool hasSoundFile(uint file) const { return _music->hasSoundFile(file) && _sfx->hasSoundFile(file); }
 	void loadSoundFile(uint file) { _music->loadSoundFile(file); _sfx->loadSoundFile(file); }
 
 	void playTrack(uint8 track) { _music->playTrack(track); }


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