diff options
author | Eugene Sandulenko | 2014-01-23 11:31:07 -0800 |
---|---|---|
committer | Eugene Sandulenko | 2014-01-23 12:01:25 -0800 |
commit | 7277ad7aa17613e91e451a572f091f4345990a32 (patch) | |
tree | 48b22b336b9ebbc3e1ed7a416f49ebfd03f84ec5 | |
parent | 8154da85ad69a3fb557fdd79f5a550e66138f457 (diff) | |
download | scummvm-rg350-7277ad7aa17613e91e451a572f091f4345990a32.tar.gz scummvm-rg350-7277ad7aa17613e91e451a572f091f4345990a32.tar.bz2 scummvm-rg350-7277ad7aa17613e91e451a572f091f4345990a32.zip |
FULLPIPE: Plug sceneFinal in
-rw-r--r-- | engines/fullpipe/module.mk | 1 | ||||
-rw-r--r-- | engines/fullpipe/scenes.cpp | 4 | ||||
-rw-r--r-- | engines/fullpipe/scenes.h | 4 | ||||
-rw-r--r-- | engines/fullpipe/scenes/sceneFinal.cpp | 2 |
4 files changed, 10 insertions, 1 deletions
diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk index d9cecf058a..f6a94de421 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 5e49fb4d98..9c2ab87d07 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 6c91481b46..65c2f3dc66 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -536,6 +536,10 @@ public: 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 e240bf52df..cbb250c633 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); |