From 0176d343bcc11cd1993587697edd065b03302c24 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Mon, 6 Jan 2014 10:03:24 +0200 Subject: FULLPIPE: Plug scene28 in --- engines/fullpipe/module.mk | 1 + engines/fullpipe/scenes.cpp | 12 ++++++++++++ engines/fullpipe/scenes.h | 12 ++++++++++++ engines/fullpipe/scenes/scene28.cpp | 4 ++-- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk index 8a4350e997..a2d4961f78 100644 --- a/engines/fullpipe/module.mk +++ b/engines/fullpipe/module.mk @@ -47,6 +47,7 @@ MODULE_OBJS = \ scenes/scene24.o \ scenes/scene25.o \ scenes/scene26.o \ + scenes/scene28.o \ scenes/scene30.o \ scenes/scene31.o \ scenes/scene36.o \ diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index 50335a4a85..04e2714053 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -298,6 +298,18 @@ Vars::Vars() { scene26_sock = 0; scene26_activeVent = 0; + scene28_var01 = 0; + scene28_var02 = 0; + scene28_var03 = 0; + scene28_var04 = 0; + scene28_var05 = 1; + scene28_var06 = 1; + scene28_var07 = 0; + scene28_var08 = 0; + scene28_var09 = 0; + scene28_var10 = 0; + scene28_var11 = 0; + scene30_leg = 0; scene30_liftFlag = 1; diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h index 169ee8b2d5..7d7bb6e48d 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -422,6 +422,18 @@ public: StaticANIObject *scene26_sock; StaticANIObject *scene26_activeVent; + int scene28_var01; + int scene28_var02; + int scene28_var03; + int scene28_var04; + int scene28_var05; + int scene28_var06; + int scene28_var07; + int scene28_var08; + int scene28_var09; + int scene28_var10; + int scene28_var11; + StaticANIObject *scene30_leg; int scene30_liftFlag; diff --git a/engines/fullpipe/scenes/scene28.cpp b/engines/fullpipe/scenes/scene28.cpp index c904c698d8..bdb1699d70 100644 --- a/engines/fullpipe/scenes/scene28.cpp +++ b/engines/fullpipe/scenes/scene28.cpp @@ -32,7 +32,7 @@ #include "fullpipe/interaction.h" #include "fullpipe/behavior.h" - +#include "fullpipe/floaters.h" namespace Fullpipe { @@ -49,7 +49,7 @@ void scene28_initScene() { g_vars->scene28_var10 = 0; g_vars->scene28_var11 = 0; - g_fp->_floaters->init(getGameLoaderGameVar()->getSubVarByName("SC_28")); + g_fp->_floaters->init(g_fp->getGameLoaderGameVar()->getSubVarByName("SC_28")); g_fp->initArcadeKeys("SC_28"); } -- cgit v1.2.3