From 50075358ee35804bb7c67fa3944a9747df189889 Mon Sep 17 00:00:00 2001
From: Fabian Greffrath <fabian@greffrath.com>
Date: Mon, 14 Feb 2022 12:30:14 +0100
Subject: [PATCH] de-hardcode colored blood values (#450)

Apply them using the doom-all autoload instead. Much less values to set, reset and apply again.
---
 Source/d_main.c                     | 5 -----
 autoload/chex.wad/extchex.deh       | 6 ------
 autoload/doom-all/bloodcolor.deh    | 8 ++++++++
 autoload/hacx.wad/bloodcolor.deh    | 6 ------
 autoload/rekkr.wad/bloodcolor.deh   | 5 -----
 autoload/rekkrsa.wad/bloodcolor.deh | 5 -----
 6 files changed, 8 insertions(+), 27 deletions(-)
 create mode 100644 autoload/doom-all/bloodcolor.deh
 delete mode 100644 autoload/rekkr.wad/bloodcolor.deh
 delete mode 100644 autoload/rekkrsa.wad/bloodcolor.deh

diff --git a/Source/d_main.c b/Source/d_main.c
index 76160e5c..a2396d1d 100644
--- a/Source/d_main.c
+++ b/Source/d_main.c
@@ -1812,11 +1812,6 @@ static void D_InitTables(void)
   mobjinfo[MT_HEADSHOT].altspeed = 20 * FRACUNIT;
   mobjinfo[MT_TROOPSHOT].altspeed = 20 * FRACUNIT;
 
-  // [Woof!]
-  mobjinfo[MT_HEAD].bloodcolor = 3; // Blue
-  mobjinfo[MT_BRUISER].bloodcolor = 2; // Green
-  mobjinfo[MT_KNIGHT].bloodcolor = 2; // Green
-
   // DEHEXTRA
   mobjinfo[MT_WOLFSS].droppeditem = MT_CLIP;
   mobjinfo[MT_POSSESSED].droppeditem = MT_CLIP;
diff --git a/autoload/chex.wad/extchex.deh b/autoload/chex.wad/extchex.deh
index 613969f2..ed28d167 100644
--- a/autoload/chex.wad/extchex.deh
+++ b/autoload/chex.wad/extchex.deh
@@ -4,12 +4,6 @@ Dropped item = 0
 Thing 3 (Shotgun guy)
 Dropped item = 0
 
-Thing 15 (Cacodemon)
-Blood color = 0
-
-Thing 16 (Baron of Hell)
-Blood color = 0
-
 [STRINGS]
 HUSTR_E1M6 = E1M5: Caverns of Bazoik
 HUSTR_E1M7 = E1M5: Caverns of Bazoik
diff --git a/autoload/doom-all/bloodcolor.deh b/autoload/doom-all/bloodcolor.deh
new file mode 100644
index 00000000..2a37552d
--- /dev/null
+++ b/autoload/doom-all/bloodcolor.deh
@@ -0,0 +1,8 @@
+Thing 15 (Cacodemon)
+Blood color = 3
+
+Thing 16 (Baron of Hell)
+Blood color = 2
+
+Thing 18 (Hell Knight)
+Blood color = 2
diff --git a/autoload/hacx.wad/bloodcolor.deh b/autoload/hacx.wad/bloodcolor.deh
index afc08698..66ef8469 100644
--- a/autoload/hacx.wad/bloodcolor.deh
+++ b/autoload/hacx.wad/bloodcolor.deh
@@ -1,8 +1,2 @@
-Thing 16 (Baron of Hell)
-Blood color = 0
-
-Thing 18 (Hell knight)
-Blood color = 0
-
 Thing 21 (Arachnotron)
 Blood color = 2
diff --git a/autoload/rekkr.wad/bloodcolor.deh b/autoload/rekkr.wad/bloodcolor.deh
deleted file mode 100644
index 972328a3..00000000
--- a/autoload/rekkr.wad/bloodcolor.deh
+++ /dev/null
@@ -1,5 +0,0 @@
-Thing 15 (Cacodemon)
-Blood color = 0
-
-Thing 16 (Baron of Hell)
-Blood color = 0
diff --git a/autoload/rekkrsa.wad/bloodcolor.deh b/autoload/rekkrsa.wad/bloodcolor.deh
deleted file mode 100644
index 972328a3..00000000
--- a/autoload/rekkrsa.wad/bloodcolor.deh
+++ /dev/null
@@ -1,5 +0,0 @@
-Thing 15 (Cacodemon)
-Blood color = 0
-
-Thing 16 (Baron of Hell)
-Blood color = 0