From e9637322f92160e015b50c7fa240c006baf9223f Mon Sep 17 00:00:00 2001
From: Lactozilla <jp6781615@gmail.com>
Date: Tue, 31 Oct 2023 16:45:47 -0300
Subject: [PATCH] Simplify fix pickedchar doesn't need to be set in these two
places, since G_DeferedInitNew already does that.
---
src/g_demo.c | 5 +----
src/m_menu.c | 4 ----
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/src/g_demo.c b/src/g_demo.c
index 6329472916..7026c33916 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -1492,10 +1492,7 @@ void G_BeginRecording(void)
demo_p += 16;
// Skin
- const char *skinname = cv_skin.string;
- if (pickedchar >= 0 && pickedchar < numskins)
- skinname = skins[pickedchar].name;
-
+ const char *skinname = skins[players[0].skin].name;
for (i = 0; i < 16 && skinname[i]; i++)
name[i] = skinname[i];
for (; i < 16; i++)
diff --git a/src/m_menu.c b/src/m_menu.c
index e2866f32b9..629f53d246 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -10372,8 +10372,6 @@ static void M_ChooseNightsAttack(INT32 choice)
sprintf(gpath,"replay"PATHSEP"%s"PATHSEP"%s", timeattackfolder, G_BuildMapName(cv_nextmap.value));
snprintf(nameofdemo, sizeof nameofdemo, "%s-%s-last", gpath, skins[cv_chooseskin.value-1].name);
- pickedchar = cv_chooseskin.value-1;
-
if (!cv_autorecord.value)
remove(va("%s"PATHSEP"%s.lmp", srb2home, nameofdemo));
else
@@ -10403,8 +10401,6 @@ static void M_ChooseTimeAttack(INT32 choice)
sprintf(gpath,"replay"PATHSEP"%s"PATHSEP"%s", timeattackfolder, G_BuildMapName(cv_nextmap.value));
snprintf(nameofdemo, sizeof nameofdemo, "%s-%s-last", gpath, skins[cv_chooseskin.value-1].name);
- pickedchar = cv_chooseskin.value-1;
-
if (!cv_autorecord.value)
remove(va("%s"PATHSEP"%s.lmp", srb2home, nameofdemo));
else
--
GitLab