Skip to content

Commit 40c1706

Browse files
committed
Revert "[HL25] Backport geiger counter changes"
This reverts commit 87ad6de. See upstream issue: ValveSoftware/halflife#3856
1 parent 453e1f5 commit 40c1706

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* 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)
1212
* Fixed null dereference in game_score [#246](https://github.com/twhl-community/halflife-updated/pull/246) (Thanks FreeSlave)
1313
* Fixed null dereference of m_rawinput and mouse issues on Linux [#251](https://github.com/twhl-community/halflife-updated/pull/251) (Thanks a1batross)
14+
* Reverted "[HL25] Fixed geiger counter sound at range 800 units and higher" (halflife issue [#3856](https://github.com/ValveSoftware/halflife/issues/3856))
1415

1516
### Features
1617

cl_dll/geiger.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,10 @@ bool CHudGeiger::Draw(float flTime)
6868
int rg[3];
6969
int i;
7070

71-
if (m_iGeigerRange < 1000 && m_iGeigerRange > 0)
71+
if (m_iGeigerRange <= 800 && m_iGeigerRange > 0)
7272
{
7373
// peicewise linear is better than continuous formula for this
74-
if (m_iGeigerRange > 800)
75-
{
76-
pct = 0; // Con_Printf ( "range > 800\n");
77-
}
78-
else if (m_iGeigerRange > 600)
74+
if (m_iGeigerRange > 600)
7975
{
8076
pct = 2;
8177
flvol = 0.4; //Con_Printf ( "range > 600\n");

0 commit comments

Comments
 (0)