diff options
author | Eric Fry | 2018-07-04 17:46:15 +1000 |
---|---|---|
committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
commit | f15335db0f5a52750ee9e2b6d61e53880bad844f (patch) | |
tree | bcff91bb55559fb4352f2e31e1ef2608aea06043 /engines/illusions | |
parent | 960d79ed5acde4d1dda7c123e224b551c7df7260 (diff) | |
download | scummvm-rg350-f15335db0f5a52750ee9e2b6d61e53880bad844f.tar.gz scummvm-rg350-f15335db0f5a52750ee9e2b6d61e53880bad844f.tar.bz2 scummvm-rg350-f15335db0f5a52750ee9e2b6d61e53880bad844f.zip |
ILLUSIONS: Remove old video logic
Diffstat (limited to 'engines/illusions')
-rw-r--r-- | engines/illusions/illusions.cpp | 39 | ||||
-rw-r--r-- | engines/illusions/illusions.h | 1 |
2 files changed, 0 insertions, 40 deletions
diff --git a/engines/illusions/illusions.cpp b/engines/illusions/illusions.cpp index 1108681f9c..c6ae20c675 100644 --- a/engines/illusions/illusions.cpp +++ b/engines/illusions/illusions.cpp @@ -286,45 +286,6 @@ bool IllusionsEngine::calcPointDirection(Common::Point &srcPt, Common::Point &ds return facing != 0; } -void IllusionsEngine::playVideo(uint32 videoId, uint32 objectId, uint32 priority, uint32 threadId) { - Video::VideoDecoder *videoDecoder = new Video::AVIDecoder(); - Common::String filename = Common::String::format("%08X.AVI", objectId); - if (!videoDecoder->loadFile(filename)) { - delete videoDecoder; - warning("Unable to open video %s", filename.c_str()); - return; - } - - videoDecoder->start(); - - bool skipVideo = false; - - while (!shouldQuit() && !videoDecoder->endOfVideo() && !skipVideo) { - if (videoDecoder->needsUpdate()) { - const Graphics::Surface *frame = videoDecoder->decodeNextFrame(); - if (videoDecoder->hasDirtyPalette()) { - const byte *palette = videoDecoder->getPalette(); - _system->getPaletteManager()->setPalette(palette, 0, 256); - } - - if (frame) { - _system->copyRectToScreen(frame->getPixels(), frame->pitch, 0, 0, frame->w, frame->h); - _system->updateScreen(); - } - } - - Common::Event event; - while (_eventMan->pollEvent(event)) { - if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_SPACE) || - event.type == Common::EVENT_LBUTTONUP) - skipVideo = true; - } - } - - videoDecoder->close(); - delete videoDecoder; -} - bool IllusionsEngine::isSoundActive() { // TODO return true; diff --git a/engines/illusions/illusions.h b/engines/illusions/illusions.h index a6f9ac752e..9c73c478a7 100644 --- a/engines/illusions/illusions.h +++ b/engines/illusions/illusions.h @@ -169,7 +169,6 @@ public: int getRandom(int max); int convertPanXCoord(int16 x); bool calcPointDirection(Common::Point &srcPt, Common::Point &dstPt, uint &facing); - void playVideo(uint32 videoId, uint32 objectId, uint32 value, uint32 threadId); bool isSoundActive(); virtual void updateFader() {}; |