From 7c4c7a142b9ff4c487b560a8b4b5e27f502061fa Mon Sep 17 00:00:00 2001
From: Titus Tscharntke <titi_ger@users.sourceforge.net>
Date: Sun, 3 Nov 2013 21:55:50 +0000
Subject: [PATCH] code cleanup ( too many formatStrings() ...)

---
 .../menu/menu_state_connected_game.cpp        | 21 ++++++++-----------
 .../menu/menu_state_custom_game.cpp           |  6 +++---
 source/glest_game/types/tech_tree.cpp         |  2 +-
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp
index e0bb49fb..841a6b2a 100644
--- a/source/glest_game/menu/menu_state_connected_game.cpp
+++ b/source/glest_game/menu/menu_state_connected_game.cpp
@@ -1911,7 +1911,7 @@ void MenuStateConnectedGame::reloadFactions(bool keepExistingSelectedItem, strin
 			translatedFactionNames.push_back(results[i]);
 		}
 		else {
-			translatedFactionNames.push_back(formatString(results[i]+" ("+translatedString+")"));
+			translatedFactionNames.push_back(results[i]+" ("+translatedString+")");
 		}
 		//printf("FACTIONS i = %d results [%s]\n",i,results[i].c_str());
 
@@ -3396,12 +3396,13 @@ bool MenuStateConnectedGame::loadFactions(const GameSettings *gameSettings, bool
 			factionFiles = results;
 		    vector<string> translatedFactionNames;
 		    for(int i= 0; i < factionFiles.size(); ++i) {
+		    	results[i]= formatString(results[i]);
 				string translatedString=techTree->getTranslatedFactionName(gameSettings->getTech(),factionFiles[i]);
-				if(toLower(translatedString)==toLower(formatString(results[i]))){
-					translatedFactionNames.push_back(formatString(results[i]));
+				if(toLower(translatedString)==toLower(results[i])){
+					translatedFactionNames.push_back(results[i]);
 				}
 				else {
-					translatedFactionNames.push_back(formatString(results[i]+" ("+translatedString+")"));
+					translatedFactionNames.push_back(results[i]+" ("+translatedString+")");
 				}
 		    }
 
@@ -3443,20 +3444,16 @@ bool MenuStateConnectedGame::loadFactions(const GameSettings *gameSettings, bool
 			factionFiles= results;
 		    vector<string> translatedFactionNames;
 		    for(int i= 0; i < factionFiles.size(); ++i) {
+		    	results[i]= formatString(results[i]);
 		    	string translatedString=techTree->getTranslatedFactionName(gameSettings->getTech(),factionFiles[i]);
-		    	if(toLower(translatedString)==toLower(formatString(results[i]))){
-		    		translatedFactionNames.push_back(formatString(results[i]));
+		    	if(toLower(translatedString)==toLower(results[i])){
+		    		translatedFactionNames.push_back(results[i]);
 		    	}
 		    	else {
-		    		translatedFactionNames.push_back(formatString(results[i]+" ("+translatedString+")"));
+		    		translatedFactionNames.push_back(results[i]+" ("+translatedString+")");
 		    	}
 		    }
 
-			for(int i= 0; i<results.size(); ++i){
-				results[i]= formatString(results[i]);
-
-				if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"Tech [%s] has faction [%s]\n",gameSettings->getTech().c_str(),results[i].c_str());
-			}
 			for(int i=0; i<GameConstants::maxPlayers; ++i){
 				listBoxFactions[i].setItems(results,translatedFactionNames);
 			}
diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp
index e8fee638..e1188676 100644
--- a/source/glest_game/menu/menu_state_custom_game.cpp
+++ b/source/glest_game/menu/menu_state_custom_game.cpp
@@ -4696,11 +4696,11 @@ void MenuStateCustomGame::reloadFactions(bool keepExistingSelectedItem, string s
 				translatedString = techTree->getTranslatedFactionName(techTreeFiles[listBoxTechTree.getSelectedItemIndex()],factionFiles[i]);
 			}
 			//printf("translatedString=%s  formatString(results[i])=%s \n",translatedString.c_str(),formatString(results[i]).c_str() );
-			if(toLower(translatedString)==toLower(formatString(results[i]))){
-				translatedFactionNames.push_back(formatString(results[i]));
+			if(toLower(translatedString)==toLower(results[i])){
+				translatedFactionNames.push_back(results[i]);
 			}
 			else {
-				translatedFactionNames.push_back(formatString(results[i]+" ("+translatedString+")"));
+				translatedFactionNames.push_back(results[i]+" ("+translatedString+")");
 			}
 			//printf("FACTIONS i = %d results [%s]\n",i,results[i].c_str());
 
diff --git a/source/glest_game/types/tech_tree.cpp b/source/glest_game/types/tech_tree.cpp
index 9dbce70a..b33071b3 100644
--- a/source/glest_game/types/tech_tree.cpp
+++ b/source/glest_game/types/tech_tree.cpp
@@ -146,7 +146,7 @@ string TechTree::getTranslatedFactionName(string techName, string factionName) {
 	getTranslatedName(techName,false,true);
 
 	string result = lang.getTechTreeString("FactionName_" + factionName,formatString(factionName).c_str());
-	printf(">>result = %s\n",result.c_str());
+	//printf(">>result = %s\n",result.c_str());
 	translatedTechFactionNames[techName][factionName] = result;
 
 	//printf("Line: %d Translated faction for Tech [%s] faction [%s] result [%s]\n",__LINE__,techName.c_str(),factionName.c_str(),result.c_str());