Skip to content
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
15 changes: 15 additions & 0 deletions src/SB/Game/zEntSimpleObj.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,18 @@
void zEntSimpleObj_Move(xEnt*, xScene*, F32, xEntFrame*)
{
}

void zEntSimpleObj_Setup(zEntSimpleObj *arg0)
{
zEntSetup((zEnt *) arg0);
}

void zEntSimpleObj_Save(zEntSimpleObj *arg0, xSerial *arg1)
{
zEntSave((zEnt *) arg0, arg1);
}

void zEntSimpleObj_Load(zEntSimpleObj *arg0, xSerial *arg1)
{
zEntLoad((zEnt *) arg0, arg1);
}
25 changes: 25 additions & 0 deletions src/SB/Game/zNPCGoalAmbient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,28 @@ S32 zNPCGoalJellyAttack::Enter(F32 arg0, void* arg1)
zNPCGoalJellyAttack::ZapperStart();
return zNPCGoalPushAnim::Enter(arg0, arg1);
}

S32 zNPCGoalJellyAttack::Exit(F32 arg0, void* arg1)
{
zNPCGoalJellyAttack::ZapperStop();
return zNPCGoalPushAnim::Exit(arg0, arg1);
}

S32 zNPCGoalJellyAttack::Process(en_trantype* arg0, F32 arg1, void* arg2, xScene* arg3)
{
zNPCGoalJellyAttack::ZapperUpdate();
return zNPCGoalPushAnim::Process(arg0, arg1, arg2, arg3);
}

S32 zNPCGoalJellyAttack::ZapperStop()
{
zNPC_SNDStop((_tageNPCSnd) 4);
for (S32 i = 0; i< 3; ++i)
{
if(zap_lytnin[i] != NULL)
{
zLightningKill(zap_lytnin[i]);
}
zap_lytnin[i] = NULL;
}
}
9 changes: 8 additions & 1 deletion src/SB/Game/zNPCGoalAmbient.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#include "zNPCGoalStd.h"
#include "zNPCSndTable.h"
#include "zNPCTypeAmbient.h"
#include "zNPCSupport.h"
#include "zLightning.h"


xFactoryInst* GOALCreate_Ambient(S32 who, RyzMemGrow* grow, void*);
Expand All @@ -22,9 +24,14 @@ struct zNPCGoalJellyBirth : zNPCGoalCommon

struct zNPCGoalJellyAttack : zNPCGoalPushAnim
{
class zLightning * zap_lytnin[3];
U32 lastAnimTime;
S32 Enter(F32 dt, void* updCtxt);
S32 ZapperStart();
S32 Exit(F32 dt, void* updCtxt);
S32 Process(en_trantype* trantyp, F32 dt, void* updCxt, xScene* xscn);
S32 ZapperStart();
S32 ZapperStop();
S32 ZapperUpdate();
};

#endif