stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-31 05:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Hardcoded A_PrepareRepeat and A_Boss5Calm, added missing prototype for A_Boss5ExtraRepeat (and also fixed its description)

Browse source
This commit is contained in:
Monster Iestyn 2019-05-03 18:51:17 +01:00
parent 266fa05e15
commit a0220454fd
3 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dehacked.c
View file

@ -2226,7 +2226,9 @@ static actionpointer_t actionpointers[] =
{{A_CryingToMomma}, "A_CRYINGTOMOMMA"},
{{A_CheckFlags2}, "A_CHECKFLAGS2"},
{{A_DoNPCPain}, "A_DONPCPAIN"},
{{A_PrepareRepeat}, "A_PREPAREREPEAT"},
{{A_Boss5ExtraRepeat}, "A_BOSS5EXTRAREPEAT"},
{{A_Boss5Calm}, "A_BOSS5CALM"},
{{A_Boss5CheckOnGround}, "A_BOSS5CHECKONGROUND"},
{{A_Boss5CheckFalling}, "A_BOSS5CHECKFALLING"},

2
src/info.h
View file

@ -240,7 +240,9 @@ void A_ParentTriesToSleep();
void A_CryingToMomma();
void A_CheckFlags2();
void A_DoNPCPain();
void A_PrepareRepeat();
void A_Boss5ExtraRepeat();
void A_Boss5Calm();
void A_Boss5CheckOnGround();
void A_Boss5CheckFalling();

41
src/p_enemy.c
View file

@ -267,6 +267,9 @@ void A_ParentTriesToSleep(mobj_t *actor);
void A_CryingToMomma(mobj_t *actor);
void A_CheckFlags2(mobj_t *actor);
void A_DoNPCPain(mobj_t *actor);
void A_PrepareRepeat(mobj_t *actor);
void A_Boss5ExtraRepeat(mobj_t *actor);
void A_Boss5Calm(mobj_t *actor);
void A_Boss5CheckOnGround(mobj_t *actor);
void A_Boss5CheckFalling(mobj_t *actor);
//for p_enemy.c
@ -11913,7 +11916,26 @@ void A_DoNPCPain(mobj_t *actor)
P_InstaThrust(actor, actor->angle, -hspeed);
}
// Function: A_Boss5PinchRepeat
// Function: A_PrepareRepeat
//
// Description: Simple way to prepare A_Repeat.
//
// var1 = value to set extravalue2 to
// var2 = unused
//
void A_PrepareRepeat(mobj_t *actor)
{
INT32 locvar1 = var1;
//INT32 locvar2 = var2;
#ifdef HAVE_BLUA
if (LUA_CallAction("A_PrepareRepeat", actor))
return;
#endif
actor->extravalue2 = locvar1;
}
// Function: A_Boss5ExtraRepeat
//
// Description: Simple way to prepare A_Repeat.
//
@ -11952,6 +11974,23 @@ void A_Boss5ExtraRepeat(mobj_t *actor)
actor->extravalue2 += locvar2;
}
// Function: A_Boss5Calm
//
// Description: Simple way to disable MF2_FRET (and enable MF_SHOOTABLE the first time it's called)
//
// var1 = unused
// var2 = unused
//
void A_Boss5Calm(mobj_t *actor)
{
#ifdef HAVE_BLUA
if (LUA_CallAction("A_Boss5Calm", actor))
return;
#endif
actor->flags |= MF_SHOOTABLE;
actor->flags2 &= ~MF2_FRET;
}
// Function: A_Boss5CheckOnGround
//
// Description: Ground checker.