mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-14 14:15:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix 9fc6c3c897 - Set entity/template before deserializing.

Browse Source 
Following 9fc6c3c897, components Deserialize() was called before
entity/template were set, which is incorrect.

Refs #4698.

Differential Revision: https://code.wildfiregames.com/D3337
This was SVN commit r24561.
This commit is contained in:
wraitii
2021-01-12 16:15:40 +00:00
parent a3c810b5eb
commit 78764926f8
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/scripting/ScriptComponent.cpp
+1 -2
View File
@@ -62,9 +62,8 @@ void CComponentTypeScript::Deserialize(const CParamNode& paramNode, IDeserialize
{
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);
deserialize.ScriptObjectAssign("comp", m_Instance);
}