From 313c8b27a656979ed081e064f58a53dd70f50756 Mon Sep 17 00:00:00 2001
From: Latapostrophe <hyperclassic3@gmail.com>
Date: Fri, 31 Aug 2018 13:52:53 +0200
Subject: [PATCH] Cleaned up a little, courtesy of toaster

---
 src/hu_stuff.c | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index b82ffe267..4eeaa79ce 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -763,28 +763,26 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 			drawstring really should be able to remap to any palette index........*/
 			
 			// there's a lot of fucking colors wtf
-			INT32 color = players[playernum].mo->color;
-			if (color >= SKINCOLOR_IVORY && color <= SKINCOLOR_SILVER)
-				prefix = "\x80";
-			else if ((color >= SKINCOLOR_CLOUDY && color <= SKINCOLOR_BLACK) || color == SKINCOLOR_JET)	// jet is more black than blue so it goes here.
-				prefix = "\x86";
-			else if (color >= SKINCOLOR_SALMON && color <= SKINCOLOR_CRIMSON)
-				prefix = "\x85";
-			else if (color >= SKINCOLOR_DAWN && color <= SKINCOLOR_CARAMEL)
-				prefix = "\x87";
-			else if (color >= SKINCOLOR_TANGERINE && color <= SKINCOLOR_CANARY)
-				prefix = "\x82";
-			else if (color >= SKINCOLOR_OLIVE && color <= SKINCOLOR_SWAMP)
-				prefix = "\x83";
-			else if ((color >= SKINCOLOR_AQUA && color <= SKINCOLOR_STEEL) || color == SKINCOLOR_SAPPHIRE)	// toaster wanted that specific one too shrug
-				prefix = "\x88";
-			else if (color >= SKINCOLOR_PERIWINKLE && color <= SKINCOLOR_NAVY)
-				prefix = "\x84";
-			else if (color >= SKINCOLOR_DUSK && color <= SKINCOLOR_LILAC)
-				prefix = "\x81";
-			else
-				prefix = "\x83";
-				
+			const UINT8 color = players[playernum].skincolor;
+            if (color <= SKINCOLOR_SILVER)
+                prefix = "\x80";
+            else if (color <= SKINCOLOR_BLACK || color == SKINCOLOR_JET)    // jet is more black than blue so it goes here.
+                prefix = "\x86";
+            else if (color <= SKINCOLOR_CRIMSON)
+                prefix = "\x85";
+            else if (color <= SKINCOLOR_CARAMEL)
+                prefix = "\x87";
+            else if (color <= SKINCOLOR_CANARY)
+                prefix = "\x82";
+            else if (color <= SKINCOLOR_SWAMP)
+                prefix = "\x83";
+            else if (color <= SKINCOLOR_STEEL || color == SKINCOLOR_SAPPHIRE)    // toaster wanted that specific one too shrug
+                prefix = "\x88";
+            else if (color <= SKINCOLOR_NAVY)
+                prefix = "\x84";
+            else
+                prefix = "\x81";
+			
 			strcat(cstart, prefix);
 			fmt = "\3%s<%s%s%s>\x80 %s\n";
 			fmt2 = "%s<%s%s%s>\x80 %s";