Changeset 24561

Timestamp:

Jan 12, 2021, 5:15:40 PM (4 years ago)

Author:

wraitii

Message:

Fix rP24462 - Set entity/template before deserializing.

Following rP24462, components Deserialize() was called before entity/template were set, which is incorrect.

Refs #4698.

Differential Revision: ​https://code.wildfiregames.com/D3337

Location:

ps/trunk

Files:

• binaries/data/mods/_test.sim/simulation/components/test-serialize.js (modified) (1 diff)
• source/simulation2/scripting/ScriptComponent.cpp (modified) (1 diff)

ps/trunk/binaries/data/mods/_test.sim/simulation/components/test-serialize.js

@@ -88 +88 @@
 TestScript1_consts.prototype.Schema = "<ref name='anything'/>";
 
+
+
+
+
+
+
+
+
+
+
 TestScript1_consts.prototype.GetX = function() {
-    return (+this.entity) + (+this.template.x);
+    return ;
 };
 

ps/trunk/source/simulation2/scripting/ScriptComponent.cpp

@@ -63 +63 @@
     ScriptRequest rq(m_ScriptInterface);
 
-    deserialize.ScriptObjectAssign("comp", m_Instance);
-
     m_ScriptInterface.SetProperty(m_Instance, "entity", (int)ent, true, false);
     m_ScriptInterface.SetProperty(m_Instance, "template", paramNode, true, false);
 
+
 }