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

[lordhoto at users.sourceforge.net]

Revision: 31586
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31586&view=rev
Author:   lordhoto
Date:     2008-04-19 17:32:39 -0700 (Sat, 19 Apr 2008)

Log Message:
-----------
Fixed bug in playStudioSFX.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v3.cpp
    scummvm/trunk/engines/kyra/kyra_v3.h
    scummvm/trunk/engines/kyra/script_v3.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v3.cpp	2008-04-20 00:30:39 UTC (rev 31585)
+++ scummvm/trunk/engines/kyra/kyra_v3.cpp	2008-04-20 00:32:39 UTC (rev 31586)
@@ -439,11 +439,15 @@
 	_soundDigital->stopSound(_voiceSoundChannel);
 }
 
-void KyraEngine_v3::playStudioSFX() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v3::playStudioSFX()");
+void KyraEngine_v3::playStudioSFX(const char *str) {
+	debugC(9, kDebugLevelMain, "KyraEngine_v3::playStudioSFX('%s')", str);
 	if (_rnd.getRandomNumberRng(1, 2) != 2)
 		return;
 
+	const int strSize = strlen(str) - 1;
+	if (str[strSize] != '?' && str[strSize] != '!')
+		return;
+
 	playSoundEffect(_curStudioSFX++, 128);
 
 	if (_curStudioSFX > 291)

Modified: scummvm/trunk/engines/kyra/kyra_v3.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v3.h	2008-04-20 00:30:39 UTC (rev 31585)
+++ scummvm/trunk/engines/kyra/kyra_v3.h	2008-04-20 00:32:39 UTC (rev 31586)
@@ -138,7 +138,7 @@
 	void snd_stopVoice();
 
 	int _curStudioSFX;
-	void playStudioSFX();
+	void playStudioSFX(const char *str);
 
 	// main menu
 	void initMainMenu();

Modified: scummvm/trunk/engines/kyra/script_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v3.cpp	2008-04-20 00:30:39 UTC (rev 31585)
+++ scummvm/trunk/engines/kyra/script_v3.cpp	2008-04-20 00:32:39 UTC (rev 31586)
@@ -107,7 +107,7 @@
 	const char *str = (const char*)getTableEntry(_useActorBuffer ? _actorFile : _sceneStrings, id);
 	if (str) {
 		objectChat(str, 0, _vocHigh, id);
-		playStudioSFX();
+		playStudioSFX(str);
 	}
 	return 0;
 }


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