Skip to content
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.

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

zParCmd equivalent #286

Merged
merged 2 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
Object(Equivalent, "SB/Game/zMenu.cpp"),
Object(NonMatching, "SB/Game/zMovePoint.cpp"),
Object(NonMatching, "SB/Game/zMusic.cpp"),
Object(NonMatching, "SB/Game/zParCmd.cpp"),
Object(Equivalent, "SB/Game/zParCmd.cpp"),
Object(Matching, "SB/Game/zParEmitter.cpp"),
Object(NonMatching, "SB/Game/zPendulum.cpp"),
Object(Matching, "SB/Game/zPickupTable.cpp"),
Expand Down
3 changes: 2 additions & 1 deletion src/SB/Core/x/xBound.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ void xBoundUpdate(xBound* b);
void xBoundHitsBound(const xBound* a, const xBound* b, xCollis* c);
void xRayHitsBound(const xRay3* r, const xBound* b, xCollis* c);
void xSphereHitsBound(const xSphere* o, const xBound* b, xCollis* c);
void xVecHitsBound(const xVec3* v, const xBound* b, xCollis* c);
float32 xsqrt(float32 x);

#endif
#endif
13 changes: 12 additions & 1 deletion src/SB/Core/x/xParCmd.h
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,12 @@ struct xParCmdRandomVelocityPar : xParCmdAsset

// XPARCMD_TYPE_CUSTOM
void xParCmdCustom_Update(xParCmd* c, xParGroup* ps, float32 dt);

struct xParCmdCustom : xParCmdAsset // not in dwarf
{
uint32 unknown;
};

void xParCmdCustom_Grass_Update(xParCmd* c, xParGroup* ps, float32 dt);

// XPARCMD_TYPE_KILLDISTANCE
Expand Down Expand Up @@ -291,6 +297,11 @@ void xParCmdClipVolumes_Update(xParCmd* c, xParGroup* ps, float32 dt);
// XPARCMD_TYPE_ANIMALMAGENTISM
void xParCmdAnimalMagentism_Update(xParCmd* c, xParGroup* ps, float32 dt);

struct xParCmdAnimalMagnetism : xParCmdAsset // not in dwarf
{
float32 unknown;
};

// XPARCMD_TYPE_DAMAGEPLAYER
void xParCmdDamagePlayer_Update(xParCmd* c, xParGroup* ps, float32 dt);

Expand Down Expand Up @@ -352,4 +363,4 @@ struct xParCmdCollideFallSticky : xParCmdCollideFall
float32 sticky;
};

#endif
#endif
1 change: 1 addition & 0 deletions src/SB/Game/zEntPlayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ extern _CurrentPlayer gCurrentPlayer;
void zEntPlayer_Load(xEnt*, xSerial*);

int32 zEntPlayer_Damage(xBase* src, uint32 damage);
int32 zEntPlayer_Damage(xBase* src, uint32 damage, const xVec3* knockback);

uint32 WalkCheck(xAnimTransition* tran, xAnimSingle* anim, void* param_3);
uint32 RunCheck(xAnimTransition* tran, xAnimSingle* anim, void* param_3);
Expand Down
Loading