[Scummvm-git-logs] scummvm master -> 002bbbc0b595694d82280dacb05dec72e31ef8f7

[neuromancer]

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

Summary:
002bbbc0b5 FREESCAPE: make sure the amiga/atari releases handle correctly the end of the game


Commit: 002bbbc0b595694d82280dacb05dec72e31ef8f7
    https://github.com/scummvm/scummvm/commit/002bbbc0b595694d82280dacb05dec72e31ef8f7
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-12-09T09:37:43+01:00

Commit Message:
FREESCAPE: make sure the amiga/atari releases handle correctly the end of the game

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


diff --git a/engines/freescape/games/driller.cpp b/engines/freescape/games/driller.cpp
index 9868fb68f89..c843e89aef1 100644
--- a/engines/freescape/games/driller.cpp
+++ b/engines/freescape/games/driller.cpp
@@ -356,29 +356,6 @@ void DrillerEngine::loadAssetsFullGame() {
 		loadGlobalObjects(&file, 0x3b42);
 		load8bitBinary(&file, 0x9b40, 16);
 
-		/*
-		We are going to inject a small script in the
-		last area to force the game to end:
-		IF COLLIDED? THEN
-		IF VAR!=? (v32, 18) THEN END ENDIF
-		GOTO (127, 0)
-		*/
-
-		FCLInstructionVector instructions;
-		Common::Array<uint8> conditionArray;
-
-		conditionArray.push_back(0xb);
-		conditionArray.push_back(0x20);
-		conditionArray.push_back(0x12);
-		conditionArray.push_back(0x12);
-		conditionArray.push_back(0x7f);
-		conditionArray.push_back(0x0);
-
-		Common::String conditionSource = detokenise8bitCondition(conditionArray, instructions);
-		debugC(1, kFreescapeDebugParser, "%s", conditionSource.c_str());
-		_areaMap[18]->_conditions.push_back(instructions);
-		_areaMap[18]->_conditionSources.push_back(conditionSource);
-
 	} else if (_renderMode == Common::kRenderCGA) {
 		loadBundledImages();
 		_title = _border;
@@ -389,6 +366,29 @@ void DrillerEngine::loadAssetsFullGame() {
 		load8bitBinary(&file, 0x7bb0, 4);
 	} else
 		error("Invalid or unsupported render mode %s for Driller", Common::getRenderModeDescription(_renderMode));
+
+	/*
+	We are going to inject a small script in the
+	last area to force the game to end:
+	IF COLLIDED? THEN
+	IF VAR!=? (v32, 18) THEN END ENDIF
+	GOTO (127, 0)
+	*/
+
+	FCLInstructionVector instructions;
+	Common::Array<uint8> conditionArray;
+
+	conditionArray.push_back(0xb);
+	conditionArray.push_back(0x20);
+	conditionArray.push_back(0x12);
+	conditionArray.push_back(0x12);
+	conditionArray.push_back(0x7f);
+	conditionArray.push_back(0x0);
+
+	Common::String conditionSource = detokenise8bitCondition(conditionArray, instructions);
+	debugC(1, kFreescapeDebugParser, "%s", conditionSource.c_str());
+	_areaMap[18]->_conditions.push_back(instructions);
+	_areaMap[18]->_conditionSources.push_back(conditionSource);
 }
 
 void DrillerEngine::drawUI() {