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

Possibly Fixed a Teams bug

Browse source
This commit is contained in:
GreYFoX 2011-02-23 08:18:38 +02:00
parent 0209ef4126
commit 48b29bebd4
1 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,41 +60,42 @@ void CGameTeams::OnCharacterStart(int ClientID)
else else
{ {
bool Waiting = false; bool Waiting = false;
for(int i = 0; i < MAX_CLIENTS; ++i) if(Count(Team) > 1)
{ for(int i = 0; i < MAX_CLIENTS; ++i)
if(Team == m_Core.Team(i))
{ {
CCharacter* pChar = Character(i); if(i != ClientID && Team == m_Core.Team(i))
if(pChar && pChar->IsAlive() && pChar->m_DDRaceState == DDRACE_FINISHED)
{ {
Waiting = true; CCharacter* pChar = Character(i);
if(m_LastChat[ClientID] + Server()->TickSpeed() + g_Config.m_SvChatDelay < Tick) if(pChar && pChar->IsAlive() && pChar->m_DDRaceState == DDRACE_FINISHED)
{ {
char aBuf[128]; Waiting = true;
str_format(aBuf, sizeof(aBuf), "%s has finished and didn't go through start yet, wait for him or join another team.", Server()->ClientName(i)); if(m_LastChat[ClientID] + Server()->TickSpeed() + g_Config.m_SvChatDelay < Tick)
GameServer()->SendChatTarget(ClientID, aBuf); {
m_LastChat[ClientID] = Tick; char aBuf[128];
str_format(aBuf, sizeof(aBuf), "%s has finished and didn't go through start yet, wait for him or join another team.", Server()->ClientName(i));
GameServer()->SendChatTarget(ClientID, aBuf);
m_LastChat[ClientID] = Tick;
}
if(m_LastChat[i] + Server()->TickSpeed() + g_Config.m_SvChatDelay < Tick)
{
char aBuf[128];
str_format(aBuf, sizeof(aBuf), "%s wants to start a new round, kill or walk to start.", Server()->ClientName(ClientID));
GameServer()->SendChatTarget(i, aBuf);
m_LastChat[i] = Tick;
}
} }
if(m_LastChat[i] + Server()->TickSpeed() + g_Config.m_SvChatDelay < Tick) else if(pChar && pChar->IsAlive() && pChar->m_DDRaceState == DDRACE_STARTED)
{ {
char aBuf[128]; Waiting = true;
str_format(aBuf, sizeof(aBuf), "%s wants to start a new round, kill or walk to start.", Server()->ClientName(ClientID)); if(m_LastChat[ClientID] + Server()->TickSpeed() + g_Config.m_SvChatDelay < Tick)
GameServer()->SendChatTarget(i, aBuf); {
m_LastChat[i] = Tick; char aBuf[128];
str_format(aBuf, sizeof(aBuf), "%s has started, wait for him, ask him to kill or join another team.", Server()->ClientName(i));
GameServer()->SendChatTarget(ClientID, aBuf);
m_LastChat[ClientID] = Tick;
}
} }
} }
else if(pChar && pChar->IsAlive() && pChar->m_DDRaceState == DDRACE_STARTED)
{
Waiting = true;
if(m_LastChat[ClientID] + Server()->TickSpeed() + g_Config.m_SvChatDelay < Tick)
{
char aBuf[128];
str_format(aBuf, sizeof(aBuf), "%s has started, wait for him, ask him to kill or join another team.", Server()->ClientName(i));
GameServer()->SendChatTarget(ClientID, aBuf);
m_LastChat[ClientID] = Tick;
}
}
}
} }
if(m_TeamState[Team] <= TEAMSTATE_CLOSED && !Waiting) if(m_TeamState[Team] <= TEAMSTATE_CLOSED && !Waiting)
@ -174,6 +175,8 @@ void CGameTeams::OnCharacterDeath(int ClientID)
if((!g_Config.m_SvStickyTeams && m_Core.Team(ClientID) != TEAM_FLOCK) || m_Core.Team(ClientID) == TEAM_SUPER) if((!g_Config.m_SvStickyTeams && m_Core.Team(ClientID) != TEAM_FLOCK) || m_Core.Team(ClientID) == TEAM_SUPER)
SetForceCharacterTeam(ClientID, 0); SetForceCharacterTeam(ClientID, 0);
m_TeeFinished[ClientID] = false;
} }
int CGameTeams::SetCharacterTeam(int ClientID, int Team) int CGameTeams::SetCharacterTeam(int ClientID, int Team)