stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-16 17:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't read or set MT_NULL's properties in A_SkullAttack

Browse source
This commit is contained in:
spherallic 2022-02-04 20:09:37 +01:00
parent a8c658b545
commit 878b4dc5b6
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/p_enemy.c
View file

@ -3329,18 +3329,18 @@ void A_SkullAttack(mobj_t *actor)
actor->angle += (P_RandomChance(FRACUNIT/2)) ? ANGLE_90 : -ANGLE_90; actor->angle += (P_RandomChance(FRACUNIT/2)) ? ANGLE_90 : -ANGLE_90;
else if (locvar1 == 3) else if (locvar1 == 3)
{ {
statenum_t oldspawnstate = mobjinfo[MT_NULL].spawnstate; statenum_t oldspawnstate = mobjinfo[MT_RAY].spawnstate;
UINT32 oldflags = mobjinfo[MT_NULL].flags; UINT32 oldflags = mobjinfo[MT_RAY].flags;
fixed_t oldradius = mobjinfo[MT_NULL].radius; fixed_t oldradius = mobjinfo[MT_RAY].radius;
fixed_t oldheight = mobjinfo[MT_NULL].height; fixed_t oldheight = mobjinfo[MT_RAY].height;
INT32 i, j; INT32 i, j;
static INT32 k;/* static for (at least) GCC 9.1 weirdness */ static INT32 k;/* static for (at least) GCC 9.1 weirdness */
angle_t testang = 0; angle_t testang = 0;
mobjinfo[MT_NULL].spawnstate = S_INVISIBLE; mobjinfo[MT_RAY].spawnstate = S_INVISIBLE;
mobjinfo[MT_NULL].flags = MF_NOGRAVITY|MF_NOTHINK|MF_NOCLIPTHING|MF_NOBLOCKMAP; mobjinfo[MT_RAY].flags = MF_NOGRAVITY|MF_NOTHINK|MF_NOCLIPTHING|MF_NOBLOCKMAP;
mobjinfo[MT_NULL].radius = mobjinfo[actor->type].radius; mobjinfo[MT_RAY].radius = mobjinfo[actor->type].radius;
mobjinfo[MT_NULL].height = mobjinfo[actor->type].height; mobjinfo[MT_RAY].height = mobjinfo[actor->type].height;
if (P_RandomChance(FRACUNIT/2)) // port priority 1? if (P_RandomChance(FRACUNIT/2)) // port priority 1?
{ {
@ -3384,10 +3384,10 @@ void A_SkullAttack(mobj_t *actor)
#undef dostuff #undef dostuff
mobjinfo[MT_NULL].spawnstate = oldspawnstate; mobjinfo[MT_RAY].spawnstate = oldspawnstate;
mobjinfo[MT_NULL].flags = oldflags; mobjinfo[MT_RAY].flags = oldflags;
mobjinfo[MT_NULL].radius = oldradius; mobjinfo[MT_RAY].radius = oldradius;
mobjinfo[MT_NULL].height = oldheight; mobjinfo[MT_RAY].height = oldheight;
} }
an = actor->angle >> ANGLETOFINESHIFT; an = actor->angle >> ANGLETOFINESHIFT;
@ -8276,7 +8276,7 @@ void A_Boss3ShockThink(mobj_t *actor)
snew->angle = (actor->angle + snext->angle) >> 1; snew->angle = (actor->angle + snext->angle) >> 1;
P_SetTarget(&snew->target, actor->target); P_SetTarget(&snew->target, actor->target);
snew->fuse = actor->fuse; snew->fuse = actor->fuse;
P_SetScale(snew, actor->scale); P_SetScale(snew, actor->scale);
snew->destscale = actor->destscale; snew->destscale = actor->destscale;
snew->scalespeed = actor->scalespeed; snew->scalespeed = actor->scalespeed;