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

- when toggling observers, we now retain original faction selection

Browse Source
This commit is contained in:
Mark Vejvoda 2010-10-14 23:22:09 +00:00
parent 94da959fd4
commit 4f3d5f0372
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -410,7 +410,7 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, b
teamItems.push_back(intToStr(i)); teamItems.push_back(intToStr(i));
} }
reloadFactions(); reloadFactions(false);
vector<string> techPaths = config.getPathListForType(ptTechs); vector<string> techPaths = config.getPathListForType(ptTechs);
for(int idx = 0; idx < techPaths.size(); idx++) { for(int idx = 0; idx < techPaths.size(); idx++) {
@ -608,7 +608,7 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
MutexSafeWrapper safeMutex(&masterServerThreadAccessor); MutexSafeWrapper safeMutex(&masterServerThreadAccessor);
needToRepublishToMasterserver = true; needToRepublishToMasterserver = true;
reloadFactions(); reloadFactions(true);
if(hasNetworkGameSettings() == true) if(hasNetworkGameSettings() == true)
{ {
@ -677,7 +677,7 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
} }
} }
else if(listBoxTechTree.mouseClick(x, y)){ else if(listBoxTechTree.mouseClick(x, y)){
reloadFactions(); reloadFactions(false);
MutexSafeWrapper safeMutex(&masterServerThreadAccessor); MutexSafeWrapper safeMutex(&masterServerThreadAccessor);
needToRepublishToMasterserver = true; needToRepublishToMasterserver = true;
@ -1973,7 +1973,7 @@ GameSettings MenuStateCustomGame::loadGameSettingsFromFile(std::string fileName)
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
reloadFactions(); reloadFactions(false);
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d] gameSettings.getFactionCount() = %d\n",__FILE__,__FUNCTION__,__LINE__,gameSettings.getFactionCount()); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d] gameSettings.getFactionCount() = %d\n",__FILE__,__FUNCTION__,__LINE__,gameSettings.getFactionCount());
@ -2103,7 +2103,7 @@ void MenuStateCustomGame::loadMapInfo(string file, MapInfo *mapInfo, bool loadMa
} }
void MenuStateCustomGame::reloadFactions() { void MenuStateCustomGame::reloadFactions(bool keepExistingSelectedItem) {
vector<string> results; vector<string> results;
@ -2123,14 +2123,14 @@ void MenuStateCustomGame::reloadFactions() {
throw runtime_error("(2)There are no factions for the tech tree [" + techTreeFiles[listBoxTechTree.getSelectedItemIndex()] + "]"); throw runtime_error("(2)There are no factions for the tech tree [" + techTreeFiles[listBoxTechTree.getSelectedItemIndex()] + "]");
} }
results.push_back(formatString(GameConstants::RANDOMFACTION_SLOTNAME));
// Add special Observer Faction // Add special Observer Faction
//Lang &lang= Lang::getInstance(); //Lang &lang= Lang::getInstance();
if(listBoxAllowObservers.getSelectedItemIndex() == 1) { if(listBoxAllowObservers.getSelectedItemIndex() == 1) {
results.push_back(formatString(GameConstants::OBSERVER_SLOTNAME)); results.push_back(formatString(GameConstants::OBSERVER_SLOTNAME));
} }
results.push_back(formatString(GameConstants::RANDOMFACTION_SLOTNAME));
factionFiles= results; factionFiles= results;
for(int i= 0; i<results.size(); ++i){ for(int i= 0; i<results.size(); ++i){
results[i]= formatString(results[i]); results[i]= formatString(results[i]);
@ -2139,8 +2139,23 @@ void MenuStateCustomGame::reloadFactions() {
} }
for(int i=0; i<GameConstants::maxPlayers; ++i){ for(int i=0; i<GameConstants::maxPlayers; ++i){
listBoxFactions[i].setItems(results); int originalIndex = listBoxFactions[i].getSelectedItemIndex();
listBoxFactions[i].setSelectedItemIndex(i % results.size());
//printf("[a] i = %d, originalIndex = %d\n",i,originalIndex);
listBoxFactions[i].setItems(results);
if( keepExistingSelectedItem == false ||
(listBoxAllowObservers.getSelectedItemIndex() == 0 &&
listBoxFactions[i].getSelectedItem() == formatString(GameConstants::OBSERVER_SLOTNAME))) {
listBoxFactions[i].setSelectedItemIndex(i % results.size());
//printf("[b] i = %d, listBoxFactions[i].getSelectedItemIndex() = %d\n",i,listBoxFactions[i].getSelectedItemIndex());
}
else if(originalIndex < results.size()) {
listBoxFactions[i].setSelectedItemIndex(originalIndex);
//printf("[c] i = %d, originalIndex = %d\n",i,originalIndex);
}
} }
} }

2
source/glest_game/menu/menu_state_custom_game.h
View File

@ -153,7 +153,7 @@ private:
bool hasNetworkGameSettings(); bool hasNetworkGameSettings();
void loadGameSettings(GameSettings *gameSettings); void loadGameSettings(GameSettings *gameSettings);
void loadMapInfo(string file, MapInfo *mapInfo,bool loadMapPreview); void loadMapInfo(string file, MapInfo *mapInfo,bool loadMapPreview);
void reloadFactions(); void reloadFactions(bool keepExistingSelectedItem);
void updateControlers(); void updateControlers();
void closeUnusedSlots(); void closeUnusedSlots();
void updateNetworkSlots(); void updateNetworkSlots();