thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 12:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Wait, no, I'm an idiot.

Browse source
This commit is contained in:
toaster 2019-11-30 14:56:43 +00:00
parent 390d40ba6d
commit 4f38017598
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/p_enemy.c
View file

@ -3457,8 +3457,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)
@ -3475,13 +3475,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);

2
src/p_mobj.c
View file

@ -6001,7 +6001,7 @@ static void P_Boss9Thinker(mobj_t *mobj)
if (mobj->health <= mobj->info->damage && mobj->fuse && !(mobj->fuse%TICRATE)) if (mobj->health <= mobj->info->damage && mobj->fuse && !(mobj->fuse%TICRATE))
{ {
var1 = 0; var1 = 1;
var2 = 0; var2 = 0;
A_BossScream(mobj); A_BossScream(mobj);
} }