[Scummvm-git-logs] scummvm master -> 0f955b40d7eaa259416ca6fb77f326fe2b98f387

[sev-]

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

Summary:
20cdb0182a FULLPIPE: Added debug info to scene28
1d6d11192e FULLPIPE: Fix navigation in scene28
0f955b40d7 FULLPIPE: Some renames in scene28


Commit: 20cdb0182a49bff7f5f61169be5d8879dbbb9930
    https://github.com/scummvm/scummvm/commit/20cdb0182a49bff7f5f61169be5d8879dbbb9930
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-15T15:44:36+02:00

Commit Message:
FULLPIPE: Added debug info to scene28

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



diff --git a/engines/fullpipe/scenes/scene28.cpp b/engines/fullpipe/scenes/scene28.cpp
index d7d2d21..391b79b 100644
--- a/engines/fullpipe/scenes/scene28.cpp
+++ b/engines/fullpipe/scenes/scene28.cpp
@@ -185,6 +185,8 @@ void sceneHandler28_turnOn2() {
 }
 
 void sceneHandler28_startWork1() {
+	debugC(2, kDebugSceneLogic, "scene28: startWork");
+
 	g_fp->_aniMan->hide();
 
 	StaticANIObject *man = g_fp->_currentScene->getStaticANIObject1ById(ANI_MAN_28, -1);
@@ -245,6 +247,8 @@ void sceneHandler28_lift6Start() {
 void sceneHandler28_clickLift(int keycode) {
 	int x = 0;
 
+	debugC(2, kDebugSceneLogic, "scene28: clickLift(%d)", keycode);
+
 	switch (keycode) {
 	case 0: x = 600; break;
 	case 1: x = 824; break;
@@ -258,6 +262,8 @@ void sceneHandler28_clickLift(int keycode) {
 	if (abs(x - g_fp->_aniMan->_ox) > 1 || abs(472 - g_fp->_aniMan->_oy) > 1
 		|| g_fp->_aniMan->_movement
 		|| g_fp->_aniMan->_statics->_staticsId != ST_MAN_UP) {
+		debugC(2, kDebugSceneLogic, "scene28: clickLift: overwrite");
+
 		MessageQueue *mq = getCurrSceneSc2MotionController()->startMove(g_fp->_aniMan, x, 472, 1, ST_MAN_UP);
 		if (mq) {
 			ExCommand *ex = new ExCommand(0, 17, MSG_SC28_CLICKLIFT, 0, 0, 0, 1, 0, 0, 0);


Commit: 1d6d11192e9b9963ca0549f12eb861c7b687a807
    https://github.com/scummvm/scummvm/commit/1d6d11192e9b9963ca0549f12eb861c7b687a807
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-15T15:44:55+02:00

Commit Message:
FULLPIPE: Fix navigation in scene28

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



diff --git a/engines/fullpipe/scenes/scene28.cpp b/engines/fullpipe/scenes/scene28.cpp
index 391b79b..e67bc41 100644
--- a/engines/fullpipe/scenes/scene28.cpp
+++ b/engines/fullpipe/scenes/scene28.cpp
@@ -268,6 +268,7 @@ void sceneHandler28_clickLift(int keycode) {
 		if (mq) {
 			ExCommand *ex = new ExCommand(0, 17, MSG_SC28_CLICKLIFT, 0, 0, 0, 1, 0, 0, 0);
 			ex->_excFlags |= 3;
+			ex->_param = keycode;
 
 			mq->addExCommandToEnd(ex);
 


Commit: 0f955b40d7eaa259416ca6fb77f326fe2b98f387
    https://github.com/scummvm/scummvm/commit/0f955b40d7eaa259416ca6fb77f326fe2b98f387
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-15T15:51:34+02:00

Commit Message:
FULLPIPE: Some renames in scene28

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



diff --git a/engines/fullpipe/scenes/scene28.cpp b/engines/fullpipe/scenes/scene28.cpp
index e67bc41..503facf 100644
--- a/engines/fullpipe/scenes/scene28.cpp
+++ b/engines/fullpipe/scenes/scene28.cpp
@@ -244,12 +244,12 @@ void sceneHandler28_lift6Start() {
 		chainQueue(QU_SC28_LIFT6_START, 1);
 }
 
-void sceneHandler28_clickLift(int keycode) {
+void sceneHandler28_clickLift(int numLift) {
 	int x = 0;
 
-	debugC(2, kDebugSceneLogic, "scene28: clickLift(%d)", keycode);
+	debugC(2, kDebugSceneLogic, "scene28: clickLift(%d)", numLift);
 
-	switch (keycode) {
+	switch (numLift) {
 	case 0: x = 600; break;
 	case 1: x = 824; break;
 	case 2: x = 1055; break;
@@ -268,14 +268,14 @@ void sceneHandler28_clickLift(int keycode) {
 		if (mq) {
 			ExCommand *ex = new ExCommand(0, 17, MSG_SC28_CLICKLIFT, 0, 0, 0, 1, 0, 0, 0);
 			ex->_excFlags |= 3;
-			ex->_param = keycode;
+			ex->_param = numLift;
 
 			mq->addExCommandToEnd(ex);
 
 			postExCommand(g_fp->_aniMan->_id, 2, x, 472, 0, -1);
 		}
 	} else {
-		switch (keycode) {
+		switch (numLift) {
 		case 0:
 			sceneHandler28_lift0Start();
 			break;