[Scummvm-cvs-logs] scummvm master -> d7dac60f151f04f7f86aebe73bc4d06b5ce61eb4
sev-
sev at scummvm.org
Tue Dec 31 22:25:32 CET 2013
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
62aaa56dbd FULLPIPE: Implement sceneHandler14_showBallMan()
9fd385f615 FULLPIPE: Implement sceneHandler14_sub02()
d7dac60f15 FULLPIPE: Implement sceneHandler14_sub03()
Commit: 62aaa56dbd2f59924f9edd1a918fe3adf0d32295
https://github.com/scummvm/scummvm/commit/62aaa56dbd2f59924f9edd1a918fe3adf0d32295
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-31T12:18:35-08:00
Commit Message:
FULLPIPE: Implement sceneHandler14_showBallMan()
Changed paths:
engines/fullpipe/scenes/scene14.cpp
diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp
index 96abf35..f5ed3e0 100644
--- a/engines/fullpipe/scenes/scene14.cpp
+++ b/engines/fullpipe/scenes/scene14.cpp
@@ -160,8 +160,51 @@ void sceneHandler14_showBallGrandmaHit() {
}
}
+void sceneHandler14_sub13() {
+ g_vars->scene14_var03 = 0;
+
+ if (g_fp->_aniMan->_movement)
+ g_fp->_aniMan->_movement->gotoLastFrame();
+
+ g_fp->_aniMan->stopAnim_maybe();
+
+ handleObjectInteraction(g_fp->_aniMan, g_fp->_currentScene->getPictureObjectById(PIC_SC14_RTRUBA, 0), 0);
+
+ g_vars->scene14_grandma->changeStatics2(ST_GMA_SIT);
+
+ chainQueue(QU_SC14_ENDARCADE, 0);
+
+ getGameLoaderInteractionController()->disableFlag24();
+ getCurrSceneSc2MotionController()->clearEnabled();
+}
+
void sceneHandler14_showBallMan() {
- warning("STUB: sceneHandler14_showBallMan()");
+ if (g_vars->scene14_var10) {
+ g_vars->scene14_var10->show1(g_vars->scene14_var14 - 166, g_vars->scene14_var15 + 40, MV_BAL14_TOGMA, 0);
+ g_vars->scene14_var10->_priority = 27;
+
+ MessageQueue *mq = new MessageQueue(g_fp->_globalMessageQueueList->compact());
+ ExCommand *ex = new ExCommand(ANI_BALL14, 1, MV_BAL14_TOGMA, 0, 0, 0, 1, 0, 0, 0);
+
+ ex->_keyCode = g_vars->scene14_var10->_okeyCode;
+ ex->_excFlags |= 2;
+ ex->_field_24 = 1;
+ mq->addExCommandToEnd(ex);
+
+ ex = new ExCommand(ANI_BALL14, 6, 0, 0, 0, 0, 1, 0, 0, 0);
+ ex->_keyCode = g_vars->scene14_var10->_okeyCode;
+ ex->_excFlags |= 3;
+ mq->addExCommandToEnd(ex);
+ mq->chain(0);
+
+ g_vars->scene14_var10->startAnim(MV_BAL14_TOGMA, 0, -1);
+
+ g_vars->scene14_var11.push_back(g_vars->scene14_var10);
+ g_vars->scene14_var10 = 0;
+
+ if (g_vars->scene14_var14 >= 1300)
+ sceneHandler14_sub13();
+ }
}
void sceneHandler14_manKickBall() {
@@ -361,24 +404,6 @@ void sceneHandler14_sub12() {
g_fp->_aniMan2 = g_vars->scene14_grandma;
}
-void sceneHandler14_sub13() {
- g_vars->scene14_var03 = 0;
-
- if (g_fp->_aniMan->_movement)
- g_fp->_aniMan->_movement->gotoLastFrame();
-
- g_fp->_aniMan->stopAnim_maybe();
-
- handleObjectInteraction(g_fp->_aniMan, g_fp->_currentScene->getPictureObjectById(PIC_SC14_RTRUBA, 0), 0);
-
- g_vars->scene14_grandma->changeStatics2(ST_GMA_SIT);
-
- chainQueue(QU_SC14_ENDARCADE, 0);
-
- getGameLoaderInteractionController()->disableFlag24();
- getCurrSceneSc2MotionController()->clearEnabled();
-}
-
int sceneHandler14(ExCommand *cmd) {
if (cmd->_messageKind != 17)
return 0;
Commit: 9fd385f615efd69218e04e21a5a7f474ae31b475
https://github.com/scummvm/scummvm/commit/9fd385f615efd69218e04e21a5a7f474ae31b475
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-31T13:00:25-08:00
Commit Message:
FULLPIPE: Implement sceneHandler14_sub02()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene14.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 5cfcc57..e36b787 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -599,6 +599,7 @@ namespace Fullpipe {
#define MV_BAL14_SPIN 1247
#define MV_BAL14_TOGMA 3214
#define MV_MAN14_KICK 1237
+#define MV_MAN14_KICKAIR 1256
#define MV_MAN14_STEPFW 1240
#define PIC_SC14_RTRUBA 1221
#define ST_GMA_SIT 1229
diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp
index f5ed3e0..1a9c87e 100644
--- a/engines/fullpipe/scenes/scene14.cpp
+++ b/engines/fullpipe/scenes/scene14.cpp
@@ -351,8 +351,28 @@ void sceneHandler14_sub01() {
warning("STUB: sceneHandler14_sub01()");
}
+void sceneHandler14_sub06() {
+ g_fp->_aniMan->_callback2 = 0;
+ g_vars->scene14_var04 = 0;
+}
+
void sceneHandler14_sub02() {
- warning("STUB: sceneHandler14_sub02()");
+ if (g_fp->_aniMan->_movement) {
+ sceneHandler14_sub06();
+
+ if (g_vars->scene14_var10 && g_vars->scene14_var14 - g_vars->scene14_var10->_ox < 180) {
+ g_fp->_aniMan->changeStatics2(g_fp->_aniMan->_movement->_staticsObj2->_staticsId);
+ g_fp->_aniMan->startAnim(MV_MAN14_KICK, 0, -1);
+
+ g_vars->scene14_var05 = 0;
+
+ g_vars->scene14_var10->stopAnim_maybe();
+ g_vars->scene14_var10->hide();
+ } else {
+ g_fp->_aniMan->changeStatics2(g_fp->_aniMan->_movement->_staticsObj2->_staticsId);
+ g_fp->_aniMan->startAnim(MV_MAN14_KICKAIR, 0, -1);
+ }
+ }
}
void sceneHandler14_sub03() {
@@ -369,11 +389,6 @@ void sceneHandler14_sub05() {
warning("STUB: sceneHandler14_sub05()");
}
-void sceneHandler14_sub06() {
- g_fp->_aniMan->_callback2 = 0;
- g_vars->scene14_var04 = 0;
-}
-
void sceneHandler14_sub07() {
warning("STUB: sceneHandler14_sub07()");
}
Commit: d7dac60f151f04f7f86aebe73bc4d06b5ce61eb4
https://github.com/scummvm/scummvm/commit/d7dac60f151f04f7f86aebe73bc4d06b5ce61eb4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-31T13:12:16-08:00
Commit Message:
FULLPIPE: Implement sceneHandler14_sub03()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene14.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index e36b787..36ef374 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -598,6 +598,7 @@ namespace Fullpipe {
#define MSG_SC14_STARTARCADE 3252
#define MV_BAL14_SPIN 1247
#define MV_BAL14_TOGMA 3214
+#define MV_MAN14_DECLINE 1239
#define MV_MAN14_KICK 1237
#define MV_MAN14_KICKAIR 1256
#define MV_MAN14_STEPFW 1240
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index c84a671..75ce5cc 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -299,6 +299,7 @@ public:
int scene14_var22;
int scene14_var23;
int scene14_var24;
+ Common::Point scene14_mouseCursorPos;
int scene15_chantingCountdown;
StaticANIObject *scene15_plusminus;
diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp
index 1a9c87e..f81bcce 100644
--- a/engines/fullpipe/scenes/scene14.cpp
+++ b/engines/fullpipe/scenes/scene14.cpp
@@ -375,8 +375,31 @@ void sceneHandler14_sub02() {
}
}
+void sceneHandler14_sub05(int *arg) {
+ Common::Point point;
+
+ if (g_vars->scene14_var04) {
+ *arg = (int)(sqrt((g_fp->_mouseVirtY - g_vars->scene14_mouseCursorPos.y)
+ * (g_fp->_mouseVirtY - g_vars->scene14_mouseCursorPos.y)
+ + (g_fp->_mouseVirtX - g_vars->scene14_mouseCursorPos.x)
+ * (g_fp->_mouseVirtX - g_vars->scene14_mouseCursorPos.x)) * 0.1);
+
+ if (*arg > 11)
+ *arg = 11;
+ } else {
+ ++*arg;
+ }
+}
+
void sceneHandler14_sub03() {
- warning("STUB: sceneHandler14_sub03()");
+ g_vars->scene14_mouseCursorPos.x = g_fp->_mouseVirtX;
+ g_vars->scene14_mouseCursorPos.y = g_fp->_mouseVirtY;
+
+ g_fp->_aniMan->_callback2 = sceneHandler14_sub05;
+ g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT|0x4000);
+ g_fp->_aniMan->startAnim(MV_MAN14_DECLINE, 0, -1);
+
+ g_vars->scene14_var04 = 1;
}
bool sceneHandler14_sub04(ExCommand *cmd) {
@@ -385,10 +408,6 @@ bool sceneHandler14_sub04(ExCommand *cmd) {
return false;
}
-void sceneHandler14_sub05() {
- warning("STUB: sceneHandler14_sub05()");
-}
-
void sceneHandler14_sub07() {
warning("STUB: sceneHandler14_sub07()");
}
More information about the Scummvm-git-logs
mailing list