Skip to content

zNPCTypeDutchman: added Death::Enter function #445

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 3 commits into from
Mar 18, 2025
Merged

zNPCTypeDutchman: added Death::Enter function #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
098a198
zNPCTypeDutchman: added Death::Enter function
RejectSanity Mar 18, 2025
4a754d6
Implemented suggestions from PR review #445
RejectSanity Mar 18, 2025
83caa29
Fixed float to F32 dt & added updCtxt
RejectSanity Mar 18, 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
7 changes: 7 additions & 0 deletions src/SB/Game/zNPCTypeDutchman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,13 @@ S32 zNPCGoalDutchmanCaught::Exit(float dt, void* updCtxt)
return xGoal::Exit(dt, updCtxt);
}

S32 zNPCGoalDutchmanDeath::Enter(F32 dt, void* updCtxt)
{
owner.delay = 0.0f;
return zNPCGoalCommon::Enter(dt, updCtxt);

}

U8 zNPCDutchman::PhysicsFlags() const
{
return 3;
Expand Down
17 changes: 9 additions & 8 deletions src/SB/Game/zNPCTypeDutchman.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ struct zNPCDutchman : zNPCSubBoss

struct move_info
{
xVec3 dest;
xVec3 vel;
xVec3 dest; //0x2ec
xVec3 vel; //0x2f8
xVec3 accel;
xVec3 max_vel;
};
Expand Down Expand Up @@ -86,15 +86,15 @@ struct zNPCDutchman : zNPCSubBoss
S32 round; //0x2B8
S32 stage; //0x2BC
F32 delay; //0x2C0
F32 alpha; //0x2C4
F32 alpha; //0x2d0
struct
{
xVec2 dir;
F32 vel;
F32 accel;
F32 max_vel;
xVec2 dir; //0x2d4
F32 vel; //0x2dc
F32 accel; //0x2e0
F32 max_vel; //0x2e4
} turn;
move_info move; //0x2C8
move_info move; //0x2e8
struct
{
U8 moreFlags; //0x31c
Expand Down Expand Up @@ -309,6 +309,7 @@ struct zNPCGoalDutchmanDeath : zNPCGoalCommon
F32 emit_frac;
F32 min_y;
F32 max_y;
S32 Enter(F32 dt, void* updCtxt);
zNPCDutchman& owner;

static xFactoryInst* create(S32 who, RyzMemGrow* grow, void* info);
Expand Down