From 6595d207093d6795e5039c3e09e7facca01be0f1 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Fri, 15 Nov 2019 17:30:58 -0800
Subject: [PATCH] Move setting from defaults to M_FirstLoadConfig, so it
triggers even when the title screen doesn't start
---
src/d_main.c | 8 --------
src/m_misc.c | 8 ++++++++
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/d_main.c b/src/d_main.c
index 995704e762..ebc618be84 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -736,14 +736,6 @@ void D_StartTitle(void)
// empty maptol so mario/etc sounds don't play in sound test when they shouldn't
maptol = 0;
- // reset to default player stuff
- COM_BufAddText (va("%s \"%s\"\n",cv_playername.name,cv_defaultplayername.string));
- COM_BufAddText (va("%s \"%s\"\n",cv_skin.name,cv_defaultskin.string));
- COM_BufAddText (va("%s \"%s\"\n",cv_playercolor.name,cv_defaultplayercolor.string));
- COM_BufAddText (va("%s \"%s\"\n",cv_playername2.name,cv_defaultplayername2.string));
- COM_BufAddText (va("%s \"%s\"\n",cv_skin2.name,cv_defaultskin2.string));
- COM_BufAddText (va("%s \"%s\"\n",cv_playercolor2.name,cv_defaultplayercolor2.string));
-
gameaction = ga_nothing;
displayplayer = consoleplayer = 0;
gametype = GT_COOP;
diff --git a/src/m_misc.c b/src/m_misc.c
index f7d5cf9613..fb00aa5af9 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -521,6 +521,14 @@ void M_FirstLoadConfig(void)
// make sure I_Quit() will write back the correct config
// (do not write back the config if it crash before)
gameconfig_loaded = true;
+
+ // reset to default player stuff
+ COM_BufAddText (va("%s \"%s\"\n",cv_playername.name,cv_defaultplayername.string));
+ COM_BufAddText (va("%s \"%s\"\n",cv_skin.name,cv_defaultskin.string));
+ COM_BufAddText (va("%s \"%s\"\n",cv_playercolor.name,cv_defaultplayercolor.string));
+ COM_BufAddText (va("%s \"%s\"\n",cv_playername2.name,cv_defaultplayername2.string));
+ COM_BufAddText (va("%s \"%s\"\n",cv_skin2.name,cv_defaultskin2.string));
+ COM_BufAddText (va("%s \"%s\"\n",cv_playercolor2.name,cv_defaultplayercolor2.string));
}
/** Saves the game configuration.
--
GitLab