[Scummvm-cvs-logs] SF.net SVN: scummvm:[55623] scummvm/trunk/engines/kyra/sequences_hof.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sat Jan 29 20:03:52 CET 2011
Revision: 55623
http://scummvm.svn.sourceforge.net/scummvm/?rev=55623&view=rev
Author: lordhoto
Date: 2011-01-29 19:03:50 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
KYRA: Hopefully fix valgrind warnings in the HoF intro when text is disabled.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/sequences_hof.cpp
Modified: scummvm/trunk/engines/kyra/sequences_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_hof.cpp 2011-01-29 18:45:45 UTC (rev 55622)
+++ scummvm/trunk/engines/kyra/sequences_hof.cpp 2011-01-29 19:03:50 UTC (rev 55623)
@@ -2455,8 +2455,10 @@
void KyraEngine_HoF::seq_playWsaSyncDialogue(uint16 strIndex, uint16 vocIndex, int textColor, int x, int y, int width, WSAMovie_v2 *wsa, int firstframe, int lastframe, int wsaXpos, int wsaYpos) {
int dur = int(strlen(_sequenceStrings[strIndex])) * (_flags.isTalkie ? 7 : 15);
- int entry = textEnabled() ? seq_setTextEntry(strIndex, x, y, dur, width) : strIndex;
- _activeText[entry].textcolor = textColor;
+ if (textEnabled()) {
+ int entry = seq_setTextEntry(strIndex, x, y, dur, width);
+ _activeText[entry].textcolor = textColor;
+ }
_seqWsaChatTimeout = _system->getMillis() + dur * _tickLength;
int curframe = firstframe;
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