[Scummvm-cvs-logs] scummvm master -> 2136644348e7984bce31bf3a867e96c5544367d4

sev- sev at scummvm.org
Fri Dec 27 21:38:40 CET 2013


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

Summary:
ea66761b04 FULLPIPE: Implement sceneHandler11_hitMan()
74199c2f19 FULLPIPE: Implement sceneHandler11_manToSwing()
0f6ce8f502 FULLPIPE: Implement scene11_updateCursor()
812f3c8a05 FULLPIPE: Plug scene11 in
3bbe32fd25 FULLPIPE: Implement sceneHandler11_putBoot()
5297a43826 FULLPIPE: Implement sceneHandler11_restartMan() and sceneHandler11_showSwing()
a702464626 FULLPIPE: More code to scene11
2136644348 FULLPIPE: Implement sceneHandler11_swing0()/swing2()


Commit: ea66761b0466a8ba58fa6b1d9650fa518c8ea513
    https://github.com/scummvm/scummvm/commit/ea66761b0466a8ba58fa6b1d9650fa518c8ea513
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-27T11:23:59-08:00

Commit Message:
FULLPIPE: Implement sceneHandler11_hitMan()

Changed paths:
    engines/fullpipe/constants.h
    engines/fullpipe/gameloader.cpp
    engines/fullpipe/gameloader.h
    engines/fullpipe/scenes/scene11.cpp



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index ce406d0..fa9b3c1 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -502,6 +502,7 @@ namespace Fullpipe {
 #define MSG_SC11_SHOWSWING 1124
 #define MSG_SC11_SITSWINGER 5198
 #define PIC_SC11_HINT 5170
+#define QU_SC11_MANFALL 3017
 #define ST_BTS11_2 2707
 #define ST_KCH_STATIC 1122
 #define ST_SWR_SIT 1147
diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp
index 57c1b23..64e6b93 100644
--- a/engines/fullpipe/gameloader.cpp
+++ b/engines/fullpipe/gameloader.cpp
@@ -510,7 +510,7 @@ InputController *FullpipeEngine::getGameLoaderInputController() {
 		return 0;
 }
 
-MotionController *getCurrSceneSc2MotionController() {
+MctlCompound *getCurrSceneSc2MotionController() {
 	return getSc2MctlCompoundBySceneId(g_fp->_currentScene->_sceneId);
 }
 
diff --git a/engines/fullpipe/gameloader.h b/engines/fullpipe/gameloader.h
index 0745375..4cfb803 100644
--- a/engines/fullpipe/gameloader.h
+++ b/engines/fullpipe/gameloader.h
@@ -111,7 +111,7 @@ class GameLoader : public CObject {
 Inventory2 *getGameLoaderInventory();
 InteractionController *getGameLoaderInteractionController();
 MctlCompound *getSc2MctlCompoundBySceneId(int16 sceneId);
-MotionController *getCurrSceneSc2MotionController();
+MctlCompound *getCurrSceneSc2MotionController();
 
 } // End of namespace Fullpipe
 
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index 0782ef8..388421f 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -150,7 +150,17 @@ void sceneHandler11_restartMan() {
 }
 
 void sceneHandler11_hitMan() {
-	warning("STUB: sceneHandler11_hitMan()");
+	if (g_fp->_aniMan->_ox > 345 && g_fp->_aniMan->_ox < 355) {
+		g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT);
+
+		MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC11_MANFALL), 0, 0);
+
+		mq->setFlags(mq->getFlags() | 1);
+		if (!mq->chain(g_fp->_aniMan))
+			delete mq;
+
+		getCurrSceneSc2MotionController()->replaceNodeX(353, 303);
+	}
 }
 
 void sceneHandler11_manToSwing() {


Commit: 74199c2f19bbbd2687993afae6f90a0a9247be07
    https://github.com/scummvm/scummvm/commit/74199c2f19bbbd2687993afae6f90a0a9247be07
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-27T11:37:07-08:00

Commit Message:
FULLPIPE: Implement sceneHandler11_manToSwing()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index fa9b3c1..a6dc51d 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -501,15 +501,16 @@ namespace Fullpipe {
 #define MSG_SC11_RESTARTMAN 1133
 #define MSG_SC11_SHOWSWING 1124
 #define MSG_SC11_SITSWINGER 5198
+#define MV_MAN11_SWING_0 1109
 #define PIC_SC11_HINT 5170
 #define QU_SC11_MANFALL 3017
 #define ST_BTS11_2 2707
 #define ST_KCH_STATIC 1122
+#define ST_MAN11_EMPTY 1110
 #define ST_SWR_SIT 1147
 #define ST_SWR_SITBALD 1153
 #define ST_SWR_STAND3 3014
 
-
 // Scene 15
 #define ANI_BOOT_15 4779
 #define ANI_INV_BOOT 881
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index 388421f..b3dc4a6 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -163,8 +163,41 @@ void sceneHandler11_hitMan() {
 	}
 }
 
+int sceneHandler11_updateScreenCallback() {
+	int res = g_fp->drawArcadeOverlay(g_vars->scene11_var02);
+
+	if (!res)
+		g_fp->_updateScreenCallback = 0;
+
+	return res;
+}
+
 void sceneHandler11_manToSwing() {
-	warning("STUB: sceneHandler11_manToSwing()");
+	g_vars->scene11_var02 = 1;
+
+	getCurrSceneSc2MotionController()->clearEnabled();
+	getGameLoaderInteractionController()->disableFlag24();
+
+	g_fp->_aniMan2->hide();
+
+	g_vars->scene11_var15 = 0;
+	g_vars->scene11_var12 = 1.9849218;
+
+	g_vars->scene11_dudeOnSwing->_flags &= 0xFFFB;
+	g_vars->scene11_dudeOnSwing = g_fp->_currentScene->getStaticANIObject1ById(ANI_MAN11, -1);
+	g_vars->scene11_dudeOnSwing->_statics = g_vars->scene11_dudeOnSwing->getStaticsById(ST_MAN11_EMPTY);
+	g_vars->scene11_dudeOnSwing->_movement = 0;
+	g_vars->scene11_dudeOnSwing->show1(690, 215, MV_MAN11_SWING_0, 0);
+	g_vars->scene11_dudeOnSwing->_priority = 20;
+	g_vars->scene11_dudeOnSwing->startAnim(MV_MAN11_SWING_0, 0, -1);
+	g_vars->scene11_dudeOnSwing->_movement->setDynamicPhaseIndex(45);
+
+	g_vars->scene11_var01.addItem(g_fp->_aniMan->_id);
+
+	g_fp->_currentScene->_x = 1400 - g_fp->_sceneRect.right;
+
+	g_vars->scene11_var03 = 1;
+	g_fp->_updateScreenCallback = sceneHandler11_updateScreenCallback;
 }
 
 void sceneHandler11_putBoot() {


Commit: 0f6ce8f502adf70c8e2c2ffe846e98f2d6db1817
    https://github.com/scummvm/scummvm/commit/0f6ce8f502adf70c8e2c2ffe846e98f2d6db1817
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-27T11:41:54-08:00

Commit Message:
FULLPIPE: Implement scene11_updateCursor()

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



diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index b3dc4a6..02f29e1 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -163,6 +163,18 @@ void sceneHandler11_hitMan() {
 	}
 }
 
+int scene11_updateCursor() {
+	g_fp->updateCursorCommon();
+
+	if (g_vars->scene11_var02) {
+		if (g_fp->_cursorId != PIC_CSR_DEFAULT_INV && g_fp->_cursorId != PIC_CSR_ITN_INV)
+			g_fp->_cursorId = -1;
+	} else if (g_vars->scene11_swingie == g_fp->_objectAtCursor && g_fp->_inventory->getSelectedItemId() == ANI_INV_BOOT)
+		g_fp->_cursorId = PIC_CSR_ITN_INV;
+
+	return g_fp->_cursorId;
+}
+
 int sceneHandler11_updateScreenCallback() {
 	int res = g_fp->drawArcadeOverlay(g_vars->scene11_var02);
 


Commit: 812f3c8a05373eec82423684bd855cde2a9c0ada
    https://github.com/scummvm/scummvm/commit/812f3c8a05373eec82423684bd855cde2a9c0ada
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-27T11:43:20-08:00

Commit Message:
FULLPIPE: Plug scene11 in

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



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 260d7a0..aee494b 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -437,7 +437,6 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
 		_updateCursorCallback = scene10_updateCursor;
 		break;
 
-#if 0
 	case SC_11:
 		sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_11");
 		scene->preloadMovements(sceneVar);
@@ -449,7 +448,6 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
 		scene11_setupMusic();
 		_updateCursorCallback = scene11_updateCursor;
 		break;
-#endif
 
 	case SC_12:
 		sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_12");
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 2ac2104..582efa2 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -72,6 +72,11 @@ void scene10_initScene(Scene *sc);
 int sceneHandler10(ExCommand *cmd);
 int scene10_updateCursor();
 
+void scene11_initScene(Scene *sc);
+void scene11_setupMusic();
+int sceneHandler11(ExCommand *cmd);
+int scene11_updateCursor();
+
 void scene12_initScene(Scene *sc);
 int sceneHandler12(ExCommand *ex);
 


Commit: 3bbe32fd25893c6d2d6dd4a1a8d2f7f70273ebdc
    https://github.com/scummvm/scummvm/commit/3bbe32fd25893c6d2d6dd4a1a8d2f7f70273ebdc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-27T12:11:20-08:00

Commit Message:
FULLPIPE: Implement sceneHandler11_putBoot()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index a6dc51d..45bddf0 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -504,7 +504,10 @@ namespace Fullpipe {
 #define MV_MAN11_SWING_0 1109
 #define PIC_SC11_HINT 5170
 #define QU_SC11_MANFALL 3017
+#define QU_SC11_PUTBOOT1 2709
+#define QU_SC11_PUTBOOT2 2710
 #define ST_BTS11_2 2707
+#define ST_BTS11_ONE 2706
 #define ST_KCH_STATIC 1122
 #define ST_MAN11_EMPTY 1110
 #define ST_SWR_SIT 1147
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index 02f29e1..d56cf58 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -212,8 +212,31 @@ void sceneHandler11_manToSwing() {
 	g_fp->_updateScreenCallback = sceneHandler11_updateScreenCallback;
 }
 
+void sceneHandler11_putABoot() {
+	if (g_vars->scene11_boots->_flags & 4) {
+		if (g_vars->scene11_boots->_statics->_staticsId == ST_BTS11_ONE)
+			chainObjQueue(0, QU_SC11_PUTBOOT2, 1);
+	} else {
+		chainObjQueue(0, QU_SC11_PUTBOOT1, 1);
+	}
+}
+
 void sceneHandler11_putBoot() {
-	warning("STUB: sceneHandler11_putBoot()");
+	if (abs(353 - g_fp->_aniMan->_ox) > 1 || abs(498 - g_fp->_aniMan->_oy) > 1
+		|| g_fp->_aniMan->_movement || g_fp->_aniMan->_statics->_staticsId != ST_MAN_RIGHT) {
+		MessageQueue *mq = getCurrSceneSc2MotionController()->method34(g_fp->_aniMan, 353, 498, 1, ST_MAN_RIGHT);
+
+		if (mq) {
+			ExCommand *ex = new ExCommand(0, 17, MSG_SC11_PUTBOOT, 0, 0, 0, 1, 0, 0, 0);
+			ex->_excFlags |= 3;
+
+			mq->addExCommandToEnd(ex);
+
+			postExCommand(g_fp->_aniMan->_id, 2, 353, 498, 0, -1);
+		}
+	} else {
+		sceneHandler11_putABoot();
+	}
 }
 
 void sceneHandler11_showSwing() {
@@ -416,7 +439,7 @@ int sceneHandler11(ExCommand *cmd) {
 						x = g_vars->scene11_var21;
 					}
 					if (y > g_fp->_sceneRect.bottom - 300) {
-						g_fp->_currentScene->_y = y - g_fp->_sceneRect.bottom + 300;
+						//g_fp->_currentScene->_y = y - g_fp->_sceneRect.bottom + 300;  // FIXME. Causes flicker
 						x = g_vars->scene11_var21;
 					}
 					if (x >= 940)


Commit: 5297a4382662e5e5af27a439ef5ff8b63c18b413
    https://github.com/scummvm/scummvm/commit/5297a4382662e5e5af27a439ef5ff8b63c18b413
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-27T12:16:59-08:00

Commit Message:
FULLPIPE: Implement sceneHandler11_restartMan() and sceneHandler11_showSwing()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 45bddf0..dd4d4e3 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -501,13 +501,16 @@ namespace Fullpipe {
 #define MSG_SC11_RESTARTMAN 1133
 #define MSG_SC11_SHOWSWING 1124
 #define MSG_SC11_SITSWINGER 5198
+#define MV_KCH_START 1121
 #define MV_MAN11_SWING_0 1109
 #define PIC_SC11_HINT 5170
 #define QU_SC11_MANFALL 3017
 #define QU_SC11_PUTBOOT1 2709
 #define QU_SC11_PUTBOOT2 2710
+#define QU_SC11_RESTARTMAN 1134
 #define ST_BTS11_2 2707
 #define ST_BTS11_ONE 2706
+#define ST_KCH_0 1096
 #define ST_KCH_STATIC 1122
 #define ST_MAN11_EMPTY 1110
 #define ST_SWR_SIT 1147
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index d56cf58..dc9acfc 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -146,7 +146,12 @@ void sceneHandler11_winArcade() {
 }
 
 void sceneHandler11_restartMan() {
-	warning("STUB: sceneHandler11_restartMan()");
+	chainObjQueue(0, QU_SC11_RESTARTMAN, 1);
+
+	getGameLoaderInteractionController()->enableFlag24();
+	getCurrSceneSc2MotionController()->setEnabled();
+
+	g_vars->scene11_var03 = 0;
 }
 
 void sceneHandler11_hitMan() {
@@ -240,7 +245,11 @@ void sceneHandler11_putBoot() {
 }
 
 void sceneHandler11_showSwing() {
-	warning("STUB: sceneHandler11_showSwing()");
+	g_vars->scene11_dudeOnSwing = g_fp->_currentScene->getStaticANIObject1ById(ANI_KACHELI, -1);
+	g_vars->scene11_dudeOnSwing->_statics = g_vars->scene11_dudeOnSwing->getStaticsById(ST_KCH_0);
+	g_vars->scene11_dudeOnSwing->_movement = 0;
+	g_vars->scene11_dudeOnSwing->show1(691, 371, MV_KCH_START, 0);
+	g_vars->scene11_dudeOnSwing->_priority = 20;
 }
 
 void sceneHandler11_sub01() {


Commit: a7024646268491c9a3b866fc3c40e1f8882a8968
    https://github.com/scummvm/scummvm/commit/a7024646268491c9a3b866fc3c40e1f8882a8968
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-27T12:24:38-08:00

Commit Message:
FULLPIPE: More code to scene11

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index dd4d4e3..2c93db9 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -503,6 +503,7 @@ namespace Fullpipe {
 #define MSG_SC11_SITSWINGER 5198
 #define MV_KCH_START 1121
 #define MV_MAN11_SWING_0 1109
+#define MV_MAN11_SWING_1 1111
 #define PIC_SC11_HINT 5170
 #define QU_SC11_MANFALL 3017
 #define QU_SC11_PUTBOOT1 2709
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index aee494b..cd816f1 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -187,6 +187,7 @@ Vars::Vars() {
 	scene11_var20 = 0;
 	scene11_var21 = 0;
 	scene11_var22 = 0;
+	scene11_var23 = 45;
 
 	scene12_fly = 0;
 	scene12_flyCountdown = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 582efa2..cb6e45e 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -251,6 +251,7 @@ public:
 	int scene11_var20;
 	int scene11_var21;
 	int scene11_var22;
+	int scene11_var23;
 
 	int scene12_fly;
 	int scene12_flyCountdown;
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index dc9acfc..1d5fc85 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -141,10 +141,6 @@ void scene11_initScene(Scene *sc) {
 	g_fp->setArcadeOverlay(PIC_CSR_ARCADE5);
 }
 
-void sceneHandler11_winArcade() {
-	warning("STUB: sceneHandler11_winArcade()");
-}
-
 void sceneHandler11_restartMan() {
 	chainObjQueue(0, QU_SC11_RESTARTMAN, 1);
 
@@ -261,7 +257,15 @@ void sceneHandler11_sub02() {
 }
 
 void sceneHandler11_sub03() {
-	warning("STUB: sceneHandler11_sub03()");
+	g_vars->scene11_dudeOnSwing->_statics = g_vars->scene11_dudeOnSwing->getStaticsById(ST_MAN11_EMPTY);
+	g_vars->scene11_dudeOnSwing->_movement = 0;
+	g_vars->scene11_dudeOnSwing->show1(690, 215, MV_MAN11_SWING_1, 0);
+	g_vars->scene11_dudeOnSwing->startAnim(MV_MAN11_SWING_1, 0, -1);
+	g_vars->scene11_dudeOnSwing->_movement->setDynamicPhaseIndex(g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex);
+
+	g_vars->scene11_var17 = 1;
+	g_vars->scene11_var23 = 42;
+	g_vars->scene11_var09 = -(fabs(g_vars->scene11_var08) * 0.075 + 0.12);
 }
 
 void sceneHandler11_sub04() {
@@ -288,6 +292,16 @@ void sceneHandler11_sub09() {
 	warning("STUB: sceneHandler11_sub09()");
 }
 
+void sceneHandler11_winArcade() {
+	if (g_vars->scene11_var02) {
+		g_vars->scene11_var02 = 0;
+
+		sceneHandler11_sub09();
+
+		g_fp->_gameLoader->preloadScene(SC_11, TrubaRight);
+	}
+}
+
 void sceneHandler11_sub10() {
 	warning("STUB: sceneHandler11_sub10()");
 }


Commit: 2136644348e7984bce31bf3a867e96c5544367d4
    https://github.com/scummvm/scummvm/commit/2136644348e7984bce31bf3a867e96c5544367d4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-27T12:32:01-08:00

Commit Message:
FULLPIPE: Implement sceneHandler11_swing0()/swing2()

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



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 2c93db9..69d9352 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -504,6 +504,7 @@ namespace Fullpipe {
 #define MV_KCH_START 1121
 #define MV_MAN11_SWING_0 1109
 #define MV_MAN11_SWING_1 1111
+#define MV_MAN11_SWING_2 1112
 #define PIC_SC11_HINT 5170
 #define QU_SC11_MANFALL 3017
 #define QU_SC11_PUTBOOT1 2709
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index 1d5fc85..50f3e93 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -252,11 +252,19 @@ void sceneHandler11_sub01() {
 	warning("STUB: sceneHandler11_sub01()");
 }
 
-void sceneHandler11_sub02() {
-	warning("STUB: sceneHandler11_sub02()");
+void sceneHandler11_swing0() {
+	g_vars->scene11_dudeOnSwing->_statics = g_vars->scene11_dudeOnSwing->getStaticsById(ST_MAN11_EMPTY);
+	g_vars->scene11_dudeOnSwing->_movement = 0;
+	g_vars->scene11_dudeOnSwing->show1(690, 215, MV_MAN11_SWING_0, 0);
+	g_vars->scene11_dudeOnSwing->startAnim(MV_MAN11_SWING_0, 0, -1);
+	g_vars->scene11_dudeOnSwing->_movement->setDynamicPhaseIndex(g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex);
+
+	g_vars->scene11_var17 = 0;
+	g_vars->scene11_var23 = 45;
+	g_vars->scene11_var09 = 1.0;
 }
 
-void sceneHandler11_sub03() {
+void sceneHandler11_swing1() {
 	g_vars->scene11_dudeOnSwing->_statics = g_vars->scene11_dudeOnSwing->getStaticsById(ST_MAN11_EMPTY);
 	g_vars->scene11_dudeOnSwing->_movement = 0;
 	g_vars->scene11_dudeOnSwing->show1(690, 215, MV_MAN11_SWING_1, 0);
@@ -268,8 +276,16 @@ void sceneHandler11_sub03() {
 	g_vars->scene11_var09 = -(fabs(g_vars->scene11_var08) * 0.075 + 0.12);
 }
 
-void sceneHandler11_sub04() {
-	warning("STUB: sceneHandler11_sub04()");
+void sceneHandler11_swing2() {
+	g_vars->scene11_dudeOnSwing->_statics = g_vars->scene11_dudeOnSwing->getStaticsById(ST_MAN11_EMPTY);
+	g_vars->scene11_dudeOnSwing->_movement = 0;
+	g_vars->scene11_dudeOnSwing->show1(690, 215, MV_MAN11_SWING_2, 0);
+	g_vars->scene11_dudeOnSwing->startAnim(MV_MAN11_SWING_2, 0, -1);
+	g_vars->scene11_dudeOnSwing->_movement->setDynamicPhaseIndex(g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex);
+
+	g_vars->scene11_var17 = 2;
+	g_vars->scene11_var23 = 48;
+	g_vars->scene11_var09 = fabs(g_vars->scene11_var08) * 0.075 + 0.12;
 }
 
 void sceneHandler11_sub05() {
@@ -401,7 +417,7 @@ int sceneHandler11(ExCommand *cmd) {
 
 				if (g_vars->scene11_var16 <= 0 || g_vars->scene11_var15 - g_vars->scene11_var16 <= 72) {
 				} else {
-					sceneHandler11_sub02();
+					sceneHandler11_swing0();
 					g_vars->scene11_var18 = 0;
 					g_vars->scene11_var16 = 0;
 				}
@@ -440,14 +456,14 @@ int sceneHandler11(ExCommand *cmd) {
 
 				if (g_vars->scene11_var18 == 1) {
 					if (!g_vars->scene11_var17)
-						sceneHandler11_sub03();
+						sceneHandler11_swing1();
 					else
-						sceneHandler11_sub02();
+						sceneHandler11_swing0();
 				} else if (g_vars->scene11_var18 == 2) {
 					if (!g_vars->scene11_var17)
-						sceneHandler11_sub04();
+						sceneHandler11_swing2();
 					else
-						sceneHandler11_sub02();
+						sceneHandler11_swing0();
 				}
 
 				g_vars->scene11_var16 = g_vars->scene11_var15;






More information about the Scummvm-git-logs mailing list