mirror
/
source-sdk-2013
mirror of https://github.com/ValveSoftware/source-sdk-2013
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge f47da3058b into 7191ecc418

This commit is contained in:
Robin ❤️ 2025-12-16 01:19:52 -08:00 committed by GitHub
parent 7191ecc418 f47da3058b
commit a6c45980d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/game/server/tf/tf_player.cpp
View File

@ -525,6 +525,7 @@ REGISTER_SEND_PROXY_NON_MODIFIED_POINTER( SendProxy_SendHealersDataTable );
BEGIN_DATADESC( CTFPlayer )
DEFINE_INPUTFUNC( FIELD_VOID, "IgnitePlayer", InputIgnitePlayer ),
DEFINE_INPUTFUNC( FIELD_FLOAT, "IgnitePlayerEx", InputIgnitePlayer ),
DEFINE_INPUTFUNC( FIELD_STRING, "SetCustomModel", InputSetCustomModel ),
DEFINE_INPUTFUNC( FIELD_STRING, "SetCustomModelWithClassAnimations", InputSetCustomModelWithClassAnimations ),
DEFINE_INPUTFUNC( FIELD_VECTOR, "SetCustomModelOffset", InputSetCustomModelOffset ),
@ -650,6 +651,7 @@ BEGIN_ENT_SCRIPTDESC( CTFPlayer, CBaseMultiplayerPlayer , "Team Fortress 2 Playe
DEFINE_SCRIPTFUNC( RemoveCurrency, "Take away money from a player for reasons such as ie. spending." )
DEFINE_SCRIPTFUNC( IgnitePlayer, "" )
DEFINE_SCRIPTFUNC( IgnitePlayerEx, "" )
DEFINE_SCRIPTFUNC( SetCustomModel, "" )
DEFINE_SCRIPTFUNC( SetCustomModelWithClassAnimations, "" )
DEFINE_SCRIPTFUNC( SetCustomModelOffset, "" )
@ -20692,10 +20694,7 @@ void CTFPlayer::Internal_HandleMapEvent( inputdata_t &inputdata )
BaseClass::Internal_HandleMapEvent( inputdata );
}
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void CTFPlayer::IgnitePlayer()
void CTFPlayer::DoomsdayAchievementCheck()
{
if ( FStrEq( "sd_doomsday", STRING( gpGlobals->mapname ) ) )
{
@ -20705,6 +20704,14 @@ void CTFPlayer::IgnitePlayer()
pRecentDamager->AwardAchievement( ACHIEVEMENT_TF_MAPS_DOOMSDAY_PUSH_INTO_EXHAUST );
}
}
}
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void CTFPlayer::IgnitePlayer()
{
DoomsdayAchievementCheck();
m_Shared.Burn( this, NULL );
}
@ -20714,6 +20721,21 @@ void CTFPlayer::InputIgnitePlayer( inputdata_t &inputdata )
IgnitePlayer();
}
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
void CTFPlayer::IgnitePlayerEx( float fBurnTime )
{
DoomsdayAchievementCheck();
m_Shared.Burn( this, NULL, fBurnTime );
}
void CTFPlayer::InputIgnitePlayerEx( inputdata_t& inputdata )
{
IgnitePlayerEx( inputdata.value.Float() );
}
//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------

4
src/game/server/tf/tf_player.h
View File

@ -566,6 +566,7 @@ public:
void PlayerUse( void );
void IgnitePlayer();
void IgnitePlayerEx( float fBurnTime = 5.0f );
void SetCustomModel( const char *pszModel );
void SetCustomModelWithClassAnimations( const char *pszModel );
void SetCustomModelOffset( const Vector &offset );
@ -581,6 +582,7 @@ public:
void ClearSpells();
void InputIgnitePlayer( inputdata_t &inputdata );
void InputIgnitePlayerEx( inputdata_t &inputdata );
void InputSetCustomModel( inputdata_t &inputdata );
void InputSetCustomModelWithClassAnimations( inputdata_t &inputdata );
void InputSetCustomModelOffset( inputdata_t &inputdata );
@ -776,6 +778,8 @@ public:
bool IsViewingCYOAPDA( void ) const { return m_bViewingCYOAPDA; }
bool IsRegenerating( void ) const { return m_bRegenerating; }
void DoomsdayAchievementCheck();
HSCRIPT ScriptGetActiveWeapon( void ) { return ToHScript( GetActiveTFWeapon() ); }
void ScriptAddCond( int nCond );