mirror of
https://github.com/ValveSoftware/source-sdk-2013.git
synced 2025-04-08 11:01:33 +00:00
Merge e3368852ba
into ceb6d4d783
This commit is contained in:
commit
48a554ff4c
3 changed files with 10 additions and 1 deletions
|
@ -63,6 +63,11 @@ void FinishClientPutInServer( CHL2MP_Player *pPlayer )
|
|||
ClientPrint( pPlayer, HUD_PRINTTALK, "You are on team %s1\n", pPlayer->GetTeam()->GetName() );
|
||||
}
|
||||
|
||||
if ( pPlayer->GetTeamNumber() == TEAM_SPECTATOR )
|
||||
{
|
||||
pPlayer->RemoveAllItems( true );
|
||||
}
|
||||
|
||||
const ConVar *hostname = cvar->FindVar( "hostname" );
|
||||
const char *title = (hostname) ? hostname->GetString() : "MESSAGE OF THE DAY";
|
||||
|
||||
|
|
|
@ -999,6 +999,9 @@ void CHL2MP_Player::ChangeTeam( int iTeam )
|
|||
{
|
||||
RemoveAllItems( true );
|
||||
|
||||
if ( FlashlightIsOn() )
|
||||
FlashlightTurnOff();
|
||||
|
||||
State_Transition( STATE_OBSERVER_MODE );
|
||||
}
|
||||
|
||||
|
|
|
@ -1026,7 +1026,8 @@ void CHL2MPRules::RestartGame()
|
|||
pPlayer->GetActiveWeapon()->Holster();
|
||||
}
|
||||
pPlayer->RemoveAllItems( true );
|
||||
respawn( pPlayer, false );
|
||||
if ( pPlayer->GetTeamNumber() != TEAM_SPECTATOR )
|
||||
respawn( pPlayer, false );
|
||||
pPlayer->Reset();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue