From f60b6cb17d138eadbefad42e20bc8554fc2fd633 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko <sev@scummvm.org>
Date: Thu, 16 Jan 2014 12:15:40 +0200
Subject: [PATCH] FULLPIPE: Plug scene35 in

---
 engines/fullpipe/constants.h        | 11 +++++++++++
 engines/fullpipe/module.mk          |  1 +
 engines/fullpipe/scenes.cpp         |  9 +++++++++
 engines/fullpipe/scenes.h           |  9 +++++++++
 engines/fullpipe/scenes/scene35.cpp |  9 +++++----
 5 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 1a6ecbbec82..af7dc45b282 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -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
diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk
index ae259d907c3..5f7d8a4244b 100644
--- a/engines/fullpipe/module.mk
+++ b/engines/fullpipe/module.mk
@@ -55,6 +55,7 @@ MODULE_OBJS = \
 	scenes/scene32.o \
 	scenes/scene33.o \
 	scenes/scene34.o \
+	scenes/scene35.o \
 	scenes/scene36.o \
 	scenes/sceneDbg.o
 
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 02fb33b7a83..a4bf2dc5ebd 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -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;
 
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index d4757ba061b..42a56be2536 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -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;
 
diff --git a/engines/fullpipe/scenes/scene35.cpp b/engines/fullpipe/scenes/scene35.cpp
index 25f926df63a..5698cbcc491 100644
--- a/engines/fullpipe/scenes/scene35.cpp
+++ b/engines/fullpipe/scenes/scene35.cpp
@@ -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