mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-11 10:54:01 +02:00
Code Issues Projects Releases Wiki Activity

menu_state_custom_game.cpp:when slots open, switch to British

Browse Source 
With enhanced observer mode, When a map is changed from 8 players to 4,
this switches factions 5-8 from Observer to British (used faction "0"
for the default, which translates to British in this situation) and
allows teams to be changed.
This commit is contained in:
andy5995
2018-03-04 12:02:45 -06:00
committed by Andy Alt
parent e135baba85
commit 6dbb62cafa
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/glest_game/menu/menu_state_custom_game.cpp
View File

@@ -4370,10 +4370,6 @@ namespace Glest
for (int i = 0; i < GameConstants::maxPlayers; ++i)
{
// FIXME: The contents of this if block could be refactored;
// Some of same statements are used in each condtion.
// please test afteward.
//
if (i >= mapInfo.hardMaxPlayers)
{
if (checkBoxAllowObservers.getValue() == false)
@@ -4381,8 +4377,6 @@ namespace Glest
listBoxControls[i].setSelectedItemIndex (ctClosed);
listBoxControls[i].setEditable (false);
listBoxControls[i].setEnabled (false);
listBoxRMultiplier[i].setEditable (false);
listBoxRMultiplier[i].setEnabled (false);
}
else
{
@@ -4393,11 +4387,12 @@ namespace Glest
listBoxTeams[i].setSelectedItem (intToStr (GameConstants::maxPlayers +
fpt_Observer));
listBoxTeams[i].setEditable (false);
}
listBoxRMultiplier[i].setEditable (false);
listBoxRMultiplier[i].setEnabled (false);
listBoxRMultiplier[i].setVisible (false);
}
}
else if (listBoxControls[i].getSelectedItemIndex () !=
ctNetworkUnassigned)
{
@@ -4412,6 +4407,7 @@ namespace Glest
listBoxControls[i].setEnabled (true);
listBoxFactions[i].setEditable (true);
listBoxTeams[i].setEditable (true);
listBoxFactions[i].setSelectedItemIndex (0);
}
else
{
@@ -4441,7 +4437,7 @@ namespace Glest
} while (++i < GameConstants::maxPlayers);
}
updateNetworkSlots ();
// updateNetworkSlots ();
bool checkDataSynch =
(serverInterface->getAllowGameDataSynchCheck () == true