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

fix for wrong path used to load overridden intro data

Browse Source
This commit is contained in:
Mark Vejvoda
2011-11-03 14:23:21 +00:00
parent 598ebb81c5
commit 0b18d22700
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/glest_game/global/core_data.cpp
View File

@@ -161,7 +161,7 @@ void CoreData::load() {
Texture2D *logoTextureExtra= renderer.newTexture2D(rsGlobal); Texture2D *logoTextureExtra= renderer.newTexture2D(rsGlobal);
if(logoTextureExtra) { if(logoTextureExtra) {
logoTextureExtra->setMipmap(true); 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); logoTextureList.push_back(logoTextureExtra);
} }
} }
@@ -195,7 +195,7 @@ void CoreData::load() {
Texture2D *logoTextureExtra= renderer.newTexture2D(rsGlobal); Texture2D *logoTextureExtra= renderer.newTexture2D(rsGlobal);
if(logoTextureExtra) { if(logoTextureExtra) {
logoTextureExtra->setMipmap(true); 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); miscTextureList.push_back(logoTextureExtra);
} }
//} //}

2
source/glest_game/main/intro.cpp
View File

@@ -169,7 +169,7 @@ Intro::Intro(Program *program):
string logo = introModels[i]; string logo = introModels[i];
Model *model= renderer.newModel(rsMenu); Model *model= renderer.newModel(rsMenu);
if(model) { 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); models.push_back(model);
//printf("model [%s]\n",model->getFileName().c_str()); //printf("model [%s]\n",model->getFileName().c_str());
} }