diff options
author | Bastien Bouclet | 2017-07-01 18:43:36 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2017-07-03 08:50:10 +0200 |
commit | b0ee5772fba2cccf16ba727deda2d8eaf5e8e655 (patch) | |
tree | 7637d255c0abf4b867aa8b934b1db27eb13c1ec7 | |
parent | 7801d6489b01207d461034bc75473d1b7ec73c73 (diff) | |
download | scummvm-rg350-b0ee5772fba2cccf16ba727deda2d8eaf5e8e655.tar.gz scummvm-rg350-b0ee5772fba2cccf16ba727deda2d8eaf5e8e655.tar.bz2 scummvm-rg350-b0ee5772fba2cccf16ba727deda2d8eaf5e8e655.zip |
MOHAWK: Remove unused / not working functions
-rw-r--r-- | engines/mohawk/riven.cpp | 7 | ||||
-rw-r--r-- | engines/mohawk/riven.h | 1 | ||||
-rw-r--r-- | engines/mohawk/riven_scripts.cpp | 9 | ||||
-rw-r--r-- | engines/mohawk/riven_video.cpp | 5 | ||||
-rw-r--r-- | engines/mohawk/riven_video.h | 9 |
5 files changed, 5 insertions, 26 deletions
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp index 8b2fa6c754..b6692d0fd4 100644 --- a/engines/mohawk/riven.cpp +++ b/engines/mohawk/riven.cpp @@ -248,7 +248,6 @@ void MohawkEngine_Riven::doFrame() { } break; default: - // TODO: Pass the keypress to the game only if it was not consumed by the engine _stack->onKeyPressed(event.kbd.keycode); break; } @@ -417,16 +416,12 @@ void MohawkEngine_Riven::refreshCard() { _card->drawHotspotRects(); // Now we need to redraw the cursor if necessary and handle mouse over scripts - updateCurrentHotspot(); + _stack->onMouseMove(_eventMan->getMousePos()); // Finally, install any hardcoded timer _stack->installCardTimer(); } -void MohawkEngine_Riven::updateCurrentHotspot() { - _card->onMouseMove(_eventMan->getMousePos()); -} - Common::SeekableReadStream *MohawkEngine_Riven::getExtrasResource(uint32 tag, uint16 id) { return _extrasFile->getResource(tag, id); } diff --git a/engines/mohawk/riven.h b/engines/mohawk/riven.h index 817d4c6358..89bef70c52 100644 --- a/engines/mohawk/riven.h +++ b/engines/mohawk/riven.h @@ -130,7 +130,6 @@ public: // Hotspot functions/variables Common::Array<ZipMode> _zipModeData; - void updateCurrentHotspot(); void addZipVisitedCard(uint16 cardId, uint16 cardNameId); bool isZipVisitedCard(const Common::String &hotspotName) const; diff --git a/engines/mohawk/riven_scripts.cpp b/engines/mohawk/riven_scripts.cpp index 761de1d703..e2e51d06c9 100644 --- a/engines/mohawk/riven_scripts.cpp +++ b/engines/mohawk/riven_scripts.cpp @@ -427,9 +427,6 @@ void RivenSimpleCommand::enableHotspot(uint16 op, uint16 argc, uint16 *argv) { if (hotspot) { hotspot->enable(true); } - - // Recheck our current hotspot because it may have now changed - _vm->updateCurrentHotspot(); } // Command 10: disable hotspot (blst_id) @@ -438,9 +435,6 @@ void RivenSimpleCommand::disableHotspot(uint16 op, uint16 argc, uint16 *argv) { if (hotspot) { hotspot->enable(false); } - - // Recheck our current hotspot because it may have now changed - _vm->updateCurrentHotspot(); } // Command 12: stop sounds (flags) @@ -609,9 +603,6 @@ void RivenSimpleCommand::activateMLSTAndPlay(uint16 op, uint16 argc, uint16 *arg // Command 43: activate BLST record (card hotspot enabling lists) void RivenSimpleCommand::activateBLST(uint16 op, uint16 argc, uint16 *argv) { _vm->getCard()->activateHotspotEnableRecord(argv[0]); - - // Recheck our current hotspot because it may have now changed - _vm->updateCurrentHotspot(); } // Command 44: activate FLST record (information on which SFXE resource this card should use) diff --git a/engines/mohawk/riven_video.cpp b/engines/mohawk/riven_video.cpp index 33245ef3c1..56cbd443bd 100644 --- a/engines/mohawk/riven_video.cpp +++ b/engines/mohawk/riven_video.cpp @@ -125,11 +125,6 @@ bool RivenVideo::isPlaying() const { return _playing; } -int RivenVideo::getVolume() const { - assert(_video); - return _video->getVolume(); -} - void RivenVideo::setVolume(int volume) { assert(_video); _video->setVolume(CLIP(volume, 0, 255)); diff --git a/engines/mohawk/riven_video.h b/engines/mohawk/riven_video.h index 914225b8de..5b5bf30fd2 100644 --- a/engines/mohawk/riven_video.h +++ b/engines/mohawk/riven_video.h @@ -105,15 +105,14 @@ public: /** Is the video playing? */ bool isPlaying() const; - /** Get the volume of the video */ - int getVolume() const; - /** Set the volume of the video */ void setVolume(int volume); - void drawNextFrame(); - + /** Checks if a video is playing and is waiting to display the next frame */ bool needsUpdate() const; + + /** Draw the next frame to the system screen */ + void drawNextFrame(); private: // Non-changing variables MohawkEngine_Riven *_vm; |