Skip to content

Parity SetTeam input for players #1349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DESTROYGIRL merged 1 commit into from
Sep 20, 2025
Merged

Parity SetTeam input for players #1349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/game/server/neo/neo_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ DEFINE_FIELD(m_bClientWantNeoName, FIELD_BOOLEAN),
// Inputs
DEFINE_INPUTFUNC(FIELD_STRING, "SetPlayerModel", InputSetPlayerModel),
DEFINE_INPUTFUNC(FIELD_VOID, "RefillAmmo", InputRefillAmmo),
DEFINE_INPUTFUNC(FIELD_INTEGER, "SetTeam", InputSetTeam),

END_DATADESC()

Expand Down Expand Up @@ -2282,7 +2283,7 @@ void CNEO_Player::SetPlayerTeamModel( void )
}

// Input to set the player's model (not skin)
void CNEO_Player::InputSetPlayerModel( inputdata_t & inputdata )
void CNEO_Player::InputSetPlayerModel( inputdata_t &inputdata )
{
const char* modelpath = inputdata.value.String();

Expand All @@ -2296,7 +2297,7 @@ void CNEO_Player::InputSetPlayerModel( inputdata_t & inputdata )
}
}

void CNEO_Player::InputRefillAmmo( inputdata_t & inputdata)
void CNEO_Player::InputRefillAmmo( inputdata_t &inputdata)
{
CBaseCombatWeapon* pWeapon = GetActiveWeapon();

Expand All @@ -2310,6 +2311,11 @@ void CNEO_Player::InputRefillAmmo( inputdata_t & inputdata)
}
}

void CNEO_Player::InputSetTeam( inputdata_t &inputdata )
{
CBasePlayer::ChangeTeam( inputdata.value.Int() );
}

void CNEO_Player::PickupObject( CBaseEntity *pObject,
bool bLimitMassAndSize )
{
Expand Down
5 changes: 3 additions & 2 deletions src/game/server/neo/neo_player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,9 @@ class CNEO_Player : public CHL2MP_Player

IMPLEMENT_NETWORK_VAR_FOR_DERIVED(m_EyeAngleOffset);

void InputSetPlayerModel( inputdata_t & inputData );
void InputRefillAmmo( inputdata_t & inputData );
void InputSetPlayerModel( inputdata_t &inputData );
void InputRefillAmmo( inputdata_t &inputData );
void InputSetTeam( inputdata_t &inputdata);
void CloakFlash(float time = 0.f);

void BecomeJuggernaut();
Expand Down
Loading