diff options
| author | Eugene Sandulenko | 2014-01-15 11:22:34 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2014-01-15 15:39:29 +0200 |
| commit | f6ebae63cd84a3ebb1a95865de11243743cd9871 (patch) | |
| tree | 836f9365cbe25db7910fc90a08ed2060b56a67d9 | |
| parent | 659fe857162d157f7076293360b85115fa8f40d8 (diff) | |
| download | scummvm-rg350-f6ebae63cd84a3ebb1a95865de11243743cd9871.tar.gz scummvm-rg350-f6ebae63cd84a3ebb1a95865de11243743cd9871.tar.bz2 scummvm-rg350-f6ebae63cd84a3ebb1a95865de11243743cd9871.zip | |
FULLPIPE: More code to ModalMap
| -rw-r--r-- | engines/fullpipe/constants.h | 3 | ||||
| -rw-r--r-- | engines/fullpipe/modal.cpp | 14 |
2 files changed, 15 insertions, 2 deletions
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h index 00ae4258cd..25f69b5515 100644 --- a/engines/fullpipe/constants.h +++ b/engines/fullpipe/constants.h @@ -199,7 +199,6 @@ namespace Fullpipe { #define SC_38 2072 #define SC_COMMON 321 #define SC_DBGMENU 726 -#define SC_LDR 635 #define SC_FINAL1 4999 #define SC_FINAL2 5000 #define SC_FINAL3 5001 @@ -207,6 +206,8 @@ namespace Fullpipe { #define SC_INTRO1 3896 #define SC_INTRO2 3907 #define SC_INV 858 +#define SC_LDR 635 +#define SC_MAP 5222 #define SND_CMN_031 3516 #define SND_CMN_060 4921 #define SND_CMN_061 4922 diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp index 813820da9a..a5b70f0775 100644 --- a/engines/fullpipe/modal.cpp +++ b/engines/fullpipe/modal.cpp @@ -28,6 +28,8 @@ #include "fullpipe/scenes.h" #include "fullpipe/gameloader.h" +#include "fullpipe/constants.h" + #include "graphics/palette.h" #include "video/avi_decoder.h" @@ -287,6 +289,12 @@ ModalMap::ModalMap() { } ModalMap::~ModalMap() { + g_fp->_gameLoader->unloadScene(SC_MAP); + + g_fp->_sceneRect = _rect1; + + g_fp->_currentScene->_x = _x; + g_fp->_currentScene->_y = _y; } bool ModalMap::init(int counterdiff) { @@ -296,7 +304,11 @@ bool ModalMap::init(int counterdiff) { } void ModalMap::update() { - warning("STUB: ModalMap::update()"); + g_fp->_sceneRect = _rect2; + + _mapScene->draw(); + + g_fp->drawArcadeOverlay(1); } bool ModalMap::handleMessage(ExCommand *cmd) { |