libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-26 20:59:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FULLPIPE: Plug scene32 in

Browse Source
This commit is contained in:
Eugene Sandulenko 2014-01-07 13:08:51 +02:00
parent 875b8f76f5
commit 2cb81f50e5
5 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engines/fullpipe/constants.h
View File

@ -1054,6 +1054,21 @@ namespace Fullpipe {
#define SND_31_001 4377
#define ST_CTS31_GROWN2 2472
// Scene 32
#define ANI_BUTTON_32 5347
#define ANI_CACTUS 2267
#define ANI_FLAG 2257
#define ANI_TESTO_BLUE 2659
#define ANI_TESTO_GREEN 2662
#define ANI_TESTO_ORANGE 2656
#define MV_TSTG_FLOW 2663
#define MV_TSTO_FLOW 2657
#define QU_KBK32_START 4982
#define QU_SC32_ENTERLIFT 2827
#define QU_SC32_EXITLIFT 2828
#define ST_BTN32_ON 5350
#define ST_HDL_LAID 3039
// Scene 36
#define ANI_SCISSORS_36 2647
#define ANI_ROTOHRUST 2360

1
engines/fullpipe/module.mk
View File

@ -51,6 +51,7 @@ MODULE_OBJS = \
scenes/scene28.o \
scenes/scene30.o \
scenes/scene31.o \
scenes/scene32.o \
scenes/scene36.o \
scenes/sceneDbg.o

17
engines/fullpipe/scenes.cpp
View File

@ -313,6 +313,23 @@ Vars::Vars() {
scene31_cactus = 0;
scene31_plusMinus = 0;
scene32_var01 = 0;
scene32_var02 = 0;
scene32_var03 = 0;
scene32_var04 = 0;
scene32_var05 = 0;
scene32_var06 = 0;
scene32_var07 = 0;
scene32_var08 = -1;
scene32_var09 = 0;
scene32_var10 = 0;
scene32_flag = 0;
scene32_cactus = 0;
scene32_massOrange = 0;
scene32_massBlue = 0;
scene32_massGreen = 0;
scene32_button = 0;
scene36_rotohrust = 0;
scene36_scissors = 0;

17
engines/fullpipe/scenes.h
View File

@ -441,6 +441,23 @@ public:
StaticANIObject *scene31_cactus;
StaticANIObject *scene31_plusMinus;
int scene32_var01;
int scene32_var02;
int scene32_var03;
int scene32_var04;
int scene32_var05;
int scene32_var06;
int scene32_var07;
int scene32_var08;
int scene32_var09;
int scene32_var10;
StaticANIObject *scene32_flag;
StaticANIObject *scene32_cactus;
StaticANIObject *scene32_massOrange;
StaticANIObject *scene32_massBlue;
StaticANIObject *scene32_massGreen;
StaticANIObject *scene32_button;
StaticANIObject *scene36_rotohrust;
StaticANIObject *scene36_scissors;

8
engines/fullpipe/scenes/scene32.cpp
View File

@ -63,7 +63,7 @@ void scene32_initScene(Scene *sc) {
Scene *oldsc = g_fp->_currentScene;
StaticANIObject *ani;
if (getObjectState(sO_ClockHandle) == getObjectEnumState(sO_ClockHandle, sO_In_32_Lies)) {
if (g_fp->getObjectState(sO_ClockHandle) == g_fp->getObjectEnumState(sO_ClockHandle, sO_In_32_Lies)) {
ani = sc->getStaticANIObject1ById(ANI_INV_HANDLE, -1);
if (ani) {
g_fp->_currentScene = sc;
@ -71,7 +71,7 @@ void scene32_initScene(Scene *sc) {
ani->changeStatics2(ST_HDL_LAID);
}
} else {
if (getObjectState(sO_ClockHandle) == getObjectEnumState(sO_ClockHandle, sO_In_32_Sticks)) {
if (g_fp->getObjectState(sO_ClockHandle) == g_fp->getObjectEnumState(sO_ClockHandle, sO_In_32_Sticks)) {
ani = sc->getStaticANIObject1ById(ANI_INV_HANDLE, -1);
g_fp->_currentScene = sc;
@ -85,8 +85,8 @@ void scene32_initScene(Scene *sc) {
g_fp->_currentScene = oldsc;
if (getObjectState(sO_Cube) == getObjectEnumState(sO_Cube, sO_In_32)) {
MessageQueue *mq = new Message(sc->getMessageQueueById(QU_KBK32_START), 0, 0);
if (g_fp->getObjectState(sO_Cube) == g_fp->getObjectEnumState(sO_Cube, sO_In_32)) {
MessageQueue *mq = new MessageQueue(sc->getMessageQueueById(QU_KBK32_START), 0, 0);
mq->sendNextCommand();
}