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

Merge pull request #1871 from sepulzera/fix-1841

Browse source 
Fix change_map command not always changing (close #1841)
This commit is contained in:
oy 2018-12-16 12:21:33 +01:00 committed by GitHub
parent ab0938f5d1 742c7ed629
commit 5ec0efd424
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/game/server/gamecontroller.cpp
View file

@ -747,7 +747,11 @@ void IGameController::Tick()
break; break;
case IGS_END_MATCH: case IGS_END_MATCH:
// start next match // start next match
if(m_MatchCount >= m_GameInfo.m_MatchNum-1)
CycleMap(); CycleMap();
if(g_Config.m_SvMatchSwap)
GameServer()->SwapTeams();
m_MatchCount++; m_MatchCount++;
StartMatch(); StartMatch();
break; break;
@ -885,7 +889,17 @@ static bool IsSeparator(char c) { return c == ';' || c == ' ' || c == ',' || c =
void IGameController::ChangeMap(const char *pToMap) void IGameController::ChangeMap(const char *pToMap)
{ {
str_copy(m_aMapWish, pToMap, sizeof(m_aMapWish)); str_copy(m_aMapWish, pToMap, sizeof(m_aMapWish));
m_MatchCount = m_GameInfo.m_MatchNum-1;
if(m_GameState == IGS_WARMUP_GAME || m_GameState == IGS_WARMUP_USER)
SetGameState(IGS_GAME_RUNNING);
EndMatch(); EndMatch();
if(m_GameState != IGS_END_MATCH)
{
// game could not been ended, force cycle
CycleMap();
}
} }
void IGameController::CycleMap() void IGameController::CycleMap()
@ -903,13 +917,6 @@ void IGameController::CycleMap()
if(!str_length(g_Config.m_SvMaprotation)) if(!str_length(g_Config.m_SvMaprotation))
return; return;
if(m_MatchCount < m_GameInfo.m_MatchNum-1)
{
if(g_Config.m_SvMatchSwap)
GameServer()->SwapTeams();
return;
}
// handle maprotation // handle maprotation
const char *pMapRotation = g_Config.m_SvMaprotation; const char *pMapRotation = g_Config.m_SvMaprotation;
const char *pCurrentMap = g_Config.m_SvMap; const char *pCurrentMap = g_Config.m_SvMap;