Skip to content

zNPCSpawner: Best Match Attempt Function Implementations #536

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
JoshSanch merged 5 commits into from
May 10, 2025
Merged

zNPCSpawner: Best Match Attempt Function Implementations #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69be70c
MovePoint: Update headers to support zNPCSpawner implementations
JoshSanch May 10, 2025
88e94e2
zNPCSupport: Add functions used by zNPCSpawner to header file
JoshSanch May 10, 2025
1e485f6
xutil: Update xUtil_select to have static definition
JoshSanch May 10, 2025
6c3ce06
zNPCSpawner: Add declarations for additional function impls
JoshSanch May 10, 2025
7dbdb94
zNPCSpawner: Implement and reorder functions to best match attempt
JoshSanch May 10, 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
3 changes: 1 addition & 2 deletions src/SB/Core/x/xMovePoint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ struct xMovePoint : xBase
};

xVec3* xMovePointGetPos(xMovePoint* m);
F32 xMovePointGetNext(const xMovePoint* m, const xMovePoint* prev, xMovePoint** next,
xVec3* hdng);
F32 xMovePointGetNext(const xMovePoint* m, const xMovePoint* prev, xMovePoint** next, xVec3* hdng);
void xMovePointSplineDestroy(xMovePoint* m);
void xMovePointSplineSetup(xMovePoint* m);
void xMovePointSetup(xMovePoint* m, xScene* sc);
Expand Down
3 changes: 1 addition & 2 deletions src/SB/Core/x/xutil.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ U32 xUtil_crc_update(U32 crc_accum, char* data, S32 datasize);
S32 xUtil_yesno(F32 wt_yes);
void xUtil_wtadjust(F32* wts, S32 cnt, F32 arbref);

template <typename T>
T* xUtil_select(T** arg0, S32 arg1, const F32* arg3);
template <typename T> static T* xUtil_select(T** arg0, S32 arg1, const F32* arg3);

#endif
4 changes: 2 additions & 2 deletions src/SB/Game/zMovePoint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ struct zMovePoint : xMovePoint
return pos;
}
U32 NumNodes();
U8 IsOn();
S32 IsOn();
};

zMovePoint* zMovePoint_GetMemPool(S32 cnt);
Expand All @@ -35,7 +35,7 @@ void zMovePointLoad(zMovePoint* ent, xSerial* s);
void zMovePointReset(zMovePoint* m);
S32 zMovePointEventCB(xBase* from, xBase* to, U32 toEvent, const F32* toParam, xBase* b3);
F32 zMovePointGetNext(const zMovePoint* current, const zMovePoint* prev, zMovePoint** next,
xVec3* hdng);
xVec3* hdng);
xVec3* zMovePointGetPos(const zMovePoint* m);
F32 zMovePointGetDelay(const zMovePoint* m);
F32 xMovePointGetDelay(const xMovePoint* m);
Expand Down
Loading