From 56717231b0a5d248ed30dba346aab9658c058002 Mon Sep 17 00:00:00 2001
From: Fabian Greffrath <fabian@greffrath.com>
Date: Thu, 24 Mar 2022 12:21:09 +0100
Subject: [PATCH] support crosshair patches from extras.wad

---
 Source/cross.h    |  8 ++++----
 Source/hu_stuff.c | 10 +++++++++-
 Source/info.c     |  8 ++++----
 Source/m_menu.c   |  8 ++++----
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/Source/cross.h b/Source/cross.h
index c3ac316f..70fe01ae 100644
--- a/Source/cross.h
+++ b/Source/cross.h
@@ -19,20 +19,20 @@
 // DESCRIPTION:
 //      crosshair patches
 
-static unsigned char cross1[] = {
+static unsigned char cross00[] = {
   5,0,5,0,0,0,0,0,28,0,0,0,34,0,0,0,40,0,0,0,53,0,0,0,59,0,0,0,2,1,0,184,0,255,
   2,1,0,184,0,255,0,2,0,184,184,0,3,2,0,184,184,0,255,2,1,0,184,0,255,2,1,0,
   184,0,255,
 };
-static unsigned char cross2[] = {
+static unsigned char cross01[] = {
   5,0,5,0,0,0,0,0,28,0,0,0,29,0,0,0,30,0,0,0,38,0,0,0,44,0,0,0,255,255,2,3,0,
   184,184,184,0,255,2,1,0,184,0,255,2,1,0,184,0,255,
 };
-static unsigned char cross3[] = {
+static unsigned char cross02[] = {
   5,0,5,0,0,0,0,0,28,0,0,0,29,0,0,0,30,0,0,0,36,0,0,0,37,0,0,0,255,255,2,1,0,
   184,0,255,255,255,
 };
-static unsigned char cross4[] = {
+static unsigned char cross03[] = {
   0x09, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00,
   0x32, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00,
   0x3f, 0x00, 0x00, 0x00, 0x4e, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00,
diff --git a/Source/hu_stuff.c b/Source/hu_stuff.c
index 4a69b7b0..354f0d9a 100644
--- a/Source/hu_stuff.c
+++ b/Source/hu_stuff.c
@@ -435,6 +435,14 @@ void HU_Init(void)
   hu_fontk[3] = (patch_t *) W_CacheLumpName("STKEYS3", PU_STATIC);
   hu_fontk[4] = (patch_t *) W_CacheLumpName("STKEYS4", PU_STATIC);
   hu_fontk[5] = (patch_t *) W_CacheLumpName("STKEYS5", PU_STATIC);
+
+  // [FG] support crosshair patches from extras.wad
+  for (i = 1; i < HU_CROSSHAIRS; i++)
+  {
+    j = W_CheckNumForName(crosshair_nam[i]);
+    if (j >= num_predefined_lumps)
+      crosshair_str[i] = crosshair_nam[i];
+  }
 }
 
 //
@@ -869,7 +877,7 @@ typedef struct
 static crosshair_t crosshair;
 
 const char *crosshair_nam[HU_CROSSHAIRS] =
-  { NULL, "CROSS1", "CROSS2", "CROSS3", "CROSS4" };
+  { NULL, "CROSS00", "CROSS01", "CROSS02", "CROSS03" };
 const char *crosshair_str[HU_CROSSHAIRS+1] =
   { "none", "cross", "angle", "dot", "big", NULL };
 
diff --git a/Source/info.c b/Source/info.c
index 7a1c7a78..da28cea2 100644
--- a/Source/info.c
+++ b/Source/info.c
@@ -7939,10 +7939,10 @@ const lumpinfo_t predefined_lumps[]={
   { "BOXLR",    sizeof boxlr, boxlr },
 
   // [FG] crosshair patches
-  { "CROSS1",   sizeof cross1, cross1 },
-  { "CROSS2",   sizeof cross2, cross2 },
-  { "CROSS3",   sizeof cross3, cross3 },
-  { "CROSS4",   sizeof cross4, cross4 },
+  { "CROSS00",  sizeof cross00, cross00 },
+  { "CROSS01",  sizeof cross01, cross01 },
+  { "CROSS02",  sizeof cross02, cross02 },
+  { "CROSS03",  sizeof cross03, cross03 },
 
   // killough 8/98: remove ENDBOOM lump, use id's ENDOOM instead
 
diff --git a/Source/m_menu.c b/Source/m_menu.c
index a0e069e2..b59ba58a 100644
--- a/Source/m_menu.c
+++ b/Source/m_menu.c
@@ -3136,24 +3136,24 @@ static void M_UpdateCrosshairItems (void)
 {
     if (hud_crosshair)
     {
-        stat_settings2[8].m_flags  &= ~S_DISABLE;
         stat_settings2[9].m_flags  &= ~S_DISABLE;
         stat_settings2[10].m_flags &= ~S_DISABLE;
+        stat_settings2[11].m_flags &= ~S_DISABLE;
         if (hud_crosshair_target)
         {
-            stat_settings2[11].m_flags &= ~S_DISABLE;
+            stat_settings2[12].m_flags &= ~S_DISABLE;
         }
         else
         {
-            stat_settings2[11].m_flags |= S_DISABLE;
+            stat_settings2[12].m_flags |= S_DISABLE;
         }
     }
     else
     {
-        stat_settings2[8].m_flags  |= S_DISABLE;
         stat_settings2[9].m_flags  |= S_DISABLE;
         stat_settings2[10].m_flags |= S_DISABLE;
         stat_settings2[11].m_flags |= S_DISABLE;
+        stat_settings2[12].m_flags |= S_DISABLE;
     }
 }