[Scummvm-cvs-logs] scummvm master -> 66dddbe892765212cf3821fd08005cef9584df2e
sev-
sev at scummvm.org
Fri Dec 27 23:31:27 CET 2013
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
183df043ae FULLPIPE: Implement sceneHandler11_sub09()
b03e329bc7 FULLPIPE: Implement sceneHandler11_swingLogic()
98598d2ec3 FULLPIPE: Implement sceneHandler11_sub10()
a67dcf27bf FULLPIPE: Implement sceneHandler11_sub11()
66dddbe892 FULLPIPE: implement sceneHandler11_sub08()
Commit: 183df043aeff7f1bbcd34238b76eb5782ca3c304
https://github.com/scummvm/scummvm/commit/183df043aeff7f1bbcd34238b76eb5782ca3c304
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-27T13:49:00-08:00
Commit Message:
FULLPIPE: Implement sceneHandler11_sub09()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene11.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 69d9352..d3ff241 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -501,6 +501,7 @@ namespace Fullpipe {
#define MSG_SC11_RESTARTMAN 1133
#define MSG_SC11_SHOWSWING 1124
#define MSG_SC11_SITSWINGER 5198
+#define MV_KCH_MOVE2 1099
#define MV_KCH_START 1121
#define MV_MAN11_SWING_0 1109
#define MV_MAN11_SWING_1 1111
@@ -513,6 +514,7 @@ namespace Fullpipe {
#define ST_BTS11_2 2707
#define ST_BTS11_ONE 2706
#define ST_KCH_0 1096
+#define ST_KCH_EMPTY 1132
#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 50f3e93..67d4534 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -305,7 +305,18 @@ void sceneHandler11_sub08() {
}
void sceneHandler11_sub09() {
- warning("STUB: sceneHandler11_sub09()");
+ if (g_vars->scene11_var17)
+ sceneHandler11_swing0();
+
+ g_vars->scene11_dudeOnSwing->stopAnim_maybe();
+ g_vars->scene11_dudeOnSwing->hide();
+ g_vars->scene11_dudeOnSwing = g_fp->_currentScene->getStaticANIObject1ById(ANI_KACHELI, -1);
+ g_vars->scene11_dudeOnSwing->show1(-1, -1, -1, 0);
+ g_vars->scene11_dudeOnSwing->changeStatics2(ST_KCH_EMPTY);
+ g_vars->scene11_dudeOnSwing->startAnim(MV_KCH_MOVE2, 0, -1);
+ g_vars->scene11_dudeOnSwing->_movement->setDynamicPhaseIndex(g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex);
+
+ g_vars->scene11_var12 = 1.9881250;
}
void sceneHandler11_winArcade() {
Commit: b03e329bc70dca1871e597b9545d6f1a64d11e2f
https://github.com/scummvm/scummvm/commit/b03e329bc70dca1871e597b9545d6f1a64d11e2f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-27T13:59:41-08:00
Commit Message:
FULLPIPE: Implement sceneHandler11_swingLogic()
Changed paths:
engines/fullpipe/scenes/scene11.cpp
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index 67d4534..3469361 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -248,8 +248,42 @@ void sceneHandler11_showSwing() {
g_vars->scene11_dudeOnSwing->_priority = 20;
}
-void sceneHandler11_sub01() {
- warning("STUB: sceneHandler11_sub01()");
+void sceneHandler11_sub08() {
+ warning("STUB: sceneHandler11_sub08()");
+}
+
+void sceneHandler11_sub12() {
+ warning("STUB: sceneHandler11_sub12()");
+}
+
+void sceneHandler11_sub10(double angle) {
+ warning("STUB: sceneHandler11_sub10()");
+}
+
+void sceneHandler11_sub11(double angle) {
+ warning("STUB: sceneHandler11_sub11()");
+}
+
+void sceneHandler11_swingLogic() {
+ if (g_vars->scene11_dudeOnSwing->_movement) {
+ int ph = g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex;
+ if (ph > 53 && ph < 90) {
+ if (ph < 70 && g_vars->scene11_var10 >= 22.0) {
+ sceneHandler11_sub10((double)ph * 0.01428571428571429); // = 1 / 70
+ } else if (ph <= 80 && g_vars->scene11_var10 >= 22.0) {
+ sceneHandler11_sub08();
+ } else {
+ sceneHandler11_sub11((double)ph * g_vars->scene11_var10 * 0.0006493506493506494); // = 1/1540
+ }
+
+ g_vars->scene11_var02 = 0;
+ g_vars->scene11_hint->_flags &= 0xFFFB;
+ return;
+ }
+
+ if (ph > 38 && ph < 53 && fabs(g_vars->scene11_var10) <= 5.0)
+ sceneHandler11_sub12();
+ }
}
void sceneHandler11_swing0() {
@@ -300,10 +334,6 @@ void sceneHandler11_sub07() {
warning("STUB: sceneHandler11_sub07()");
}
-void sceneHandler11_sub08() {
- warning("STUB: sceneHandler11_sub08()");
-}
-
void sceneHandler11_sub09() {
if (g_vars->scene11_var17)
sceneHandler11_swing0();
@@ -329,18 +359,6 @@ void sceneHandler11_winArcade() {
}
}
-void sceneHandler11_sub10() {
- warning("STUB: sceneHandler11_sub10()");
-}
-
-void sceneHandler11_sub11() {
- warning("STUB: sceneHandler11_sub11()");
-}
-
-void sceneHandler11_sub12() {
- warning("STUB: sceneHandler11_sub12()");
-}
-
int sceneHandler11(ExCommand *cmd) {
if (cmd->_messageKind != 17)
return 0;
@@ -385,7 +403,7 @@ int sceneHandler11(ExCommand *cmd) {
case 107:
if (g_vars->scene11_var02)
- sceneHandler11_sub01();
+ sceneHandler11_swingLogic();
break;
case 33:
Commit: 98598d2ec3d17e866ced96f52007a93ccd0e7bd9
https://github.com/scummvm/scummvm/commit/98598d2ec3d17e866ced96f52007a93ccd0e7bd9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-27T14:09:52-08:00
Commit Message:
FULLPIPE: Implement sceneHandler11_sub10()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene11.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index d3ff241..15f73e4 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_MOVE2 1099
#define MV_KCH_START 1121
+#define MV_MAN11_JUMPOVER 1131
#define MV_MAN11_SWING_0 1109
#define MV_MAN11_SWING_1 1111
#define MV_MAN11_SWING_2 1112
@@ -511,11 +512,13 @@ namespace Fullpipe {
#define QU_SC11_PUTBOOT1 2709
#define QU_SC11_PUTBOOT2 2710
#define QU_SC11_RESTARTMAN 1134
+#define SND_11_022 3706
#define ST_BTS11_2 2707
#define ST_BTS11_ONE 2706
#define ST_KCH_0 1096
#define ST_KCH_EMPTY 1132
#define ST_KCH_STATIC 1122
+#define ST_MAN_1PIX 518
#define ST_MAN11_EMPTY 1110
#define ST_SWR_SIT 1147
#define ST_SWR_SITBALD 1153
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index 3469361..4336432 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -256,36 +256,6 @@ void sceneHandler11_sub12() {
warning("STUB: sceneHandler11_sub12()");
}
-void sceneHandler11_sub10(double angle) {
- warning("STUB: sceneHandler11_sub10()");
-}
-
-void sceneHandler11_sub11(double angle) {
- warning("STUB: sceneHandler11_sub11()");
-}
-
-void sceneHandler11_swingLogic() {
- if (g_vars->scene11_dudeOnSwing->_movement) {
- int ph = g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex;
- if (ph > 53 && ph < 90) {
- if (ph < 70 && g_vars->scene11_var10 >= 22.0) {
- sceneHandler11_sub10((double)ph * 0.01428571428571429); // = 1 / 70
- } else if (ph <= 80 && g_vars->scene11_var10 >= 22.0) {
- sceneHandler11_sub08();
- } else {
- sceneHandler11_sub11((double)ph * g_vars->scene11_var10 * 0.0006493506493506494); // = 1/1540
- }
-
- g_vars->scene11_var02 = 0;
- g_vars->scene11_hint->_flags &= 0xFFFB;
- return;
- }
-
- if (ph > 38 && ph < 53 && fabs(g_vars->scene11_var10) <= 5.0)
- sceneHandler11_sub12();
- }
-}
-
void sceneHandler11_swing0() {
g_vars->scene11_dudeOnSwing->_statics = g_vars->scene11_dudeOnSwing->getStaticsById(ST_MAN11_EMPTY);
g_vars->scene11_dudeOnSwing->_movement = 0;
@@ -322,18 +292,6 @@ void sceneHandler11_swing2() {
g_vars->scene11_var09 = fabs(g_vars->scene11_var08) * 0.075 + 0.12;
}
-void sceneHandler11_sub05() {
- warning("STUB: sceneHandler11_sub05()");
-}
-
-void sceneHandler11_sub06() {
- warning("STUB: sceneHandler11_sub06()");
-}
-
-void sceneHandler11_sub07() {
- warning("STUB: sceneHandler11_sub07()");
-}
-
void sceneHandler11_sub09() {
if (g_vars->scene11_var17)
sceneHandler11_swing0();
@@ -349,6 +307,77 @@ void sceneHandler11_sub09() {
g_vars->scene11_var12 = 1.9881250;
}
+void sceneHandler11_sub10(double angle) {
+ MGMInfo mgminfo;
+
+ sceneHandler11_sub09();
+
+ g_fp->_aniMan->show1(690 - (int)(sin(g_vars->scene11_var08) * -267.0), 215 - (int)(cos(g_vars->scene11_var08) * -267.0),
+ MV_MAN11_JUMPOVER, 0);
+ g_fp->_aniMan->_priority = 0;
+
+ mgminfo.staticsId2 = ST_MAN_1PIX;
+ mgminfo.ani = g_fp->_aniMan;
+ mgminfo.x1 = 1163;
+ mgminfo.y1 = 837 - (int)(angle * 153.0);
+ mgminfo.field_1C = 0;
+ mgminfo.field_10 = 1;
+ mgminfo.flags = 78;
+ mgminfo.movementId = MV_MAN11_JUMPOVER;
+
+ MessageQueue *mq = g_vars->scene11_var01.genMovement(&mgminfo);
+
+ if (mq) {
+ g_vars->scene11_var07 = SND_11_022;
+
+ ExCommand *ex = new ExCommand(0, 17, MSG_SC11_RESTARTMAN, 0, 0, 0, 1, 0, 0, 0);
+ ex->_excFlags = 2;
+
+ mq->addExCommandToEnd(ex);
+
+ if (!mq->chain(g_fp->_aniMan) )
+ delete mq;
+ }
+}
+
+void sceneHandler11_sub11(double angle) {
+ warning("STUB: sceneHandler11_sub11()");
+}
+
+void sceneHandler11_swingLogic() {
+ if (g_vars->scene11_dudeOnSwing->_movement) {
+ int ph = g_vars->scene11_dudeOnSwing->_movement->_currDynamicPhaseIndex;
+ if (ph > 53 && ph < 90) {
+ if (ph < 70 && g_vars->scene11_var10 >= 22.0) {
+ sceneHandler11_sub10((double)ph * 0.01428571428571429); // = 1 / 70
+ } else if (ph <= 80 && g_vars->scene11_var10 >= 22.0) {
+ sceneHandler11_sub08();
+ } else {
+ sceneHandler11_sub11((double)ph * g_vars->scene11_var10 * 0.0006493506493506494); // = 1/1540
+ }
+
+ g_vars->scene11_var02 = 0;
+ g_vars->scene11_hint->_flags &= 0xFFFB;
+ return;
+ }
+
+ if (ph > 38 && ph < 53 && fabs(g_vars->scene11_var10) <= 5.0)
+ sceneHandler11_sub12();
+ }
+}
+
+void sceneHandler11_sub05() {
+ warning("STUB: sceneHandler11_sub05()");
+}
+
+void sceneHandler11_sub06() {
+ warning("STUB: sceneHandler11_sub06()");
+}
+
+void sceneHandler11_sub07() {
+ warning("STUB: sceneHandler11_sub07()");
+}
+
void sceneHandler11_winArcade() {
if (g_vars->scene11_var02) {
g_vars->scene11_var02 = 0;
Commit: a67dcf27bf88746b7808ef1447bc513e029caeb6
https://github.com/scummvm/scummvm/commit/a67dcf27bf88746b7808ef1447bc513e029caeb6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-27T14:19:28-08:00
Commit Message:
FULLPIPE: Implement sceneHandler11_sub11()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene11.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 15f73e4..f8fa0ef 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_MOVE2 1099
#define MV_KCH_START 1121
+#define MV_MAN11_JUMPHIT 1129
#define MV_MAN11_JUMPOVER 1131
#define MV_MAN11_SWING_0 1109
#define MV_MAN11_SWING_1 1111
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index 4336432..44cbf56 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -341,7 +341,44 @@ void sceneHandler11_sub10(double angle) {
}
void sceneHandler11_sub11(double angle) {
- warning("STUB: sceneHandler11_sub11()");
+ MGMInfo mgminfo;
+
+ sceneHandler11_sub09();
+
+ if (angle >= 0.0) {
+ if (angle > 1.0)
+ angle = 1.0;
+ } else {
+ angle = 0.0;
+ }
+
+ g_fp->_aniMan->show1(690 - (int)(sin(g_vars->scene11_var08) * -267.0), 215 - (int)(cos(g_vars->scene11_var08) * -267.0),
+ MV_MAN11_JUMPOVER, 0);
+ g_fp->_aniMan->_priority = 0;
+
+ mgminfo.staticsId2 = ST_MAN_1PIX;
+ mgminfo.ani = g_fp->_aniMan;
+ mgminfo.x1 = 1017 - (int)(angle * -214.0);
+ mgminfo.y1 = 700;
+ mgminfo.field_1C = 0;
+ mgminfo.field_10 = 1;
+ mgminfo.flags = 78;
+ mgminfo.movementId = MV_MAN11_JUMPHIT;
+
+ MessageQueue *mq = g_vars->scene11_var01.genMovement(&mgminfo);
+
+ if (mq) {
+ g_vars->scene11_var07 = SND_11_022;
+
+ ExCommand *ex = new ExCommand(0, 17, MSG_SC11_RESTARTMAN, 0, 0, 0, 1, 0, 0, 0);
+ ex->_excFlags = 2;
+
+ mq->addExCommandToEnd(ex);
+
+ if (!mq->chain(g_fp->_aniMan) )
+ delete mq;
+
+ }
}
void sceneHandler11_swingLogic() {
Commit: 66dddbe892765212cf3821fd08005cef9584df2e
https://github.com/scummvm/scummvm/commit/66dddbe892765212cf3821fd08005cef9584df2e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-27T14:28:50-08:00
Commit Message:
FULLPIPE: implement sceneHandler11_sub08()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene11.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index f8fa0ef..2a6f03b 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -514,6 +514,7 @@ namespace Fullpipe {
#define QU_SC11_PUTBOOT2 2710
#define QU_SC11_RESTARTMAN 1134
#define SND_11_022 3706
+#define SND_11_024 3708
#define ST_BTS11_2 2707
#define ST_BTS11_ONE 2706
#define ST_KCH_0 1096
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index 44cbf56..bde67d7 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -248,10 +248,6 @@ void sceneHandler11_showSwing() {
g_vars->scene11_dudeOnSwing->_priority = 20;
}
-void sceneHandler11_sub08() {
- warning("STUB: sceneHandler11_sub08()");
-}
-
void sceneHandler11_sub12() {
warning("STUB: sceneHandler11_sub12()");
}
@@ -307,6 +303,51 @@ void sceneHandler11_sub09() {
g_vars->scene11_var12 = 1.9881250;
}
+void sceneHandler11_sub08() {
+ MGMInfo mgminfo;
+
+ sceneHandler11_sub09();
+
+ g_fp->_aniMan->show1(690 - (int)(sin(g_vars->scene11_var08) * -267.0), 215 - (int)(cos(g_vars->scene11_var08) * -267.0),
+ MV_MAN11_JUMPHIT, 0);
+ g_fp->_aniMan->_priority = 10;
+
+ mgminfo.field_1C = 10;
+ mgminfo.ani = g_fp->_aniMan;
+ mgminfo.staticsId2 = ST_MAN_1PIX;
+ mgminfo.x1 = 1400;
+ mgminfo.y1 = 0;
+ mgminfo.field_10 = 1;
+ mgminfo.flags = 66;
+ mgminfo.movementId = MV_MAN11_JUMPHIT;
+
+ MessageQueue *mq = g_vars->scene11_var01.genMovement(&mgminfo);
+
+ if (mq) {
+ g_vars->scene11_var07 = SND_11_024;
+ ExCommand *ex = new ExCommand(ANI_MAN, 2, 36, 0, 0, 0, 1, 0, 0, 0);
+ ex->_keyCode = -1;
+ ex->_excFlags = 2;
+
+ mq->addExCommandToEnd(ex);
+
+ ex = new ExCommand(SC_11, 17, 61, 0, 0, 0, 1, 0, 0, 0);
+ ex->_keyCode = TrubaRight;
+ ex->_excFlags = 3;
+
+ mq->addExCommandToEnd(ex);
+
+ if (!mq->chain(g_fp->_aniMan))
+ delete mq;
+
+
+ if (g_fp->getObjectState(sO_Swingie) == g_fp->getObjectEnumState(sO_Swingie, sO_IsStandingInCorner))
+ g_fp->setObjectState(sO_Swingie, g_fp->getObjectEnumState(sO_Swingie, sO_IsSitting));
+
+ g_fp->setObjectState(sO_DudeHasJumped, g_fp->getObjectEnumState(sO_DudeHasJumped, sO_Yes));
+ }
+}
+
void sceneHandler11_sub10(double angle) {
MGMInfo mgminfo;
@@ -335,7 +376,7 @@ void sceneHandler11_sub10(double angle) {
mq->addExCommandToEnd(ex);
- if (!mq->chain(g_fp->_aniMan) )
+ if (!mq->chain(g_fp->_aniMan))
delete mq;
}
}
@@ -375,7 +416,7 @@ void sceneHandler11_sub11(double angle) {
mq->addExCommandToEnd(ex);
- if (!mq->chain(g_fp->_aniMan) )
+ if (!mq->chain(g_fp->_aniMan))
delete mq;
}
More information about the Scummvm-git-logs
mailing list