Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bugfix for loading textures for gpl and startup model pics

This commit is contained in:
SoftCoder 2014-01-29 20:42:59 -08:00
parent 02fa995ce3
commit 4ba68576aa
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -439,6 +439,7 @@ void CoreData::loadLogoTextureExtraIfRequired() {
getGameCustomCoreDataPath(data_path, "") +
CORE_MENU_TEXTURES_PATH + logo, tsyst_NONE,
true, false, true);
logoTextureList.push_back(logoTextureExtra);
}
}
if (logoTextureList.empty() == true) {
@ -455,6 +456,7 @@ void CoreData::loadLogoTextureExtraIfRequired() {
loadTextureIfRequired(&logoTextureExtra,data_path,
data_path + CORE_MENU_TEXTURES_PATH + logo, tsyst_NONE,
true, false, true);
logoTextureList.push_back(logoTextureExtra);
}
}
}
@ -490,7 +492,7 @@ void CoreData::loadMiscTextureListIfRequired() {
getGameCustomCoreDataPath(data_path, "") + CORE_MENU_TEXTURES_PATH +
logo, tsyst_NONE,
true, false, true);
miscTextureList.push_back(logoTextureExtra);
}
if (miscTextureList.empty() == true) {
introPath = data_path + CORE_MENU_TEXTURES_PATH + "intro*.*";
@ -503,6 +505,7 @@ void CoreData::loadMiscTextureListIfRequired() {
loadTextureIfRequired(&logoTextureExtra,data_path,
data_path + CORE_MENU_TEXTURES_PATH + logo, tsyst_NONE,
true, false, true);
miscTextureList.push_back(logoTextureExtra);
}
}

2
source/glest_game/global/core_data.h
View File

@ -113,7 +113,6 @@ public:
enum TextureSystemType {
tsyst_NONE,
tsyst_logoTexture,
//std::vector<Texture2D *> logoTextureList;
tsyst_backgroundTexture,
tsyst_fireTexture,
tsyst_teamColorTexture,
@ -136,7 +135,6 @@ public:
tsyst_statusBRBTexture,
tsyst_COUNT
//std::vector<Texture2D *> miscTextureList;
};
public: