diff options
| author | Paul Gilbert | 2014-02-03 23:44:50 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2014-02-03 23:44:50 -0500 |
| commit | d5231aa862538bba94e456fd70fbdeb6a4b0f9ca (patch) | |
| tree | 77edb9df6b795b76f633d6c427a554ec77b09ced /engines/voyeur/voyeur.cpp | |
| parent | 90b7d10a77cfd0ed43dd792d82d148211c9371c1 (diff) | |
| download | scummvm-rg350-d5231aa862538bba94e456fd70fbdeb6a4b0f9ca.tar.gz scummvm-rg350-d5231aa862538bba94e456fd70fbdeb6a4b0f9ca.tar.bz2 scummvm-rg350-d5231aa862538bba94e456fd70fbdeb6a4b0f9ca.zip | |
VOYEUR: Moved RL2Decoder into Voyeur namespace, and merged with VoyeurRL2Decoder
Diffstat (limited to 'engines/voyeur/voyeur.cpp')
| -rw-r--r-- | engines/voyeur/voyeur.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp index 150d567638..177ee552f0 100644 --- a/engines/voyeur/voyeur.cpp +++ b/engines/voyeur/voyeur.cpp @@ -470,7 +470,7 @@ void VoyeurEngine::doOpening() { (*_graphicsManager._vPort)->setupViewPort(); flipPageAndWait(); - ::Video::RL2Decoder decoder; + RL2Decoder decoder; decoder.loadFile("a2300100.rl2"); decoder.start(); @@ -486,7 +486,7 @@ void VoyeurEngine::doOpening() { Common::copy((const byte *)frame->getPixels(), (const byte *)frame->getPixels() + 320 * 200, (byte *)_graphicsManager._screenSurface.getPixels()); - if (decoder.getCurFrame() >= READ_LE_UINT32(frameTable + frameIndex * 4)) { + if (decoder.getCurFrame() >= (int32)READ_LE_UINT32(frameTable + frameIndex * 4)) { if (creditShow) { // Show a credit textPic = _bVoy->boltEntry(frameIndex / 2 + 0x202)._picResource; @@ -524,7 +524,7 @@ void VoyeurEngine::doOpening() { } void VoyeurEngine::playRL2Video(const Common::String &filename) { - ::Video::RL2Decoder decoder; + RL2Decoder decoder; decoder.loadFile(filename); decoder.start(); @@ -562,7 +562,7 @@ void VoyeurEngine::playAVideoDuration(int videoId, int duration) { pic = _bVoy->boltEntry(0xE00 + _eventsManager._videoDead)._picResource; } - ::Video::RL2Decoder decoder; + RL2Decoder decoder; decoder.loadVideo(videoId); decoder.start(); |