zNPCTypeTiki: Progress (#707)

* zNPCTypeTiki: Progress

* Regression fix attempt

Author: bluisblu

configure.py

@@ -558,7 +558,7 @@ def MatchingFor(*versions):
             Object(NonMatching, "SB/Game/zNPCTypeRobot.cpp"),
             Object(NonMatching, "SB/Game/zNPCTypeVillager.cpp"),
             Object(NonMatching, "SB/Game/zNPCTypeAmbient.cpp"),
-            Object(NonMatching, "SB/Game/zNPCTypeTiki.cpp"),
+            Object(NonMatching, "SB/Game/zNPCTypeTiki.cpp", extra_cflags=["-sym on"]),
             Object(NonMatching, "SB/Core/x/xBehaveMgr.cpp"),
             Object(Matching, "SB/Core/x/xBehaviour.cpp", extra_cflags=["-sym on"]),
             Object(Matching, "SB/Core/x/xBehaveGoalSimple.cpp", extra_cflags=["-sym on"]),

src/SB/Game/zEntPlayer.cpp

@@ -2312,8 +2312,6 @@ static U32 BounceCheck(xAnimTransition*, xAnimSingle*, void*)
     return globals.player.Bounced == 1;
 }
 
-
-
 // Equivalent: sda relocation scheduling + regswap
 static U32 BounceCB(xAnimTransition*, xAnimSingle*, void*)
 {
@@ -3530,7 +3528,6 @@ static U32 LassoSwingReleaseCB(xAnimTransition* tran, xAnimSingle* anim, void* o
     return 0;
 }
 
-
 static U8 StunBubbleTrail(xAnimSingle* anim)
 {
     S32 ret = 0;
@@ -3570,7 +3567,6 @@ static U8 BubbleBounceContrails(xAnimSingle* anim)
     return ret;
 }
 
-
 static U32 StunStartFallCB(xAnimTransition*, xAnimSingle*, void*)
 {
     stun_power_tmr = 0;
@@ -3624,8 +3620,6 @@ static S32 MeleeAttackBoundCollide(xEnt* ent, zScene* zscn, xBound* meleeB)
     return cbdata.hitsomething;
 }
 
-
-
 static S32 CheckObjectAgainstMeleeBound(xEnt* ent, void* data)
 {
     return 0;
@@ -3709,10 +3703,6 @@ static U32 count_talk_anims(xAnimTable* anims)
     return talkAnimCount;
 }
 
-
-
-
-
 static void load_player_ini(zPlayerSettings& ps, xModelInstance& model, xModelAssetParam* modelass,
                             U32 params_size)
 {
@@ -7579,12 +7569,6 @@ WEAK xVec3* NPCC_upDir(xEnt* ent)
     return (xVec3*)&ent->model->Mat->up;
 }
 
-WEAK S32 zGooIs(xEnt* ent)
-{
-    F32 temp;
-    return zGooIs(ent, temp, 0);
-}
-
 WEAK S32 zNPCCommon::SetCarryState(en_NPC_CARRY_STATE)
 {
     return 0;

src/SB/Game/zGoo.h

@@ -10,6 +10,11 @@ void zGooInit(S32 nobj);
 void zGooExit();
 S32 zGooAdd(xEnt* obj, F32 depth, S32 freezeGroup);
 S32 zGooIs(xEnt* obj, F32& depth, U32 playerCheck);
+inline S32 zGooIs(xEnt* ent)
+{
+    F32 temp;
+    return zGooIs(ent, temp, 0);
+};
 void zGooCollsBegin();
 void zGooCollsEnd();
 void zGooStopTide();