FREESCAPE: fixed issue when adding the same type of game twice and re…

…generated freescape.dat file
scummvm · Jan 7, 2023 · 54ae69f · 54ae69f
1 parent 66d89f3
commit 54ae69f
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 2 deletions.
diff --git a/...ate_freescape/driller-cpc_Amstrad CPC.bmp → devtools/create_freescape/driller_cpc.bmp b/...ate_freescape/driller-cpc_Amstrad CPC.bmp → devtools/create_freescape/driller_cpc.bmp
diff --git a/...eate_freescape/driller-zx_ZX Spectrum.bmp → devtools/create_freescape/driller_zx.bmp b/...eate_freescape/driller-zx_ZX Spectrum.bmp → devtools/create_freescape/driller_zx.bmp
diff --git a/...reescape/driller-zx_ZX Spectrum_title.bmp → ...ols/create_freescape/driller_zx_title.bmp b/...reescape/driller-zx_ZX Spectrum_title.bmp → ...ols/create_freescape/driller_zx_title.bmp
diff --git a/...spacestationoblivion-c64_Commodore 64.bmp → ...te_freescape/spacestationoblivion_c64.bmp b/...spacestationoblivion-c64_Commodore 64.bmp → ...te_freescape/spacestationoblivion_c64.bmp
diff --git a/dists/engine-data/freescape.dat b/dists/engine-data/freescape.dat
diff --git a/engines/freescape/loaders/8bitBinaryLoader.cpp b/engines/freescape/loaders/8bitBinaryLoader.cpp
@@ -574,11 +574,11 @@ void FreescapeEngine::load8bitBinary(Common::SeekableReadStream *file, int offse
 
 void FreescapeEngine::loadBundledImages() {
 	Image::BitmapDecoder decoder;
-	Common::String targetName = _targetName;
+	Common::String targetName = Common::String(_gameDescription->gameId);
 	if (isDOS() && isDemo())
 		Common::replace(targetName, "-demo", "");
 
-	Common::String borderFilename = targetName + "_" + Common::getRenderModeDescription(_renderMode) + ".bmp";
+	Common::String borderFilename = targetName + "_" + Common::getRenderModeCode(_renderMode) + ".bmp";
 	if (_dataBundle->hasFile(borderFilename)) {
 		Common::SeekableReadStream *borderFile = _dataBundle->createReadStreamForMember(borderFilename);
 		decoder.loadStream(*borderFile);