diff --git a/cl_dll/geiger.cpp b/cl_dll/geiger.cpp
index 8fa1407..9944267 100644
--- a/cl_dll/geiger.cpp
+++ b/cl_dll/geiger.cpp
@@ -68,14 +68,10 @@ int CHudGeiger::Draw (float flTime)
 	int rg[3];
 	int i;
 	
-	if (m_iGeigerRange < 1000 && m_iGeigerRange > 0)
+	if (m_iGeigerRange <= 800 && m_iGeigerRange > 0)
 	{
 		// peicewise linear is better than continuous formula for this
-		if (m_iGeigerRange > 800)
-		{
-			pct = 0;			//Con_Printf ( "range > 800\n");
-		}
-		else if (m_iGeigerRange > 600)
+		if (m_iGeigerRange > 600)
 		{
 			pct = 2;
 			flvol = 0.4;		//Con_Printf ( "range > 600\n");
diff --git a/cl_dll/message.cpp b/cl_dll/message.cpp
index 293e8a8..deb40e3 100644
--- a/cl_dll/message.cpp
+++ b/cl_dll/message.cpp
@@ -147,13 +147,13 @@ void CHudMessage::MessageScanNextChar( void )
 	srcGreen = m_parms.pMessage->g1;
 	srcBlue = m_parms.pMessage->b1;
 	blend = 0;	// Pure source
+	destRed = destGreen = destBlue = 0;
 
 	switch( m_parms.pMessage->effect )
 	{
 	// Fade-in / Fade-out
 	case 0:
 	case 1:
-		destRed = destGreen = destBlue = 0;
 		blend = m_parms.fadeBlend;
 		break;
 
@@ -168,7 +168,6 @@ void CHudMessage::MessageScanNextChar( void )
 		{
 			float deltaTime = m_parms.time - m_parms.charTime;
 
-			destRed = destGreen = destBlue = 0;
 			if ( m_parms.time > m_parms.fadeTime )
 			{
 				blend = m_parms.fadeBlend;
diff --git a/dmc/cl_dll/geiger.cpp b/dmc/cl_dll/geiger.cpp
index 8fa1407..9944267 100644
--- a/dmc/cl_dll/geiger.cpp
+++ b/dmc/cl_dll/geiger.cpp
@@ -68,14 +68,10 @@ int CHudGeiger::Draw (float flTime)
 	int rg[3];
 	int i;
 	
-	if (m_iGeigerRange < 1000 && m_iGeigerRange > 0)
+	if (m_iGeigerRange <= 800 && m_iGeigerRange > 0)
 	{
 		// peicewise linear is better than continuous formula for this
-		if (m_iGeigerRange > 800)
-		{
-			pct = 0;			//Con_Printf ( "range > 800\n");
-		}
-		else if (m_iGeigerRange > 600)
+		if (m_iGeigerRange > 600)
 		{
 			pct = 2;
 			flvol = 0.4;		//Con_Printf ( "range > 600\n");
diff --git a/dmc/cl_dll/message.cpp b/dmc/cl_dll/message.cpp
index e86396f..b4d8118 100644
--- a/dmc/cl_dll/message.cpp
+++ b/dmc/cl_dll/message.cpp
@@ -143,13 +143,13 @@ void CHudMessage::MessageScanNextChar( void )
 	srcGreen = m_parms.pMessage->g1;
 	srcBlue = m_parms.pMessage->b1;
 	blend = 0;	// Pure source
+	destRed = destGreen = destBlue = 0;
 
 	switch( m_parms.pMessage->effect )
 	{
 	// Fade-in / Fade-out
 	case 0:
 	case 1:
-		destRed = destGreen = destBlue = 0;
 		blend = m_parms.fadeBlend;
 		break;
 
@@ -164,7 +164,6 @@ void CHudMessage::MessageScanNextChar( void )
 		{
 			float deltaTime = m_parms.time - m_parms.charTime;
 
-			destRed = destGreen = destBlue = 0;
 			if ( m_parms.time > m_parms.fadeTime )
 			{
 				blend = m_parms.fadeBlend;
diff --git a/ricochet/cl_dll/geiger.cpp b/ricochet/cl_dll/geiger.cpp
index c50d695..7087e59 100644
--- a/ricochet/cl_dll/geiger.cpp
+++ b/ricochet/cl_dll/geiger.cpp
@@ -68,14 +68,10 @@ int CHudGeiger::Draw (float flTime)
 	int rg[3];
 	int i;
 	
-	if (m_iGeigerRange < 1000 && m_iGeigerRange > 0)
+	if (m_iGeigerRange <= 800 && m_iGeigerRange > 0)
 	{
 		// peicewise linear is better than continuous formula for this
-		if (m_iGeigerRange > 800)
-		{
-			pct = 0;			//Con_Printf ( "range > 800\n");
-		}
-		else if (m_iGeigerRange > 600)
+		if (m_iGeigerRange > 600)
 		{
 			pct = 2;
 			flvol = 0.4;		//Con_Printf ( "range > 600\n");
diff --git a/ricochet/cl_dll/message.cpp b/ricochet/cl_dll/message.cpp
index 3307b25..64dbcd9 100644
--- a/ricochet/cl_dll/message.cpp
+++ b/ricochet/cl_dll/message.cpp
@@ -143,13 +143,13 @@ void CHudMessage::MessageScanNextChar( void )
 	srcGreen = m_parms.pMessage->g1;
 	srcBlue = m_parms.pMessage->b1;
 	blend = 0;	// Pure source
+	destRed = destGreen = destBlue = 0;
 
 	switch( m_parms.pMessage->effect )
 	{
 	// Fade-in / Fade-out
 	case 0:
 	case 1:
-		destRed = destGreen = destBlue = 0;
 		blend = m_parms.fadeBlend;
 		break;
 
@@ -164,7 +164,6 @@ void CHudMessage::MessageScanNextChar( void )
 		{
 			float deltaTime = m_parms.time - m_parms.charTime;
 
-			destRed = destGreen = destBlue = 0;
 			if ( m_parms.time > m_parms.fadeTime )
 			{
 				blend = m_parms.fadeBlend;