[Scummvm-cvs-logs] scummvm master -> 1a4f951f8bff52f6185304722f2ab9cf9bcd58f4

[sev-]

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

Summary:
1a4f951f8b FULLPIPE: More code to scene34


Commit: 1a4f951f8bff52f6185304722f2ab9cf9bcd58f4
    https://github.com/scummvm/scummvm/commit/1a4f951f8bff52f6185304722f2ab9cf9bcd58f4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-12T02:39:44-08:00

Commit Message:
FULLPIPE: More code to scene34

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index f10b3a8..cdb5dc6 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -1143,6 +1143,8 @@ namespace Fullpipe {
 #define QU_SC34_ENTERLIFT 2819
 #define QU_SC34_EXITLIFT 2820
 #define ST_CTS34_EMPTY 2383
+#define QU_CTS34_FALLEFT 4316
+#define QU_CTS34_FALLRIGHT 4317
 #define ST_CTS34_GROWNEMPTY2 2475
 
 // Scene 36
diff --git a/engines/fullpipe/scenes/scene34.cpp b/engines/fullpipe/scenes/scene34.cpp
index 2361e7c..0882c0f 100644
--- a/engines/fullpipe/scenes/scene34.cpp
+++ b/engines/fullpipe/scenes/scene34.cpp
@@ -34,7 +34,6 @@
 #include "fullpipe/behavior.h"
 #include "fullpipe/floaters.h"
 
-
 namespace Fullpipe {
 
 void sceneHandler34_setExits() {
@@ -84,4 +83,23 @@ void scene34_initScene(Scene *sc) {
 	g_fp->initArcadeKeys("SC_34");
 }
 
+void scene34_initBeh() {
+	g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene34_cactus, ST_CTS34_GROWNEMPTY2, QU_CTS34_FALLEFT, 0);
+	g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene34_cactus, ST_CTS34_GROWNEMPTY2, QU_CTS34_FALLRIGHT, 0);
+}
+
+int scene34_updateCursor() {
+#if 0
+	g_fp->updateCursorCommon();
+
+	if ((g_fp->_objectIdAtCursor != ANI_STOOL_34 || g_fp->getGameLoaderInventory()->getSelectedItemId() != ANI_INV_BOX)
+		 && (g_fp->_objectIdAtCursor != ANI_BOX_34 || g_fp->getGameLoaderInventory()->getSelectedItemId() != ANI_INV_STOOL))
+		; // emtpy
+	else
+		g_fp->_cursorId = PIC_CSR_ITN_INV;
+
+#endif
+	return g_fp->_cursorId;
+}
+
 } // End of namespace Fullpipe