mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-10 10:08:18 +00:00
Check for super character in team, don't annoy them more than expected
This commit is contained in:
parent
bb3bd57c0e
commit
40ed4bb98f
|
@ -266,6 +266,7 @@ void CGameTeams::Tick()
|
||||||
}
|
}
|
||||||
for(int i = 0; i < MAX_CLIENTS; i++)
|
for(int i = 0; i < MAX_CLIENTS; i++)
|
||||||
{
|
{
|
||||||
|
bool TeamHasSuperCharacter = false;
|
||||||
if(((TeamHasWantedStartTime >> i) & 1) == 0)
|
if(((TeamHasWantedStartTime >> i) & 1) == 0)
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
|
@ -279,6 +280,8 @@ void CGameTeams::Tick()
|
||||||
aPlayerNames[0] = 0;
|
aPlayerNames[0] = 0;
|
||||||
for(int j = 0; j < MAX_CLIENTS; j++)
|
for(int j = 0; j < MAX_CLIENTS; j++)
|
||||||
{
|
{
|
||||||
|
if(GameServer()->GetPlayerChar(j) && GameServer()->GetPlayerChar(j)->IsSuper())
|
||||||
|
TeamHasSuperCharacter = true;
|
||||||
if(m_Core.Team(j) == i && !m_aTeeStarted[j])
|
if(m_Core.Team(j) == i && !m_aTeeStarted[j])
|
||||||
{
|
{
|
||||||
if(aPlayerNames[0])
|
if(aPlayerNames[0])
|
||||||
|
@ -289,7 +292,7 @@ void CGameTeams::Tick()
|
||||||
NumPlayersNotStarted += 1;
|
NumPlayersNotStarted += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(!aPlayerNames[0])
|
if(!aPlayerNames[0] || TeamHasSuperCharacter)
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue