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

fixed last commit

Browse source
This commit is contained in:
oy 2011-12-30 22:17:51 +01:00
parent afb1d5e201
commit ed4158e837
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/game/server/gamecontext.cpp
View file

@ -1079,64 +1079,61 @@ void CGameContext::ConSetTeamAll(IConsole::IResult *pResult, void *pUserData)
void CGameContext::ConSwapTeams(IConsole::IResult *pResult, void *pUserData)
{
CGameContext *pSelf = (CGameContext *)pUserData;
if(!pSelf->m_pController->IsTeamplay())
return;
char aBuf[256];
str_format(aBuf, sizeof(aBuf), "swaped the current teams");
pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "swapped the current teams");
for(int i = 0; i < MAX_CLIENTS; ++i)
{
if(pSelf->m_apPlayers[i] && pSelf->m_apPlayers[i]->GetTeam() != TEAM_SPECTATORS)
{
int Team = pSelf->m_apPlayers[i]->GetTeam();
if(Team == TEAM_RED)
pSelf->m_apPlayers[i]->SetTeam(TEAM_BLUE);
else
pSelf->m_apPlayers[i]->SetTeam(TEAM_RED);
}
pSelf->m_apPlayers[i]->SetTeam(pSelf->m_apPlayers[i]->GetTeam()^1);
}
(void)pSelf->m_pController->CheckTeamBalance();
}
void CGameContext::ConShuffleTeams(IConsole::IResult *pResult, void *pUserData)
{
CGameContext *pSelf = (CGameContext *)pUserData;
int counterRed = 0;
int counterBlue = 0;
int PlayerTeam = (g_Config.m_SvMaxClients-g_Config.m_SvSpectatorSlots)/2;
char aBuf[256];
str_format(aBuf, sizeof(aBuf), "shuffled the current teams");
pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", aBuf);
if(!pSelf->m_pController->IsTeamplay())
return;
int CounterRed = 0;
int CounterBlue = 0;
int PlayerTeam = 0;
for(int i = 0; i < MAX_CLIENTS; ++i)
if(pSelf->m_apPlayers[i] && pSelf->m_apPlayers[i]->GetTeam() != TEAM_SPECTATORS)
++PlayerTeam;
PlayerTeam = (PlayerTeam+1)/2;
pSelf->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "server", "shuffled the current teams");
for(int i = 0; i < MAX_CLIENTS; ++i)
{
if(pSelf->m_apPlayers[i] && pSelf->m_apPlayers[i]->GetTeam() != TEAM_SPECTATORS)
{
if( counterRed == PlayerTeam )
if(CounterRed == PlayerTeam)
pSelf->m_apPlayers[i]->SetTeam(TEAM_BLUE);
else if( counterBlue == PlayerTeam )
else if(CounterBlue == PlayerTeam)
pSelf->m_apPlayers[i]->SetTeam(TEAM_RED);
else
{
if(rand() % 2)
{
pSelf->m_apPlayers[i]->SetTeam(TEAM_BLUE);
++counterBlue;
++CounterBlue;
}
else
{
pSelf->m_apPlayers[i]->SetTeam(TEAM_RED);
++counterRed;
++CounterRed;
}
}
}
}
(void)pSelf->m_pController->CheckTeamBalance();
}
void CGameContext::ConAddVote(IConsole::IResult *pResult, void *pUserData)