mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-25 17:20:43 +02:00
Code Issues Projects Releases Wiki Activity

added translatable factions to custom menu

Browse Source
This commit is contained in:
Mark Vejvoda
2013-06-13 21:20:55 +00:00
parent 1ae691904c
commit 7a6b59ddb1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,7 +252,7 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
//tileset listBox //tileset listBox
listBoxTileset.registerGraphicComponent(containerName,"listBoxTileset"); listBoxTileset.registerGraphicComponent(containerName,"listBoxTileset");
listBoxTileset.init(xoffset+460, mapPos, 150); listBoxTileset.init(xoffset+460, mapPos, 150);
//listBoxTileset.setItems(results);
setupTilesetList(""); setupTilesetList("");
Chrono seed(true); Chrono seed(true);
srand((unsigned int)seed.getCurTicks()); srand((unsigned int)seed.getCurTicks());
@@ -4552,9 +4552,11 @@ void MenuStateCustomGame::reloadFactions(bool keepExistingSelectedItem, string s
results.push_back(formatString(GameConstants::OBSERVER_SLOTNAME)); results.push_back(formatString(GameConstants::OBSERVER_SLOTNAME));
} }
vector<string> translatedFactionNames;
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]);
translatedFactionNames.push_back(techTree->getTranslatedFactionName(techTreeFiles[listBoxTechTree.getSelectedItemIndex()],factionFiles[i]));
//printf("FACTIONS i = %d results [%s]\n",i,results[i].c_str()); //printf("FACTIONS i = %d results [%s]\n",i,results[i].c_str());
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"Tech [%s] has faction [%s]\n",techTreeFiles[listBoxTechTree.getSelectedItemIndex()].c_str(),results[i].c_str()); if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"Tech [%s] has faction [%s]\n",techTreeFiles[listBoxTechTree.getSelectedItemIndex()].c_str(),results[i].c_str());
@@ -4564,7 +4566,7 @@ void MenuStateCustomGame::reloadFactions(bool keepExistingSelectedItem, string s
int originalIndex = listBoxFactions[i].getSelectedItemIndex(); int originalIndex = listBoxFactions[i].getSelectedItemIndex();
string originalValue = (listBoxFactions[i].getItemCount() > 0 ? listBoxFactions[i].getSelectedItem() : ""); string originalValue = (listBoxFactions[i].getItemCount() > 0 ? listBoxFactions[i].getSelectedItem() : "");
listBoxFactions[i].setItems(results); listBoxFactions[i].setItems(results,translatedFactionNames);
if( keepExistingSelectedItem == false || if( keepExistingSelectedItem == false ||
(checkBoxAllowObservers.getValue() == 0 && (checkBoxAllowObservers.getValue() == 0 &&
originalValue == formatString(GameConstants::OBSERVER_SLOTNAME)) ) { originalValue == formatString(GameConstants::OBSERVER_SLOTNAME)) ) {