[Scummvm-cvs-logs] scummvm master -> 809aaead099e03a235be0dcb4d18d8ca17d0ea92

Strangerke Strangerke at scummvm.org
Tue Oct 29 08:19:48 CET 2013


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c00ff935de TSAGE: Fix CID 1003170
809aaead09 TOON: Fix CID 1002424


Commit: c00ff935de452fa32feaab89b5c1c584e5722044
    https://github.com/scummvm/scummvm/commit/c00ff935de452fa32feaab89b5c1c584e5722044
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-10-29T00:18:36-07:00

Commit Message:
TSAGE: Fix CID 1003170

Changed paths:
    engines/tsage/core.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 8021160..424df16 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -860,6 +860,8 @@ void PlayerMover::doStepsOfNpcMovement(const Common::Point &srcPos, const Common
 int PlayerMover::calculateRestOfRoute(int *routeList, int srcRegion, int destRegion, bool &foundRoute) {
 	// Make a copy of the provided route. The first entry is the size.
 	int tempList[REGION_LIST_SIZE + 1];
+	memset(tempList, 0, REGION_LIST_SIZE + 1);
+
 	foundRoute = false;
 	for (int idx = 0; idx <= *routeList; ++idx)
 		tempList[idx] = routeList[idx];


Commit: 809aaead099e03a235be0dcb4d18d8ca17d0ea92
    https://github.com/scummvm/scummvm/commit/809aaead099e03a235be0dcb4d18d8ca17d0ea92
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-10-29T00:18:54-07:00

Commit Message:
TOON: Fix CID 1002424

Changed paths:
    engines/toon/toon.cpp



diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 286bcf1..a97bfd5 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -922,6 +922,36 @@ ToonEngine::ToonEngine(OSystem *syst, const ADGameDescription *gameDescription)
 		_gameVariant = 0;
 		break;
 	}
+
+	for (int i = 0; i < 64; i++) {
+		_sceneAnimationScripts[i]._lastTimer = 0;
+		_sceneAnimationScripts[i]._frozen = false;
+		_sceneAnimationScripts[i]._frozenForConversation = false;
+		_sceneAnimationScripts[i]._active = false;
+	}
+
+	_lastProcessedSceneScript = 0;
+	_animationSceneScriptRunFlag = false;
+	_updatingSceneScriptRunFlag = false;
+	_dirtyAll = false;
+	_cursorOffsetX = 0;
+	_cursorOffsetY = 0;
+	_currentTextLine = 0;
+	_currentTextLineId = 0;
+	_currentTextLineX = 0;
+	_currentTextLineY = 0;
+	_currentTextLineCharacterId = -1;
+	_oldScrollValue = 0;
+	_drew = nullptr;
+	_flux = nullptr;
+	_currentHotspotItem = 0;
+	_shouldQuit = false;
+	_scriptStep = 0;
+	_oldTimer = 0;
+	_oldTimer2 = 0;
+	_lastRenderTime = 0;
+	_firstFrame = false;
+	_needPaletteFlush = true;
 }
 
 ToonEngine::~ToonEngine() {






More information about the Scummvm-git-logs mailing list