From c11266d529108c68c4b2aceec3cf60d5bc9218a4 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Wed, 14 Dec 2011 23:01:13 +0000 Subject: [PATCH] - fix custom player colors for mods --- source/glest_game/main/main.cpp | 11 ++--------- source/glest_game/type_instances/faction.cpp | 10 ++-------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp index 17992678..4448a1c3 100644 --- a/source/glest_game/main/main.cpp +++ b/source/glest_game/main/main.cpp @@ -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 playerColorTextureFilenames; - findAll(playerColorTexturePath, playerColorTextureFilenames, false, false); - std::map &crcPlayerTextureCache = CacheManager::getCachedItem< std::map >(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) { diff --git a/source/glest_game/type_instances/faction.cpp b/source/glest_game/type_instances/faction.cpp index f69009b9..71122a9a 100644 --- a/source/glest_game/type_instances/faction.cpp +++ b/source/glest_game/type_instances/faction.cpp @@ -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 &&