FULLPIPE: Plug scene24 in

This commit is contained in:
Eugene Sandulenko 2013-12-28 22:04:12 +02:00
parent b24b1880be
commit 0af0d2bc6a
5 changed files with 31 additions and 2 deletions

View File

@ -551,6 +551,12 @@ namespace Fullpipe {
#define ST_GMS_BOOT 1270
#define ST_GMS_BOOTLESS2 3316
// Scene 24
#define ANI_DROP_24 3505
#define ANI_JET24 1837
#define ANI_WATER24 1834
#define ST_WTR24_FLOWLOWER 1843
} // End of namespace Fullpipe
#endif /* FULLPIPE_CONSTANTS_H */

View File

@ -36,6 +36,7 @@ MODULE_OBJS = \
scenes/scene11.o \
scenes/scene12.o \
scenes/scene15.o \
scenes/scene24.o \
scenes/sceneDbg.o \
scenes/sceneIntro.o

View File

@ -195,6 +195,17 @@ Vars::Vars() {
scene15_ladder = 0;
scene15_boot = 0;
scene24_var01 = 0;
scene24_var02 = 0;
scene24_var03 = 0;
scene24_var04 = 0;
scene24_var05 = 0;
scene24_var06 = 0;
scene24_var07 = 0;
scene24_water = 0;
scene24_jet = 0;
scene24_drop = 0;
selector = 0;
}

View File

@ -259,6 +259,17 @@ public:
PictureObject *scene15_ladder;
StaticANIObject *scene15_boot;
int scene24_var01;
int scene24_var02;
int scene24_var03;
int scene24_var04;
int scene24_var05;
int scene24_var06;
int scene24_var07;
StaticANIObject *scene24_water;
StaticANIObject *scene24_jet;
StaticANIObject *scene24_drop;
PictureObject *selector;
};

View File

@ -71,11 +71,11 @@ void scene24_initScene(Scene *sc) {
g_vars->scene24_water->hide();
g_fp->setObjectState(sO_StairsDown_24, g_fp->getObjectEnumState(sO_StairsDown_24, sO_IsOpened))
g_fp->setObjectState(sO_StairsDown_24, g_fp->getObjectEnumState(sO_StairsDown_24, sO_IsOpened));
} else {
g_vars->scene24_var07 = 1;
g_fp->setObjectState(sO_StairsDown_24, g_fp->getObjectEnumState(sO_StairsDown_24, sO_IsClosed))
g_fp->setObjectState(sO_StairsDown_24, g_fp->getObjectEnumState(sO_StairsDown_24, sO_IsClosed));
}
g_fp->_currentScene = oldsc;