diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp index c99578e93..492128a57 100644 --- a/source/glest_game/game/game.cpp +++ b/source/glest_game/game/game.cpp @@ -521,7 +521,8 @@ void Game::loadHudTexture(const GameSettings *settings) { string factionName = ""; string techName = settings->getTech(); - string scenarioDir =settings->getScenarioDir(); + string scenarioDir = extractDirectoryPathFromFile(settings->getScenarioDir()); + //printf("In loadHudTexture, scenarioDir [%s]\n",scenarioDir.c_str()); for(int i=0; i < settings->getFactionCount(); ++i ) { if(settings->getFactionControl(i) == ctHuman){ @@ -529,7 +530,7 @@ void Game::loadHudTexture(const GameSettings *settings) break; } } - if(factionName != ""){ + if(factionName != "") { Config &config= Config::getInstance(); vector pathList= config.getPathListForType(ptTechs, scenarioDir); for(int idx= 0; idx < pathList.size(); idx++){ diff --git a/source/shared_lib/sources/graphics/gl/font_textFTGL.cpp b/source/shared_lib/sources/graphics/gl/font_textFTGL.cpp index 8315c3da0..c59ea670b 100644 --- a/source/shared_lib/sources/graphics/gl/font_textFTGL.cpp +++ b/source/shared_lib/sources/graphics/gl/font_textFTGL.cpp @@ -78,7 +78,7 @@ TextFTGL::TextFTGL(FontTextHandlerType type) : Text(type) { delete ftFont; ftFont = NULL; free((void*)fontFile); fontFile = NULL; - throw runtime_error("FTGL: error loading font"); + throw runtime_error(string("FTGL: error loading font: ") + string(fontFile)); } free((void*)fontFile); fontFile = NULL;