Skip to content

Commit

Permalink
Merge branch 'fix-shoop-da-koop' into 'next'
Browse files Browse the repository at this point in the history
Fix Eggmobile spawning Bowsers after hitting Fang with pinch phase laser

Closes #288

See merge request STJr/SRB2!1160
  • Loading branch information
lachablock committed Sep 28, 2020
2 parents ca2eb78 + ddd59a6 commit 09c83b4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/p_enemy.c
Original file line number Diff line number Diff line change
Expand Up @@ -3040,11 +3040,11 @@ void A_Boss1Laser(mobj_t *actor)
z = actor->z + FixedMul(56*FRACUNIT, actor->scale);
break;
case 2:
var2 = 3; // Fire middle laser
var1 = locvar1; var2 = 3; // Fire middle laser
A_Boss1Laser(actor);
var2 = 0; // Fire left laser
var1 = locvar1; var2 = 0; // Fire left laser
A_Boss1Laser(actor);
var2 = 1; // Fire right laser
var1 = locvar1; var2 = 1; // Fire right laser
A_Boss1Laser(actor);
return;
break;
Expand Down

0 comments on commit 09c83b4

Please sign in to comment.