diff options
author | Eugene Sandulenko | 2016-12-08 18:12:06 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2016-12-08 18:12:57 +0100 |
commit | 6a3ee9a00884c36f3f591ac4bb410565f4caf31b (patch) | |
tree | 31a11de451ec29336c9a867e1e4e54c06175ac79 | |
parent | 55b6e7f0902ee30c371cde5ab916d7a8d9972fa8 (diff) | |
download | scummvm-rg350-6a3ee9a00884c36f3f591ac4bb410565f4caf31b.tar.gz scummvm-rg350-6a3ee9a00884c36f3f591ac4bb410565f4caf31b.tar.bz2 scummvm-rg350-6a3ee9a00884c36f3f591ac4bb410565f4caf31b.zip |
FULLPIPE: Implement ModalMap::findMapSceneId() and plug new map code in
-rw-r--r-- | engines/fullpipe/modal.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp index d46ffadd82..05b719a5c2 100644 --- a/engines/fullpipe/modal.cpp +++ b/engines/fullpipe/modal.cpp @@ -302,6 +302,9 @@ ModalMap::~ModalMap() { } bool ModalMap::init(int counterdiff) { + if (_picI03) + return init2(counterdiff); + g_fp->setCursor(PIC_CSR_ITN); if (_flag) { @@ -416,7 +419,14 @@ bool ModalMap::init2(int counterdiff) { } int ModalMap::findMapSceneId(int picId) { - warning("STUB: ModalMap::findMapSceneId()"); + for (uint i = 0; i < g_fp->_gameLoader->_preloadItems.size(); i++) { + PreloadItem *pitem = g_fp->_gameLoader->_preloadItems[i]; + + if (pitem->preloadId1 == SC_MAP && pitem->preloadId2 == picId) { + return pitem->sceneId; + } + } + return 0; } @@ -520,8 +530,6 @@ void ModalMap::initMap() { if (_picI03) { _picI03->_flags &= 0xFFFB; - } else { - warning("No PIC_MAP_I03"); } g_system->warpMouse(400, 300); |