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

fix for macosx

This commit is contained in:
Mark Vejvoda 2011-11-01 21:47:34 +00:00
parent 81c5d12324
commit bb25e0ec79
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/glest_game/global/lang.cpp
View File

@ -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();
}
}
}

2
source/glest_game/global/lang.h
View File

@ -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="");

24
source/glest_game/main/main.cpp
View File

@ -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"));