Revert "[HL25] Backport geiger counter changes"

This reverts commit 87ad6de. See upstream issue: ValveSoftware/halflife#3856
JoelTroch · Nov 8, 2024 · 40c1706 · 40c1706
1 parent 453e1f5
commit 40c1706
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * Prevented game_zone_player from transitioning across levels to fix Mod_NumForName: not found issue [#241](https://github.com/twhl-community/halflife-updated/pull/241) (Thanks FreeSlave)
 * Fixed null dereference in game_score [#246](https://github.com/twhl-community/halflife-updated/pull/246) (Thanks FreeSlave)
 * Fixed null dereference of m_rawinput and mouse issues on Linux [#251](https://github.com/twhl-community/halflife-updated/pull/251) (Thanks a1batross)
+* Reverted "[HL25] Fixed geiger counter sound at range 800 units and higher" (halflife issue [#3856](https://github.com/ValveSoftware/halflife/issues/3856))
 
 ### Features
 

diff --git a/cl_dll/geiger.cpp b/cl_dll/geiger.cpp
@@ -68,14 +68,10 @@ bool 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");