Fix FL_FAKECLIENT flag being cleared in some places

Resolves ValveSoftware/halflife#3256
twhl-community · Mar 17, 2022 · 6b8ab74 · 6b8ab74
1 parent 95cc9dc
commit 6b8ab74
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/game/server/entities/items/weapons/CDisplacerBall.cpp b/src/game/server/entities/items/weapons/CDisplacerBall.cpp
@@ -158,8 +158,9 @@ void CDisplacerBall::BallTouch(CBaseEntity* pOther)
 	{
 		CBasePlayer* pPlayer = static_cast<CBasePlayer*>(pOther);
 
-		//TODO: what is this for? - Solokiller
-		pPlayer->pev->flags = FL_CLIENT;
+		//Clear any flags set on player (onground, using grapple, etc).
+		pPlayer->pev->flags &= FL_FAKECLIENT;
+		pPlayer->pev->flags |= FL_CLIENT;
 		pPlayer->m_flFallVelocity = 0;
 
 		if (g_pGameRules->IsCTF() && pPlayer->m_pFlag)

diff --git a/src/game/server/entities/player.cpp b/src/game/server/entities/player.cpp
@@ -5327,7 +5327,8 @@ bool CBasePlayer::Menu_Char_Input(int inp)
 	if (0 != pev->iuser1)
 	{
 		pev->effects &= ~EF_NODRAW;
-		pev->flags = FL_CLIENT;
+		pev->flags &= FL_FAKECLIENT;
+		pev->flags |= FL_CLIENT;
 		pev->takedamage = DAMAGE_YES;
 		m_iHideHUD &= ~(HIDEHUD_HEALTH | HIDEHUD_WEAPONS);
 		m_afPhysicsFlags &= PFLAG_OBSERVER;