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

Fixed names

Browse source
This commit is contained in:
Kyle Bradley 2021-03-20 18:33:34 +02:00
parent 23c36e637f
commit 35991ea973
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -44,7 +44,7 @@ void CGameTeams::ResetRoundState(int Team)
GameServer()->m_apPlayers[i]->m_VotedForPractice = false;
GameServer()->m_apPlayers[i]->m_SwapTargetsClientID = -1;
}
}
}
}
void CGameTeams::ResetSwitchers(int Team)
@ -681,17 +681,17 @@ void CGameTeams::OnFinish(CPlayer *Player, float Time, const char *pTimestamp)
}
}
void CGameTeams::RequestTeamSwap(CPlayer *Player, CPlayer *TargetPlayer, int Team)
void CGameTeams::RequestTeamSwap(CPlayer *pPlayer, CPlayer *pTargetPlayer, int Team)
{
if(!Player || !TargetPlayer)
if(!pPlayer || !pTargetPlayer)
return;
char aBuf[512];
if(Player->m_SwapTargetsClientID == TargetPlayer->GetCID())
if(pPlayer->m_SwapTargetsClientID == pTargetPlayer->GetCID())
{
str_format(aBuf, sizeof(aBuf),
"%s has already requested to swap with %s.",
Server()->ClientName(Player->GetCID()), Server()->ClientName(TargetPlayer->GetCID()));
Server()->ClientName(pPlayer->GetCID()), Server()->ClientName(pTargetPlayer->GetCID()));
GameServer()->SendChatTeam(Team, aBuf);
return;
@ -699,17 +699,17 @@ void CGameTeams::RequestTeamSwap(CPlayer *Player, CPlayer *TargetPlayer, int Tea
str_format(aBuf, sizeof(aBuf),
"%s has requested to swap with %s. Please wait %d then type /swap %s.",
Server()->ClientName(Player->GetCID()), Server()->ClientName(TargetPlayer->GetCID()), g_Config.m_SvSaveSwapGamesDelay, Server()->ClientName(Player->GetCID()));
Server()->ClientName(pPlayer->GetCID()), Server()->ClientName(pTargetPlayer->GetCID()), g_Config.m_SvSaveSwapGamesDelay, Server()->ClientName(pPlayer->GetCID()));
GameServer()->SendChatTeam(Team, aBuf);
Player->m_SwapTargetsClientID = TargetPlayer->GetCID();
pPlayer->m_SwapTargetsClientID = pTargetPlayer->GetCID();
m_LastSwap[Team] = Server()->Tick();
}
void CGameTeams::SwapTeamCharacters(CPlayer *Player, CPlayer *TargetPlayer, int Team)
void CGameTeams::SwapTeamCharacters(CPlayer *pPlayer, CPlayer *pTargetPlayer, int Team)
{
if(!Player || !TargetPlayer)
if(!pPlayer || !pTargetPlayer)
return;
char aBuf[128];
@ -735,27 +735,27 @@ void CGameTeams::SwapTeamCharacters(CPlayer *Player, CPlayer *TargetPlayer, int
GameServer()->SendChatTeam(Team, aBuf);
Player->m_SwapTargetsClientID = -1;
TargetPlayer->m_SwapTargetsClientID = -1;
pPlayer->m_SwapTargetsClientID = -1;
pTargetPlayer->m_SwapTargetsClientID = -1;
return;
}
CSaveTee PrimarySavedTee;
PrimarySavedTee.Save(Player->GetCharacter());
PrimarySavedTee.Save(pPlayer->GetCharacter());
CSaveTee SecondarySavedTee;
SecondarySavedTee.Save(TargetPlayer->GetCharacter());
SecondarySavedTee.Save(pTargetPlayer->GetCharacter());
PrimarySavedTee.Load(TargetPlayer->GetCharacter(), Team);
SecondarySavedTee.Load(Player->GetCharacter(), Team);
PrimarySavedTee.Load(pTargetPlayer->GetCharacter(), Team);
SecondarySavedTee.Load(pPlayer->GetCharacter(), Team);
Player->m_SwapTargetsClientID = -1;
TargetPlayer->m_SwapTargetsClientID = -1;
pPlayer->m_SwapTargetsClientID = -1;
pTargetPlayer->m_SwapTargetsClientID = -1;
str_format(aBuf, sizeof(aBuf),
"%s has swapped with %s.",
Server()->ClientName(Player->GetCID()), Server()->ClientName(TargetPlayer->GetCID()));
Server()->ClientName(pPlayer->GetCID()), Server()->ClientName(pTargetPlayer->GetCID()));
GameServer()->SendChatTeam(Team, aBuf);
}

4
src/game/server/teams.h
View file

@ -94,8 +94,8 @@ public:
void SetCpActive(CPlayer *Player, int CpActive);
void KillSavedTeam(int ClientID, int Team);
void ResetSavedTeam(int ClientID, int Team);
void RequestTeamSwap(CPlayer *Player, CPlayer *TargetPlayer, int Team);
void SwapTeamCharacters(CPlayer *Player, CPlayer *TargetPlayer, int Team);
void RequestTeamSwap(CPlayer *pPlayer, CPlayer *pTargetPlayer, int Team);
void SwapTeamCharacters(CPlayer *pPlayer, CPlayer *pTargetPlayer, int Team);
void ProcessSaveTeam();
bool TeeFinished(int ClientID)