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

- disable rendering of other items in the menu when error showing

Browse Source
This commit is contained in:
Mark Vejvoda 2012-10-15 15:06:21 +00:00
parent abb525fbd1
commit 01d2ba8db5
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1849,9 +1849,11 @@ void MenuStateCustomGame::render() {
try { try {
Renderer &renderer= Renderer::getInstance(); Renderer &renderer= Renderer::getInstance();
if(factionTexture != NULL) { if(mainMessageBox.getEnabled() == false) {
if(factionVideo == NULL || factionVideo->isPlaying() == false) { if(factionTexture != NULL) {
renderer.renderTextureQuad(800,600,200,150,factionTexture,0.7f); if(factionVideo == NULL || factionVideo->isPlaying() == false) {
renderer.renderTextureQuad(800,600,200,150,factionTexture,0.7f);
}
} }
} }
if(factionVideo != NULL) { if(factionVideo != NULL) {
@ -1874,20 +1876,21 @@ void MenuStateCustomGame::render() {
} }
} }
} }
if(mapPreviewTexture != NULL) {
renderer.renderTextureQuad(5,185,150,150,mapPreviewTexture,1.0f);
//printf("=================> Rendering map preview texture\n");
}
if(scenarioLogoTexture != NULL) {
renderer.renderTextureQuad(300,350,400,300,scenarioLogoTexture,1.0f);
//renderer.renderBackground(scenarioLogoTexture);
}
if(mainMessageBox.getEnabled()) { if(mainMessageBox.getEnabled()) {
renderer.renderMessageBox(&mainMessageBox); renderer.renderMessageBox(&mainMessageBox);
} }
else { else {
if(mapPreviewTexture != NULL) {
renderer.renderTextureQuad(5,185,150,150,mapPreviewTexture,1.0f);
//printf("=================> Rendering map preview texture\n");
}
if(scenarioLogoTexture != NULL) {
renderer.renderTextureQuad(300,350,400,300,scenarioLogoTexture,1.0f);
//renderer.renderBackground(scenarioLogoTexture);
}
renderer.renderButton(&buttonReturn); renderer.renderButton(&buttonReturn);
renderer.renderButton(&buttonPlayNow); renderer.renderButton(&buttonPlayNow);
renderer.renderButton(&buttonRestoreLastSettings); renderer.renderButton(&buttonRestoreLastSettings);
@ -2052,13 +2055,13 @@ void MenuStateCustomGame::render() {
renderer.renderListBox(&listBoxNetworkPauseGameForLaggedClients); renderer.renderListBox(&listBoxNetworkPauseGameForLaggedClients);
} }
} }
}
//renderer.renderLabel(&labelInfo); //renderer.renderLabel(&labelInfo);
renderer.renderCheckBox(&checkBoxScenario); renderer.renderCheckBox(&checkBoxScenario);
renderer.renderLabel(&labelScenario); renderer.renderLabel(&labelScenario);
if(checkBoxScenario.getValue() == true) { if(checkBoxScenario.getValue() == true) {
renderer.renderListBox(&listBoxScenario); renderer.renderListBox(&listBoxScenario);
}
} }
if(program != NULL) program->renderProgramMsgBox(); if(program != NULL) program->renderProgramMsgBox();
@ -2074,8 +2077,10 @@ void MenuStateCustomGame::render() {
} }
} }
if(hasNetworkGameSettings() == true) { if(mainMessageBox.getEnabled() == false) {
renderer.renderChatManager(&chatManager); if(hasNetworkGameSettings() == true) {
renderer.renderChatManager(&chatManager);
}
} }
renderer.renderConsole(&console,showFullConsole,true); renderer.renderConsole(&console,showFullConsole,true);
} }