# HG changeset patch
# User Adam Kaminski <kaminskiadam9@gmail.com>
# Date 1604509086 18000
#      Wed Nov 04 11:58:06 2020 -0500
# Node ID df4ba3bf564ebde4ec875b64b9c5e7de0e255023
# Parent  02f7fdde0bf8ee005028c1aeedd9218bdd4ee24b
Fixed serverside and clientside ACS HudMessages using different id namespaces so that they couldn't replace each other.

diff -r 02f7fdde0bf8 -r df4ba3bf564e docs/zandronum-history.txt
--- a/docs/zandronum-history.txt	Wed Nov 04 10:28:24 2020 -0500
+++ b/docs/zandronum-history.txt	Wed Nov 04 11:58:06 2020 -0500
@@ -42,6 +42,7 @@
 -	- Fixed an integer overflow crash related to decals. [eagle, Torr Samaho]
 -	- Fixed the obituary for the BFG tracer not being used if a player was killed by them. [Kaminsky]
 -	- Fixed desaturated translations created with CreateTranslation() not syncing with clients in an online game. [Kaminsky]
+-	- Fixed serverside and clientside ACS HudMessages using different id namespaces so that they couldn't replace each other. [Kaminsky]
 !	- 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 02f7fdde0bf8 -r df4ba3bf564e src/cl_main.cpp
--- a/src/cl_main.cpp	Wed Nov 04 10:28:24 2020 -0500
+++ b/src/cl_main.cpp	Wed Nov 04 11:58:06 2020 -0500
@@ -5531,7 +5531,7 @@
 		holdTime );
 
 	// Now attach the message.
-	StatusBar->AttachMessage( hudMessage, id );
+	StatusBar->AttachMessage( hudMessage, id ? 0xff000000|id : 0 );
 
 	// Log the message if desired.
 	if ( log )
@@ -5562,7 +5562,7 @@
 		fadeOutTime );
 
 	// Now attach the message.
-	StatusBar->AttachMessage( hudMessage, id );
+	StatusBar->AttachMessage( hudMessage, id ? 0xff000000|id : 0 );
 
 	// Log the message if desired.
 	if ( log )
@@ -5594,7 +5594,7 @@
 		fadeOutTime );
 
 	// Now attach the message.
-	StatusBar->AttachMessage( hudMessage, id );
+	StatusBar->AttachMessage( hudMessage, id ? 0xff000000|id : 0 );
 
 	// Log the message if desired.
 	if ( log )
@@ -5626,7 +5626,7 @@
 		fadeOutTime );
 
 	// Now attach the message.
-	StatusBar->AttachMessage( hudMessage, id );
+	StatusBar->AttachMessage( hudMessage, id ? 0xff000000|id : 0 );
 
 	// Log the message if desired.
 	if ( log )