From 55337fa93b8a8abd9ccaec63d44415d50beb6a18 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Mon, 7 Jan 2013 17:40:41 +0200 Subject: HOPKINS: Get rid of the checks for the interlaced videos inside the TSVGA folder --- engines/hopkins/anim.cpp | 8 +- engines/hopkins/dialogs.cpp | 9 +- engines/hopkins/files.cpp | 16 +-- engines/hopkins/globals.cpp | 1 - engines/hopkins/globals.h | 1 - engines/hopkins/hopkins.cpp | 248 ++++++++++++-------------------------------- engines/hopkins/script.cpp | 30 ++---- 7 files changed, 84 insertions(+), 229 deletions(-) (limited to 'engines') diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp index 1630de3fe7..539586c433 100644 --- a/engines/hopkins/anim.cpp +++ b/engines/hopkins/anim.cpp @@ -58,7 +58,13 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui byte *screenP = _vm->_graphicsManager._vesaScreen; byte *ptr = _vm->_globals.allocMemory(20); - _vm->_fileManager.constructFilename("ANM", filename); + // 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") + _vm->_fileManager.constructFilename("ANM", "BOMBE1.ANM"); + else if (_vm->getPlatform() == Common::kPlatformWindows && _vm->getIsDemo() && filename == "BOMBE2A.ANM") + _vm->_fileManager.constructFilename("ANM", "BOMBE2.ANM"); + else + _vm->_fileManager.constructFilename("ANM", filename); if (!f.open(_vm->_globals._curFilename)) error("File not found - %s", _vm->_globals._curFilename.c_str()); diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp index 055664db23..42abaa8ad9 100644 --- a/engines/hopkins/dialogs.cpp +++ b/engines/hopkins/dialogs.cpp @@ -229,8 +229,6 @@ void DialogsManager::showOptionsDialog() { // Values are blocked, thus handling the zone is useless //if (mousePos.x >= _vm->_graphicsManager.ofscroll + 348 && mousePos.y > 248 && mousePos.x <= _vm->_graphicsManager.ofscroll + 394 && mousePos.y <= 273) // _vm->_globals._speed = 2; - //if (mousePos.x >= _vm->_graphicsManager.ofscroll + 300 && mousePos.y > 221 && mousePos.x <= _vm->_graphicsManager.ofscroll + 358 && mousePos.y <= 246) - // _vm->_globals.SVGA = 2; if (mousePos.x < _vm->_graphicsManager._scrollOffset + 165 || mousePos.x > _vm->_graphicsManager._scrollOffset + 496 || (uint)(mousePos.y - 107) > 211) doneFlag = true; @@ -253,12 +251,7 @@ void DialogsManager::showOptionsDialog() { _vm->_globals._menuSoundOff = !_vm->_soundManager._soundOffFl ? 7 : 8; _vm->_globals._menuMusicOff = !_vm->_soundManager._musicOffFl ? 7 : 8; - if (_vm->_globals.SVGA == 1) - _vm->_globals._menuDisplayType = 10; - else if (_vm->_globals.SVGA == 2) - _vm->_globals._menuDisplayType = 9; - else if (_vm->_globals.SVGA == 3) - _vm->_globals._menuDisplayType = 11; + _vm->_globals._menuDisplayType = 9; if (_vm->_graphicsManager._scrollSpeed == 1) _vm->_globals._menuScrollSpeed = 12; diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp index 279ca4c0d3..4aeba02a74 100644 --- a/engines/hopkins/files.cpp +++ b/engines/hopkins/files.cpp @@ -97,20 +97,8 @@ void FileManager::constructFilename(const Common::String &folder, const Common:: // check for animations that don't exist in the ANM folder, but rather in special // sub-folders depending on the physical screen resolution being used. - if (folder == "ANM") { - switch (_vm->_globals.SVGA) { - case 1: - if (fileExists(folderToUse, file)) - folderToUse = "TSVGA"; - break; - case 2: - if (fileExists(folderToUse, file)) - folderToUse = "SVGA"; - break; - default: - break; - } - } + if (folder == "ANM" && fileExists("SVGA", file)) + folderToUse = "SVGA"; _vm->_globals._curFilename = Common::String::format("%s/%s", folderToUse.c_str(), file.c_str()); } diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp index f3ee56be87..c0803d8f95 100644 --- a/engines/hopkins/globals.cpp +++ b/engines/hopkins/globals.cpp @@ -115,7 +115,6 @@ Globals::Globals() { // Initialise fields _language = LANG_EN; - SVGA = 2; _internetFl = true; PUBEXIT = false; diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h index fdf1b4e866..18cbf95318 100644 --- a/engines/hopkins/globals.h +++ b/engines/hopkins/globals.h @@ -329,7 +329,6 @@ public: int _inventory[36]; SortItem _sortedDisplay[51]; Language _language; - int SVGA; bool _internetFl; bool PUBEXIT; int PERSO_TYPE; diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp index 536220caa3..13eceff46a 100644 --- a/engines/hopkins/hopkins.cpp +++ b/engines/hopkins/hopkins.cpp @@ -129,8 +129,6 @@ Common::Error HopkinsEngine::run() { } bool HopkinsEngine::runWin95Demo() { - _globals.SVGA = 1; - _globals.loadObjects(); _objectsManager.changeObject(14); _objectsManager.addObject(14); @@ -817,8 +815,6 @@ bool HopkinsEngine::runLinuxDemo() { } bool HopkinsEngine::runOS2Full() { - _globals.SVGA = 2; - _globals.loadObjects(); _objectsManager.changeObject(14); _objectsManager.addObject(14); @@ -1031,10 +1027,7 @@ bool HopkinsEngine::runOS2Full() { _graphicsManager.clearPalette(); // _soundManager.WSOUND_OFF(); _soundManager.WSOUND(6); - if (_globals.SVGA == 2) - _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); - else if (_globals.SVGA == 1) - _animationManager.playAnim("PURG1.ANM", 12, 18, 50); + _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } @@ -1074,10 +1067,7 @@ bool HopkinsEngine::runOS2Full() { _graphicsManager.clearPalette(); _soundManager.WSOUND(6); - if (_globals.SVGA == 2) - _animationManager.playAnim("PURG2A.ANM", 12, 18, 50); - else if (_globals.SVGA == 1) - _animationManager.playAnim("PURG2.ANM", 12, 18, 50); + _animationManager.playAnim("PURG2A.ANM", 12, 18, 50); _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } @@ -1508,10 +1498,7 @@ bool HopkinsEngine::runOS2Full() { _graphicsManager.clearPalette(); _soundManager.WSOUND(6); - if (_globals.SVGA == 2) - _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); - else if (_globals.SVGA == 1) - _animationManager.playAnim("PURG1.ANM", 12, 18, 50); + _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } @@ -1661,8 +1648,6 @@ bool HopkinsEngine::runOS2Full() { } bool HopkinsEngine::runBeOSFull() { - _globals.SVGA = 2; - warning("TODO: Init_Interrupt()"); _globals.loadObjects(); _objectsManager.changeObject(14); @@ -1878,11 +1863,7 @@ bool HopkinsEngine::runBeOSFull() { _graphicsManager.clearPalette(); _soundManager.WSOUND_OFF(); _soundManager.WSOUND(6); - if (_globals.SVGA == 2) - _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); - else if (_globals.SVGA == 1) - _animationManager.playAnim("PURG1.ANM", 12, 18, 50); - + _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } @@ -1922,10 +1903,7 @@ bool HopkinsEngine::runBeOSFull() { _graphicsManager.clearPalette(); _soundManager.WSOUND(6); - if (_globals.SVGA == 2) - _animationManager.playAnim("PURG2A.ANM", 12, 18, 50); - else if (_globals.SVGA == 1) - _animationManager.playAnim("PURG2.ANM", 12, 18, 50); + _animationManager.playAnim("PURG2A.ANM", 12, 18, 50); _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } @@ -2356,11 +2334,7 @@ bool HopkinsEngine::runBeOSFull() { _graphicsManager.clearPalette(); _soundManager.WSOUND(6); - if (_globals.SVGA == 2) - _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); - else if (_globals.SVGA == 1) - _animationManager.playAnim("PURG1.ANM", 12, 18, 50); - + _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } @@ -2505,8 +2479,6 @@ bool HopkinsEngine::runBeOSFull() { } bool HopkinsEngine::runWin95full() { - _globals.SVGA = 2; - warning("TODO: Init_Interrupt_()"); _globals.loadObjects(); @@ -2726,10 +2698,7 @@ bool HopkinsEngine::runWin95full() { _graphicsManager.clearPalette(); _soundManager.WSOUND_OFF(); _soundManager.WSOUND(29); - if (_globals.SVGA == 2) - _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); - else if (_globals.SVGA == 1) - _animationManager.playAnim("PURG1.ANM", 12, 18, 50); + _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } @@ -2766,10 +2735,7 @@ bool HopkinsEngine::runWin95full() { _graphicsManager.unlockScreen(); _graphicsManager.clearPalette(); _soundManager.WSOUND(6); - if (_globals.SVGA == 2) - _animationManager.playAnim("PURG2A.ANM", 12, 18, 50); - else if (_globals.SVGA == 1) - _animationManager.playAnim("PURG2.ANM", 12, 18, 50); + _animationManager.playAnim("PURG2A.ANM", 12, 18, 50); _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } @@ -3196,10 +3162,7 @@ bool HopkinsEngine::runWin95full() { _graphicsManager.unlockScreen(); _graphicsManager.clearPalette(); _soundManager.WSOUND(6); - if (_globals.SVGA == 2) - _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); - else if (_globals.SVGA == 1) - _animationManager.playAnim("PURG1.ANM", 12, 18, 50); + _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } @@ -3561,10 +3524,7 @@ bool HopkinsEngine::runLinuxFull() { _soundManager.WSOUND_OFF(); _soundManager.WSOUND(29); _graphicsManager.FADE_LINUX = 2; - if (_globals.SVGA == 2) - _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); - else if (_globals.SVGA == 1) - _animationManager.playAnim("PURG1.ANM", 12, 18, 50); + _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); _globals.iRegul = 0; } break; @@ -3601,10 +3561,7 @@ bool HopkinsEngine::runLinuxFull() { _soundManager.WSOUND_OFF(); _soundManager.WSOUND(6); _graphicsManager.FADE_LINUX = 2; - if (_globals.SVGA == 2) - _animationManager.playAnim("PURG2A.ANM", 12, 18, 50); - else if (_globals.SVGA == 1) - _animationManager.playAnim("PURG2.ANM", 12, 18, 50); + _animationManager.playAnim("PURG2A.ANM", 12, 18, 50); _globals.iRegul = 0; } break; @@ -4031,10 +3988,7 @@ bool HopkinsEngine::runLinuxFull() { _graphicsManager.unlockScreen(); _graphicsManager.clearPalette(); _soundManager.WSOUND(6); - if (_globals.SVGA == 2) - _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); - else if (_globals.SVGA == 1) - _animationManager.playAnim("PURG1.ANM", 12, 18, 50); + _animationManager.playAnim("PURG1A.ANM", 12, 18, 50); _graphicsManager.fadeOutShort(); _globals.iRegul = 0; } @@ -4544,11 +4498,7 @@ void HopkinsEngine::bombExplosion() { _globals.iRegul = 1; _soundManager.SPECIAL_SOUND = 199; _graphicsManager.FADE_LINUX = 2; - if (_globals.SVGA == 1) - _animationManager.playAnim("BOMBE2.ANM", 50, 14, 500); - else if (_globals.SVGA == 2) - _animationManager.playAnim("BOMBE2A.ANM", 50, 14, 500); - + _animationManager.playAnim("BOMBE2A.ANM", 50, 14, 500); _soundManager.SPECIAL_SOUND = 0; _graphicsManager.loadImage("IM15"); _animationManager.loadAnim("ANIM15"); @@ -4657,59 +4607,31 @@ void HopkinsEngine::BASE() { _graphicsManager.clearPalette(); _animationManager._clearAnimationFl = true; _soundManager.WSOUND(25); - if (_globals.SVGA == 1) { - _animationManager.playAnim("base00.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("base05.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("base10.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("base20.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("base30.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("base40.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("base50.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("OC00.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("OC05.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("OC10.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("OC20.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) { - _graphicsManager.FADE_LINUX = 2; - _animationManager.playAnim("OC30.anm", 10, 18, 18); - } - } else if (_globals.SVGA == 2) { - _animationManager.playAnim("base00a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("base05a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("base10a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("base20a.anm", 10, 18, 18); - // CHECKME: The original code was doing the opposite test, which looks like a bug. - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("base30a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("base40a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("base50a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("OC00a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("OC05a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("OC10a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("OC20a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) { - _graphicsManager.FADE_LINUX = 2; - _animationManager.playAnim("OC30a.anm", 10, 18, 18); - } + _animationManager.playAnim("base00a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("base05a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("base10a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("base20a.anm", 10, 18, 18); + // CHECKME: The original code was doing the opposite test, which looks like a bug. + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("base30a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("base40a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("base50a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("OC00a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("OC05a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("OC10a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("OC20a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) { + _graphicsManager.FADE_LINUX = 2; + _animationManager.playAnim("OC30a.anm", 10, 18, 18); } _eventsManager._escKeyFl = false; @@ -4915,70 +4837,36 @@ void HopkinsEngine::displayPlane() { _graphicsManager.clearPalette(); _animationManager._clearAnimationFl = false; - if (_globals.SVGA == 1) { - _animationManager.playAnim("aerop00.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("aerop10.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("aerop20.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("aerop30.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("aerop40.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("aerop50.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("aerop60.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("aerop70.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("trans00.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("trans10.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("trans15.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("trans20.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("trans30.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("trans40.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) { - _graphicsManager.FADE_LINUX = 2; - _animationManager.playAnim("PARA00.anm", 9, 9, 9); - } - } else if (_globals.SVGA == 2) { - _animationManager.playAnim("aerop00a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("serop10a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("aerop20a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("aerop30a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("aerop40a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("aerop50a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("aerop60a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("aerop70a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("trans00a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("trans10a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("trans15a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("trans20a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("trans30a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) - _animationManager.playAnim("trans40a.anm", 10, 18, 18); - if (!_eventsManager._escKeyFl) { - _graphicsManager.FADE_LINUX = 2; - _animationManager.playAnim("PARA00a.anm", 9, 9, 9); - } + _animationManager.playAnim("aerop00a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("serop10a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("aerop20a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("aerop30a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("aerop40a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("aerop50a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("aerop60a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("aerop70a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("trans00a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("trans10a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("trans15a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("trans20a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("trans30a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) + _animationManager.playAnim("trans40a.anm", 10, 18, 18); + if (!_eventsManager._escKeyFl) { + _graphicsManager.FADE_LINUX = 2; + _animationManager.playAnim("PARA00a.anm", 9, 9, 9); } _eventsManager._escKeyFl = false; diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp index 3077393d61..10ed19016c 100644 --- a/engines/hopkins/script.cpp +++ b/engines/hopkins/script.cpp @@ -1352,10 +1352,7 @@ int ScriptManager::handleOpcode(byte *dataP) { _vm->_globals.NOPARLE = true; _vm->_talkManager.PARLER_PERSO("tourist1.pe2"); _vm->_globals.NOPARLE = false; - if (_vm->_globals.SVGA == 1) - _vm->_animationManager.playAnim2("T421.ANM", 100, 14, 500); - else if (_vm->_globals.SVGA == 2) - _vm->_animationManager.playAnim2("T421a.ANM", 100, 14, 500); + _vm->_animationManager.playAnim2("T421.ANM", 100, 14, 500); _vm->_eventsManager.VBL(); _vm->_eventsManager.VBL(); _vm->_eventsManager.VBL(); @@ -2278,10 +2275,7 @@ int ScriptManager::handleOpcode(byte *dataP) { if (!_vm->_globals._internetFl) { _vm->_graphicsManager.FADE_LINUX = 2; _vm->_graphicsManager._fadeDefaultSpeed = 1; - if (_vm->_globals.SVGA == 2) - _vm->_animationManager.playAnim("BOMBE1A.ANM", 100, 18, 100); - else if (_vm->_globals.SVGA == 1) - _vm->_animationManager.playAnim("BOMBE1.ANM", 100, 18, 100); + _vm->_animationManager.playAnim("BOMBE1A.ANM", 100, 18, 100); } _vm->_graphicsManager.loadImage("BOMBEB"); _vm->_graphicsManager.SETCOLOR3(252, 100, 100, 100); @@ -2313,10 +2307,7 @@ int ScriptManager::handleOpcode(byte *dataP) { _vm->_objectsManager.OPTI_ONE(3, 0, 16, 4); _vm->_soundManager.SPECIAL_SOUND = 199; _vm->_graphicsManager.FADE_LINUX = 2; - if (_vm->_globals.SVGA == 1) - _vm->_animationManager.playAnim("BOMBE2.ANM", 50, 14, 500); - else if (_vm->_globals.SVGA == 2) - _vm->_animationManager.playAnim("BOMBE2A.ANM", 50, 14, 500); + _vm->_animationManager.playAnim("BOMBE2A.ANM", 50, 14, 500); _vm->_soundManager.SPECIAL_SOUND = 0; memset(_vm->_graphicsManager._vesaBuffer, 0, 614400); _vm->_graphicsManager._noFadingFl = true; @@ -2329,10 +2320,7 @@ int ScriptManager::handleOpcode(byte *dataP) { _vm->_globals.NO_VISU = false; _vm->_objectsManager.OPTI_ONE(1, 0, 16, 4); _vm->_soundManager.SPECIAL_SOUND = 199; - if (_vm->_globals.SVGA == 1) - _vm->_animationManager.playAnim("BOMBE2.ANM", 50, 14, 500); - else if (_vm->_globals.SVGA == 2) - _vm->_animationManager.playAnim("BOMBE2A.ANM", 50, 14, 500); + _vm->_animationManager.playAnim("BOMBE2A.ANM", 50, 14, 500); _vm->_soundManager.SPECIAL_SOUND = 0; _vm->_graphicsManager._noFadingFl = true; memset(_vm->_graphicsManager._vesaBuffer, 0, 614400); @@ -2347,10 +2335,7 @@ int ScriptManager::handleOpcode(byte *dataP) { _vm->_graphicsManager.fadeOutShort(); _vm->_soundManager.SPECIAL_SOUND = 199; _vm->_graphicsManager.FADE_LINUX = 2; - if (_vm->_globals.SVGA == 1) - _vm->_animationManager.playAnim("BOMBE2.ANM", 50, 14, 500); - else if (_vm->_globals.SVGA == 2) - _vm->_animationManager.playAnim("BOMBE2A.ANM", 50, 14, 500); + _vm->_animationManager.playAnim("BOMBE2A.ANM", 50, 14, 500); _vm->_soundManager.SPECIAL_SOUND = 0; _vm->_graphicsManager._noFadingFl = true; memset(_vm->_graphicsManager._vesaBuffer, 0, 614400); @@ -2363,10 +2348,7 @@ int ScriptManager::handleOpcode(byte *dataP) { _vm->_globals.NO_VISU = false; _vm->_objectsManager.OPTI_ONE(6, 0, 16, 4); if ((_vm->getPlatform() != Common::kPlatformWindows) || !_vm->getIsDemo()) { - if (_vm->_globals.SVGA == 1) - _vm->_animationManager.playAnim("BOMBE3.ANM", 50, 14, 500); - else if (_vm->_globals.SVGA == 2) - _vm->_animationManager.playAnim("BOMBE3A.ANM", 50, 14, 500); + _vm->_animationManager.playAnim("BOMBE3A.ANM", 50, 14, 500); memset(_vm->_graphicsManager._vesaBuffer, 0, 614400); } _vm->_globals._exitId = 6; -- cgit v1.2.3