[Scummvm-git-logs] scummvm master -> 14b42a3a4ea23d178bf34571f2b8e27d22f126f7

[neuromancer]

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

Summary:
1fe21ca59b FREESCAPE: deallocate array of coordinates in opengl renderer
8a7dcd0bbf FREESCAPE: avoid potential null derreference when scaling objects
14b42a3a4e FREESCAPE: parse more data in the atari release of driller


Commit: 1fe21ca59b6ceeb458f501df2ab73035bcc79562
    https://github.com/scummvm/scummvm/commit/1fe21ca59b6ceeb458f501df2ab73035bcc79562
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-11-18T23:17:09+01:00

Commit Message:
FREESCAPE: deallocate array of coordinates in opengl renderer

Changed paths:
    engines/freescape/gfx_opengl.cpp


diff --git a/engines/freescape/gfx_opengl.cpp b/engines/freescape/gfx_opengl.cpp
index 37aa1197a9c..9d8450a3ec7 100644
--- a/engines/freescape/gfx_opengl.cpp
+++ b/engines/freescape/gfx_opengl.cpp
@@ -45,6 +45,7 @@ OpenGLRenderer::OpenGLRenderer(int screenW, int screenH, Common::RenderMode rend
 
 OpenGLRenderer::~OpenGLRenderer() {
 	free(_verts);
+	free(_coords);
 }
 
 Texture *OpenGLRenderer::createTexture(const Graphics::Surface *surface) {


Commit: 8a7dcd0bbf9f8e611a8522f255b65cad58dcc364
    https://github.com/scummvm/scummvm/commit/8a7dcd0bbf9f8e611a8522f255b65cad58dcc364
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-11-18T23:19:51+01:00

Commit Message:
FREESCAPE: avoid potential null derreference when scaling objects

Changed paths:
    engines/freescape/loaders/8bitBinaryLoader.cpp


diff --git a/engines/freescape/loaders/8bitBinaryLoader.cpp b/engines/freescape/loaders/8bitBinaryLoader.cpp
index f22251c4b18..31ca3b81bce 100644
--- a/engines/freescape/loaders/8bitBinaryLoader.cpp
+++ b/engines/freescape/loaders/8bitBinaryLoader.cpp
@@ -373,9 +373,9 @@ Area *FreescapeEngine::load8bitArea(Common::SeekableReadStream *file, uint16 nco
 	for (uint8 object = 0; object < numberOfObjects && areaNumber != 192; object++) {
 		debugC(1, kFreescapeDebugParser, "Reading object: %d", object);
 		Object *newObject = load8bitObject(file);
-		newObject->scale(scale);
 
 		if (newObject) {
+			newObject->scale(scale);
 			if (newObject->getType() == kEntranceType) {
 				if (entrancesByID->contains(newObject->getObjectID() & 0x7fff))
 					error("WARNING: replacing object id %d (%d)", newObject->getObjectID(), newObject->getObjectID() & 0x7fff);


Commit: 14b42a3a4ea23d178bf34571f2b8e27d22f126f7
    https://github.com/scummvm/scummvm/commit/14b42a3a4ea23d178bf34571f2b8e27d22f126f7
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-11-18T23:42:08+01:00

Commit Message:
FREESCAPE: parse more data in the atari release of driller

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


diff --git a/engines/freescape/games/driller.cpp b/engines/freescape/games/driller.cpp
index 7210cacb7d8..7ee8e8c6deb 100644
--- a/engines/freescape/games/driller.cpp
+++ b/engines/freescape/games/driller.cpp
@@ -324,8 +324,8 @@ void DrillerEngine::loadAssetsFullGame() {
 		}
 		_title = loadAndConvertNeoImage(&file, 0x10, palette);
 
-		//loadMessagesFixedSize(&file, 0xc66e, 14, 20);
-		//loadGlobalObjects(&file, 0xbd62);
+		loadMessagesFixedSize(&file, 0xc5d8, 14, 20);
+		loadGlobalObjects(&file, 0xbccc);
 		load8bitBinary(&file, 0x29b3c, 16);
 		loadPalettes(&file, 0x296fa);
 		loadSoundsFx(&file, 0x30da6, 25);