diff options
| author | oy <tom_adams@web.de> | 2020-04-19 20:50:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-19 20:50:14 +0200 |
| commit | b83ff660710f2d094d3b2883baae5520b005d67a (patch) | |
| tree | f33bdc9d567f305533bac618340c43c9e354f839 | |
| parent | 16b5c961bfe073ceab27978186a6cbbf386225b6 (diff) | |
| parent | 5a695ac7d5691f243ed41313ea9f48257a7998bb (diff) | |
Merge pull request #2464 from Learath2/pr_mapchange
Always end match properly
| -rw-r--r-- | src/game/server/gamecontroller.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/game/server/gamecontroller.cpp b/src/game/server/gamecontroller.cpp index 998c70fb1..a175ff134 100644 --- a/src/game/server/gamecontroller.cpp +++ b/src/game/server/gamecontroller.cpp @@ -921,15 +921,8 @@ void IGameController::ChangeMap(const char *pToMap) 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); + SetGameState(IGS_GAME_RUNNING); EndMatch(); - - if(m_GameState != IGS_END_MATCH) - { - // game could not been ended, force cycle - CycleMap(); - } } void IGameController::CycleMap() |