Skip to content

Commit

Permalink
fix #4212
Browse files Browse the repository at this point in the history
  • Loading branch information
rtri committed Feb 18, 2016
1 parent d76fe27 commit 51665f0
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions rts/Game/UI/StartPosSelecter.cpp
Expand Up @@ -13,6 +13,7 @@
#include "Rendering/GL/myGL.h"
#include "Rendering/Fonts/glFont.h"
#include "Net/Protocol/NetProtocol.h"
#include "Sim/Misc/TeamHandler.h"


CStartPosSelecter* CStartPosSelecter::selector = NULL;
Expand Down Expand Up @@ -44,6 +45,12 @@ bool CStartPosSelecter::Ready(bool luaForcedReady)
return true;
}

// allow in case we already sent our startpos and rejoined
if (teamHandler->Team(gu->myTeam)->HasValidStartPos()) {
delete this;
return true;
}

// player did not set a startpos yet, so do not let
// him ready up if he clicked on the ready-box first
if (!startPosSet && !luaForcedReady)
Expand Down

0 comments on commit 51665f0

Please sign in to comment.