mirror of
https://github.com/nillerusr/source-engine.git
synced 2026-08-11 19:29:08 +00:00
add source-sdk-2013
This commit is contained in:
@@ -26,8 +26,6 @@ IMPLEMENT_CLIENTCLASS_DT_NOBASE(C_PlayerResource, DT_PlayerResource, CPlayerReso
|
||||
RecvPropArray3( RECVINFO_ARRAY(m_iTeam), RecvPropInt( RECVINFO(m_iTeam[0]))),
|
||||
RecvPropArray3( RECVINFO_ARRAY(m_bAlive), RecvPropInt( RECVINFO(m_bAlive[0]))),
|
||||
RecvPropArray3( RECVINFO_ARRAY(m_iHealth), RecvPropInt( RECVINFO(m_iHealth[0]))),
|
||||
RecvPropArray3( RECVINFO_ARRAY(m_iAccountID), RecvPropInt( RECVINFO(m_iAccountID[0]))),
|
||||
RecvPropArray3( RECVINFO_ARRAY(m_bValid), RecvPropInt( RECVINFO(m_bValid[0]))),
|
||||
END_RECV_TABLE()
|
||||
|
||||
BEGIN_PREDICTION_DATA( C_PlayerResource )
|
||||
@@ -40,8 +38,6 @@ BEGIN_PREDICTION_DATA( C_PlayerResource )
|
||||
DEFINE_PRED_ARRAY( m_iTeam, FIELD_INTEGER, MAX_PLAYERS+1, FTYPEDESC_PRIVATE ),
|
||||
DEFINE_PRED_ARRAY( m_bAlive, FIELD_BOOLEAN, MAX_PLAYERS+1, FTYPEDESC_PRIVATE ),
|
||||
DEFINE_PRED_ARRAY( m_iHealth, FIELD_INTEGER, MAX_PLAYERS+1, FTYPEDESC_PRIVATE ),
|
||||
DEFINE_PRED_ARRAY( m_iAccountID, FIELD_INTEGER, MAX_PLAYERS+1, FTYPEDESC_PRIVATE ),
|
||||
DEFINE_PRED_ARRAY( m_bValid, FIELD_BOOLEAN, MAX_PLAYERS+1, FTYPEDESC_PRIVATE ),
|
||||
|
||||
END_PREDICTION_DATA()
|
||||
|
||||
@@ -62,8 +58,6 @@ C_PlayerResource::C_PlayerResource()
|
||||
memset( m_iTeam, 0, sizeof( m_iTeam ) );
|
||||
memset( m_bAlive, 0, sizeof( m_bAlive ) );
|
||||
memset( m_iHealth, 0, sizeof( m_iHealth ) );
|
||||
memset( m_iAccountID, 0, sizeof( m_iAccountID ) );
|
||||
memset( m_bValid, 0, sizeof( m_bValid ) );
|
||||
m_szUnconnectedName = 0;
|
||||
|
||||
for ( int i=0; i<MAX_TEAMS; i++ )
|
||||
@@ -104,11 +98,8 @@ void C_PlayerResource::UpdatePlayerName( int slot )
|
||||
Error( "UpdatePlayerName with bogus slot %d\n", slot );
|
||||
return;
|
||||
}
|
||||
|
||||
if ( !m_szUnconnectedName )
|
||||
{
|
||||
if (!m_szUnconnectedName )
|
||||
m_szUnconnectedName = AllocPooledString( PLAYER_UNCONNECTED_NAME );
|
||||
}
|
||||
|
||||
player_info_t sPlayerInfo;
|
||||
if ( IsConnected( slot ) && engine->GetPlayerInfo( slot, &sPlayerInfo ) )
|
||||
@@ -117,10 +108,7 @@ void C_PlayerResource::UpdatePlayerName( int slot )
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( !IsValid( slot ) )
|
||||
{
|
||||
m_szName[slot] = m_szUnconnectedName;
|
||||
}
|
||||
m_szName[slot] = m_szUnconnectedName;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -128,7 +116,7 @@ void C_PlayerResource::ClientThink()
|
||||
{
|
||||
BaseClass::ClientThink();
|
||||
|
||||
for ( int i = 1; i <= MAX_PLAYERS; ++i )
|
||||
for ( int i = 1; i <= gpGlobals->maxClients; ++i )
|
||||
{
|
||||
UpdatePlayerName( i );
|
||||
}
|
||||
@@ -147,7 +135,7 @@ const char *C_PlayerResource::GetPlayerName( int iIndex )
|
||||
return PLAYER_ERROR_NAME;
|
||||
}
|
||||
|
||||
if ( !IsConnected( iIndex ) && !IsValid( iIndex ) )
|
||||
if ( !IsConnected( iIndex ) )
|
||||
return PLAYER_UNCONNECTED_NAME;
|
||||
|
||||
// X360TBD: Network - figure out why the name isn't set
|
||||
@@ -179,9 +167,9 @@ int C_PlayerResource::GetTeam(int iIndex )
|
||||
}
|
||||
}
|
||||
|
||||
const char * C_PlayerResource::GetTeamName(int index_)
|
||||
const char * C_PlayerResource::GetTeamName(int index)
|
||||
{
|
||||
C_Team *team = GetGlobalTeam( index_ );
|
||||
C_Team *team = GetGlobalTeam( index );
|
||||
|
||||
if ( !team )
|
||||
return "Unknown";
|
||||
@@ -189,9 +177,9 @@ const char * C_PlayerResource::GetTeamName(int index_)
|
||||
return team->Get_Name();
|
||||
}
|
||||
|
||||
int C_PlayerResource::GetTeamScore(int index_ )
|
||||
int C_PlayerResource::GetTeamScore(int index)
|
||||
{
|
||||
C_Team *team = GetGlobalTeam( index_ );
|
||||
C_Team *team = GetGlobalTeam( index );
|
||||
|
||||
if ( !team )
|
||||
return 0;
|
||||
@@ -199,30 +187,30 @@ int C_PlayerResource::GetTeamScore(int index_ )
|
||||
return team->Get_Score();
|
||||
}
|
||||
|
||||
int C_PlayerResource::GetFrags(int index_ )
|
||||
int C_PlayerResource::GetFrags(int index )
|
||||
{
|
||||
return 666;
|
||||
}
|
||||
|
||||
bool C_PlayerResource::IsLocalPlayer(int index_ )
|
||||
bool C_PlayerResource::IsLocalPlayer(int index)
|
||||
{
|
||||
C_BasePlayer *pPlayer = C_BasePlayer::GetLocalPlayer();
|
||||
|
||||
if ( !pPlayer )
|
||||
return false;
|
||||
|
||||
return (index_ == pPlayer->entindex() );
|
||||
return ( index == pPlayer->entindex() );
|
||||
}
|
||||
|
||||
|
||||
bool C_PlayerResource::IsHLTV(int index_ )
|
||||
bool C_PlayerResource::IsHLTV(int index)
|
||||
{
|
||||
if ( !IsConnected( index_ ) && !IsValid( index_ ) )
|
||||
if ( !IsConnected( index ) )
|
||||
return false;
|
||||
|
||||
player_info_t sPlayerInfo;
|
||||
|
||||
if ( engine->GetPlayerInfo( index_, &sPlayerInfo ) )
|
||||
if ( engine->GetPlayerInfo( index, &sPlayerInfo ) )
|
||||
{
|
||||
return sPlayerInfo.ishltv;
|
||||
}
|
||||
@@ -230,15 +218,15 @@ bool C_PlayerResource::IsHLTV(int index_ )
|
||||
return false;
|
||||
}
|
||||
|
||||
bool C_PlayerResource::IsReplay(int index_ )
|
||||
bool C_PlayerResource::IsReplay(int index)
|
||||
{
|
||||
#if defined( REPLAY_ENABLED )
|
||||
if ( !IsConnected( index_ ) && !IsValid( index_ ) )
|
||||
if ( !IsConnected( index ) )
|
||||
return false;
|
||||
|
||||
player_info_t sPlayerInfo;
|
||||
|
||||
if ( engine->GetPlayerInfo( index_, &sPlayerInfo ) )
|
||||
if ( engine->GetPlayerInfo( index, &sPlayerInfo ) )
|
||||
{
|
||||
return sPlayerInfo.isreplay;
|
||||
}
|
||||
@@ -252,7 +240,7 @@ bool C_PlayerResource::IsReplay(int index_ )
|
||||
//-----------------------------------------------------------------------------
|
||||
bool C_PlayerResource::IsFakePlayer( int iIndex )
|
||||
{
|
||||
if ( !IsConnected( iIndex ) && !IsValid( iIndex ) )
|
||||
if ( !IsConnected( iIndex ) )
|
||||
return false;
|
||||
|
||||
// Yuck, make sure it's up to date
|
||||
@@ -270,7 +258,7 @@ bool C_PlayerResource::IsFakePlayer( int iIndex )
|
||||
//-----------------------------------------------------------------------------
|
||||
int C_PlayerResource::GetPing( int iIndex )
|
||||
{
|
||||
if ( !IsConnected( iIndex ) && !IsValid( iIndex ) )
|
||||
if ( !IsConnected( iIndex ) )
|
||||
return 0;
|
||||
|
||||
return m_iPing[iIndex];
|
||||
@@ -281,7 +269,7 @@ int C_PlayerResource::GetPing( int iIndex )
|
||||
/*-----------------------------------------------------------------------------
|
||||
int C_PlayerResource::GetPacketloss( int iIndex )
|
||||
{
|
||||
if ( !IsConnected( iIndex ) && !IsPreservedData( iIndex ) )
|
||||
if ( !IsConnected( iIndex ) )
|
||||
return 0;
|
||||
|
||||
return m_iPacketloss[iIndex];
|
||||
@@ -292,7 +280,7 @@ int C_PlayerResource::GetPacketloss( int iIndex )
|
||||
//-----------------------------------------------------------------------------
|
||||
int C_PlayerResource::GetPlayerScore( int iIndex )
|
||||
{
|
||||
if ( !IsConnected( iIndex ) && !IsValid( iIndex ) )
|
||||
if ( !IsConnected( iIndex ) )
|
||||
return 0;
|
||||
|
||||
return m_iScore[iIndex];
|
||||
@@ -303,7 +291,7 @@ int C_PlayerResource::GetPlayerScore( int iIndex )
|
||||
//-----------------------------------------------------------------------------
|
||||
int C_PlayerResource::GetDeaths( int iIndex )
|
||||
{
|
||||
if ( !IsConnected( iIndex ) && !IsValid( iIndex ) )
|
||||
if ( !IsConnected( iIndex ) )
|
||||
return 0;
|
||||
|
||||
return m_iDeaths[iIndex];
|
||||
@@ -314,15 +302,15 @@ int C_PlayerResource::GetDeaths( int iIndex )
|
||||
//-----------------------------------------------------------------------------
|
||||
int C_PlayerResource::GetHealth( int iIndex )
|
||||
{
|
||||
if ( !IsConnected( iIndex ) && !IsValid( iIndex ) )
|
||||
if ( !IsConnected( iIndex ) )
|
||||
return 0;
|
||||
|
||||
return m_iHealth[iIndex];
|
||||
}
|
||||
|
||||
const Color &C_PlayerResource::GetTeamColor(int index_ )
|
||||
const Color &C_PlayerResource::GetTeamColor(int index )
|
||||
{
|
||||
if ( index_ < 0 || index_ >= MAX_TEAMS )
|
||||
if ( index < 0 || index >= MAX_TEAMS )
|
||||
{
|
||||
Assert( false );
|
||||
static Color blah;
|
||||
@@ -330,7 +318,7 @@ const Color &C_PlayerResource::GetTeamColor(int index_ )
|
||||
}
|
||||
else
|
||||
{
|
||||
return m_Colors[index_];
|
||||
return m_Colors[index];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -344,28 +332,3 @@ bool C_PlayerResource::IsConnected( int iIndex )
|
||||
else
|
||||
return m_bConnected[iIndex];
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
//-----------------------------------------------------------------------------
|
||||
uint32 C_PlayerResource::GetAccountID( int iIndex )
|
||||
{
|
||||
if ( ( iIndex < 0 ) || ( iIndex >= ARRAYSIZE( m_iAccountID ) ) )
|
||||
return 0;
|
||||
|
||||
if ( !IsConnected( iIndex ) && !IsValid( iIndex ) )
|
||||
return 0;
|
||||
|
||||
return m_iAccountID[iIndex];
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose:
|
||||
//-----------------------------------------------------------------------------
|
||||
bool C_PlayerResource::IsValid( int iIndex )
|
||||
{
|
||||
if ( ( iIndex < 0 ) || ( iIndex >= ARRAYSIZE( m_bValid ) ) )
|
||||
return false;
|
||||
|
||||
return m_bValid[iIndex];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user