[Scummvm-cvs-logs] SF.net SVN: scummvm:[33737] scummvm/branches/branch-0-12-0/engines/kyra/ kyra_hof.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sun Aug 10 02:41:59 CEST 2008


Revision: 33737
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33737&view=rev
Author:   lordhoto
Date:     2008-08-10 00:41:57 +0000 (Sun, 10 Aug 2008)

Log Message:
-----------
Backport of r33733 "Fixed crash in KyraEngine_HoF::pauseEngineIntern."

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/engines/kyra/kyra_hof.cpp

Modified: scummvm/branches/branch-0-12-0/engines/kyra/kyra_hof.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/kyra/kyra_hof.cpp	2008-08-10 00:36:46 UTC (rev 33736)
+++ scummvm/branches/branch-0-12-0/engines/kyra/kyra_hof.cpp	2008-08-10 00:41:57 UTC (rev 33737)
@@ -196,14 +196,18 @@
 		_seqWsaChatTimeout += pausedTime;
 		_seqWsaChatFrameTimeout += pausedTime;
 
-		for (int x = 0; x < 10; x++) {
-			if (_activeText[x].duration != -1)
-				_activeText[x].startTime += pausedTime;
+		if (_activeText) {
+			for (int x = 0; x < 10; x++) {
+				if (_activeText[x].duration != -1)
+					_activeText[x].startTime += pausedTime;
+			}
 		}
 
-		for (int x = 0; x < 8; x++) {
-			if (_activeWSA[x].flags != -1)
-				_activeWSA[x].nextFrame += pausedTime;
+		if (_activeWSA) {
+			for (int x = 0; x < 8; x++) {
+				if (_activeWSA[x].flags != -1)
+					_activeWSA[x].nextFrame += pausedTime;
+			}
 		}
 
 		_nextIdleAnim += pausedTime;


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