Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop
This commit is contained in:
commit
96eeb2e72e
|
@ -4903,7 +4903,7 @@ void MenuStateConnectedGame::setupUIFromGameSettings(GameSettings *gameSettings,
|
||||||
labelPlayerNames[slot].setEditable(false);
|
labelPlayerNames[slot].setEditable(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(i >= gameSettings->getFactionCount()) {
|
if(i >= mapInfo.players) {
|
||||||
if( gameSettings->getFactionControl(i) != ctNetworkUnassigned) {
|
if( gameSettings->getFactionControl(i) != ctNetworkUnassigned) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user