Skip to content

Commit

Permalink
Switch to chainsaw when starting new level
Browse files Browse the repository at this point in the history
If the player has a chainsaw and a berserk power-up, and ends a level
with their fists selected, they start the next level with their fists.
This shouldn't happen, because the berserk power-up has been removed and
they have the chainsaw. This commit corrects this. Thanks to @plumsinus
for finding this!
  • Loading branch information
bradharding committed Jul 29, 2014
1 parent 76a9ea6 commit 8f1c6c8
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/g_game.c
Original file line number Diff line number Diff line change
Expand Up @@ -1019,6 +1019,9 @@ void G_PlayerFinishLevel(int player)
p->fixedcolormap = 0; // cancel ir gogles
p->damagecount = 0; // no palette changes
p->bonuscount = 0;

if (p->readyweapon == wp_fist && p->weaponowned[wp_chainsaw])
p->readyweapon = wp_chainsaw;
}

//
Expand Down

0 comments on commit 8f1c6c8

Please sign in to comment.