From bb25e0ec79934e2b3fda8114f4fc61e3825fe6eb Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Tue, 1 Nov 2011 21:47:34 +0000
Subject: [PATCH] fix for macosx

---
 source/glest_game/global/lang.cpp |  8 +++++---
 source/glest_game/global/lang.h   |  2 +-
 source/glest_game/main/main.cpp   | 24 ++++++++++++------------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/source/glest_game/global/lang.cpp b/source/glest_game/global/lang.cpp
index 9ccff26a..81607de4 100644
--- a/source/glest_game/global/lang.cpp
+++ b/source/glest_game/global/lang.cpp
@@ -45,7 +45,7 @@ Lang &Lang::getInstance() {
 	return lang;
 }
 
-void Lang::loadStrings(const string &language) {
+void Lang::loadStrings(const string &language, bool loadFonts) {
 	bool languageChanged = (language != this->language);
 	this->language= language;
 	loadStrings(language, strings, true);
@@ -154,8 +154,10 @@ void Lang::loadStrings(const string &language) {
 		// end win32
 	#endif
 
-		CoreData &coreData= CoreData::getInstance();
-		coreData.loadFonts();
+		if(loadFonts) {
+			CoreData &coreData= CoreData::getInstance();
+			coreData.loadFonts();
+		}
     }
 }
 
diff --git a/source/glest_game/global/lang.h b/source/glest_game/global/lang.h
index 57ca46c3..1b39b4d0 100644
--- a/source/glest_game/global/lang.h
+++ b/source/glest_game/global/lang.h
@@ -42,7 +42,7 @@ private:
 public:
 	static Lang &getInstance();    
 
-	void loadStrings(const string &language);
+	void loadStrings(const string &language, bool loadFonts=true);
 	void loadScenarioStrings(const string &scenarioDir, const string &scenarioName);
 
 	string get(const string &s,string language="");
diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp
index 10f2992c..b908df29 100644
--- a/source/glest_game/main/main.cpp
+++ b/source/glest_game/main/main.cpp
@@ -2846,12 +2846,7 @@ int glestMain(int argc, char** argv) {
     	}
 
     	Renderer &renderer= Renderer::getInstance();
-//#if defined(__APPLE__)
-		program= new Program();
-		mainWindow= new MainWindow(program);
-//#endif
-
-        lang.loadStrings(language);
+        lang.loadStrings(language,false);
 
         if(	lang.hasString("FONT_HEIGHT_TEXT")) {
         	Font::langHeightText = config.getString("FONT_HEIGHT_TEXT",Font::langHeightText.c_str());
@@ -2876,6 +2871,7 @@ int glestMain(int argc, char** argv) {
 	        else {
 	            printf("\nInvalid missing font base size specified on commandline [%s] value [%s]\n\n",argv[foundParamIndIndex],(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
 	            //printParameterHelp(argv[0],false);
+
 	            return -1;
 	        }
     	}
@@ -2937,11 +2933,13 @@ int glestMain(int argc, char** argv) {
 				else {
 					printf("Map [%s] was NOT FOUND\n",itemName.c_str());
 				}
+
 				return -1;
 			}
 	        else {
 	            printf("\nInvalid missing map specified on commandline [%s] value [%s]\n\n",argv[foundParamIndIndex],(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
 	            //printParameterHelp(argv[0],false);
+
 	            return -1;
 	        }
     	}
@@ -2964,11 +2962,13 @@ int glestMain(int argc, char** argv) {
 				else {
 					printf("Tileset [%s] was NOT FOUND\n",itemName.c_str());
 				}
+
 				return -1;
 			}
 	        else {
 	            printf("\nInvalid missing tileset specified on commandline [%s] value [%s]\n\n",argv[foundParamIndIndex],(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
 	            //printParameterHelp(argv[0],false);
+
 	            return -1;
 	        }
     	}
@@ -2997,6 +2997,7 @@ int glestMain(int argc, char** argv) {
 	        else {
 	            printf("\nInvalid missing techtree specified on commandline [%s] value [%s]\n\n",argv[foundParamIndIndex],(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
 	            //printParameterHelp(argv[0],false);
+
 	            return -1;
 	        }
     	}
@@ -3025,6 +3026,7 @@ int glestMain(int argc, char** argv) {
 	        else {
 	            printf("\nInvalid missing scenario specified on commandline [%s] value [%s]\n\n",argv[foundParamIndIndex],(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
 	            //printParameterHelp(argv[0],false);
+
 	            return -1;
 	        }
     	}
@@ -3046,6 +3048,7 @@ int glestMain(int argc, char** argv) {
 				int32 crcValue = getFolderTreeContentsCheckSumRecursively(itemName, itemNameFilter, NULL, true);
 
 				printf("CRC value for path [%s] filter [%s] is [%d]\n",itemName.c_str(),itemNameFilter.c_str(),crcValue);
+
 				return -1;
 			}
 	        else {
@@ -3057,6 +3060,7 @@ int glestMain(int argc, char** argv) {
 	        	}
 
 	            //printParameterHelp(argv[0],false);
+
 	            return -1;
 	        }
     	}
@@ -3073,15 +3077,11 @@ int glestMain(int argc, char** argv) {
         //return -1;
         //
 
-		if(program == NULL) {
-			program= new Program();
-		}
+		program= new Program();
 
 		SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
 
-		if(mainWindow == NULL) {
-			mainWindow= new MainWindow(program);
-		}
+		mainWindow= new MainWindow(program);
 
 		mainWindow->setUseDefaultCursorOnly(config.getBool("No2DMouseRendering","false"));