Skip to content

zNPCSupport - added NPCSupport_Startup #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattbruv merged 2 commits into from
Mar 12, 2025
Merged

zNPCSupport - added NPCSupport_Startup #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
779970b
zNPCSupport - added NPCSupport_Startup
Mar 12, 2025
8ad094a
clang format pass
Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/SB/Game/zNPCSupplement.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
17 changes: 15 additions & 2 deletions src/SB/Game/zNPCSupport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@

#include "xMathInlines.h"

void NPCSupport_Startup()

{
zNPCHazard_Startup();
zNPCGlyph_Startup();
NPCWidget_Startup();
NPCSupplement_Startup();
return;
}

void NPCSupport_Shutdown()
{
zNPCHazard_Shutdown();
Expand All @@ -16,6 +26,9 @@ void NPCSupport_Shutdown()
NPCSupplement_Shutdown();
}

void NPCWidget_Startup()
{
}
void NPCWidget_Shutdown()
{
}
Expand All @@ -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;
}
}
4 changes: 3 additions & 1 deletion src/SB/Game/zNPCSupport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ struct NPCBlinker
void Reset();
};

void NPCWidget_Startup();
void NPCWidget_Shutdown();
void NPCSupport_Startup();
void NPCSupport_ScenePrepare();
Expand All @@ -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*);
Expand Down