Merge branch 'fix-shoop-da-koop' into 'next'

Fix Eggmobile spawning Bowsers after hitting Fang with pinch phase laser

Closes #288

See merge request STJr/SRB2!1160
This commit is contained in:
Lachlan Wright 2020-09-27 22:42:28 -04:00
commit bbca4ed805

View file

@ -3040,11 +3040,11 @@ void A_Boss1Laser(mobj_t *actor)
z = actor->z + FixedMul(56*FRACUNIT, actor->scale); z = actor->z + FixedMul(56*FRACUNIT, actor->scale);
break; break;
case 2: case 2:
var2 = 3; // Fire middle laser var1 = locvar1; var2 = 3; // Fire middle laser
A_Boss1Laser(actor); A_Boss1Laser(actor);
var2 = 0; // Fire left laser var1 = locvar1; var2 = 0; // Fire left laser
A_Boss1Laser(actor); A_Boss1Laser(actor);
var2 = 1; // Fire right laser var1 = locvar1; var2 = 1; // Fire right laser
A_Boss1Laser(actor); A_Boss1Laser(actor);
return; return;
break; break;