Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bugfix to reset team to 1 when toggling OFF observers and we previously had an observer selected

This commit is contained in:
Mark Vejvoda 2010-10-15 00:12:17 +00:00
parent 4f3d5f0372
commit 025d8520b6
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1745,7 +1745,7 @@ void MenuStateCustomGame::loadGameSettings(GameSettings *gameSettings) {
listBoxTeams[i].setSelectedItem(intToStr(GameConstants::maxPlayers + fpt_Observer));
}
else if(listBoxTeams[i].getSelectedItem() == intToStr(GameConstants::maxPlayers + fpt_Observer)) {
listBoxTeams[i].setSelectedItem(intToStr(GameConstants::maxPlayers));
listBoxTeams[i].setSelectedItem(intToStr(1));
}
gameSettings->setTeam(slotIndex, listBoxTeams[i].getSelectedItemIndex());
@ -2140,15 +2140,24 @@ void MenuStateCustomGame::reloadFactions(bool keepExistingSelectedItem) {
for(int i=0; i<GameConstants::maxPlayers; ++i){
int originalIndex = listBoxFactions[i].getSelectedItemIndex();
//printf("[a] i = %d, originalIndex = %d\n",i,originalIndex);
string originalValue = (listBoxFactions[i].getItemCount() > 0 ? listBoxFactions[i].getSelectedItem() : "");
//printf("[a1] i = %d, originalValue = [%s]\n",i,originalValue.c_str());
listBoxFactions[i].setItems(results);
if( keepExistingSelectedItem == false ||
(listBoxAllowObservers.getSelectedItemIndex() == 0 &&
listBoxFactions[i].getSelectedItem() == formatString(GameConstants::OBSERVER_SLOTNAME))) {
originalValue == formatString(GameConstants::OBSERVER_SLOTNAME)) ) {
listBoxFactions[i].setSelectedItemIndex(i % results.size());
if( originalValue == formatString(GameConstants::OBSERVER_SLOTNAME) &&
listBoxFactions[i].getSelectedItem() != formatString(GameConstants::OBSERVER_SLOTNAME)) {
if(listBoxTeams[i].getSelectedItem() == intToStr(GameConstants::maxPlayers + fpt_Observer)) {
listBoxTeams[i].setSelectedItem(intToStr(1));
}
}
//printf("[b] i = %d, listBoxFactions[i].getSelectedItemIndex() = %d\n",i,listBoxFactions[i].getSelectedItemIndex());
}
else if(originalIndex < results.size()) {