From 0b18d227006a567f58d7d3e77edea2f920a0ba06 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Thu, 3 Nov 2011 14:23:21 +0000 Subject: [PATCH] fix for wrong path used to load overridden intro data --- source/glest_game/global/core_data.cpp | 4 ++-- source/glest_game/main/intro.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/glest_game/global/core_data.cpp b/source/glest_game/global/core_data.cpp index 4b3c906c..0e693add 100644 --- a/source/glest_game/global/core_data.cpp +++ b/source/glest_game/global/core_data.cpp @@ -161,7 +161,7 @@ void CoreData::load() { Texture2D *logoTextureExtra= renderer.newTexture2D(rsGlobal); if(logoTextureExtra) { logoTextureExtra->setMipmap(true); - logoTextureExtra->getPixmap()->load(logosPath + "data/core/menu/textures/" + logo); + logoTextureExtra->getPixmap()->load(getGameCustomCoreDataPath(data_path, "") + "data/core/menu/textures/" + logo); logoTextureList.push_back(logoTextureExtra); } } @@ -195,7 +195,7 @@ void CoreData::load() { Texture2D *logoTextureExtra= renderer.newTexture2D(rsGlobal); if(logoTextureExtra) { logoTextureExtra->setMipmap(true); - logoTextureExtra->getPixmap()->load(introPath + "data/core/menu/textures/" + logo); + logoTextureExtra->getPixmap()->load(getGameCustomCoreDataPath(data_path, "") + "data/core/menu/textures/" + logo); miscTextureList.push_back(logoTextureExtra); } //} diff --git a/source/glest_game/main/intro.cpp b/source/glest_game/main/intro.cpp index 3bb6382f..050e7af9 100644 --- a/source/glest_game/main/intro.cpp +++ b/source/glest_game/main/intro.cpp @@ -169,7 +169,7 @@ Intro::Intro(Program *program): string logo = introModels[i]; Model *model= renderer.newModel(rsMenu); if(model) { - model->load(introPath + "data/core/menu/main_model/" + logo); + model->load(getGameCustomCoreDataPath(data_path, "") + "data/core/menu/main_model/" + logo); models.push_back(model); //printf("model [%s]\n",model->getFileName().c_str()); }