diff options
| author | Paul Gilbert | 2014-08-28 21:40:59 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-08-28 21:40:59 -0400 |
| commit | 661a5694b4bf91e61d62fbabf0294c5815cf85f6 (patch) | |
| tree | b0b5fdf9bcd476b0f3389aa98194aefe60c8d673 | |
| parent | 729f03f42c88f2caaa6616e530cf4543a6cca536 (diff) | |
| download | scummvm-rg350-661a5694b4bf91e61d62fbabf0294c5815cf85f6.tar.gz scummvm-rg350-661a5694b4bf91e61d62fbabf0294c5815cf85f6.tar.bz2 scummvm-rg350-661a5694b4bf91e61d62fbabf0294c5815cf85f6.zip | |
ACCESS: Implemented cmdVideoEnded
| -rw-r--r-- | engines/access/scripts.cpp | 10 | ||||
| -rw-r--r-- | engines/access/scripts.h | 2 | ||||
| -rw-r--r-- | engines/access/video.h | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp index f92a6d73a5..ad806de056 100644 --- a/engines/access/scripts.cpp +++ b/engines/access/scripts.cpp @@ -105,7 +105,7 @@ void Scripts::executeCommand(int commandIndex) { &Scripts::cmdSetTimer, &Scripts::cmdCheckTimer, &Scripts::cmdSetTravel, &Scripts::cmdSetTravel, &Scripts::cmdSetVideo, &Scripts::cmdPlayVideo, &Scripts::cmdPlotImage, &Scripts::cmdSetDisplay, &Scripts::cmdSetBuffer, - &Scripts::cmdSetScroll, &Scripts::CMDSAVERECT, &Scripts::CMDSAVERECT, + &Scripts::cmdSetScroll, &Scripts::cmdVideoEnded, &Scripts::cmdVideoEnded, &Scripts::CMDSETBUFVID, &Scripts::CMDPLAYBUFVID, &Scripts::cmdRemoveLast, &Scripts::cmdSpecial, &Scripts::cmdSpecial, &Scripts::cmdSpecial, &Scripts::CMDSETCYCLE, &Scripts::CMDCYCLE, &Scripts::cmdCharSpeak, @@ -457,7 +457,13 @@ void Scripts::cmdSetScroll() { _vm->_screen->_scrollY = 0; } -void Scripts::CMDSAVERECT() { error("TODO CMDSAVERECT"); } +void Scripts::cmdVideoEnded() { + if (_vm->_video->_videoEnd) + cmdGoto(); + else + _data->skip(2); +} + void Scripts::CMDSETBUFVID() { error("TODO CMDSETBUFVID"); } void Scripts::CMDPLAYBUFVID() { error("TODO CMDPLAYBUFVID"); } diff --git a/engines/access/scripts.h b/engines/access/scripts.h index 414ba46f81..7568e033c0 100644 --- a/engines/access/scripts.h +++ b/engines/access/scripts.h @@ -96,7 +96,7 @@ protected: void cmdSetDisplay(); void cmdSetBuffer(); void cmdSetScroll(); - void CMDSAVERECT(); + void cmdVideoEnded(); void CMDSETBUFVID(); void CMDPLAYBUFVID(); void cmdRemoveLast(); diff --git a/engines/access/video.h b/engines/access/video.h index 20e5cfc10e..bb9656b296 100644 --- a/engines/access/video.h +++ b/engines/access/video.h @@ -48,13 +48,13 @@ private: int _xCount; int _scanCount; int _frameSize; - bool _videoEnd; void getFrame(); public: int _videoFrame; bool _soundFlag; int _soundFrame; + bool _videoEnd; public: VideoPlayer(AccessEngine *vm); ~VideoPlayer(); |