[Scummvm-git-logs] scummvm master -> 9df2166b2ebdf7edfdc023c840cbe273b9792172

[neuromancer]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f80620c5ff FREESCAPE: added driller-zx_ZX Spectrum.bmp into freescape.dat and regenerated the data file
9df2166b2e FREESCAPE: loaded global objects in driller zx releases


Commit: f80620c5ffff4544f36647045d6bd5adb5e649ea
    https://github.com/scummvm/scummvm/commit/f80620c5ffff4544f36647045d6bd5adb5e649ea
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-12-24T15:57:11-03:00

Commit Message:
FREESCAPE: added driller-zx_ZX Spectrum.bmp into freescape.dat and regenerated the data file

Changed paths:
  A devtools/create_freescape/driller-zx_ZX Spectrum.bmp
    dists/engine-data/freescape.dat


diff --git a/devtools/create_freescape/driller-zx_ZX Spectrum.bmp b/devtools/create_freescape/driller-zx_ZX Spectrum.bmp
new file mode 100644
index 00000000000..6cc207a6913
Binary files /dev/null and b/devtools/create_freescape/driller-zx_ZX Spectrum.bmp differ
diff --git a/dists/engine-data/freescape.dat b/dists/engine-data/freescape.dat
index 901f77e4620..f6aeb331c27 100644
Binary files a/dists/engine-data/freescape.dat and b/dists/engine-data/freescape.dat differ


Commit: 9df2166b2ebdf7edfdc023c840cbe273b9792172
    https://github.com/scummvm/scummvm/commit/9df2166b2ebdf7edfdc023c840cbe273b9792172
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-12-24T16:58:22-03:00

Commit Message:
FREESCAPE: loaded global objects in driller zx releases

Changed paths:
    engines/freescape/games/driller.cpp


diff --git a/engines/freescape/games/driller.cpp b/engines/freescape/games/driller.cpp
index 9db0fa13958..5b55818eea7 100644
--- a/engines/freescape/games/driller.cpp
+++ b/engines/freescape/games/driller.cpp
@@ -422,8 +422,7 @@ void DrillerEngine::loadAssetsFullGame() {
 		if (_variant & ADGF_ZX_MUSICAL)
 			loadFonts(&file, 0x5aa8);
 
-		//loadGlobalObjects(&file, 0x642c);
-		//loadGlobalObjects(&file, 0x5c0a);
+		loadGlobalObjects(&file, 0x1c93);
 
 		if (_variant & ADGF_ZX_RETAIL)
 			load8bitBinary(&file, 0x642c, 4);