[Scummvm-git-logs] scummvm master -> 447c0523f7c401a62eb450e13847e762f4a7f52c

[npjg]

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

Summary:
7f146b5b29 MEDIASTATION: Remove redundant field. PVS-Studio V703
0b555afa01 MEDIASTATION: Fix typo in platform reporting. PVS-Studio V1037
d56870ecb0 MEDIASTATION: Condense some switch cases. PVS-Studio V1037
447c0523f7 MEDIASTATION: Silence noisy script warnings


Commit: 7f146b5b29eb537a6bb1d42283a890fb0a28630f
    https://github.com/scummvm/scummvm/commit/7f146b5b29eb537a6bb1d42283a890fb0a28630f
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2026-10-20T21:06:41-04:00

Commit Message:
MEDIASTATION: Remove redundant field. PVS-Studio V703

Changed paths:
    engines/mediastation/actors/path.h


diff --git a/engines/mediastation/actors/path.h b/engines/mediastation/actors/path.h
index 57a8f2afe78..59482bec038 100644
--- a/engines/mediastation/actors/path.h
+++ b/engines/mediastation/actors/path.h
@@ -51,7 +51,6 @@ private:
 	double _stepRate = 0.0;
 	uint _stepDurationInMilliseconds = 0;
 	uint _currentStep = 0;
-	uint _startTime = 0;
 	uint _pauseTime = 0;
 	uint _totalSteps = 0;
 	uint _nextPathStepTime = 0;


Commit: 0b555afa01a9ae956b062e357a3001791627f001
    https://github.com/scummvm/scummvm/commit/0b555afa01a9ae956b062e357a3001791627f001
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2026-10-20T21:06:41-04:00

Commit Message:
MEDIASTATION: Fix typo in platform reporting. PVS-Studio V1037

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


