From d589953fc4287ee998f6751553e018bf367e9b2d Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Sat, 19 Aug 2023 23:39:54 -0400
Subject: [PATCH] Fix P_WriteSkincolor
---
src/p_setup.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/p_setup.c b/src/p_setup.c
index 13187bb41c..77f5370dd0 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -50,6 +50,7 @@
#include "m_random.h"
#include "dehacked.h" // for map headers
+#include "deh_tables.h" // FREE_SKINCOLORS
#include "r_main.h"
#include "m_cond.h" // for emblems
@@ -1266,12 +1267,19 @@ static void P_WriteDuplicateText(const char *text, char **target)
static void P_WriteSkincolor(INT32 constant, char **target)
{
+ const char *color_name;
+
if (constant <= SKINCOLOR_NONE
|| constant >= (INT32)numskincolors)
return;
+ if (constant >= SKINCOLOR_FIRSTFREESLOT)
+ color_name = FREE_SKINCOLORS[constant - SKINCOLOR_FIRSTFREESLOT];
+ else
+ color_name = COLOR_ENUMS[constant];
+
P_WriteDuplicateText(
- va("SKINCOLOR_%s", skincolors[constant].name),
+ va("SKINCOLOR_%s", color_name),
target
);
}
--
GitLab