Skip to content

Commit 3e07ec2

Browse files
LivewireCBLivewire
andauthored
zNPCSupport - added NPCSupport_Startup (#422)
* zNPCSupport - added NPCSupport_Startup * clang format pass --------- Co-authored-by: Livewire <[email protected]>
1 parent 2da1c35 commit 3e07ec2

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

src/SB/Game/zNPCSupplement.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ struct StreakInfo
107107
};
108108

109109
void NPCC_MakeASplash(const xVec3* pos, F32 radius);
110+
void NPCSupplement_Startup();
110111
void NPCSupplement_Shutdown();
111112
void NPAR_ScenePrepare();
112113
void NPAR_SceneFinish();

src/SB/Game/zNPCSupport.cpp

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@
88

99
#include "xMathInlines.h"
1010

11+
void NPCSupport_Startup()
12+
13+
{
14+
zNPCHazard_Startup();
15+
zNPCGlyph_Startup();
16+
NPCWidget_Startup();
17+
NPCSupplement_Startup();
18+
return;
19+
}
20+
1121
void NPCSupport_Shutdown()
1222
{
1323
zNPCHazard_Shutdown();
@@ -16,6 +26,9 @@ void NPCSupport_Shutdown()
1626
NPCSupplement_Shutdown();
1727
}
1828

29+
void NPCWidget_Startup()
30+
{
31+
}
1932
void NPCWidget_Shutdown()
2033
{
2134
}
@@ -38,8 +51,8 @@ F32 NPCC_TmrCycle(float* tmr, float dt, float interval)
3851

3952
if (*tmr > interval)
4053
{
41-
*tmr = xfmod(*tmr,interval);
54+
*tmr = xfmod(*tmr, interval);
4255
}
4356

4457
return parameterized;
45-
}
58+
}

src/SB/Game/zNPCSupport.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ struct NPCBlinker
4646
void Reset();
4747
};
4848

49+
void NPCWidget_Startup();
4950
void NPCWidget_Shutdown();
5051
void NPCSupport_Startup();
5152
void NPCSupport_ScenePrepare();
@@ -59,7 +60,8 @@ F32 NPCC_TmrCycle(float* tmr, float dt, float interval);
5960
xVec3* NPCC_rightDir(xEnt* ent);
6061
xVec3* NPCC_faceDir(xEnt* ent);
6162
void NPCC_ang_toXZDir(F32 angle, xVec3* dir);
62-
F32 NPCC_aimVary(xVec3* dir_aim, xVec3* pos_src, xVec3* pos_tgt, F32 dst_vary, S32 flg_vary, xVec3* pos_aimPoint);
63+
F32 NPCC_aimVary(xVec3* dir_aim, xVec3* pos_src, xVec3* pos_tgt, F32 dst_vary, S32 flg_vary,
64+
xVec3* pos_aimPoint);
6365
F32 NPCC_ds2_toCam(const xVec3* pos_from, xVec3* delta);
6466
void zNPC_SNDStop(_tageNPCSnd snd);
6567
void zNPC_SNDPlay3D(_tageNPCSnd snd, xEnt*);

0 commit comments

Comments
 (0)