From fa09c0420fe11049c22b6c803b8dd87f9aa3b18b Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 5 Oct 2019 13:15:36 -0700 Subject: [PATCH 1/2] Custom gamedata parameter --- src/g_game.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/g_game.c b/src/g_game.c index d5ed9af7d..15a22f493 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -4082,6 +4082,11 @@ void G_LoadGameData(void) if (M_CheckParm("-resetdata")) return; // Don't load (essentially, reset). + if (M_CheckParm("-gamedata") && M_IsNextParm()) + { + strlcpy(gamedatafilename, M_GetNextParm(), sizeof gamedatafilename); + } + length = FIL_ReadFile(va(pandf, srb2home, gamedatafilename), &savebuffer); if (!length) // Aw, no game data. Their loss! return; From 7c0ca5bf7cdc62f7ff4892499e3638a8ae1664b0 Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 27 Oct 2019 10:33:40 -0700 Subject: [PATCH 2/2] Move gamedata param to cover -resetdata --- src/g_game.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 15a22f493..ae47e633f 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -4079,14 +4079,14 @@ void G_LoadGameData(void) // Allow saving of gamedata beyond this point gamedataloaded = true; - if (M_CheckParm("-resetdata")) - return; // Don't load (essentially, reset). - if (M_CheckParm("-gamedata") && M_IsNextParm()) { strlcpy(gamedatafilename, M_GetNextParm(), sizeof gamedatafilename); } + if (M_CheckParm("-resetdata")) + return; // Don't load (essentially, reset). + length = FIL_ReadFile(va(pandf, srb2home, gamedatafilename), &savebuffer); if (!length) // Aw, no game data. Their loss! return;