diff options
| author | Strangerke | 2013-05-01 23:14:00 +0200 |
|---|---|---|
| committer | Strangerke | 2013-05-01 23:14:00 +0200 |
| commit | a11f579a3f1690cf55c5402b8453fbaef6dd16fb (patch) | |
| tree | 630e54038ee8294dfd0a4f50423655ee46b01a17 /engines/hopkins/anim.cpp | |
| parent | 7c4a42127663f43cdf13ce2b8a2985ad53414068 (diff) | |
| download | scummvm-rg350-a11f579a3f1690cf55c5402b8453fbaef6dd16fb.tar.gz scummvm-rg350-a11f579a3f1690cf55c5402b8453fbaef6dd16fb.tar.bz2 scummvm-rg350-a11f579a3f1690cf55c5402b8453fbaef6dd16fb.zip | |
HOPKINS: Remove an incomplete hack in playAnim(), rework related code to avoid low/high res missing files
Diffstat (limited to 'engines/hopkins/anim.cpp')
| -rw-r--r-- | engines/hopkins/anim.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp index e332d9910f..8dab9f7e58 100644 --- a/engines/hopkins/anim.cpp +++ b/engines/hopkins/anim.cpp @@ -55,7 +55,7 @@ void AnimationManager::clearAll() { * @param rate2 Delay amount between animation frames * @param rate3 Delay amount after animation finishes */ -void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, uint32 rate2, uint32 rate3, bool skipSeqFl) { +void AnimationManager::playAnim(const Common::String &hiresName, const Common::String &lowresName, uint32 rate1, uint32 rate2, uint32 rate3, bool skipSeqFl) { Common::File f; if (_vm->shouldQuit()) @@ -65,16 +65,10 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui byte *screenP = _vm->_graphicsMan->_backBuffer; - Common::String tmpStr; - // The Windows 95 demo only contains the interlaced version of the BOMBE1 and BOMBE2 videos - if (_vm->getPlatform() == Common::kPlatformWindows && _vm->getIsDemo() && filename == "BOMBE1A.ANM") - tmpStr = "BOMBE1.ANM"; - else if (_vm->getPlatform() == Common::kPlatformWindows && _vm->getIsDemo() && filename == "BOMBE2A.ANM") - tmpStr = "BOMBE2.ANM"; - else - tmpStr = filename; - if (!f.open(tmpStr)) - error("File not found - %s", tmpStr.c_str()); + if (!f.open(hiresName)) { + if (!f.open(lowresName)) + error("Files not found: %s - %s", hiresName.c_str(), lowresName.c_str()); + } f.skip(6); f.read(_vm->_graphicsMan->_palette, 800); |