Merge branch 'super-giverings' into 'next'

Make P_DoSuperTransformation (with giverings) only set 50 rings if you have less than 50

See merge request STJr/SRB2!1278
This commit is contained in:
James R 2020-12-10 15:27:01 -05:00
commit 5a0d3981f1
1 changed files with 1 additions and 1 deletions

View File

@ -1341,7 +1341,7 @@ void P_DoSuperTransformation(player_t *player, boolean giverings)
// Transformation animation
P_SetPlayerMobjState(player->mo, S_PLAY_SUPER_TRANS1);
if (giverings)
if (giverings && player->rings < 50)
player->rings = 50;
// Just in case.