From 23b1b650bb5bdced6f96d19134344f0f51d5dc1e Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 29 Nov 2017 07:29:27 +0000
Subject: [PATCH] Clean up E_PostLoadPalette.

git-svn-id: https://svn.eduke32.com/eduke32@6513 1a8010ca-5511-0410-912e-c29ae57300e0
---
 source/build/include/palette.h |  3 +++
 source/build/src/palette.cpp   | 36 ++++++++++++----------------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/source/build/include/palette.h b/source/build/include/palette.h
index 787d56fd7..4e5454757 100644
--- a/source/build/include/palette.h
+++ b/source/build/include/palette.h
@@ -32,6 +32,9 @@ extern uint32_t PaletteIndexFullbrights[8];
 typedef struct {
     char r, g, b, f;
 } palette_t;
+typedef struct {
+    uint8_t r, g, b;
+} rgb24_t;
 extern palette_t curpalette[256], curpalettefaded[256], palfadergb;
 extern char palfadedelta;
 
diff --git a/source/build/src/palette.cpp b/source/build/src/palette.cpp
index bdcbf63e8..f6edc91cf 100644
--- a/source/build/src/palette.cpp
+++ b/source/build/src/palette.cpp
@@ -274,24 +274,16 @@ void E_PostLoadPalette(void)
 
     fixtransluscence(FP_OFF(blendtable[0]));
 
+    char const * const palookup0 = palookup[0];
+
 #ifdef DEBUG_TILESIZY_512
     // Bump shade 1 by 16.
     for (bssize_t i=256; i<512; i++)
-        palookup[0][i] = palookup[0][i+(16<<8)];
+        palookup0[i] = palookup0[i+(16<<8)];
 #endif
 
-    // find white and black colors
-    for (bssize_t i=0, j, k=0; i<256; i++)
-    {
-        j = palette[i*3] + palette[i*3+1] + palette[i*3+2];
-        if (j > k) { k = j; whitecol = i; }
-    }
-    for (bssize_t i=0, j, k=768; i<256; i++)
-    {
-        j = palette[i*3] + palette[i*3+1] + palette[i*3+2];
-        if (j < k) { k = j; blackcol = i; }
-    }
-
+    blackcol = getclosestcol(0, 0, 0);
+    whitecol = getclosestcol(255, 255, 255);
     redcol = getclosestcol(255, 0, 0);
 
     for (size_t i = 0; i<16; i++)
@@ -303,22 +295,20 @@ void E_PostLoadPalette(void)
     // Bmemset(PaletteIndexFullbrights, 0, sizeof(PaletteIndexFullbrights));
     for (bssize_t c = 0; c < 255; ++c) // skipping transparent color
     {
-        char const * const thispalookup = palookup[0];
-        char const color = thispalookup[c];
+        uint8_t const index = palookup0[c];
+        rgb24_t const & color = *(rgb24_t *)&palette[index*3];
 
-        if (EDUKE32_PREDICT_FALSE(palette[color*3] == 0 &&
-            palette[color*3+1] == 0 &&
-            palette[color*3+2] == 0))
-            continue; // don't consider #000000 fullbright
+        // don't consider #000000 fullbright
+        if (EDUKE32_PREDICT_FALSE(color.r == 0 && color.g == 0 && color.b == 0))
+            continue;
 
-        for (bssize_t s = c + 256; s < 256*32; s += 256)
-            if (EDUKE32_PREDICT_FALSE(thispalookup[s] != color))
+        for (size_t s = c + 256, s_end = 256*numshades; s < s_end; s += 256)
+            if (EDUKE32_PREDICT_FALSE(palookup0[s] != index))
                 goto PostLoad_NotFullbright;
 
         SetPaletteIndexFullbright(c);
 
-    PostLoad_NotFullbright:
-        continue; // should be optimized out
+        PostLoad_NotFullbright: ;
     }
 }