[Scummvm-git-logs] scummvm branch-2-9 -> debbc709cc6df9c3d7e8697521ee41f8253aa47e

[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:
debbc709cc SCUMM: MOONBASE: Fix multiplayer crash


Commit: debbc709cc6df9c3d7e8697521ee41f8253aa47e
    https://github.com/scummvm/scummvm/commit/debbc709cc6df9c3d7e8697521ee41f8253aa47e
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-02-20T09:26:03+01:00

Commit Message:
SCUMM: MOONBASE: Fix multiplayer crash

Fixes ticket #15752:
"SCUMM: MOONBASE: Multiplayer crashes guests when starting game"

Changed paths:
    engines/scumm/script_v6.cpp


diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 6b31b539b24..938668817e2 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -362,7 +362,7 @@ int ScummEngine_v6::findFreeArrayId() {
 
 	for (i = 1; i < _numArray; i++) {
 		if (!rtd[i]._address)
-			return i;
+			return (_game.heversion >= 80 ? (i | MAGIC_ARRAY_NUMBER) : i);
 	}
 	error("Out of array pointers, %d max", _numArray);
 	return -1;