Merge pull request #66 from cortex-command-community/fix-loading-progress

Fix Loading Screen Progress Window not showing

Author: Causeless

Source/Managers/WindowMan.cpp

@@ -683,10 +683,12 @@ void WindowMan::Update() {
 	m_EventQueue.clear();
 }
 
-void WindowMan::ClearRenderer() {
+void WindowMan::ClearRenderer(bool clearFrameMan) {
 	GL_CHECK(glBindFramebuffer(GL_FRAMEBUFFER, 0));
 	GL_CHECK(glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT));
-	g_FrameMan.ClearBackBuffer32();
+	if (clearFrameMan) {
+		g_FrameMan.ClearBackBuffer32();
+	}
 	GL_CHECK(glActiveTexture(GL_TEXTURE0));
 	GL_CHECK(glBindTexture(GL_TEXTURE_2D, 0));
 	GL_CHECK(glActiveTexture(GL_TEXTURE1));

Source/Managers/WindowMan.h

@@ -172,7 +172,7 @@ namespace RTE {
 		void Update();
 
 		/// Clears the primary renderer, or all the renderers if in multi-display fullscreen.
-		void ClearRenderer();
+		void ClearRenderer(bool clearFrameMan = true);
 
 		/// Set this Frame to draw the game. To be set before UploadFrame. Resets on ClearRenderer.
 		void DrawPostProcessBuffer() { m_DrawPostProcessBuffer = true; }

Source/Menus/LoadingScreen.cpp

@@ -121,6 +121,7 @@ void LoadingScreen::LoadingSplashProgressReport(const std::string& reportString,
 	}
 
 	if (g_LoadingScreen.m_ProgressListboxBitmap) {
+
 		AllegroBitmap drawBitmap(g_LoadingScreen.m_ProgressListboxBitmap);
 
 		// Clear current line.
@@ -133,7 +134,7 @@ void LoadingScreen::LoadingSplashProgressReport(const std::string& reportString,
 
 		blit(g_LoadingScreen.m_ProgressListboxBitmap, g_FrameMan.GetBackBuffer32(), 0, 0, g_LoadingScreen.m_ProgressListboxPosX, g_LoadingScreen.m_ProgressListboxPosY, g_LoadingScreen.m_ProgressListboxBitmap->w, g_LoadingScreen.m_ProgressListboxBitmap->h);
 
-		g_WindowMan.ClearRenderer();
+		g_WindowMan.ClearRenderer(false);
 		g_WindowMan.UploadFrame();
 	}
 }