[Scummvm-git-logs] scummvm master -> 205c4ff6183bc64c68008f94e958d9182f1f834d

[bluegr]

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

Summary:
48d325b301 COMMON: Fix JSON isNumber/asNumber IntegerNumber handling
205c4ff618 TWP: Simplify JSON IntegerNumber handling


Commit: 48d325b301c714db19b0831cade52cbcaf5780e2
    https://github.com/scummvm/scummvm/commit/48d325b301c714db19b0831cade52cbcaf5780e2
Author: Sebastien Ronsse (sronsse at gmail.com)
Date: 2026-02-16T07:59:30+02:00

Commit Message:
COMMON: Fix JSON isNumber/asNumber IntegerNumber handling

Changed paths:
    common/formats/json.cpp


diff --git a/common/formats/json.cpp b/common/formats/json.cpp
index 09fb1633acb..d5c193f6440 100644
--- a/common/formats/json.cpp
+++ b/common/formats/json.cpp
@@ -777,7 +777,7 @@ bool JSONValue::isBool() const {
 * @return bool Returns true if it is a Number value, false otherwise
 */
 bool JSONValue::isNumber() const {
-	return _type == JSONType_Number;
+	return _type == JSONType_Number || _type == JSONType_IntegerNumber;
 }
 
 /**
@@ -846,6 +846,8 @@ bool JSONValue::asBool() const {
 * @return double Returns the number value
 */
 double JSONValue::asNumber() const {
+	if (_type == JSONType_IntegerNumber)
+		return (double)_integerValue;
 	return _numberValue;
 }
 


Commit: 205c4ff6183bc64c68008f94e958d9182f1f834d
    https://github.com/scummvm/scummvm/commit/205c4ff6183bc64c68008f94e958d9182f1f834d
Author: Sebastien Ronsse (sronsse at gmail.com)
Date: 2026-02-16T07:59:30+02:00

Commit Message:
TWP: Simplify JSON IntegerNumber handling

Changed paths:
    engines/twp/room.cpp
    engines/twp/util.cpp


diff --git a/engines/twp/room.cpp b/engines/twp/room.cpp
index 4c4c3983462..60160562487 100644
--- a/engines/twp/room.cpp
+++ b/engines/twp/room.cpp
@@ -52,9 +52,6 @@ static Direction parseUseDir(const Common::String &s) {
 }
 
 static Math::Vector2d parseParallax(const Common::JSONValue &v) {
-	if (v.isIntegerNumber()) {
-		return {(float)v.asIntegerNumber(), 1};
-	}
 	if (v.isNumber()) {
 		return {(float)v.asNumber(), 1};
 	}
diff --git a/engines/twp/util.cpp b/engines/twp/util.cpp
index bd7605d9f5e..0df017e338e 100644
--- a/engines/twp/util.cpp
+++ b/engines/twp/util.cpp
@@ -61,8 +61,6 @@ Facing getFacingToFaceTo(Common::SharedPtr<Object> actor, Common::SharedPtr<Obje
 static float parseFps(const Common::JSONValue &jFps) {
 	if (jFps.isNumber())
 		return jFps.asNumber();
-	if (jFps.isIntegerNumber())
-		return jFps.asIntegerNumber();
 	error("fps should be a number: %s", jFps.stringify().c_str());
 }