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

- fix custom player colors for mods

This commit is contained in:
Mark Vejvoda 2011-12-14 23:01:13 +00:00
parent 157c052a82
commit c11266d529
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/glest_game/main/main.cpp
View File

@ -3474,17 +3474,10 @@ int glestMain(int argc, char** argv) {
// Cache Player textures - START
string data_path = getGameReadWritePath(GameConstants::path_data_CacheLookupKey);
string playerColorTexturePath = getGameCustomCoreDataPath(data_path, "") + "data/core/faction_textures/faction*.tga";
vector<string> playerColorTextureFilenames;
findAll(playerColorTexturePath, playerColorTextureFilenames, false, false);
std::map<int,Texture2D *> &crcPlayerTextureCache = CacheManager::getCachedItem< std::map<int,Texture2D *> >(GameConstants::playerTextureCacheLookupKey);
for(int index = 0; index < GameConstants::maxPlayers; ++index) {
string playerTexture = data_path + "data/core/faction_textures/faction" + intToStr(index) + ".tga";
if(playerColorTextureFilenames.size() > 0) {
playerTexture = getGameCustomCoreDataPath(data_path, "") + "data/core/faction_textures/faction" + intToStr(index) + ".tga";
}
//string playerTexture = data_path + "data/core/faction_textures/faction" + intToStr(index) + ".tga";
string playerTexture = getGameCustomCoreDataPath(data_path, "data/core/faction_textures/faction" + intToStr(index) + ".tga");
if(fileExists(playerTexture) == true) {
Texture2D *texture = Renderer::getInstance().newTexture2D(rsGlobal);
if(texture) {

10
source/glest_game/type_instances/faction.cpp
View File

@ -490,15 +490,9 @@ void Faction::init(
texture= Renderer::getInstance().newTexture2D(rsGame);
string data_path = getGameReadWritePath(GameConstants::path_data_CacheLookupKey);
if(texture) {
string playerColorTexture = getGameCustomCoreDataPath(data_path, "") + "data/core/faction_textures/faction" + intToStr(startLocationIndex) + ".tga";
if(fileExists(playerColorTexture) == true) {
texture->load(getGameCustomCoreDataPath(data_path, "") + "data/core/faction_textures/faction" + intToStr(startLocationIndex) + ".tga");
}
else {
texture->load(data_path + "data/core/faction_textures/faction" + intToStr(startLocationIndex) + ".tga");
}
string playerTexture = getGameCustomCoreDataPath(data_path, "data/core/faction_textures/faction" + intToStr(startLocationIndex) + ".tga");
texture->load(playerTexture);
}
if( game->getGameSettings()->getPathFinderType() == pfBasic &&