[Scummvm-cvs-logs] SF.net SVN: scummvm:[42473] scummvm/trunk/engines/sky/logic.cpp
joostp at users.sourceforge.net
joostp at users.sourceforge.net
Tue Jul 14 13:15:21 CEST 2009
Revision: 42473
http://scummvm.svn.sourceforge.net/scummvm/?rev=42473&view=rev
Author: joostp
Date: 2009-07-14 11:15:21 +0000 (Tue, 14 Jul 2009)
Log Message:
-----------
add workaround for #2687172: BASS: Occasional loss of speech
Modified Paths:
--------------
scummvm/trunk/engines/sky/logic.cpp
Modified: scummvm/trunk/engines/sky/logic.cpp
===================================================================
--- scummvm/trunk/engines/sky/logic.cpp 2009-07-14 10:55:51 UTC (rev 42472)
+++ scummvm/trunk/engines/sky/logic.cpp 2009-07-14 11:15:21 UTC (rev 42473)
@@ -1702,6 +1702,15 @@
}
bool Logic::fnSpeakMe(uint32 targetId, uint32 mesgNum, uint32 animNum) {
+ /* WORKAROUND for #2687172: When Mrs. Piermont is talking
+ on the phone in her apartment, ignore her fnSpeakMe calls
+ on other screens, as the lack of speech files for these lines
+ will cause Foster's speech to be aborted if the timing is bad.
+ */
+ if (targetId == 0x4039 && animNum == 0x9B && Logic::_scriptVariables[SCREEN] != 38) {
+ return false;
+ }
+
stdSpeak(_skyCompact->fetchCpt(targetId), mesgNum, animNum, 0);
return false; //drop out of script
}
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