edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove projectiles on team change

Browse source
This commit is contained in:
Zwelf 2023-01-04 21:08:47 +01:00
parent c7192d703e
commit 877ab41dd7
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game/server/gameworld.cpp
View file

@ -150,6 +150,11 @@ void CGameWorld::Reset()
GameServer()->CreateAllEntities(false);
}
void CGameWorld::RemoveEntitiesFromPlayer(int PlayerId)
{
RemoveEntitiesFromPlayers(&PlayerId, 1);
}
void CGameWorld::RemoveEntitiesFromPlayers(int PlayerIds[], int NumPlayers)
{
for(auto *pEnt : m_apFirstEntityTypes)

1
src/game/server/gameworld.h
View file

@ -121,6 +121,7 @@ public:
*/
void RemoveEntity(CEntity *pEntity);
void RemoveEntitiesFromPlayer(int PlayerId);
void RemoveEntitiesFromPlayers(int PlayerIds[], int NumPlayers);
/*

1
src/game/server/teams.cpp
View file

@ -413,6 +413,7 @@ void CGameTeams::SetForceCharacterTeam(int ClientID, int Team)
GetPlayer(ClientID)->m_VotedForPractice = false;
GetPlayer(ClientID)->m_SwapTargetsClientID = -1;
}
m_pGameContext->m_World.RemoveEntitiesFromPlayer(ClientID);
}
if(Team != TEAM_SUPER && (m_aTeamState[Team] == TEAMSTATE_EMPTY || m_aTeamLocked[Team]))