fix for macosx
This commit is contained in:
parent
81c5d12324
commit
bb25e0ec79
|
@ -45,7 +45,7 @@ Lang &Lang::getInstance() {
|
||||||
return lang;
|
return lang;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Lang::loadStrings(const string &language) {
|
void Lang::loadStrings(const string &language, bool loadFonts) {
|
||||||
bool languageChanged = (language != this->language);
|
bool languageChanged = (language != this->language);
|
||||||
this->language= language;
|
this->language= language;
|
||||||
loadStrings(language, strings, true);
|
loadStrings(language, strings, true);
|
||||||
|
@ -154,8 +154,10 @@ void Lang::loadStrings(const string &language) {
|
||||||
// end win32
|
// end win32
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
CoreData &coreData= CoreData::getInstance();
|
if(loadFonts) {
|
||||||
coreData.loadFonts();
|
CoreData &coreData= CoreData::getInstance();
|
||||||
|
coreData.loadFonts();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@ private:
|
||||||
public:
|
public:
|
||||||
static Lang &getInstance();
|
static Lang &getInstance();
|
||||||
|
|
||||||
void loadStrings(const string &language);
|
void loadStrings(const string &language, bool loadFonts=true);
|
||||||
void loadScenarioStrings(const string &scenarioDir, const string &scenarioName);
|
void loadScenarioStrings(const string &scenarioDir, const string &scenarioName);
|
||||||
|
|
||||||
string get(const string &s,string language="");
|
string get(const string &s,string language="");
|
||||||
|
|
|
@ -2846,12 +2846,7 @@ int glestMain(int argc, char** argv) {
|
||||||
}
|
}
|
||||||
|
|
||||||
Renderer &renderer= Renderer::getInstance();
|
Renderer &renderer= Renderer::getInstance();
|
||||||
//#if defined(__APPLE__)
|
lang.loadStrings(language,false);
|
||||||
program= new Program();
|
|
||||||
mainWindow= new MainWindow(program);
|
|
||||||
//#endif
|
|
||||||
|
|
||||||
lang.loadStrings(language);
|
|
||||||
|
|
||||||
if( lang.hasString("FONT_HEIGHT_TEXT")) {
|
if( lang.hasString("FONT_HEIGHT_TEXT")) {
|
||||||
Font::langHeightText = config.getString("FONT_HEIGHT_TEXT",Font::langHeightText.c_str());
|
Font::langHeightText = config.getString("FONT_HEIGHT_TEXT",Font::langHeightText.c_str());
|
||||||
|
@ -2876,6 +2871,7 @@ int glestMain(int argc, char** argv) {
|
||||||
else {
|
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));
|
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);
|
//printParameterHelp(argv[0],false);
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2937,11 +2933,13 @@ int glestMain(int argc, char** argv) {
|
||||||
else {
|
else {
|
||||||
printf("Map [%s] was NOT FOUND\n",itemName.c_str());
|
printf("Map [%s] was NOT FOUND\n",itemName.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
printf("\nInvalid missing map specified on commandline [%s] value [%s]\n\n",argv[foundParamIndIndex],(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
|
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);
|
//printParameterHelp(argv[0],false);
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2964,11 +2962,13 @@ int glestMain(int argc, char** argv) {
|
||||||
else {
|
else {
|
||||||
printf("Tileset [%s] was NOT FOUND\n",itemName.c_str());
|
printf("Tileset [%s] was NOT FOUND\n",itemName.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
printf("\nInvalid missing tileset specified on commandline [%s] value [%s]\n\n",argv[foundParamIndIndex],(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
|
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);
|
//printParameterHelp(argv[0],false);
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2997,6 +2997,7 @@ int glestMain(int argc, char** argv) {
|
||||||
else {
|
else {
|
||||||
printf("\nInvalid missing techtree specified on commandline [%s] value [%s]\n\n",argv[foundParamIndIndex],(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
|
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);
|
//printParameterHelp(argv[0],false);
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3025,6 +3026,7 @@ int glestMain(int argc, char** argv) {
|
||||||
else {
|
else {
|
||||||
printf("\nInvalid missing scenario specified on commandline [%s] value [%s]\n\n",argv[foundParamIndIndex],(paramPartTokens.size() >= 2 ? paramPartTokens[1].c_str() : NULL));
|
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);
|
//printParameterHelp(argv[0],false);
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3046,6 +3048,7 @@ int glestMain(int argc, char** argv) {
|
||||||
int32 crcValue = getFolderTreeContentsCheckSumRecursively(itemName, itemNameFilter, NULL, true);
|
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);
|
printf("CRC value for path [%s] filter [%s] is [%d]\n",itemName.c_str(),itemNameFilter.c_str(),crcValue);
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -3057,6 +3060,7 @@ int glestMain(int argc, char** argv) {
|
||||||
}
|
}
|
||||||
|
|
||||||
//printParameterHelp(argv[0],false);
|
//printParameterHelp(argv[0],false);
|
||||||
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3073,15 +3077,11 @@ int glestMain(int argc, char** argv) {
|
||||||
//return -1;
|
//return -1;
|
||||||
//
|
//
|
||||||
|
|
||||||
if(program == NULL) {
|
program= new Program();
|
||||||
program= new Program();
|
|
||||||
}
|
|
||||||
|
|
||||||
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__);
|
||||||
|
|
||||||
if(mainWindow == NULL) {
|
mainWindow= new MainWindow(program);
|
||||||
mainWindow= new MainWindow(program);
|
|
||||||
}
|
|
||||||
|
|
||||||
mainWindow->setUseDefaultCursorOnly(config.getBool("No2DMouseRendering","false"));
|
mainWindow->setUseDefaultCursorOnly(config.getBool("No2DMouseRendering","false"));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user