AnimFrame_Z: Almost match. Agent System: Whole lot of work

Author: 0x5abe

configure.py

@@ -799,12 +799,12 @@ def MatchingFor(*versions):
             Object(NonMatching, "Engine/MatrixCache_Z.cpp"),
             Object(NonMatching, "Engine/SurfaceCache_Z.cpp"),
             Object(Matching,    "Engine/ABC_Category.cpp"),
-            Object(NonMatching, "Engine/AnimatedMsgAgent_Z.cpp"),
+            Object(Matching,    "Engine/AnimatedMsgAgent_Z.cpp"),
             Object(NonMatching, "Engine/StreamAgent_Z.cpp"),
             Object(NonMatching, "Engine/ObjectMoveCollShadow_Z.cpp"),
             Object(NonMatching, "Engine/SystemDatas_Z.cpp"),
             Object(NonMatching, "Engine/ParticlesLoad_Z.cpp"),
-            Object(NonMatching, "Engine/SkinAgent_Z.cpp"),
+            Object(Matching,    "Engine/SkinAgent_Z.cpp"),
             Object(NonMatching, "Engine/MeshCollision_Z.cpp"),
             Object(NonMatching, "Engine/CameraAgent_Z.cpp"),
             Object(NonMatching, "Engine/InputEngine_Z.cpp"),
@@ -988,7 +988,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "Engine/LodCollisionSphere_Z.cpp"),
             Object(NonMatching, "Engine/ABC_ScriptManagerReserve_Z.cpp"),
             Object(NonMatching, "Engine/ObjectsMoveCollNode_Z.cpp"),
-            Object(NonMatching, "Engine/LodDynAgent_Z.cpp"),
+            Object(Matching,    "Engine/LodDynAgent_Z.cpp"),
             Object(NonMatching, "Engine/LodMoveCollCarrying_Z.cpp"),
             Object(NonMatching, "Engine/Particles_Z.cpp"),
             Object(Matching,    "Engine/AnimationNode_Z.cpp"),

src/Engine/ABC_Agent.cpp

@@ -1,19 +1,45 @@
 #include "ABC_Agent.h"
+#include "Program_Z.h"
+#include "ABC_ScriptManager.h"
+
+ABC_Behavior* ABC_Agent::currentBehavior = NULL;
+S32 behaviorLocalVariablesSize;
+void* behaviorLocalData;
+S32 sequenceCurrentNesting;
 
 ABC_Agent::ABC_Agent() {
-    m_AgentState = agent_neverActivated;
-    m_UnkAgent = NULL;
-    m_UnkAgent2 = NULL;
+    m_State = agent_neverActivated;
+    m_Next = NULL;
+    m_Prev = NULL;
     m_Sender = 0;
     m_MessageListHead = NULL;
     m_MessageListTail = NULL;
     m_BufferMessageListHead = NULL;
     m_BufferMessageListTail = NULL;
     m_BehaviorListHead = NULL;
-    m_AbcAgentFlags = NULL;
+    m_Flags = NULL;
 }
 
-ABC_Agent::~ABC_Agent() { }
+ABC_Agent::~ABC_Agent() {
+    if (gData.ScriptMgr) {
+        ReleaseMessageList();
+        SwapMessageList();
+        ReleaseMessageList();
+        ReleaseBehaviors();
+        ABC_AgentHdl& l_Hdl = (ABC_AgentHdl&)GetHandle();
+        gData.ScriptMgr->RemoveAgent(l_Hdl);
+    }
+}
 
-void ABC_Agent::GetBehavior(behaviorMethodPtr i_Behav) {
+ABC_Behavior* ABC_Agent::GetBehavior(behaviorMethodPtr i_BhvMethod) {
+    ABC_Behavior* l_CurBhv = m_BehaviorListHead;
+    while (l_CurBhv) {
+        if (i_BhvMethod == l_CurBhv->m_Method) {
+            return l_CurBhv;
+        }
+        else {
+            l_CurBhv = l_CurBhv->m_Next;
+        }
+    }
+    return NULL;
 }

src/Engine/ABC_ScriptManager.cpp

@@ -1 +1,29 @@
 #include "ABC_ScriptManager.h"
+#include "LodDynAgent_Z.h"
+#include "Program_Z.h"
+#include "CameraAgent_Z.h"
+#include "SkinAgent_Z.h"
+#include "StreamAgent_Z.h"
+#include "LodAgent_Z.h"
+#include "Breakable_Z.h"
+#include "RtcAgent_Z.h"
+#include "SubLevelVolumeAgent_Z.h"
+#include "ParticlesAgent_Z.h"
+
+void InitEngineScriptClasses() {
+    INIT_AGENT_CLASS(CameraAgent_Z)
+    INIT_AGENT_CLASS(Agent_Z)
+    INIT_AGENT_CLASS(StreamAgent_Z)
+    INIT_AGENT_CLASS(AnimatedMsgAgent_Z)
+    INIT_AGENT_CLASS(AnimatedAgent_Z)
+    INIT_AGENT_CLASS(LodDynAgent_Z)
+    INIT_AGENT_CLASS(SkinAgent_Z)
+    INIT_AGENT_CLASS(MovingAgent_Z)
+    INIT_AGENT_CLASS(Throwable_Z)
+    INIT_AGENT_CLASS(LodAgent_Z)
+    INIT_AGENT_CLASS(Breakable_Z)
+    INIT_AGENT_CLASS(RtcAgent_Z)
+    INIT_AGENT_CLASS(VolumeAgent_Z)
+    INIT_AGENT_CLASS(SubLevelVolumeAgent_Z)
+    INIT_AGENT_CLASS(ParticlesAgent_Z)
+}

src/Engine/Agent_Z.cpp

@@ -0,0 +1,12 @@
+#include "Agent_Z.h"
+
+BEGIN_INIT_AGENT_CLASS(Agent_Z, ABC_Agent)
+END_INIT_AGENT_CLASS
+
+Agent_Z::Agent_Z() {
+    m_AgentFlags = 0;
+    EnableFlag(FL_AGENT_UNK_0x200000);
+    m_ClassSoundIndex = -1;
+    m_MaxSqrDistActive = User_DefaultAgentMaxSqrDistActive;
+    m_MinSqrDistActive = User_DefaultAgentMinSqrDistActive;
+}

src/Engine/AnimFrameLoad_Z.cpp

@@ -3,7 +3,7 @@
 
 // TODO: Finish matching
 void AnimFrame_Z::Load(void** i_Data) {
-    gData.ClassMgr->LoadLink(m_NodeHdl, i_Data);
+    gData.ClassMgr->LoadLink(m_AnimatedNodeHdl, i_Data);
     LOAD_Z(m_MaxTime);
     m_TransKfr.Load(i_Data);
     m_RotKfr.Load(i_Data);
@@ -43,7 +43,7 @@ void AnimFrame_Z::EndLoad() {
     S32 i;
     S32 j;
     m_ResObjLink.EndLoad();
-    gData.ClassMgr->UpdateLink(m_NodeHdl);
+    gData.ClassMgr->UpdateLink(m_AnimatedNodeHdl);
     for (i = 0; i < m_FollowSplineKfr.GetNbKeys(); i++) {
         gData.ClassMgr->UpdateLink(m_FollowSplineKfr.m_Keys[i].m_NodeHdl);
     }