From dd82ce426e0bf191f81023932a22daeb1ee3ad80 Mon Sep 17 00:00:00 2001 From: AdamTadeusz Date: Sat, 4 May 2024 15:08:54 +0100 Subject: [PATCH 1/3] enter observer mode on death --- mp/src/game/server/neo/neo_player.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mp/src/game/server/neo/neo_player.cpp b/mp/src/game/server/neo/neo_player.cpp index 6f6644f5a..943b27a11 100644 --- a/mp/src/game/server/neo/neo_player.cpp +++ b/mp/src/game/server/neo/neo_player.cpp @@ -1412,6 +1412,7 @@ void CNEO_Player::Event_Killed( const CTakeDamageInfo &info ) } } + m_bEnterObserver = true; ShowViewPortPanel(PANEL_SPECGUI, true); BaseClass::Event_Killed(info); @@ -1799,7 +1800,7 @@ CBaseEntity* CNEO_Player::EntSelectSpawnPoint( void ) bool CNEO_Player::StartObserverMode(int mode) { - return BaseClass::StartObserverMode(mode); + return BaseClass::StartObserverMode(OBS_MODE_IN_EYE); // Hardcode this for now, dead players can't ghost } void CNEO_Player::StopObserverMode() From 7ea2345adc4aeb4d54d23e49e9e5fdccd496b583 Mon Sep 17 00:00:00 2001 From: AdamTadeusz Date: Mon, 6 May 2024 15:29:44 +0100 Subject: [PATCH 2/3] Start observer mode on death --- mp/src/game/server/neo/neo_player.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mp/src/game/server/neo/neo_player.cpp b/mp/src/game/server/neo/neo_player.cpp index 943b27a11..b7f539b44 100644 --- a/mp/src/game/server/neo/neo_player.cpp +++ b/mp/src/game/server/neo/neo_player.cpp @@ -1413,6 +1413,7 @@ void CNEO_Player::Event_Killed( const CTakeDamageInfo &info ) } m_bEnterObserver = true; + StartObserverMode(OBS_MODE_CHASE); ShowViewPortPanel(PANEL_SPECGUI, true); BaseClass::Event_Killed(info); @@ -1800,7 +1801,7 @@ CBaseEntity* CNEO_Player::EntSelectSpawnPoint( void ) bool CNEO_Player::StartObserverMode(int mode) { - return BaseClass::StartObserverMode(OBS_MODE_IN_EYE); // Hardcode this for now, dead players can't ghost + return BaseClass::StartObserverMode(mode); // Hardcode this for now, dead players can't ghost } void CNEO_Player::StopObserverMode() From 94068ca52bdc8e05c5f398487a89a472b507740b Mon Sep 17 00:00:00 2001 From: AdamTadeusz Date: Tue, 7 May 2024 16:27:10 +0100 Subject: [PATCH 3/3] No more tposing spectators visible in thermals hopefully? --- mp/src/game/server/neo/neo_player.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mp/src/game/server/neo/neo_player.cpp b/mp/src/game/server/neo/neo_player.cpp index b7f539b44..1d17217f2 100644 --- a/mp/src/game/server/neo/neo_player.cpp +++ b/mp/src/game/server/neo/neo_player.cpp @@ -460,7 +460,7 @@ void CNEO_Player::Precache( void ) void CNEO_Player::Spawn(void) { ShowViewPortPanel(PANEL_SPECGUI, (GetTeamNumber() == TEAM_SPECTATOR ? true : false)); - + // Should do this class update first, because most of the stuff below depends on which player class we are. if ((m_iNextSpawnClassChoice != -1) && (m_iNeoClass != m_iNextSpawnClassChoice)) { @@ -1411,12 +1411,12 @@ void CNEO_Player::Event_Killed( const CTakeDamageInfo &info ) Weapon_Detach(pWep); } } + BaseClass::Event_Killed(info); m_bEnterObserver = true; StartObserverMode(OBS_MODE_CHASE); + RemoveAllWeapons(); ShowViewPortPanel(PANEL_SPECGUI, true); - - BaseClass::Event_Killed(info); } float CNEO_Player::GetReceivedDamageScale(CBaseEntity* pAttacker)