Merge pull request #386 from YoYoGames/bugs/gmb-1709

jackerley · web-flow · commit a05703e99c22 · 2023-10-16T17:17:40.000+01:00
Fix bug YoYoGames/GameMaker-Bugs#1709
diff --git a/scripts/functions/Function_File.js b/scripts/functions/Function_File.js
@@ -1404,7 +1404,7 @@ function _json_reviver(_, value)
 			}
 			// It's an object prepare to set internal values
 			var obj = {};
-			obj.__type = "Object";
+			obj.__type = "___struct___";
 			obj.__yyIsGMLObject = true;
 			// Go through all the property names in parsed value
 			for (var oName in value) {
diff --git a/scripts/functions/Function_Maths.js b/scripts/functions/Function_Maths.js
@@ -1535,7 +1535,7 @@ function lerp(_val1, _val2, _amount) {
     _val1 = yyGetReal(_val1);
     _val2 = yyGetReal(_val2);
 
-    return _val1 + ((_val2 - _val1) * _amount);
+    return _val1 + ((_val2 - _val1) * yyGetReal(_amount));
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1404,7 +1404,7 @@ function _json_reviver(_, value)`
`1404`	`1404`	`}`
`1405`	`1405`	`// It's an object prepare to set internal values`
`1406`	`1406`	`var obj = {};`
`1407`		`- obj.__type = "Object";`
	`1407`	`+ obj.__type = "___struct___";`
`1408`	`1408`	`obj.__yyIsGMLObject = true;`
`1409`	`1409`	`// Go through all the property names in parsed value`
`1410`	`1410`	`for (var oName in value) {`
Original file line number	Diff line number	Diff line change
`@@ -1535,7 +1535,7 @@ function lerp(_val1, _val2, _amount) {`
`1535`	`1535`	`_val1 = yyGetReal(_val1);`
`1536`	`1536`	`_val2 = yyGetReal(_val2);`
`1537`	`1537`
`1538`		`- return _val1 + ((_val2 - _val1) * _amount);`
	`1538`	`+ return _val1 + ((_val2 - _val1) * yyGetReal(_amount));`
`1539`	`1539`	`}`
`1540`	`1540`
`1541`	`1541`