Skip to content

Allow use of Retry with no lives if a continue is available

Sparkette requested to merge flarn2006/SRB2:retry_continue into next

I noticed that when I don't have any lives left (well, technically 1 life) I couldn't use the Retry option on the pause menu, even if I have a continue. I feel like Retry should work any time dying wouldn't result in a true game over, because if I died then, I'd still be able to retry, so why shouldn't I be able to do so from the pause menu as well?

So I went ahead and implemented this functionality. In more exact terms, what I did was:

  1. I changed the "Retry" option in the pause menu to no longer be grayed out when the player has only one life, unless the player is in a "No Save" game with no continues left, and

  2. I added a check to the code that carries out the retry command, so it will properly handle if the player is out of lives. Specifically, in this situation, it will increment numgameovers and call G_UseContinue() to go to the "Continue" screen.

Please let me know if I missed anything.

Merge request reports