diff --git a/engines/mediastation/mediascript/function.cpp b/engines/mediastation/mediascript/function.cpp
index 5abbb8efa62..08a245c4f97 100644
--- a/engines/mediastation/mediascript/function.cpp
+++ b/engines/mediastation/mediascript/function.cpp
@@ -297,7 +297,7 @@ void FunctionManager::script_GetPlatform(Common::Array<ScriptValue> &args, Scrip
 		break;
 
 	case Common::Platform::kPlatformMacintosh:
-		returnValue.setToParamToken(kPlatformParamTokenWindows);
+		returnValue.setToParamToken(kPlatformParamTokenMacintosh);
 		break;
 
 	default:
diff --git a/engines/mediastation/mediascript/function.h b/engines/mediastation/mediascript/function.h
index 72107565808..2381cc5c1bc 100644
--- a/engines/mediastation/mediascript/function.h
+++ b/engines/mediastation/mediascript/function.h
@@ -34,7 +34,7 @@ namespace MediaStation {
 enum Platform {
 	kPlatformParamTokenUnknown = 0,
 	kPlatformParamTokenWindows = 0x76D,
-	kPlatformParakTokenMacintosh = 0x76E
+	kPlatformParamTokenMacintosh = 0x76E
 };
 
 class ScriptFunction {


Commit: d56870ecb030aa36afd8bc2306c330274257b3c3
    https://github.com/scummvm/scummvm/commit/d56870ecb030aa36afd8bc2306c330274257b3c3
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2026-10-20T21:06:42-04:00

Commit Message:
MEDIASTATION: Condense some switch cases. PVS-Studio V1037

Changed paths:
    engines/mediastation/mediascript/scriptvalue.cpp


diff --git a/engines/mediastation/mediascript/scriptvalue.cpp b/engines/mediastation/mediascript/scriptvalue.cpp
index 9ae3fdb7a25..8e0393576b2 100644
--- a/engines/mediastation/mediascript/scriptvalue.cpp
+++ b/engines/mediastation/mediascript/scriptvalue.cpp
@@ -132,6 +132,7 @@ void ScriptValue::copyFrom(const ScriptValue &other) {
 		break;
 
 	case kScriptValueTypeFloat:
+	case kScriptValueTypeTime:
 		_u.d = other._u.d;
 		break;
 
@@ -139,10 +140,6 @@ void ScriptValue::copyFrom(const ScriptValue &other) {
 		_u.b = other._u.b;
 		break;
 
-	case kScriptValueTypeTime:
-		_u.d = other._u.d;
-		break;
-
 	case kScriptValueTypeParamToken:
 		_u.paramToken = other._u.paramToken;
 		break;
@@ -380,6 +377,7 @@ bool ScriptValue::compare(Opcode op, const ScriptValue &lhs, const ScriptValue &
 		break;
 
 	case kScriptValueTypeFloat:
+	case kScriptValueTypeTime:
 		result = compare(op, lhs.asFloatOrTime(), rhs.asFloatOrTime());
 		break;
 
@@ -387,10 +385,6 @@ bool ScriptValue::compare(Opcode op, const ScriptValue &lhs, const ScriptValue &
 		result = compare(op, lhs.asBool(), rhs.asBool());
 		break;
 
-	case kScriptValueTypeTime:
-		result = compare(op, lhs.asFloatOrTime(), rhs.asFloatOrTime());
-		break;
-
 	case kScriptValueTypeParamToken:
 		result = compare(op, lhs.asParamToken(), rhs.asParamToken());
 		break;


Commit: 447c0523f7c401a62eb450e13847e762f4a7f52c
    https://github.com/scummvm/scummvm/commit/447c0523f7c401a62eb450e13847e762f4a7f52c
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2026-10-20T21:06:42-04:00

Commit Message:
MEDIASTATION: Silence noisy script warnings

Changed paths:
    engines/mediastation/mediascript/function.cpp
    engines/mediastation/mediascript/scriptvalue.cpp


diff --git a/engines/mediastation/mediascript/function.cpp b/engines/mediastation/mediascript/function.cpp
index 08a245c4f97..23fce0f51e2 100644
--- a/engines/mediastation/mediascript/function.cpp
+++ b/engines/mediastation/mediascript/function.cpp
@@ -391,7 +391,7 @@ void FunctionManager::script_EffectTransition(Common::Array<ScriptValue> &args,
 	// Puzzle Castle has this weird code path where it checks for this magic value.
 	// If so, it doesn't actually do the transition. Otherwise, we just do a normal
 	// transition. Scripts rely on this behavior, so we must reimplement it.
-	bool triggerPuzzleCastleIterationUpdate = (args.size() == 2) && (args[0].asFloat() == 9999);
+	bool triggerPuzzleCastleIterationUpdate = (args.size() == 2) && (args[0].getType() == kScriptValueTypeFloat && args[0].asFloat() == 9999);
 	if (triggerPuzzleCastleIterationUpdate) {
 		uint iterations = static_cast<uint>(args[1].asFloat());
 		uint start = g_engine->currentTimeInSeconds();
diff --git a/engines/mediastation/mediascript/scriptvalue.cpp b/engines/mediastation/mediascript/scriptvalue.cpp
index 8e0393576b2..dafdd2bc7e0 100644
--- a/engines/mediastation/mediascript/scriptvalue.cpp
+++ b/engines/mediastation/mediascript/scriptvalue.cpp
@@ -365,14 +365,13 @@ Common::String ScriptValue::getDebugString(bool includeDefaultName) const {
 }
 
 bool ScriptValue::compare(Opcode op, const ScriptValue &lhs, const ScriptValue &rhs) {
-	if (lhs.getType() != rhs.getType()) {
-		warning("%s: Attempt to compare mismatched values: %s; %s",
-			__func__, lhs.getDebugString().c_str(), rhs.getDebugString().c_str());
-	}
-
 	bool result = false;
 	switch (lhs.getType()) {
 	case kScriptValueTypeEmpty:
+		if (lhs.getType() != rhs.getType()) {
+			warning("%s: Attempt to compare mismatched values: %s; %s",
+				__func__, lhs.getDebugString().c_str(), rhs.getDebugString().c_str());
+		}
 		result = compareEmptyValues(op);
 		break;