Start decompiling zNPCGoalStd (#334)

configure.py

@@ -416,7 +416,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
             Object(NonMatching, "SB/Core/gc/ngcrad3d.c"),
             Object(Matching, "SB/Game/zNPCGoals.cpp"),
             Object(NonMatching, "SB/Game/zNPCGoalCommon.cpp"), # wrong function order
-            Object(NonMatching, "SB/Game/zNPCGoalStd.cpp"),
+            Object(NonMatching, "SB/Game/zNPCGoalStd.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Game/zNPCGoalRobo.cpp"),
             Object(Matching, "SB/Game/zNPCGoalTiki.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Game/zNPCMessenger.cpp"),

src/SB/Core/x/xBehaviour.h

@@ -103,8 +103,9 @@ struct xPsyche : RyzMemData
     void ImmTranOff();
     S32 ImmTranIsOn();
     S32 HasGoal(S32 goal);
-    S32 GIDOfPending() const;
+    xGoal* GetCurGoal() const;
     S32 GIDOfActive() const;
+    S32 GIDOfPending() const;
     S32 Timestep(F32 dt, void* updCtxt);
     xGoal* FindGoal(S32 gid);
     S32 GoalSet(S32 gid, S32 r5);

src/SB/Core/x/xFactory.h

@@ -12,8 +12,16 @@ struct xFactoryInst : RyzMemData
     xFactoryInst* nextprod;
     xFactoryInst* prevprod;
 
-    xFactoryInst();
-    ~xFactoryInst();
+    xFactoryInst()
+    {
+        itemType = 0;
+        prevprod = NULL;
+        nextprod = NULL;
+    }
+
+    ~xFactoryInst()
+    {
+    }
 };
 
 typedef xFactoryInst* (*XGOFTypeInfoCreator)(S32, RyzMemGrow*, void*);

src/SB/Core/x/xListItem.h

@@ -9,6 +9,12 @@ template <class T> struct xListItem
     T* next;
     T* prev;
 
+    xListItem() {
+        flg_travFilter = 0;
+        prev = NULL;
+        next = NULL;
+    }
+
     T* Next();
     void Insert(T* list);
     T* RemHead(T** listhead);

src/SB/Core/x/xNPCBasic.h

@@ -21,6 +21,7 @@ enum en_npcdcat
     eNPCDCAT_Zero,
     eNPCDCAT_Seven = 7,
     eNPCDCAT_Eight = 8,
+    eNPCDCAT_Eleven = 11,
 };
 
 struct xNPCBasic : xEnt, xFactoryInst
@@ -61,7 +62,15 @@ struct xNPCBasic : xEnt, xFactoryInst
     xNPCBasic(S32);
 
     S32 SelfType() const;
-    void RestoreColFlags();
+    void RestoreColFlags()
+    {
+        flags2.flg_colCheck = ColChkFlags();
+        flags2.flg_penCheck = ColPenFlags();
+        chkby = ColChkByFlags();
+        penby = ColPenByFlags();
+        pflags = PhysicsFlags();
+        colFreq = -1;
+    }
 
     void DBG_PStatClear();
     void DBG_PStatCont(en_npcperf stat);
@@ -81,19 +90,38 @@ struct xNPCBasic : xEnt, xFactoryInst
     virtual void NewTime(xScene* xscn, F32 dt);
     virtual void Move(xScene* xscn, F32 dt, xEntFrame* frm);
     virtual S32 SysEvent(xBase* from, xBase* to, U32 toEvent, const F32* toParam,
-                           xBase* toParamWidget, S32* handled);
+                         xBase* toParamWidget, S32* handled);
     virtual void Render();
     virtual void Save(xSerial*) const;
     virtual void Load(xSerial*);
     virtual void CollideReview();
 
     /* These most likely return a combination of XENT_COLLTYPE_* values */
-    virtual U8 ColChkFlags() const;
-    virtual U8 ColPenFlags() const;
-    virtual U8 ColChkByFlags() const;
-    virtual U8 ColPenByFlags() const;
+    virtual U8 ColChkFlags() const
+    {
+        return 0;
+    }
+
+    virtual U8 ColPenFlags() const
+    {
+        return 0;
+    }
+
+    virtual U8 ColChkByFlags() const
+    {
+        return 0;
+    }
+
+    virtual U8 ColPenByFlags() const
+    {
+        return 0;
+    }
+
+    virtual U8 PhysicsFlags() const
+    {
+        return 0;
+    }
 
-    virtual U8 PhysicsFlags() const;
     virtual void Destroy();
 };
 

src/SB/Game/zMovePoint.h

@@ -9,6 +9,8 @@
 
 struct zMovePoint : xMovePoint
 {
+    F32 RadiusZone();
+    F32 Delay();
     U32 NumNodes();
     U8 IsOn();
 };

src/SB/Game/zNPCGoalCommon.h

@@ -15,7 +15,10 @@ struct zNPCGoalCommon : xGoal
     S32 flg_info : 16; // 0x48
     S32 flg_user : 16; // 0x4a
 
-    zNPCGoalCommon(S32 goalID);
+    zNPCGoalCommon(S32 goalID) : xGoal(goalID)
+    {
+        flg_npcgauto |= ~(1 << 3);
+    }
 
     U32 DoAutoAnim(en_NPC_GOAL_SPOT gspot, S32 forceRestart);
     U32 DoExplicitAnim(U32 anid, S32 forceRestart);