lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'metalfix' into 'master' 

Boss Scream fix

See merge request STJr/SRB2Internal!581
This commit is contained in:
MascaraSnake 2019-12-01 02:26:24 -05:00
parent 97fdc5aaf0 9d442ae6ea
commit ae2594e5ce
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/p_enemy.c
View File

@ -3458,8 +3458,8 @@ void A_BossZoom(mobj_t *actor)
// Description: Spawns explosions and plays appropriate sounds around the defeated boss. // Description: Spawns explosions and plays appropriate sounds around the defeated boss.
// //
// var1: // var1:
// 0 - Use movecount to spawn explosions evenly // & 1 - Use P_Random to spawn explosions at complete random
// 1 - Use P_Random to spawn explosions at complete random // & 2 - Use entire vertical range of object to spawn
// var2 = Object to spawn. Default is MT_SONIC3KBOSSEXPLODE. // var2 = Object to spawn. Default is MT_SONIC3KBOSSEXPLODE.
// //
void A_BossScream(mobj_t *actor) void A_BossScream(mobj_t *actor)
@ -3476,13 +3476,13 @@ void A_BossScream(mobj_t *actor)
return; return;
#endif #endif
if (locvar1 & 1) if (locvar1 & 1)
fa = (FixedAngle(P_RandomKey(360)*FRACUNIT)>>ANGLETOFINESHIFT) & FINEMASK;
else
{ {
actor->movecount += 4*16; actor->movecount += 4*16;
actor->movecount %= 360; actor->movecount %= 360;
fa = (FixedAngle(actor->movecount*FRACUNIT)>>ANGLETOFINESHIFT) & FINEMASK; fa = (FixedAngle(actor->movecount*FRACUNIT)>>ANGLETOFINESHIFT) & FINEMASK;
} }
else
fa = (FixedAngle(P_RandomKey(360)*FRACUNIT)>>ANGLETOFINESHIFT) & FINEMASK;
x = actor->x + FixedMul(FINECOSINE(fa),actor->radius); x = actor->x + FixedMul(FINECOSINE(fa),actor->radius);
y = actor->y + FixedMul(FINESINE(fa),actor->radius); y = actor->y + FixedMul(FINESINE(fa),actor->radius);