[Scummvm-cvs-logs] scummvm master -> fced15bef825a2abfe540d2928e02a0718a64fa3

[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:
08f8bc8b6f FULLPIPE: Implement scene04_updateCursor()
fced15bef8 FULLPIPE: Enable scene04


Commit: 08f8bc8b6f9d132183b395fd858b7886cf5262e9
    https://github.com/scummvm/scummvm/commit/08f8bc8b6f9d132183b395fd858b7886cf5262e9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-21T08:43:16-08:00

Commit Message:
FULLPIPE: Implement scene04_updateCursor()

Changed paths:
    engines/fullpipe/constants.h
    engines/fullpipe/scenes/scene04.cpp



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index e4576a1..a2e8121 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -141,7 +141,10 @@ namespace Fullpipe {
 #define PIC_SC3_LADDER 1102
 #define PIC_SC4_BOTTLE 568
 #define PIC_SC4_BOTTLE2 2936
+#define PIC_SC4_DOWNTRUBA 619
+#define PIC_SC4_LRTRUBA 616
 #define PIC_SC4_MASK 585
+#define PIC_SC4_PLANK 5183
 #define PIC_SCD_SEL 734
 #define QU_EGTR_MD2_SHOW 4698
 #define QU_EGTR_MD1_SHOW 4697
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index c43bfe3..3699def 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -174,4 +174,41 @@ void scene04_initScene(Scene *sc) {
 	g_fullpipe->initArcadeKeys("SC_4");
 }
 
+bool sceneHandler04_friesAreWalking() {
+	warning("STUB: sceneHandler04_friesAreWalking()");
+
+	return false;
+}
+
+int scene04_updateCursor() {
+	g_fullpipe->updateCursorCommon();
+
+	if (g_fullpipe->_objectIdAtCursor == PIC_SC4_LRTRUBA) {
+		if (!g_vars->scene04_var19) {
+			g_fullpipe->_cursorId = PIC_CSR_DEFAULT;
+
+			return g_fullpipe->_cursorId;
+		}
+	} else if (g_fullpipe->_objectIdAtCursor == ANI_PLANK || g_fullpipe->_objectIdAtCursor == PIC_SC4_PLANK) {
+		if (g_fullpipe->_objectIdAtCursor == ANI_PLANK && g_fullpipe->_cursorId != PIC_CSR_ITN)
+			return g_fullpipe->_cursorId;
+
+		if (g_fullpipe->_objectIdAtCursor == ANI_PLANK || (g_fullpipe->_objectIdAtCursor == PIC_SC4_PLANK && g_fullpipe->_cursorId == PIC_CSR_DEFAULT)) {
+			if (sceneHandler04_friesAreWalking()) {
+				g_fullpipe->_cursorId = PIC_CSR_ARCADE1;
+				return g_fullpipe->_cursorId;
+			}
+			if (g_vars->scene04_soundPlaying) {
+				g_fullpipe->_cursorId = PIC_CSR_DEFAULT;
+				return g_fullpipe->_cursorId;
+			}
+		}
+	}
+
+	if (g_fullpipe->_objectIdAtCursor == PIC_CSR_ITN && g_fullpipe->_objectIdAtCursor == PIC_SC4_DOWNTRUBA)
+		g_fullpipe->_cursorId = PIC_CSR_GOD;
+
+	return g_fullpipe->_cursorId;
+}
+
 } // End of namespace Fullpipe


Commit: fced15bef825a2abfe540d2928e02a0718a64fa3
    https://github.com/scummvm/scummvm/commit/fced15bef825a2abfe540d2928e02a0718a64fa3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-21T08:49:12-08:00

Commit Message:
FULLPIPE: Enable scene04

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



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 7252b44..801734e 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -243,7 +243,6 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
 		_updateCursorCallback = scene03_updateCursor;
 		break;
 
-#if 0
 	case SC_4:
 		sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_4");
 		scene->preloadMovements(sceneVar);
@@ -255,6 +254,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
 		_updateCursorCallback = scene04_updateCursor;
 		break;
 
+#if 0
 	case SC_5:
 		sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_5");
 		scene->preloadMovements(sceneVar);
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 81a9be5..741835f 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -45,6 +45,10 @@ int scene03_updateCursor();
 void scene03_initScene(Scene *sc);
 int sceneHandler03(ExCommand *cmd);
 
+int scene04_updateCursor();
+void scene04_initScene(Scene *sc);
+int sceneHandler04(ExCommand *cmd);
+
 void sceneDbgMenu_initScene(Scene *sc);
 int sceneHandlerDbgMenu(ExCommand *cmd);
 
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index 3699def..6a2b32a 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -211,4 +211,10 @@ int scene04_updateCursor() {
 	return g_fullpipe->_cursorId;
 }
 
+int sceneHandler04(ExCommand *ex) {
+	warning("STUB: sceneHandler04()");
+
+	return 0;
+}
+
 } // End of namespace Fullpipe