[Scummvm-git-logs] scummvm master -> 8fc4c977a539cf011bff71610c60e4e216434557

[AndywinXp]

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:
8fc4c977a5 SCUMM: DOTT: Partial fix for hotspots being unclickable after load


Commit: 8fc4c977a539cf011bff71610c60e4e216434557
    https://github.com/scummvm/scummvm/commit/8fc4c977a539cf011bff71610c60e4e216434557
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-11-18T22:00:01+01:00

Commit Message:
SCUMM: DOTT: Partial fix for hotspots being unclickable after load

Related to ticket #15404.

Changed paths:
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 4b501dc1d66..d1b8afb9da2 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -1344,7 +1344,6 @@ bool ScummEngine::changeSavegameName(int slot, char *newName) {
 
 void ScummEngine::saveLoadWithSerializer(Common::Serializer &s) {
 	int i;
-	int var120Backup;
 	int var98Backup;
 	uint8 md5Backup[16];
 
@@ -1930,7 +1929,14 @@ void ScummEngine::saveLoadWithSerializer(Common::Serializer &s) {
 	//
 	// Save/load script variables
 	//
-	var120Backup = _scummVars[120];
+
+	// From disasm...
+	int32 dottVarsBackup[5];
+	if (_game.id == GID_TENTACLE) {
+		for (int j = 0; j < 5; j++)
+			dottVarsBackup[j] = _scummVars[120 + j];
+	}
+
 	var98Backup = _scummVars[98];
 
 	s.syncArray(_roomVars, _numRoomVariables, Common::Serializer::Sint32LE, VER(38));
@@ -1961,8 +1967,14 @@ void ScummEngine::saveLoadWithSerializer(Common::Serializer &s) {
 		}
 	}
 
-	if (_game.id == GID_TENTACLE)	// Maybe misplaced, but that's the main idea
-		_scummVars[120] = var120Backup;
+	// This is again from disasm...
+	if (_game.id == GID_TENTACLE) {	
+		for (int j = 0; j < 5; j++)
+			_scummVars[120 + j] = dottVarsBackup[j];
+
+		_scummVars[70] = 1;
+	}
+
 	if (_game.id == GID_INDY4)
 		_scummVars[98] = var98Backup;