diff options
| author | Eugene Sandulenko | 2016-08-29 23:35:20 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-08-29 23:35:20 +0200 |
| commit | 888a4578af7ee7f5d47f59a2b6d8718f88b96eb3 (patch) | |
| tree | 8e8f9bb8c1333ed0f6747d0b0482bffc24ada593 /engines/fullpipe | |
| parent | d3cf9ed9c0a39141fe5cb5364bbfc8dee7b3914b (diff) | |
| download | scummvm-rg350-888a4578af7ee7f5d47f59a2b6d8718f88b96eb3.tar.gz scummvm-rg350-888a4578af7ee7f5d47f59a2b6d8718f88b96eb3.tar.bz2 scummvm-rg350-888a4578af7ee7f5d47f59a2b6d8718f88b96eb3.zip | |
FULLPIPE: Fix few bugs in Map code
Diffstat (limited to 'engines/fullpipe')
| -rw-r--r-- | engines/fullpipe/fullpipe.cpp | 3 | ||||
| -rw-r--r-- | engines/fullpipe/modal.cpp | 32 |
2 files changed, 19 insertions, 16 deletions
diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp index 9658199930..54a77938c9 100644 --- a/engines/fullpipe/fullpipe.cpp +++ b/engines/fullpipe/fullpipe.cpp @@ -406,6 +406,7 @@ void FullpipeEngine::updateEvents() { _lastInputTicks = _updateTicks; ex->handle(); } + _mouseScreenPos = event.mouse; break; case Common::EVENT_LBUTTONDOWN: if (!_inputArFlag && (_updateTicks - _lastInputTicks) >= 2) { @@ -418,6 +419,7 @@ void FullpipeEngine::updateEvents() { _lastInputTicks = _updateTicks; ex->handle(); } + _mouseScreenPos = event.mouse; break; case Common::EVENT_LBUTTONUP: if (!_inputArFlag && (_updateTicks - _lastButtonUpTicks) >= 2) { @@ -426,6 +428,7 @@ void FullpipeEngine::updateEvents() { _lastButtonUpTicks = _updateTicks; ex->handle(); } + _mouseScreenPos = event.mouse; break; default: break; diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp index 096323781f..382cdfd688 100644 --- a/engines/fullpipe/modal.cpp +++ b/engines/fullpipe/modal.cpp @@ -309,7 +309,7 @@ bool ModalMap::init(int counterdiff) { _rect2.right = _rect2.left + 800; _rect2.bottom = _rect2.top + 600; - g_fp->_sceneRect =_rect2; + g_fp->_sceneRect = _rect2; _mapScene->updateScrolling2(); @@ -346,17 +346,17 @@ bool ModalMap::handleMessage(ExCommand *cmd) { _mouseX = g_fp->_mouseScreenPos.x; _mouseY = g_fp->_mouseScreenPos.x; - _field_3C = _rect2.top; _field_38 = _rect2.left; + _field_3C = _rect2.top; - break; + return false; case 30: _flag = 0; - break; + return false; case 36: - if (cmd->_keyCode != 9 && cmd->_keyCode != 27 ) + if (cmd->_keyCode != 9 && cmd->_keyCode != 27) return false; break; @@ -431,20 +431,20 @@ PictureObject *ModalMap::getScenePicture() { switch (g_fp->_currentScene->_sceneId) { case SC_1: - picId = PIC_MAP_S01; - break; + picId = PIC_MAP_S01; + break; case SC_2: - picId = PIC_MAP_S02; - break; + picId = PIC_MAP_S02; + break; case SC_3: - picId = PIC_MAP_S03; - break; + picId = PIC_MAP_S03; + break; case SC_4: - picId = PIC_MAP_S04; - break; + picId = PIC_MAP_S04; + break; case SC_5: - picId = PIC_MAP_S05; - break; + picId = PIC_MAP_S05; + break; case SC_6: picId = PIC_MAP_S06; break; @@ -489,7 +489,7 @@ PictureObject *ModalMap::getScenePicture() { picId = PIC_MAP_S20; break; case SC_21: - picId = PIC_MAP_S21; + picId = PIC_MAP_S21; break; case SC_22: picId = PIC_MAP_S22; |