[Scummvm-git-logs] scummvm master -> a1a1eb719ba62d1fc937fcc4717ae970507de702

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


Commit: a1a1eb719ba62d1fc937fcc4717ae970507de702
    https://github.com/scummvm/scummvm/commit/a1a1eb719ba62d1fc937fcc4717ae970507de702
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-02-19T23:37:53+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 bdfe1538a11..926912dcfee 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;