diff options
| -rw-r--r-- | engines/voyeur/events.cpp | 8 | ||||
| -rw-r--r-- | engines/voyeur/events.h | 3 | ||||
| -rw-r--r-- | engines/voyeur/files_threads.cpp | 2 | ||||
| -rw-r--r-- | engines/voyeur/graphics.cpp | 2 | ||||
| -rw-r--r-- | engines/voyeur/voyeur.cpp | 4 |
5 files changed, 7 insertions, 12 deletions
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp index 6b2b49639a..469d80cc6e 100644 --- a/engines/voyeur/events.cpp +++ b/engines/voyeur/events.cpp @@ -426,16 +426,12 @@ void EventsManager::setCursorColor(int idx, int mode) { } } -void EventsManager::mouseOn() { +void EventsManager::showCursor() { CursorMan.showMouse(true); } -void EventsManager::mouseOff() { - CursorMan.showMouse(false); -} - void EventsManager::hideCursor() { - error("TODO: hideCursor"); + CursorMan.showMouse(false); } void EventsManager::getMouseInfo() { diff --git a/engines/voyeur/events.h b/engines/voyeur/events.h index 6b7d4e8682..3d1c5779e5 100644 --- a/engines/voyeur/events.h +++ b/engines/voyeur/events.h @@ -217,8 +217,7 @@ public: void setCursor(PictureResource *pic); void setCursor(byte *cursorData, int width, int height); void setCursorColor(int idx, int mode); - void mouseOn(); - void mouseOff(); + void showCursor(); void hideCursor(); Common::Point getMousePos() { return _mousePos; } void getMouseInfo(); diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp index 49b271e79c..6b2b26860d 100644 --- a/engines/voyeur/files_threads.cpp +++ b/engines/voyeur/files_threads.cpp @@ -1280,7 +1280,7 @@ void ThreadResource::doRoom() { pic1 = vm._bVoy->boltEntry(vm._playStamp1 + 2)._picResource; pic2 = vm._bVoy->boltEntry(vm._playStamp1 + 3)._picResource; vm._graphicsManager._backColors = vm._bVoy->boltEntry( - vm._playStamp1 + 2)._cMapResource; + vm._playStamp1 + 1)._cMapResource; vm._graphicsManager._backgroundPage = vm._bVoy->boltEntry( vm._playStamp1)._picResource; diff --git a/engines/voyeur/graphics.cpp b/engines/voyeur/graphics.cpp index f6829b45ea..f189d2b699 100644 --- a/engines/voyeur/graphics.cpp +++ b/engines/voyeur/graphics.cpp @@ -718,7 +718,7 @@ void GraphicsManager::fadeUpICF1(int steps) { void GraphicsManager::fadeDownICF(int steps) { if (steps > 0) { - _vm->_eventsManager.mouseOff(); + _vm->_eventsManager.hideCursor(); int stepAmount1 = _vm->_voy._field4376 / steps; int stepAmount2 = _vm->_voy._field4378 / steps; diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp index 966ce77e20..f4b83e589a 100644 --- a/engines/voyeur/voyeur.cpp +++ b/engines/voyeur/voyeur.cpp @@ -285,7 +285,7 @@ bool VoyeurEngine::doLock() { // Set up the cursor _eventsManager.setCursor(cursorPic); - _eventsManager.mouseOn(); + _eventsManager.showCursor(); _eventsManager._intPtr. field38 = 1; _eventsManager._intPtr._hasPalette = true; @@ -410,7 +410,7 @@ bool VoyeurEngine::doLock() { _bVoy->freeBoltGroup(0x700); } - _eventsManager.mouseOff(); + _eventsManager.hideCursor(); delete[] buttonVoc; delete[] wrongVoc; |