mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-19 06:31:19 +02:00
Code Issues Projects Releases Wiki Activity

- bugfix for not finding hud for scenarios with embedded techtree

Browse Source
This commit is contained in:
Mark Vejvoda
2012-01-04 04:10:11 +00:00
parent a20b848646
commit a1a0b9e79c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/glest_game/game/game.cpp
View File

@@ -521,7 +521,8 @@ void Game::loadHudTexture(const GameSettings *settings)
{ {
string factionName = ""; string factionName = "";
string techName = settings->getTech(); 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 ) { for(int i=0; i < settings->getFactionCount(); ++i ) {
if(settings->getFactionControl(i) == ctHuman){ if(settings->getFactionControl(i) == ctHuman){

2
source/shared_lib/sources/graphics/gl/font_textFTGL.cpp
View File

@@ -78,7 +78,7 @@ TextFTGL::TextFTGL(FontTextHandlerType type) : Text(type) {
delete ftFont; ftFont = NULL; delete ftFont; ftFont = NULL;
free((void*)fontFile); free((void*)fontFile);
fontFile = NULL; fontFile = NULL;
throw runtime_error("FTGL: error loading font"); throw runtime_error(string("FTGL: error loading font: ") + string(fontFile));
} }
free((void*)fontFile); free((void*)fontFile);
fontFile = NULL; fontFile = NULL;