[Scummvm-cvs-logs] scummvm master -> 9ef756e8d7062999052d71e512a996c80c70af4c
sev-
sev at scummvm.org
Sat Dec 21 23:59:44 CET 2013
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c45720566d FULLPIPE: Implement scene08_updateCursor()
c3ee5b4fed FULLPIPE: Implement sceneHandler08_arcadeNow()
bccb4d8f00 FULLPIPE: More code to scene08
9ef756e8d7 FULLPIPE: Implement sceneHandler08_sitDown()
Commit: c45720566d4c5a770058d417762a180527aaa73f
https://github.com/scummvm/scummvm/commit/c45720566d4c5a770058d417762a180527aaa73f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-21T14:58:42-08:00
Commit Message:
FULLPIPE: Implement scene08_updateCursor()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene08.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 49f9a33..ee5bf24 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -287,6 +287,7 @@ namespace Fullpipe {
#define PIC_SC6_LADDER 1104
#define PIC_SC8_ARCADENOW 1043
#define PIC_SC8_LADDER 754
+#define PIC_SC8_LADDERD 1106
#define PIC_SC10_DTRUBA 974
#define PIC_SC10_LADDER 995
#define PIC_SCD_SEL 734
diff --git a/engines/fullpipe/scenes/scene08.cpp b/engines/fullpipe/scenes/scene08.cpp
index b6670b7..cb2762b 100644
--- a/engines/fullpipe/scenes/scene08.cpp
+++ b/engines/fullpipe/scenes/scene08.cpp
@@ -106,10 +106,26 @@ void scene08_setupMusic() {
}
int scene08_updateCursor() {
- warning("STUB: scene08_updateCursor()");
-
g_fp->updateCursorCommon();
+ if (g_vars->scene08_var06) {
+ if (g_vars->scene08_var03) {
+ if (g_fp->_objectIdAtCursor == PIC_SC8_LADDERD && g_fp->_cursorId == PIC_CSR_ITN)
+ g_fp->_cursorId = PIC_CSR_GOU;
+ } else {
+ g_fp->_cursorId = -1;
+ }
+ } else {
+ if (g_fp->_objectIdAtCursor == PIC_SC8_LADDERD && g_fp->_cursorId == PIC_CSR_ITN) {
+ if (g_fp->_aniMan2->_oy >= 520) {
+ if (g_fp->_aniMan2->_oy <= 750)
+ g_fp->_cursorId = PIC_CSR_GOU;
+ } else {
+ g_fp->_cursorId = PIC_CSR_GOD;
+ }
+ }
+ }
+
return g_fp->_cursorId;
}
Commit: c3ee5b4fed3558c42e3637a589159cb2faeb1df3
https://github.com/scummvm/scummvm/commit/c3ee5b4fed3558c42e3637a589159cb2faeb1df3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-21T14:58:42-08:00
Commit Message:
FULLPIPE: Implement sceneHandler08_arcadeNow()
Changed paths:
engines/fullpipe/scenes/scene08.cpp
diff --git a/engines/fullpipe/scenes/scene08.cpp b/engines/fullpipe/scenes/scene08.cpp
index cb2762b..d3e81cb 100644
--- a/engines/fullpipe/scenes/scene08.cpp
+++ b/engines/fullpipe/scenes/scene08.cpp
@@ -142,7 +142,14 @@ void sceneHandler08_hideLadder() {
}
void sceneHandler08_arcadeNow() {
- warning("STUB: sceneHandler08_arcadeNow()");
+ MovGraphLink *lnk = getCurrSceneSc2MotionController()->getLinkByName(sO_Stairway);
+
+ g_fp->setObjectState(sO_TummyTrampie, g_fp->getObjectEnumState(sO_TummyTrampie, sO_IsSleeping));
+
+ g_vars->scene08_batuta->changeStatics2(ST_BTT_SLEEPS);
+
+ if (lnk)
+ lnk->_flags |= 0x20000000;
}
void sceneHandler08_resumeFlight() {
Commit: bccb4d8f00b6f5abf404bcabbd53817c4d407a83
https://github.com/scummvm/scummvm/commit/bccb4d8f00b6f5abf404bcabbd53817c4d407a83
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-21T14:58:42-08:00
Commit Message:
FULLPIPE: More code to scene08
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene08.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index ee5bf24..a55bfc8 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -287,6 +287,7 @@ namespace Fullpipe {
#define PIC_SC6_LADDER 1104
#define PIC_SC8_ARCADENOW 1043
#define PIC_SC8_LADDER 754
+#define PIC_SC8_LADDER_D 755
#define PIC_SC8_LADDERD 1106
#define PIC_SC10_DTRUBA 974
#define PIC_SC10_LADDER 995
@@ -330,6 +331,7 @@ namespace Fullpipe {
#define QU_SC6_FALLBALL 2690
#define QU_SC6_SHOWHANDLE 1689
#define QU_SC6_SHOWNEXTBALL 2689
+#define QU_SC8_STANDUP 2975
#define QU_SC10_ENTERLIFT 1067
#define QU_SC10_EXITLIFT 2809
#define SC_1 301
diff --git a/engines/fullpipe/scenes/scene08.cpp b/engines/fullpipe/scenes/scene08.cpp
index d3e81cb..a523dd9 100644
--- a/engines/fullpipe/scenes/scene08.cpp
+++ b/engines/fullpipe/scenes/scene08.cpp
@@ -129,16 +129,22 @@ int scene08_updateCursor() {
return g_fp->_cursorId;
}
-void sceneHandler08_winArcade() {
- warning("STUB: sceneHandler08_winArcade()");
-}
-
void sceneHandler08_enterUp() {
warning("STUB: sceneHandler08_enterUp()");
}
+void sceneHandler08_winArcade() {
+ if (g_vars->scene08_var06) {
+ g_vars->scene08_var06 = 0;
+ g_fp->_sceneRect.top = 0;
+ g_fp->_sceneRect.bottom = 600;
+
+ sceneHandler08_enterUp();
+ }
+}
+
void sceneHandler08_hideLadder() {
- warning("STUB: sceneHandler08_hideLadder()");
+ g_fp->_currentScene->getPictureObjectById(PIC_SC8_LADDER_D, 0)->_flags &= 0xFFFB;
}
void sceneHandler08_arcadeNow() {
@@ -153,7 +159,10 @@ void sceneHandler08_arcadeNow() {
}
void sceneHandler08_resumeFlight() {
- warning("STUB: sceneHandler08_resumeFlight()");
+ g_vars->scene08_var08 = 3;
+ g_vars->scene08_var04 = -39;
+ g_vars->scene08_var01 = 1;
+ g_vars->scene08_var07 = 0;
}
void sceneHandler08_startArcade() {
@@ -201,11 +210,19 @@ void sceneHandler08_sitDown() {
}
void sceneHandler08_standUp() {
- warning("STUB: sceneHandler08_standUp()");
+ chainQueue(QU_SC8_STANDUP, 1);
+ g_vars->scene08_var03 = 0;
}
-void sceneHandler08_updateScreenCallback() {
- warning("STUB: sceneHandler08_updateScreenCallback()");
+int sceneHandler08_updateScreenCallback() {
+ int res;
+
+ res = g_fp->drawArcadeOverlay(g_vars->scene08_var06);
+
+ if (!res)
+ g_fp->_updateScreenCallback = 0;
+
+ return res;
}
int sceneHandler08(ExCommand *cmd) {
Commit: 9ef756e8d7062999052d71e512a996c80c70af4c
https://github.com/scummvm/scummvm/commit/9ef756e8d7062999052d71e512a996c80c70af4c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-21T14:58:42-08:00
Commit Message:
FULLPIPE: Implement sceneHandler08_sitDown()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene08.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index a55bfc8..af495ee 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -208,6 +208,7 @@ namespace Fullpipe {
#define MV_MAN_TURN_SUD 1089
#define MV_MAN6_TAKEBALL 2691
#define MV_MAN6_THROWBALL 2692
+#define MV_MAN8_SITDOWN 2968
#define MV_MANHDL_HANDLEDOWN 630
#define MV_MANHDL_HANDLEUP 631
#define MV_MOM_CYCLEBK 3012
@@ -451,6 +452,7 @@ namespace Fullpipe {
#define ST_MAN_STANDLADDER 453
#define ST_MAN_UP 449
#define ST_MAN6_BALL 2688
+#define ST_MAN8_FLYDOWN 771
#define ST_MOM_SITS 659
#define ST_MOM_STANDS 658
#define ST_NBL_NORM 1076
diff --git a/engines/fullpipe/scenes/scene08.cpp b/engines/fullpipe/scenes/scene08.cpp
index a523dd9..1f2d4bc 100644
--- a/engines/fullpipe/scenes/scene08.cpp
+++ b/engines/fullpipe/scenes/scene08.cpp
@@ -32,6 +32,7 @@
#include "fullpipe/motion.h"
#include "fullpipe/gameloader.h"
#include "fullpipe/behavior.h"
+#include "fullpipe/interaction.h"
namespace Fullpipe {
@@ -194,7 +195,10 @@ void sceneHandler08_calcOffset() {
}
void sceneHandler08_finishArcade() {
- warning("STUB: sceneHandler08_finishArcade()");
+ g_vars->scene08_var06 = 0;
+
+ getGameLoaderInteractionController()->enableFlag24();
+ getCurrSceneSc2MotionController()->setEnabled();
}
void sceneHandler08_jumpOff() {
@@ -206,7 +210,16 @@ void sceneHandler08_pushCallback(int *par) {
}
void sceneHandler08_sitDown() {
- warning("STUB: sceneHandler08_sitDown()");
+ g_fp->_aniMan->setOXY(380, g_fp->_aniMan->_oy);
+
+ g_fp->_aniMan->changeStatics2(ST_MAN8_FLYDOWN);
+ g_fp->_aniMan->startAnim(MV_MAN8_SITDOWN, 0, -1);
+
+ g_vars->scene08_vmyats->changeStatics2(ST_VMT_MIN);
+ g_vars->scene08_vmyats->hide();
+
+ g_vars->scene08_var01 = 0;
+ g_vars->scene08_var03 = 1;
}
void sceneHandler08_standUp() {
More information about the Scummvm-git-logs
mailing list