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

[npjg]

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:
fb303a7871 MEDIASTATION: Skip reading variable ID for collection members


Commit: fb303a7871ca7c35620a56c587e3578b5054092d
    https://github.com/scummvm/scummvm/commit/fb303a7871ca7c35620a56c587e3578b5054092d
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2025-01-05T15:27:58-05:00

Commit Message:
MEDIASTATION: Skip reading variable ID for collection members

Changed paths:
    engines/mediastation/mediascript/variable.cpp
    engines/mediastation/mediascript/variable.h


diff --git a/engines/mediastation/mediascript/variable.cpp b/engines/mediastation/mediascript/variable.cpp
index 4ebe62580c4..d12d3eb2a1c 100644
--- a/engines/mediastation/mediascript/variable.cpp
+++ b/engines/mediastation/mediascript/variable.cpp
@@ -27,9 +27,11 @@
 
 namespace MediaStation {
 
-Variable::Variable(Chunk &chunk) {
-	_id = Datum(chunk, kDatumTypeUint16_1).u.i;
-	_type = VariableType(Datum(chunk, kDatumTypeUint8).u.i);
+Variable::Variable(Chunk &chunk, bool readId) {
+	if (readId) {
+		_id = Datum(chunk).u.i;
+	}
+	_type = VariableType(Datum(chunk).u.i);
 	debugC(5, kDebugLoading, "Variable::Variable(): id = 0x%x, type 0x%x (@0x%llx)", _id, static_cast<uint>(_type), static_cast<long long int>(chunk.pos()));
 	switch ((VariableType)_type) {
 	case kVariableTypeCollection: {
@@ -37,7 +39,7 @@ Variable::Variable(Chunk &chunk) {
 		_value.collection = new Common::Array<Variable *>;
 		for (uint i = 0; i < totalItems; i++) {
 			debugC(7, kDebugLoading, "Variable::Variable(): COLLECTION: Value %d of %d", i, totalItems);
-			Variable *variableDeclaration = new Variable(chunk);
+			Variable *variableDeclaration = new Variable(chunk, readId = false);
 			_value.collection->push_back(variableDeclaration);
 		}
 		break;
diff --git a/engines/mediastation/mediascript/variable.h b/engines/mediastation/mediascript/variable.h
index a85935d78fa..ffb11c9a723 100644
--- a/engines/mediastation/mediascript/variable.h
+++ b/engines/mediastation/mediascript/variable.h
@@ -67,7 +67,7 @@ public:
 	} _value;
 
 	Variable();
-	Variable(Chunk &chunk);
+	Variable(Chunk &chunk, bool readId = true);
 	~Variable();
 };