From 68bfe9e455a36814b4fe9be1bc3a7da234c59325 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Mon, 28 May 2012 02:36:12 +0000
Subject: [PATCH] - fixed rendering on battle end screen

---
 source/glest_game/graphics/renderer.cpp | 9 +++++++--
 source/glest_game/main/battle_end.cpp   | 4 +++-
 source/glest_game/menu/main_menu.cpp    | 2 ++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp
index e9165d45..a42b79b4 100644
--- a/source/glest_game/graphics/renderer.cpp
+++ b/source/glest_game/graphics/renderer.cpp
@@ -190,8 +190,8 @@ Renderer::Renderer() : BaseRenderer() {
 	//list3dMenu=0;
 	//list3dMenuValid=false;
 	//customlist3dMenu=NULL;
-	mm3d = NULL;
-	custom_mm3d = NULL;
+	this->mm3d = NULL;
+	this->custom_mm3d = NULL;
 
 	this->program = NULL;
 
@@ -554,6 +554,9 @@ void Renderer::reset2d() {
 void Renderer::reset3dMenu() {
 	assertGl();
 	glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SINGLE_COLOR);
+
+	//printf("In [%s::%s Line: %d] this->custom_mm3d [%p] this->mm3d [%p]\n",__FILE__,__FUNCTION__,__LINE__,this->custom_mm3d,this->mm3d);
+
 	if(this->custom_mm3d != NULL) {
 		render3dMenuSetup(this->custom_mm3d);
 		//glCallList(*this->customlist3dMenu);
@@ -7148,6 +7151,8 @@ void Renderer::init3dListMenu(const MainMenu *mm) {
 	}
 
 	this->mm3d = mm;
+	//printf("In [%s::%s Line: %d] this->custom_mm3d [%p] this->mm3d [%p]\n",__FILE__,__FUNCTION__,__LINE__,this->custom_mm3d,this->mm3d);
+
 /*
 	assertGl();
 
diff --git a/source/glest_game/main/battle_end.cpp b/source/glest_game/main/battle_end.cpp
index 841cdd2f..38ebb9ce 100644
--- a/source/glest_game/main/battle_end.cpp
+++ b/source/glest_game/main/battle_end.cpp
@@ -121,16 +121,18 @@ void BattleEnd::render() {
 	canRender();
 	incrementFps();
 
+	//printf("In [%s::%s Line: %d] renderToTexture [%p]\n",__FILE__,__FUNCTION__,__LINE__,renderToTexture);
 	if(renderToTexture != NULL) {
 		//printf("Rendering from texture!\n");
 
 		renderer.clearBuffers();
 		renderer.reset3dMenu();
 		renderer.clearZBuffer();
-		renderer.renderBackground(renderToTexture);
 
 		renderer.reset2d();
 
+		renderer.renderBackground(renderToTexture);
+
 		renderer.renderButton(&buttonExit);
 
 		//exit message box
diff --git a/source/glest_game/menu/main_menu.cpp b/source/glest_game/menu/main_menu.cpp
index 45a9455b..ec880849 100644
--- a/source/glest_game/menu/main_menu.cpp
+++ b/source/glest_game/menu/main_menu.cpp
@@ -136,6 +136,8 @@ void MainMenu::render() {
 			renderer.reset3dMenu();
 			renderer.clearZBuffer();
 
+			//printf("In [%s::%s Line: %d] menuBackgroundVideo [%p]\n",__FILE__,__FUNCTION__,__LINE__,menuBackgroundVideo);
+
 			if(menuBackgroundVideo == NULL) {
 				renderer.loadCameraMatrix(menuBackground.getCamera());
 				renderer.renderMenuBackground(&menuBackground);