ported zNPCSupport and zNPCTypeCommon

src/SB/Core/gc/iCollide.h

@@ -10,8 +10,9 @@ void iBoxForModelLocal(xBox* o, const xModelInstance* m);
 void iBoxForModel(xBox* o, const xModelInstance* m);
 S32 iSphereHitsEnv3(const xSphere* b, const xEnv* env, xCollis* colls, U8 ncolls, F32 sth);
 S32 iSphereHitsModel3(const xSphere* b, const xModelInstance* m, xCollis* colls, U8 ncolls,
-                        F32 sth);
+                      F32 sth);
 U32 iRayHitsModel(const xRay3* r, const xModelInstance* m, xCollis* coll);
+void iSphereForModel(xSphere* o, const xModelInstance* m);
 void iCollideInit(xScene* sc);
 
 #endif

src/SB/Core/x/xCollide.h

@@ -6,6 +6,20 @@
 #include "xQuickCull.h"
 #include "iMath3.h"
 
+#define k_HIT_IT ((U32)(1 << 0))
+#define k_HIT_0x2 ((U32)(1 << 1))
+#define k_HIT_0x4 ((U32)(1 << 2))
+#define k_HIT_0x8 ((U32)(1 << 3))
+#define k_HIT_0x10 ((U32)(1 << 4))
+#define k_HIT_0x100 ((U32)(1 << 8))
+#define k_HIT_0x200 ((U32)(1 << 9))
+#define k_HIT_0x400 ((U32)(1 << 10))
+#define k_HIT_0x800 ((U32)(1 << 11))
+#define k_HIT_0xF00 (k_HIT_0x100 | k_HIT_0x200 | k_HIT_0x400 | k_HIT_0x800)
+#define k_HIT_CALC_HDNG ((U32)(1 << 12))
+#define k_HIT_CALC_TRI ((U32)(1 << 13))
+#define k_HIT_0x20000 ((U32)(1 << 17))
+
 struct xModelInstance;
 
 struct xCollis

src/SB/Core/x/xDraw.h

@@ -5,6 +5,9 @@
 #include "xMath3.h"
 
 void xDrawSetColor(iColor_tag);
+inline void xDrawLine(const xVec3* a, const xVec3* b)
+{
+}
 void xDrawSphere2(const xSphere*, U32);
 void xDrawOBB(const xBox*, const xMat4x3*);
 void xDrawBox(const xBox*);

src/SB/Core/x/xEntMotion.cpp

@@ -284,11 +284,6 @@ void xEntMotionMove(xEntMotion*, xScene*, F32, xEntFrame*)
 {
 }
 
-F32 xSpline3_ArcTotal(xSpline3*)
-{
-    return 0.0f;
-}
-
 void xQuatCopy(xQuat* a, const xQuat* b)
 {
     a->s = b->s;

src/SB/Core/x/xMath.h

@@ -9,6 +9,8 @@
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
 #define xabs(x) iabs(x)
 
+#define xeq(a, b, e) (xabs((a) - (b)) <= (e))
+
 #define CLAMP(x, a, b) (MAX((a), MIN((x), (b))))
 
 #define SQR(x) ((x) * (x))

src/SB/Core/x/xSpline.h

@@ -32,6 +32,11 @@ struct xSpline3
 };
 
 void xSpline3_ArcInit(xSpline3* spl, U32 sample);
-xSpline3* xSpline3_Bezier(xVec3* points, F32* time, U32 numpoints, U32 numalloc, xVec3* p1, xVec3* p2);
+xSpline3* xSpline3_Bezier(xVec3* points, F32* time, U32 numpoints, U32 numalloc, xVec3* p1,
+                          xVec3* p2);
+inline F32 xSpline3_ArcTotal(xSpline3* spl)
+{
+    return spl->arcLength[spl->N * spl->arcSample - 1];
+}
 
 #endif

src/SB/Game/zMovePoint.h

@@ -23,6 +23,11 @@ struct zMovePoint : xMovePoint
     }
     U32 NumNodes();
     S32 IsOn();
