mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-30 03:09:49 +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

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

@@ -797,6 +797,7 @@ void MenuStateConnectedGame::update() {
} }
} }
if(enableFactionTexturePreview == true) {
if( clientInterface != NULL && clientInterface->isConnected() && if( clientInterface != NULL && clientInterface->isConnected() &&
gameSettings != NULL) { gameSettings != NULL) {
@@ -810,6 +811,7 @@ void MenuStateConnectedGame::update() {
} }
} }
} }
}
//update lobby //update lobby
clientInterface= NetworkManager::getInstance().getClientInterface(); clientInterface= NetworkManager::getInstance().getClientInterface();

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

@@ -1304,6 +1304,7 @@ void MenuStateCustomGame::update() {
} }
soundConnectionCount = currentConnectionCount; soundConnectionCount = currentConnectionCount;
if(enableFactionTexturePreview == true) {
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);
@@ -1312,6 +1313,7 @@ void MenuStateCustomGame::update() {
currentFactionLogo = factionLogo; currentFactionLogo = factionLogo;
loadFactionTexture(currentFactionLogo); 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__);
} }