# HG changeset patch
# User Joshua Surace <doomjoshuaboy@gmail.com>
# Date 1629867311 -36000
#      Wed Aug 25 14:55:11 2021 +1000
# Node ID 74b2554ee202771e43a58ce59425322fc21b1b19
# Parent  03a61d48fab9838bef5faa09ee7f7b0aebdf7dba
Added and Backported the rest of the text colors defintions from GZDoom.

diff -r 03a61d48fab9 -r 74b2554ee202 docs/zandronum-history.txt
--- a/docs/zandronum-history.txt	Mon Aug 09 06:50:19 2021 -0400
+++ b/docs/zandronum-history.txt	Wed Aug 25 14:55:11 2021 +1000
@@ -56,6 +56,7 @@
 +	- Added CVars that customize how the weapon bobs, sways, and offsets based on the player's pitch, or whether or not to bob the screen itself while leaving the weapon bob unaffected. [Kaminsky]
 +	- Added the GAMEMODE flag DONTPRINTPLAYERSLEFT to prevent printing the "waiting for players" or "x allies/opponents left" message at the bottom of the screen. [Kaminsky]
 +	- Added all of the text colors from "New Text Colors", originally made by FuzzballFox. [Kaminsky]
++	- Added the rest of the Text Colors. Backported from GZDoom.  [Jimmy/DoomJoshuaBoy] 
 -	- Fixed: Bots tries to jump to reach item when sv_nojump is true. [sleep]
 -	- Fixed: ACS function SetSkyScrollSpeed didn't work online. [Edward-san]
 -	- Fixed: color codes in callvote reasons weren't terminated properly. [Dusk]
@@ -91,6 +92,7 @@
 -	- Fixed dormant sounds from still playing upon resetting the map. [Kaminsky]
 -	- Fixed a player's old body from being frozen and not finishing their animation when they become a dead spectator. [Kaminsky]
 -	- Fixed dead spectators not spawning where they died if sv_samespawnspot is enabled. [Kaminsky]
+-	- Fixed the Cream and Olive text color definitions. Backported from GZDoom.  [Jimmy/DoomJoshuaBoy] 
 !	- sv_forcegldefaults renamed to sv_forcevideodefaults. The old name still exists for compatibility. [Dusk]
 !	- r_3dfloors is now forced to be true when sv_forcevideodefaults is true. [Dusk]
 !	- When the wad authentication fails for a connecting client, the client only reports the missing and incompatible PWADS instead of all of them. [Pol Marcet]
diff -r 03a61d48fab9 -r 74b2554ee202 src/v_font.h
--- a/src/v_font.h	Mon Aug 09 06:50:19 2021 -0400
+++ b/src/v_font.h	Wed Aug 25 14:55:11 2021 +1000
@@ -67,6 +67,10 @@
 	CR_PURPLE,
 	CR_DARKGRAY,
 	CR_CYAN,
+	CR_ICE,
+	CR_FIRE,
+	CR_SAPPHIRE,
+	CR_TEAL,
 	NUM_TEXT_COLORS
 };
 
diff -r 03a61d48fab9 -r 74b2554ee202 src/v_text.cpp
--- a/src/v_text.cpp	Mon Aug 09 06:50:19 2021 -0400
+++ b/src/v_text.cpp	Wed Aug 25 14:55:11 2021 +1000
@@ -828,8 +828,8 @@
 			&& ( pszString[i+1] != '*' )
 			&& ( pszString[i+1] != '+' )
 			&& ( pszString[i+1] != '[' )
-			&& ( ( pszString[i+1] < 'a' ) || ( pszString[i+1] > 'v' ) )
-			&& ( ( pszString[i+1] < 'A' ) || ( pszString[i+1] > 'V' ) ) )
+			&& ( ( pszString[i+1] < 'a' ) || ( pszString[i+1] > 'z' ) )
+			&& ( ( pszString[i+1] < 'A' ) || ( pszString[i+1] > 'Z' ) ) )
 			pszString[i] = ' ';
 	}
 }
diff -r 03a61d48fab9 -r 74b2554ee202 src/v_text.h
--- a/src/v_text.h	Mon Aug 09 06:50:19 2021 -0400
+++ b/src/v_text.h	Wed Aug 25 14:55:11 2021 +1000
@@ -68,6 +68,10 @@
 #define TEXTCOLOR_PURPLE		"\034T"
 #define TEXTCOLOR_DARKGRAY		"\034U"
 #define TEXTCOLOR_CYAN			"\034V"
+#define TEXTCOLOR_ICE			"\034W"
+#define TEXTCOLOR_FIRE			"\034X"
+#define TEXTCOLOR_SAPPHIRE		"\034Y"
+#define TEXTCOLOR_TEAL			"\034Z"
 
 #define TEXTCOLOR_NORMAL		"\034-"
 #define TEXTCOLOR_BOLD			"\034+"
diff -r 03a61d48fab9 -r 74b2554ee202 wadsrc/static/menudef.txt
--- a/wadsrc/static/menudef.txt	Mon Aug 09 06:50:19 2021 -0400
+++ b/wadsrc/static/menudef.txt	Wed Aug 25 14:55:11 2021 +1000
@@ -769,6 +769,10 @@
 	19.0, "\ctpurple"
 	20.0, "\cudark gray"
 	21.0, "\cvcyan"
+	22.0, "\cwice"
+	23.0, "\cxfire"
+	24.0, "\cysapphire"
+	25.0, "\czteal"
 }
 
 OptionValue Crosshairs
diff -r 03a61d48fab9 -r 74b2554ee202 wadsrc/static/textcolors.txt
--- a/wadsrc/static/textcolors.txt	Mon Aug 09 06:50:19 2021 -0400
+++ b/wadsrc/static/textcolors.txt	Wed Aug 25 14:55:11 2021 +1000
@@ -1,3 +1,4 @@
+  
 Brick
 {
 	#470000  #FFB8B8
@@ -140,7 +141,8 @@
 
 Cream
 {
-	#CF8353  #FFD7BB
+	#18120a  #BF7B4B    0 128
+	#BF7B4B  #FFBF9B   129 256
 Console:
 	#2B230F  #BF7B4B    0 127
 	#FFB383  #FFFFFF  128 256
@@ -150,7 +152,7 @@
 
 Olive
 {
-	#2F371F  #7B7F50
+	#171F07  #7B7F50
 Console:
 	#373F27  #7B7F63    0 127
 	#676B4F  #D1D8A8  128 256
@@ -217,3 +219,47 @@
 Flat:
 	#00DDDD
 }
+
+Ice
+{
+	#343450  #7C7C98    0 94
+	#7C7C98  #E0E0E0   95 256
+Console:
+	#343450  #7C7C98    0 127
+	#7C7C98  #E0E0E0  128 256
+Flat:
+	#7C7C98
+}
+
+Fire
+{
+	#660000  #D57604   0 104
+	#D57604  #FFFF00   105 256
+Console:
+	#6F0000  #D57604    0 127
+	#D57604  #FFFF00  128 256
+Flat:
+	#D57604
+}
+
+Sapphire
+{
+	#000468  #506CFC    0 94
+	#506CFC  #50ECFC   95 256
+Console:
+	#000468  #506CFC    0 127
+	#506CFC  #50ECFC  128 256
+Flat:
+	#506CFC
+}
+
+Teal
+{
+	#001F1F  #236773    0 90
+	#236773  #7BB3C3   91 256
+Console:
+	#001F1F  #236773    0 127
+	#236773  #7BB3C3  128 256
+Flat:
+	#236773
+}
\ No newline at end of file