Skip to content

Match zNPCGoalJellyAttack::Enter(float, void*) #393

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 1 commit into from
Feb 2, 2025
+24 −1
Merged

Match zNPCGoalJellyAttack::Enter(float, void*) #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion src/SB/Game/zNPCGoalAmbient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include "xMath3.h"
#include "xVec3.h"

#include "zNPCGoalAmbient.h"
#include "zNPCSndTable.h"

void xMat3x3RMulVec(xVec3* o, const xMat3x3* m, const xVec3* v)
{
Expand All @@ -15,3 +15,14 @@ void xMat3x3RMulVec(xVec3* o, const xMat3x3* m, const xVec3* v)
o->y = y;
o->z = z;
}

S32 zNPCGoalJellyAttack::Enter(F32 arg0, void* arg1)
{
zNPCJelly* temp_r31 = (zNPCJelly*)psyche->clt_owner;

temp_r31->SndPlayRandom(NPC_STYP_ENCOUNTER);
temp_r31->VelStop();
lastAnimTime = 0;
zNPCGoalJellyAttack::ZapperStart();
return zNPCGoalPushAnim::Enter(arg0, arg1);
}
12 changes: 12 additions & 0 deletions src/SB/Game/zNPCGoalAmbient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
#ifndef ZNPCGOALAMBIENT_H
#define ZNPCGOALAMBIENT_H

#include "zNPCGoalAmbient.h"
#include "zNPCGoalCommon.h"
#include "zNPCGoalStd.h"
#include "zNPCSndTable.h"
#include "zNPCTypeAmbient.h"


xFactoryInst* GOALCreate_Ambient(S32 who, RyzMemGrow* grow, void*);

Expand All @@ -15,4 +20,11 @@ struct zNPCGoalJellyBirth : zNPCGoalCommon
S32 Enter(F32 dt, void* updCtxt);
};

struct zNPCGoalJellyAttack : zNPCGoalPushAnim
{
U32 lastAnimTime;
S32 Enter(F32 dt, void* updCtxt);
S32 ZapperStart();
};

#endif