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

athrxx at users.sourceforge.net athrxx at users.sourceforge.net
Thu Jun 25 23:17:51 CEST 2009


Revision: 41887
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41887&view=rev
Author:   athrxx
Date:     2009-06-25 21:17:50 +0000 (Thu, 25 Jun 2009)

Log Message:
-----------
KYRA/LOL: - support speech/text settings in LOL intro
- fix possible pc98 music issue

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_tim.cpp
    scummvm/trunk/engines/kyra/sound_towns.cpp

Modified: scummvm/trunk/engines/kyra/script_tim.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_tim.cpp	2009-06-25 20:00:52 UTC (rev 41886)
+++ scummvm/trunk/engines/kyra/script_tim.cpp	2009-06-25 21:17:50 UTC (rev 41887)
@@ -304,7 +304,7 @@
 			memcpy(filename, text+1, end-1-text);
 	}
 
-	if (filename[0])
+	if (filename[0] && _vm->speechEnabled())
 		_vm->sound()->voicePlay(filename);
 
 	if (text[0] == '$')
@@ -328,7 +328,7 @@
 	char *str = text;
 	int heightAdd = 0;
 
-	while (str[0]) {
+	while (str[0] && _vm->textEnabled()) {
 		char *nextLine = strchr(str, '\r');
 
 		backupChar = 0;

Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp	2009-06-25 20:00:52 UTC (rev 41886)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp	2009-06-25 21:17:50 UTC (rev 41887)
@@ -1504,7 +1504,7 @@
 private:
 	void updatesRegs();
 
-	uint8 _updateRequestBuf[32];
+	uint8 _updateRequestBuf[64];
 	int _updateRequest;
 	int _rand;
 
@@ -2657,7 +2657,7 @@
 	}
 
 	if (!force) {
-		if (_updateRequest == 31) {
+		if (_updateRequest >= 63) {
 			warning("TownsPC98_OpnSquareSineSource: event buffer overflow");
 			_updateRequest = -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