[Scummvm-git-logs] scummvm master -> e16725a763e560bb4b36c5e19980bf5a1391cb94

[sev-]

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:
7da5d48d5e FULLPIPE: Clarify MovGraphLink flags variable type
e16725a763 FULLPIPE: Rebames in scene37


Commit: 7da5d48d5ea1300b4a07eefccfd57b6a6c299f98
    https://github.com/scummvm/scummvm/commit/7da5d48d5ea1300b4a07eefccfd57b6a6c299f98
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-01T23:13:54+02:00

Commit Message:
FULLPIPE: Clarify MovGraphLink flags variable type

Changed paths:
    engines/fullpipe/motion.h



diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index 93b57c7..5b22514 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -222,7 +222,7 @@ class MovGraphLink : public CObject {
 	MovGraphNode *_graphDst;
 	DWordArray _dwordArray1;
 	DWordArray _dwordArray2;
-	int _flags;
+	uint32 _flags;
 	int _field_38;
 	int _field_3C;
 	double _length;


Commit: e16725a763e560bb4b36c5e19980bf5a1391cb94
    https://github.com/scummvm/scummvm/commit/e16725a763e560bb4b36c5e19980bf5a1391cb94
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-10-01T23:13:54+02:00

Commit Message:
FULLPIPE: Rebames in scene37

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



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index d37f5db..71e9126 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -445,7 +445,7 @@ Vars::Vars() {
 
 	scene37_rings.clear();
 	scene37_lastDudeX = -1;
-	scene37_cursorIsLocked = 0;
+	scene37_pipeIsOpen = 0;
 	scene37_plusMinus1 = 0;
 	scene37_plusMinus2 = 0;
 	scene37_plusMinus3 = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index fc593a6..918fb72 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -636,7 +636,7 @@ public:
 
 	Common::Array<Ring *> scene37_rings;
 	int scene37_lastDudeX;
-	bool scene37_cursorIsLocked;
+	bool scene37_pipeIsOpen;
 	StaticANIObject *scene37_plusMinus1;
 	StaticANIObject *scene37_plusMinus2;
 	StaticANIObject *scene37_plusMinus3;
diff --git a/engines/fullpipe/scenes/scene37.cpp b/engines/fullpipe/scenes/scene37.cpp
index 0e5685f..31b38c2 100644
--- a/engines/fullpipe/scenes/scene37.cpp
+++ b/engines/fullpipe/scenes/scene37.cpp
@@ -96,7 +96,7 @@ void scene37_initScene(Scene *sc) {
 
 	g_fp->_currentScene = sc;
 
-	g_vars->scene37_cursorIsLocked = false;
+	g_vars->scene37_pipeIsOpen = false;
 
 	g_vars->scene37_plusMinus1 = sc->getStaticANIObject1ById(ANI_PLUSMINUS, 1);
 
@@ -149,7 +149,7 @@ int scene37_updateCursor() {
 	g_fp->updateCursorCommon();
 
 	if (g_fp->_cursorId == PIC_CSR_ITN && g_fp->_objectIdAtCursor == PIC_SC37_MASK) {
-		if (g_vars->scene37_cursorIsLocked)
+		if (g_vars->scene37_pipeIsOpen)
 			g_fp->_cursorId = PIC_CSR_GOL;
 	}
 
@@ -175,20 +175,22 @@ void sceneHandler37_updateRing(int ringNum) {
 		}
 	}
 
-	g_vars->scene37_cursorIsLocked = true;
+	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[ringNum]->numSubRings; i++) {
+		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]);
 
-			if ((ani->_movement && ani->_movement->_id != MV_RNG_CLOSE) || ani->_statics->_staticsId != ST_RNG_CLOSED2)
-				g_vars->scene37_cursorIsLocked = false;
+			if ((ani->_movement && ani->_movement->_id == MV_RNG_CLOSE) || ani->_statics->_staticsId == ST_RNG_CLOSED2)
+				g_vars->scene37_pipeIsOpen = false;
 		}
 	}
 
+	debugC(1, kDebugSceneLogic, "Pipe is: %s", g_vars->scene37_pipeIsOpen ? "open" : "closed");
+
 	int state;
 
-	if (g_vars->scene37_cursorIsLocked)
+	if (g_vars->scene37_pipeIsOpen)
 		state = g_fp->getObjectEnumState(sO_LeftPipe_37, sO_IsOpened);
 	else
 		state = g_fp->getObjectEnumState(sO_LeftPipe_37, sO_IsClosed);