diff --git a/mp/src/game/server/neo/neo_player.cpp b/mp/src/game/server/neo/neo_player.cpp index 6f6644f5a..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,10 +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) @@ -1799,7 +1801,7 @@ CBaseEntity* CNEO_Player::EntSelectSpawnPoint( void ) bool CNEO_Player::StartObserverMode(int mode) { - return BaseClass::StartObserverMode(mode); + return BaseClass::StartObserverMode(mode); // Hardcode this for now, dead players can't ghost } void CNEO_Player::StopObserverMode()