diff options
| author | Kamil Zbróg | 2013-12-26 14:55:11 +0000 |
|---|---|---|
| committer | Kamil Zbróg | 2013-12-26 14:55:11 +0000 |
| commit | 165b8be77f4621ff5de8a483c6cd9ac497492a0a (patch) | |
| tree | 41065a7a961c1b0caa07ac4b2b1b6c027c12ae99 /engines/fullpipe/fullpipe.cpp | |
| parent | fc04a3c328e70733eea1b065cb5dacc9ec6999f2 (diff) | |
| parent | f3691700436e647e808023180430263a6567bfaf (diff) | |
| download | scummvm-rg350-165b8be77f4621ff5de8a483c6cd9ac497492a0a.tar.gz scummvm-rg350-165b8be77f4621ff5de8a483c6cd9ac497492a0a.tar.bz2 scummvm-rg350-165b8be77f4621ff5de8a483c6cd9ac497492a0a.zip | |
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'engines/fullpipe/fullpipe.cpp')
| -rw-r--r-- | engines/fullpipe/fullpipe.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp index 970af423ae..a0348a9407 100644 --- a/engines/fullpipe/fullpipe.cpp +++ b/engines/fullpipe/fullpipe.cpp @@ -33,14 +33,14 @@ #include "fullpipe/behavior.h" #include "fullpipe/modal.h" #include "fullpipe/input.h" +#include "fullpipe/motion.h" #include "fullpipe/scenes.h" #include "fullpipe/floaters.h" -#include "fullpipe/motion.h" #include "fullpipe/console.h" namespace Fullpipe { -FullpipeEngine *g_fullpipe = 0; +FullpipeEngine *g_fp = 0; Vars *g_vars = 0; FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc) { @@ -148,9 +148,16 @@ FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc) _objectAtCursor = 0; _objectIdAtCursor = 0; + _arcadeOverlay = 0; + _arcadeOverlayHelper = 0; + _arcadeOverlayX = 0; + _arcadeOverlayY = 0; + _arcadeOverlayMidX = 0; + _arcadeOverlayMidY = 0; + _isSaveAllowed = true; - g_fullpipe = this; + g_fp = this; g_vars = new Vars; } |