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

Browse Source
This commit is contained in:
Mark Vejvoda
2010-09-02 13:53:23 +00:00
parent 8ca44feffc
commit f5711b0949
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/glest_game/menu/menu_state_connected_game.cpp
View File

@@ -797,16 +797,18 @@ void MenuStateConnectedGame::update() {
} }
} }
if( clientInterface != NULL && clientInterface->isConnected() && if(enableFactionTexturePreview == true) {
gameSettings != NULL) { if( clientInterface != NULL && clientInterface->isConnected() &&
gameSettings != NULL) {
string factionLogo = Game::findFactionLogoFile(gameSettings, NULL,"preview_screen.*"); string factionLogo = Game::findFactionLogoFile(gameSettings, NULL,"preview_screen.*");
if(factionLogo == "") { if(factionLogo == "") {
factionLogo = Game::findFactionLogoFile(gameSettings, NULL); factionLogo = Game::findFactionLogoFile(gameSettings, NULL);
} }
if(currentFactionLogo != factionLogo) { if(currentFactionLogo != factionLogo) {
currentFactionLogo = factionLogo; currentFactionLogo = factionLogo;
loadFactionTexture(currentFactionLogo); loadFactionTexture(currentFactionLogo);
}
} }
} }
} }

16
source/glest_game/menu/menu_state_custom_game.cpp
View File

@@ -1304,13 +1304,15 @@ void MenuStateCustomGame::update() {
} }
soundConnectionCount = currentConnectionCount; soundConnectionCount = currentConnectionCount;
string factionLogo = Game::findFactionLogoFile(&gameSettings, NULL,"preview_screen.*"); if(enableFactionTexturePreview == true) {
if(factionLogo == "") { string factionLogo = Game::findFactionLogoFile(&gameSettings, NULL,"preview_screen.*");
factionLogo = Game::findFactionLogoFile(&gameSettings, NULL); if(factionLogo == "") {
} factionLogo = Game::findFactionLogoFile(&gameSettings, NULL);
if(currentFactionLogo != factionLogo) { }
currentFactionLogo = factionLogo; if(currentFactionLogo != factionLogo) {
loadFactionTexture(currentFactionLogo); currentFactionLogo = factionLogo;
loadFactionTexture(currentFactionLogo);
}
} }
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__); //SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);