From 31b05a433c1f86b65217f1d17f8636c60deb4280 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Fri, 8 Aug 2008 00:32:16 +0000
Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@940
 1a8010ca-5511-0410-912e-c29ae57300e0

---
 polymer/eduke32/source/game.c   | 30 ++++++++++++++++++++----------
 polymer/eduke32/source/premap.c |  5 ++---
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index aa317e4cf..b082de558 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -3367,6 +3367,9 @@ extern int getclosestcol(int r, int g, int b);
 int crosshair_red = 255;
 int crosshair_green = 255;
 int crosshair_blue = 0;
+static int crosshair_red_default = -1;
+static int crosshair_green_default = -1;
+static int crosshair_blue_default = -1;
 #define CROSSHAIR_PAL (MAXPALOOKUPS>>1)
 
 void SetCrosshairColor(int r, int g, int b)
@@ -3374,17 +3377,19 @@ void SetCrosshairColor(int r, int g, int b)
     /* TODO: turn this into something useful */
     char *ptr = (char *)waloff[CROSSHAIR];
     int i, ii;
-    static int crosshair_red_default = -1;
-    static int crosshair_green_default = -1;
-    static int crosshair_blue_default = -1;
+    static int sum;
 
-    hictinting[CROSSHAIR_PAL].r = crosshair_red = r;
-    hictinting[CROSSHAIR_PAL].g = crosshair_green = g;
-    hictinting[CROSSHAIR_PAL].b = crosshair_blue = b;
-    hictinting[CROSSHAIR_PAL].f = 1;
-    invalidatetile(CROSSHAIR, -1, -1);
+    if (sum == r+(g<<1)+(b<<2)) return;
+    sum = r+(g<<1)+(b<<2);
+    crosshair_red = r;
+    crosshair_green = g;
+    crosshair_blue = b;
 
-    if (waloff[CROSSHAIR] == 0) return;
+    if (waloff[CROSSHAIR] == 0)
+    {
+        loadtile(CROSSHAIR);
+        ptr = (char *)waloff[CROSSHAIR];
+    }
 
     if (crosshair_red_default == -1)
     {
@@ -3401,7 +3406,6 @@ void SetCrosshairColor(int r, int g, int b)
             ptr++;
             ii--;
         }
-        OSD_Printf("brightest color index: %d\n",bri);
         crosshair_red_default = crosshair_red = curpalette[bri].r;
         crosshair_green_default = crosshair_green = curpalette[bri].g;
         crosshair_blue_default = crosshair_blue = curpalette[bri].b;
@@ -3419,6 +3423,12 @@ void SetCrosshairColor(int r, int g, int b)
     for (i = 0; i < 256; i++)
         tempbuf[i] = i;
     makepalookup(CROSSHAIR_PAL,tempbuf,crosshair_red>>2, crosshair_green>>2, crosshair_blue>>2,1);
+
+    hictinting[CROSSHAIR_PAL].r = crosshair_red;
+    hictinting[CROSSHAIR_PAL].g = crosshair_green;
+    hictinting[CROSSHAIR_PAL].b = crosshair_blue;
+    hictinting[CROSSHAIR_PAL].f = 1;
+    invalidatetile(CROSSHAIR, -1, -1);
 }
 
 void palto(int r,int g,int b,int e)
diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c
index 45132a789..0ae076d43 100644
--- a/polymer/eduke32/source/premap.c
+++ b/polymer/eduke32/source/premap.c
@@ -502,9 +502,6 @@ void cacheit(void)
         }
     }
 
-    loadtile(CROSSHAIR);
-    SetCrosshairColor(crosshair_red, crosshair_green, crosshair_blue);
-
     clearbufbyte(gotpic,sizeof(gotpic),0L);
 
     endtime = getticks();
@@ -562,6 +559,8 @@ void vscrn(void)
 
     setview(x1,y1,x2-1,y2-1);
 
+    SetCrosshairColor(crosshair_red, crosshair_green, crosshair_blue);
+
     pub = NUMPAGES;
     pus = NUMPAGES;
 }