Changeset 21828 for ps

Timestamp:

05/28/18 21:06:09 (7 years ago)

Author:

Stan

Message:

Fix non-visual replay hash mismatch caused by CCmpSound condition in CCmpVisualActor
Differential Revision: ​​https://code.wildfiregames.com/D1519
Reviewed by: temple, elexis, wraitii
refs: rP21359

File:

• ps/trunk/source/simulation2/components/CCmpVisualActor.cpp (modified) (2 diffs)

ps/trunk/source/simulation2/components/CCmpVisualActor.cpp

@@ -69 +69 @@
     std::wstring m_BaseActorName, m_ActorName;
     bool m_IsFoundationActor;
+
+    // Not initialized in non-visual mode
     CUnit* m_Unit;
 
@@ -451 +453 @@
         SetVariant("animation", m_AnimName);
 
+        CmpPtr<ICmpSound> cmpSound(GetEntityHandle());
+        if (cmpSound)
+            m_SoundGroup = cmpSound->GetSoundGroup(wstring_from_utf8(m_AnimName));
+
         if (!m_Unit || !m_Unit->GetAnimation() || !m_Unit->GetID())
             return;
-
-        CmpPtr<ICmpSound> cmpSound(GetSimContext(), m_Unit->GetID());
-        if (cmpSound)
-            m_SoundGroup = cmpSound->GetSoundGroup(wstring_from_utf8(m_AnimName));
 
         m_Unit->GetAnimation()->SetAnimationState(m_AnimName, m_AnimOnce, m_AnimSpeed.ToFloat(), m_AnimDesync.ToFloat(), m_SoundGroup.c_str());