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

[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:
eb9d53b999 FULLPIPE: Do some renaming in scene02
a7a54c5d60 FULLPIPE: More work on scene02


Commit: eb9d53b999ddaa19634e0b099fa96e32d04b4eec
    https://github.com/scummvm/scummvm/commit/eb9d53b999ddaa19634e0b099fa96e32d04b4eec
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-19T13:07:40-08:00

Commit Message:
FULLPIPE: Do some renaming in scene02

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



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 80e299b..1748662 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -80,7 +80,7 @@ Vars::Vars() {
 	scene01_picSc01Osk2 = 0;
 
 	scene02_guvTheDrawer = 0;
-	scene02_var1 = 0;
+	scene02_boxDelay = 0;
 	scene02_boxOpen = false;
 
 	scene03_eggeater = 0;
@@ -1582,7 +1582,7 @@ void scene02_initScene(Scene *sc) {
 		g_fullpipe->_currentScene = s;
 	}
 
-	g_vars->scene02_var1 = 0;
+	g_vars->scene02_boxDelay = 0;
 
 	StaticANIObject *box = sc->getStaticANIObject1ById(ANI_SC2_BOX, -1);
 
@@ -1590,10 +1590,10 @@ void scene02_initScene(Scene *sc) {
 		g_vars->scene02_boxOpen = false;
 	} else {
 		g_vars->scene02_boxOpen = true;
-		g_vars->scene02_var1 = 100 * g_fullpipe->_rnd->getRandomNumber(32767) / 0x7FFF + 150;
+		g_vars->scene02_boxDelay = 100 * g_fullpipe->_rnd->getRandomNumber(32767) / 0x7FFF + 150;
 	}
 
-	//Unk1_sub1(&unk1, g_fullpipe->_gameLoader->_gameVar->getSubVarByName("SC_2"));
+	//g_fullpipe->_floaters->init(g_fullpipe->_gameLoader->_gameVar->getSubVarByName("SC_2"));
 
 	warning("STUB: scene02_initScene()");
 }
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 71fccaf..4be8d89 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -46,7 +46,7 @@ public:
 	PictureObject *scene01_picSc01Osk2;
 
 	StaticANIObject *scene02_guvTheDrawer;
-	int scene02_var1;
+	int scene02_boxDelay;
 	bool scene02_boxOpen;
 
 	StaticANIObject *scene03_eggeater;


Commit: a7a54c5d60ebdbda600f7aa12a4a0ffb28a53bbe
    https://github.com/scummvm/scummvm/commit/a7a54c5d60ebdbda600f7aa12a4a0ffb28a53bbe
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-19T13:42:26-08:00

Commit Message:
FULLPIPE: More work on scene02

Changed paths:
    engines/fullpipe/scenes.cpp



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 1748662..2d93751 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -1590,7 +1590,7 @@ void scene02_initScene(Scene *sc) {
 		g_vars->scene02_boxOpen = false;
 	} else {
 		g_vars->scene02_boxOpen = true;
-		g_vars->scene02_boxDelay = 100 * g_fullpipe->_rnd->getRandomNumber(32767) / 0x7FFF + 150;
+		g_vars->scene02_boxDelay = 100 * g_fullpipe->_rnd->getRandomNumber(32767) + 150;
 	}
 
 	//g_fullpipe->_floaters->init(g_fullpipe->_gameLoader->_gameVar->getSubVarByName("SC_2"));
@@ -1599,9 +1599,67 @@ void scene02_initScene(Scene *sc) {
 }
 
 int sceneHandler02(ExCommand *ex) {
+	int res = 0;
+
+#if 0
+	if (cmd->_messageKind != 17)
+		return 0;
+
+	switch(cmd->_messageNum) {
+	case MSG_SC2_LADDERCLICK:
+		sceneHandler02_ladderClick();
+		return 0;
+
+	case MSG_SC2_SHOWLADDER:
+		sceneHandler02_showLadder();
+		return 0;
+
+	case MSG_SC2_PUTMANUP:
+		g_aniMan2->_priority = 0;
+		return 0;
+
+	case MSG_SC2_HIDELADDER:
+		sceneHandler02_hideLadder();
+		return 0;
+
+	case 33:
+		if (g_fullpipe->_aniMan2) {
+			if (g_fullpipe->_aniMan2->_ox < g_fullpipe->_sceneRect.left + 200) {
+				g_fullpipe->_currentScene->_x = g_fullpipe->_aniMan2->_ox - g_fullpipe->_sceneRect.left - 300;
+
+			if (g_fullpipe->_aniMan2->_ox > g_fullpipe->_sceneRect.right - 200 )
+				g_currentScene->bg.x = g_fullpipe->_aniMan2->_ox - g_fullpipe->_sceneRect.right + 300;
+
+			res = 1;
+		}
+
+		if (g_vars->scene02_boxOpen) {
+			if (g_vars->scene02_boxDelay >= 1) {
+				--g_vars->scene02_boxDelay;
+			} else if (g_fullpipe->_floaters.size() >= 1) {
+				if (g_fullpipe->_floaters->array2[0]->val5 == -50) {
+					g_fullpipe->_floaters->stopAll();
+					g_vars->scene02_boxOpen = false;
+					g_vars->scene02_boxDelay = 100 * g_fullpipe->_rnd->getRandomNumber(32767) + 150;
+				} else {
+					g_floaters.array2[0]->val3 = -50;
+				}
+			} else {
+				g_fullpipe->_floaters->genFlies(g_fullpipe->_currentScene, g_fullpipe->_rnd->getRandomNumber(700) + 100, -50, 0, 0);
+				g_vars_scene02_boxDelay = 500 * g_fullpipe->_rnd->getRandomNumber(32767) + 1000;
+			}
+		}
+
+		g_fullpipe->_floaters->update();
+		g_fullpipe->_behaviorManager->updateBehaviors();
+
+		startSceneTrack();
+	}
+
+#endif
 	warning("STUB: sceneHandler02()");
 
-	return 0;
+	return res;
 }
 
 void scene03_initScene(Scene *sc) {