+
+    S32 HasSpline()
+    {
+        return spl != NULL;
+    }
 };
 
 zMovePoint* zMovePoint_GetMemPool(S32 cnt);

src/SB/Game/zNPCFXCinematic.cpp

@@ -438,6 +438,14 @@ void NCIN_Par_CIN_PLATFORM_JETS_Upd(const zCutsceneMgr*, NCINEntry* fxrec, S32 p
     fxrec->pos_B[0] = 5.0f;
 }
 
+void NCINBeNosey::CanRenderNow()
+{
+    zCutsceneMgr* csnmgr;
+    NCINEntry* fxtab;
+    NCINEntry* nextrec;
+    NCINEntry* fxrec;
+}
+
 void NCIN_Generic_Upd(const zCutsceneMgr*, NCINEntry* fxrec, S32 param)
 {
     if (param != 0)
@@ -473,7 +481,8 @@ void NCIN_BubSlam(const zCutsceneMgr*, NCINEntry* fxrec, S32 param)
     }
 }
 
-void NCIN_BubTrailBone_AR(const zCutsceneMgr*, NCINEntry* fxrec, RpAtomic*, RwMatrixTag*, U32 num_1, U32 num_2)
+void NCIN_BubTrailBone_AR(const zCutsceneMgr*, NCINEntry* fxrec, RpAtomic*, RwMatrixTag*, U32 num_1,
+                          U32 num_2)
 {
     S32 ifx = fxrec->pos_A[1].x;
     S32 ify = fxrec->pos_A[1].y;
@@ -690,6 +699,14 @@ void NCIN_HazTTSteam_AR(const zCutsceneMgr* cutsceneMgr, NCINEntry* fxrec, RpAto
 {
 }
 
+void NCIN_ArfDogBoom(const zCutsceneMgr*, NCINEntry*, S32)
+{
+}
+
+void NCIN_ShieldPop(const zCutsceneMgr*, NCINEntry*, S32)
+{
+}
+
 void clamp_bone_index(NCINEntry*, RpAtomic*)
 {
 }

src/SB/Game/zNPCFXCinematic.h

@@ -11,14 +11,12 @@
 #include "zShrapnel.h"
 #include "rwcore.h"
 
-
 void zNPCFXStartup();
 void zNPCFXShutdown();
 S32 zNPCFXCutscenePrep(const xScene*, F32, const zCutsceneMgr* csnmgr);
 void zNPCFXCutscene(const xScene*, F32, const zCutsceneMgr* csnmgr);
 void zNPCFXCutsceneDone(const xScene*, F32, const zCutsceneMgr* csnmgr);
 
-
 struct NCINLyt
 {
     zLightning* lyt_zap;
@@ -200,4 +198,13 @@ struct NPCCone
     void RadiusSet(F32);
 };
 
+struct NCINBeNosey : XCSNNosey
+{
+    zCutsceneMgr* use_csnmgr;
+    NCINEntry* use_fxtab;
+
+    void UpdatedAnimated(RpAtomic* model, RwMatrixTag* animMat, U32 animIndex, U32 dataIndex);
+    void CanRenderNow();
+};
+
 #endif

src/SB/Game/zNPCMessenger.h

@@ -8,10 +8,12 @@ void zNPCMsg_SceneReset();
 void zNPCMsg_ScenePrepare();
 void zNPCMsg_Startup();
 void zNPCMsg_Shutdown();
-void zNPCMsg_AreaNotify(zNPCCommon* sender, en_NPC_MSG_ID msgid, F32 rad, S32 filter,
-                        en_NPCTYPES toNPCType);
+// void zNPCMsg_AreaNotify(zNPCCommon* sender, en_NPC_MSG_ID msgid, F32 rad, S32 filter,
+//                         en_NPCTYPES toNPCType);
 void zNPCMsg_Timestep(xScene* xscn, F32 dt);
 
+struct NPCMsg;
+
 struct NPCPSClt
 {
     // total size: 0x10