From 6766f478014ef6507fa9d352a6418ceeacf2b635 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sun, 7 Sep 2008 20:46:11 +0000
Subject: [PATCH] - Added missing Strife automap colors for items and
 non-monsters.

SVN r1204 (trunk)
---
 docs/rh-log.txt |  1 +
 src/am_map.cpp  | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 160e3652f..188ff17b6 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,5 @@
 September 7, 2008  (Changes by Graf Zahl)
+- Added missing Strife automap colors for items and non-monsters.
 - Fixed: GetMSLength didn't resolve random and player sounds.
 - Moved sound aliasing code out of fmodsound.cpp into S_LoadSound.
 
diff --git a/src/am_map.cpp b/src/am_map.cpp
index 2b392461f..83cdf3a1c 100644
--- a/src/am_map.cpp
+++ b/src/am_map.cpp
@@ -97,7 +97,7 @@ static BYTE StrifePaletteVals[11*3] =
 	0x00,0x00,0x00,  239, 239,   0, 0x10,0x10,0x10,
 	 199, 195, 195,  119, 115, 115,   55,  59,  91,
 	 119, 115, 115, 0xfc,0x00,0x00, 0x4c,0x4c,0x4c,
-	0x80,0x80,0x80, 0x6c,0x6c,0x6c
+	187, 59, 0, 219, 171, 0
 };
 
 #define MAPBITS 12
@@ -751,13 +751,13 @@ static void AM_initColors (bool overlayed)
 			FDWallColor = StrifeColors[5];
 			LockedColor =
 				CDWallColor = StrifeColors[6];
-			ThingColor_Item = 
-				ThingColor_Friend = 
-				ThingColor_Monster =
-				ThingColor = StrifeColors[7];
+			ThingColor_Item = StrifeColors[10];
+			ThingColor_Friend = 
+				ThingColor_Monster = StrifeColors[7];
+			ThingColor = StrifeColors[9];
 			GridColor = StrifeColors[8];
-			XHairColor = StrifeColors[9];
-			NotSeenColor = StrifeColors[10];
+			XHairColor = DoomColors[9];
+			NotSeenColor = DoomColors[10];
 			break;
 	}