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

[athrxx at users.sourceforge.net]

Revision: 31278
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31278&view=rev
Author:   athrxx
Date:     2008-03-27 17:07:40 -0700 (Thu, 27 Mar 2008)

Log Message:
-----------
- some accuracy changes for KyraEngine_v2::snd_playSoundEffect()
- fix one more skip flag bug in the sequence player
- fix SoundTowns_v2::voicePlay()

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v2.cpp
    scummvm/trunk/engines/kyra/sequences_v2.cpp
    scummvm/trunk/engines/kyra/sound.h
    scummvm/trunk/engines/kyra/sound_towns.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-03-27 23:53:49 UTC (rev 31277)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-03-28 00:07:40 UTC (rev 31278)
@@ -1766,13 +1766,15 @@
 void KyraEngine_v2::snd_playSoundEffect(int track) {
 	debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine_v2::snd_playSoundEffect(%d)", track);
 
-	if (track == 10)
-		track = _lastSfxTrack;
+	if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) {
+		if (track == 10)
+			track = _lastSfxTrack;
 
-	if (track == 10 || track == -1)
-		return;
+		if (track == 10 || track == -1)
+			return;
 
-	_lastSfxTrack = track;
+		_lastSfxTrack = track;
+	}
 
 	int16 vocIndex = (int16)READ_LE_UINT16(&_ingameSoundIndex[track * 2]);
 	if (vocIndex != -1)

Modified: scummvm/trunk/engines/kyra/sequences_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_v2.cpp	2008-03-27 23:53:49 UTC (rev 31277)
+++ scummvm/trunk/engines/kyra/sequences_v2.cpp	2008-03-28 00:07:40 UTC (rev 31278)
@@ -2605,7 +2605,7 @@
 	_screen->fadeToBlack();
 	_screen->showMouse();
 
-	resetSkipFlag();
+	_eventList.clear();
 	delete ci;
 }
 

Modified: scummvm/trunk/engines/kyra/sound.h
===================================================================
--- scummvm/trunk/engines/kyra/sound.h	2008-03-27 23:53:49 UTC (rev 31277)
+++ scummvm/trunk/engines/kyra/sound.h	2008-03-28 00:07:40 UTC (rev 31278)
@@ -428,7 +428,7 @@
 	void haltTrack();
 	void beginFadeOut();
 
-	bool voicePlay(const char *file);
+	bool voicePlay(const char *file, bool isSfx = false);
 	void playSoundEffect(uint8) {}
 
 private:

Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp	2008-03-27 23:53:49 UTC (rev 31277)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp	2008-03-28 00:07:40 UTC (rev 31278)
@@ -1432,7 +1432,7 @@
 	//_driver->reset();
 }
 
-bool SoundTowns_v2::voicePlay(const char *file) {
+bool SoundTowns_v2::voicePlay(const char *file, bool) {
 	static const uint16 rates[] =	{ 0x10E1, 0x0CA9, 0x0870, 0x0654, 0x0438, 0x032A, 0x021C, 0x0194 };
 
 	int h = 0;


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