libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 14:18:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FULLPIPE: Plug scene35 in

Browse Source
This commit is contained in:
Eugene Sandulenko 2014-01-16 12:15:40 +02:00
parent f79390fea2
commit f60b6cb17d
5 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engines/fullpipe/constants.h
View File

@ -1257,6 +1257,17 @@ namespace Fullpipe {
#define ST_VNT34_RIGHT3 4318
#define ST_VNT34_UP2 4310
// Scene 35
#define ANI_HOSE 2424
#define ANI_PUZODUV 2418
#define QU_SC35_ENTERLIFT 2815
#define QU_SC35_EXITLIFT 2816
#define SND_35_011 4509
#define SND_35_012 4510
#define ST_HZE_NORM 2426
#define ST_PDV_LARGE 2421
#define ST_PDV_SMALL 2420
// Scene 36
#define ANI_SCISSORS_36 2647
#define ANI_ROTOHRUST 2360

1
engines/fullpipe/module.mk
View File

@ -55,6 +55,7 @@ MODULE_OBJS = \
scenes/scene32.o \
scenes/scene33.o \
scenes/scene34.o \
scenes/scene35.o \
scenes/scene36.o \
scenes/sceneDbg.o

9
engines/fullpipe/scenes.cpp
View File

@ -348,6 +348,15 @@ Vars::Vars() {
scene34_dudeOnCactus = false;
scene34_fliesCountdown = 0;
scene35_var01 = 0;
scene35_var02 = 0;
scene35_var03 = 0;
scene35_var04 = 0;
scene35_hose = 0;
scene35_bellyInflater = 0;
scene35_var05 = 0;
scene35_var06 = 0;
scene36_rotohrust = 0;
scene36_scissors = 0;

9
engines/fullpipe/scenes.h
View File

@ -491,6 +491,15 @@ public:
bool scene34_dudeOnCactus;
int scene34_fliesCountdown;
int scene35_var01;
int scene35_var02;
int scene35_var03;
int scene35_var04;
StaticANIObject *scene35_hose;
StaticANIObject *scene35_bellyInflater;
int scene35_var05;
int scene35_var06;
StaticANIObject *scene36_rotohrust;
StaticANIObject *scene36_scissors;

9
engines/fullpipe/scenes/scene35.cpp
View File

@ -33,6 +33,7 @@
#include "fullpipe/interaction.h"
#include "fullpipe/behavior.h"
#include "fullpipe/floaters.h"
namespace Fullpipe {
@ -41,8 +42,8 @@ void scene35_initScene(Scene *sc) {
g_vars->scene35_var02 = 200;
g_vars->scene35_var03 = 300;
g_vars->scene35_var04 = 300;
g_vars->scene35_hose = Scene_getStaticANIObject1ById(sc, ANI_HOSE, -1);
g_vars->scene35_bellyInflater = Scene_getStaticANIObject1ById(sc, ANI_PUZODUV, -1);
g_vars->scene35_hose = sc->getStaticANIObject1ById(ANI_HOSE, -1);
g_vars->scene35_bellyInflater = sc->getStaticANIObject1ById(ANI_PUZODUV, -1);
g_vars->scene35_var05 = 0;
g_vars->scene35_var06 = 0;
@ -55,7 +56,7 @@ void scene35_initScene(Scene *sc) {
int sndId = 0;
if (getObjectState(sO_Valve_35) == getObjectEnumState(sO_Valve_35, sO_TurnedOn)) {
if (g_fp->getObjectState(sO_Valve_35) == g_fp->getObjectEnumState(sO_Valve_35, sO_TurnedOn)) {
if ((g_vars->scene35_hose->_flags & 4) && g_vars->scene35_hose->_statics->_staticsId == ST_HZE_NORM) {
sndId = SND_35_012;
} else if (g_vars->scene35_bellyInflater->_statics->_staticsId == ST_PDV_SMALL) {
@ -71,7 +72,7 @@ void scene35_initScene(Scene *sc) {
g_fp->initArcadeKeys("SC_35");
g_fp->_floaters->init(getGameLoaderGameVar()->getSubVarByName("SC_35"));
g_fp->_floaters->init(g_fp->getGameLoaderGameVar()->getSubVarByName("SC_35"));
}
} // End of namespace Fullpipe