From 7277ad7aa17613e91e451a572f091f4345990a32 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Thu, 23 Jan 2014 11:31:07 -0800 Subject: [PATCH] FULLPIPE: Plug sceneFinal in --- engines/fullpipe/module.mk | 1 + engines/fullpipe/scenes.cpp | 4 ++++ engines/fullpipe/scenes.h | 4 ++++ engines/fullpipe/scenes/sceneFinal.cpp | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk index d9cecf058af1..f6a94de42169 100644 --- a/engines/fullpipe/module.mk +++ b/engines/fullpipe/module.mk @@ -59,6 +59,7 @@ MODULE_OBJS = \ scenes/scene36.o \ scenes/scene37.o \ scenes/scene38.o \ + scenes/sceneFinal.o \ scenes/sceneDbg.o # This module can be built as a plugin diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index 5e49fb4d9880..9c2ab87d0794 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -382,6 +382,10 @@ Vars::Vars() { scene38_lastShortyAnim = 0; scene38_shortyAnimCounter = 0; + sceneFinal_var01 = 0; + sceneFinal_var02 = 0; + sceneFinal_var03 = 0; + selector = 0; } diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h index 6c91481b4628..65c2f3dc66a2 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -536,6 +536,10 @@ class Vars { int scene38_lastShortyAnim; int scene38_shortyAnimCounter; + int sceneFinal_var01; + int sceneFinal_var02; + int sceneFinal_var03; + PictureObject *selector; }; diff --git a/engines/fullpipe/scenes/sceneFinal.cpp b/engines/fullpipe/scenes/sceneFinal.cpp index e240bf52df8f..cbb250c63336 100644 --- a/engines/fullpipe/scenes/sceneFinal.cpp +++ b/engines/fullpipe/scenes/sceneFinal.cpp @@ -41,7 +41,7 @@ void sceneFinal_initScene() { g_fp->accessScene(SC_FINAL2)->setPictureObjectsFlag4(); g_fp->_gameLoader->loadScene(SC_FINAL3); g_fp->accessScene(SC_FINAL3)->setPictureObjectsFlag4(); - g_fp->_gameLoader->loadScene(v4, SC_FINAL4); + g_fp->_gameLoader->loadScene(SC_FINAL4); g_fp->accessScene(SC_FINAL4)->setPictureObjectsFlag4(); getGameLoaderInventory()->setIsLocked(0);