From 7a1342188af1dc9842f9e24b3e1ff5f551308402 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Thu, 18 Apr 2024 04:51:38 -0400 Subject: [PATCH] - add cvar `cl_restartondeath` - bypasses autoloading savegame when pressing +use after dying - added https://github.com/ZDoom/gzdoom/issues/1563 --- src/g_game.cpp | 3 ++- wadsrc/static/menudef.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/g_game.cpp b/src/g_game.cpp index 72b8b763a..e094bd1b5 100644 --- a/src/g_game.cpp +++ b/src/g_game.cpp @@ -122,6 +122,7 @@ CVAR (Bool, storesavepic, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR (Bool, longsavemessages, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR (Bool, cl_waitforsave, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); CVAR (Bool, enablescriptscreenshot, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); +CVAR (Bool, cl_restartondeath, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); EXTERN_CVAR (Float, con_midtime); //========================================================================== @@ -1751,7 +1752,7 @@ void FLevelLocals::DoReborn (int playernum, bool freshbot) if (!multiplayer && !(flags2 & LEVEL2_ALLOWRESPAWN) && !sv_singleplayerrespawn && !G_SkillProperty(SKILLP_PlayerRespawn)) { - if (BackupSaveName.Len() > 0 && FileExists (BackupSaveName)) + if (!(cl_restartondeath) && (BackupSaveName.Len() > 0 && FileExists (BackupSaveName))) { // Load game from the last point it was saved savename = BackupSaveName; gameaction = ga_autoloadgame; diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index fffac02ef..ed0d727c5 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -1220,6 +1220,7 @@ OptionMenu "MiscOptions" protected Option "$MISCMNU_NOCHEATS", "nocheats", "OnOff" Option "$MISCMNU_ALLCHEATS", "allcheats", "OnOff" Option "$MISCMNU_ENABLEAUTOSAVES", "disableautosave", "Autosave" + Option "$MISCMNU_RESTARTONDEATH", "cl_restartondeath", "OnOff" Option "$MISCMNU_SAVELOADCONFIRMATION", "saveloadconfirmation", "OnOff" Slider "$MISCMNU_AUTOSAVECOUNT", "autosavecount", 1, 20, 1, 0 Option "$MISCMNU_QUICKSAVEROTATION", "quicksaverotation", "OnOff"