HOPKINS: Get rid of the checks for the interlaced videos inside the T…

…SVGA folder
scummvm · Jan 7, 2013 · 55337fa · 55337fa
1 parent f1dafa0
commit 55337fa
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 229 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -329,7 +329,6 @@ class Globals {
 	int _inventory[36];
 	SortItem _sortedDisplay[51];
 	Language _language;
-	int SVGA;
 	bool _internetFl;
 	bool PUBEXIT;
 	int PERSO_TYPE;