Skip to content

Commit

Permalink
Resolve EnvHudHint.cpp.rej
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewmcwatters committed Dec 25, 2024
1 parent d4cb2f0 commit aa5fb84
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 25 deletions.
8 changes: 8 additions & 0 deletions mp/src/game/server/EnvHudHint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,11 @@ void CEnvHudHint::InputShowHudHint( inputdata_t &inputdata )
}
else
{
#ifdef HL2SB
pPlayer = UTIL_GetNearestPlayer( GetAbsOrigin() );
#else
pPlayer = UTIL_GetLocalPlayer();
#endif
}

if ( !pPlayer || !pPlayer->IsNetClient() )
Expand Down Expand Up @@ -126,7 +130,11 @@ void CEnvHudHint::InputHideHudHint( inputdata_t &inputdata )
}
else
{
#ifdef HL2SB
pPlayer = UTIL_GetNearestPlayer( GetAbsOrigin() );
#else
pPlayer = UTIL_GetLocalPlayer();
#endif
}

if ( !pPlayer || !pPlayer->IsNetClient() )
Expand Down
25 changes: 0 additions & 25 deletions mp/src/game/server/envhudhint.cpp.rej

This file was deleted.

0 comments on commit aa5fb84

Please sign in to comment.