[Scummvm-git-logs] scummvm master -> 90ec4f6ac52fc104f08e796f907f44f6fdde2122

sev- sev at scummvm.org
Sun Oct 2 13:01:48 CEST 2016


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:
e2325f022b FULLPIPE: Fix tube logic on scene37
90ec4f6ac5 FULLPIPE: Fix crash on reenter to scene37


Commit: e2325f022be85750ae6434dbae38adbbd3f8e095
    https://github.com/scummvm/scummvm/commit/e2325f022be85750ae6434dbae38adbbd3f8e095
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-02T13:01:39+02:00

Commit Message:
FULLPIPE: Fix tube logic on scene37

Changed paths:
    engines/fullpipe/scenes/scene37.cpp



diff --git a/engines/fullpipe/scenes/scene37.cpp b/engines/fullpipe/scenes/scene37.cpp
index 31b38c2..d4ecebc 100644
--- a/engines/fullpipe/scenes/scene37.cpp
+++ b/engines/fullpipe/scenes/scene37.cpp
@@ -177,12 +177,19 @@ void sceneHandler37_updateRing(int ringNum) {
 
 	g_vars->scene37_pipeIsOpen = true;
 
-	for (uint j = 0; j < g_vars->scene37_rings.size(); j++) {
-		for (int i = 0; i < g_vars->scene37_rings[j]->numSubRings; i++) {
-			ani = g_fp->_currentScene->getStaticANIObject1ById(ANI_RING, g_vars->scene37_rings[j]->subRings[i]);
+	for (uint i = 0; i < g_vars->scene37_rings.size(); i++) {
+		for (int j = 0; j < g_vars->scene37_rings[i]->numSubRings; j++) {
+			ani = g_fp->_currentScene->getStaticANIObject1ById(ANI_RING, g_vars->scene37_rings[i]->subRings[j]);
 
-			if ((ani->_movement && ani->_movement->_id == MV_RNG_CLOSE) || ani->_statics->_staticsId == ST_RNG_CLOSED2)
-				g_vars->scene37_pipeIsOpen = false;
+			debugC(2, kDebugSceneLogic, "ring[%d][%d]: mov: %d st: %d", i, j, (ani->_movement ? ani->_movement->_id : 0), ani->_statics->_staticsId);
+
+			if (ani->_movement) {
+				if (ani->_movement->_id == MV_RNG_CLOSE)
+					g_vars->scene37_pipeIsOpen = false;
+			} else {
+				if (ani->_statics->_staticsId == ST_RNG_CLOSED2)
+					g_vars->scene37_pipeIsOpen = false;
+			}
 		}
 	}
 


Commit: 90ec4f6ac52fc104f08e796f907f44f6fdde2122
    https://github.com/scummvm/scummvm/commit/90ec4f6ac52fc104f08e796f907f44f6fdde2122
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-02T13:01:39+02:00

Commit Message:
FULLPIPE: Fix crash on reenter to scene37

Changed paths:
    engines/fullpipe/scenes/scene37.cpp



diff --git a/engines/fullpipe/scenes/scene37.cpp b/engines/fullpipe/scenes/scene37.cpp
index d4ecebc..ba18164 100644
--- a/engines/fullpipe/scenes/scene37.cpp
+++ b/engines/fullpipe/scenes/scene37.cpp
@@ -52,6 +52,11 @@ void scene37_initScene(Scene *sc) {
 	Ring *ring;
 	StaticANIObject *ani;
 
+	for (uint i = 0; i < g_vars->scene37_rings.size(); i++)
+		delete g_vars->scene37_rings[i];
+
+	g_vars->scene37_rings.clear();
+
 	g_vars->scene37_lastDudeX = -1;
 
 	ring = new Ring();





More information about the Scummvm-git-logs mailing list