diff --git a/src/SB/Game/zNPCSupplement.h b/src/SB/Game/zNPCSupplement.h index 02350575d..7856eac2c 100644 --- a/src/SB/Game/zNPCSupplement.h +++ b/src/SB/Game/zNPCSupplement.h @@ -107,6 +107,7 @@ struct StreakInfo }; void NPCC_MakeASplash(const xVec3* pos, F32 radius); +void NPCSupplement_Startup(); void NPCSupplement_Shutdown(); void NPAR_ScenePrepare(); void NPAR_SceneFinish(); diff --git a/src/SB/Game/zNPCSupport.cpp b/src/SB/Game/zNPCSupport.cpp index 69b44fafd..ac21e005c 100644 --- a/src/SB/Game/zNPCSupport.cpp +++ b/src/SB/Game/zNPCSupport.cpp @@ -8,6 +8,16 @@ #include "xMathInlines.h" +void NPCSupport_Startup() + +{ + zNPCHazard_Startup(); + zNPCGlyph_Startup(); + NPCWidget_Startup(); + NPCSupplement_Startup(); + return; +} + void NPCSupport_Shutdown() { zNPCHazard_Shutdown(); @@ -16,6 +26,9 @@ void NPCSupport_Shutdown() NPCSupplement_Shutdown(); } +void NPCWidget_Startup() +{ +} void NPCWidget_Shutdown() { } @@ -38,8 +51,8 @@ F32 NPCC_TmrCycle(float* tmr, float dt, float interval) if (*tmr > interval) { - *tmr = xfmod(*tmr,interval); + *tmr = xfmod(*tmr, interval); } return parameterized; -} \ No newline at end of file +} diff --git a/src/SB/Game/zNPCSupport.h b/src/SB/Game/zNPCSupport.h index 74199baaa..f8573a82b 100644 --- a/src/SB/Game/zNPCSupport.h +++ b/src/SB/Game/zNPCSupport.h @@ -46,6 +46,7 @@ struct NPCBlinker void Reset(); }; +void NPCWidget_Startup(); void NPCWidget_Shutdown(); void NPCSupport_Startup(); void NPCSupport_ScenePrepare(); @@ -59,7 +60,8 @@ F32 NPCC_TmrCycle(float* tmr, float dt, float interval); xVec3* NPCC_rightDir(xEnt* ent); xVec3* NPCC_faceDir(xEnt* ent); void NPCC_ang_toXZDir(F32 angle, xVec3* dir); -F32 NPCC_aimVary(xVec3* dir_aim, xVec3* pos_src, xVec3* pos_tgt, F32 dst_vary, S32 flg_vary, xVec3* pos_aimPoint); +F32 NPCC_aimVary(xVec3* dir_aim, xVec3* pos_src, xVec3* pos_tgt, F32 dst_vary, S32 flg_vary, + xVec3* pos_aimPoint); F32 NPCC_ds2_toCam(const xVec3* pos_from, xVec3* delta); void zNPC_SNDStop(_tageNPCSnd snd); void zNPC_SNDPlay3D(_tageNPCSnd snd, xEnt*);