Mercurial > mm7

diff GUIProgressBar.cpp @ 712:e7c86528a2b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Thu, 21 Mar 2013 23:11:54 +0400
parents 735dab8d3c9a
children da130dd3092a
line wrap: on
line diff
--- a/GUIProgressBar.cpp	Thu Mar 21 23:10:57 2013 +0400
+++ b/GUIProgressBar.cpp	Thu Mar 21 23:11:54 2013 +0400
@@ -158,20 +158,20 @@
       Progress();
     }
     free(v1->pLoadingBg.pPixels);
-    v3 = (int)&v1->pLoadingProgress.pLevelOfDetail0;
-    free(v1->pLoadingProgress.pLevelOfDetail0);
+    v3 = (int)&v1->pLoadingProgress.pLevelOfDetail0_prolly_alpha_mask;
+    free(v1->pLoadingProgress.pLevelOfDetail0_prolly_alpha_mask);
     free(v1->pLoadingProgress.pPalette16);
     v1->pLoadingProgress.pPalette16 = 0;
     v1->pLoadingBg.pPixels = 0;
   }
   else
   {
-    if ( !v1->pBardata.pLevelOfDetail0 )
+    if ( !v1->pBardata.pLevelOfDetail0_prolly_alpha_mask )
       return;
-    free(v1->pBardata.pLevelOfDetail0);
+    free(v1->pBardata.pLevelOfDetail0_prolly_alpha_mask);
     v3 = (int)&v1->pBardata.pPalette16;
     free(v1->pBardata.pPalette16);
-    v1->pBardata.pLevelOfDetail0 = 0;
+    v1->pBardata.pLevelOfDetail0_prolly_alpha_mask = 0;
   }
   *(int *)v3 = 0;
 }
@@ -186,7 +186,7 @@
   pRenderer->BeginScene();
   if (uType != TYPE_Fullscreen)
   {
-    if (pBardata.pLevelOfDetail0)
+    if (pBardata.pLevelOfDetail0_prolly_alpha_mask)
     {
       if (pRenderer->pRenderD3D)
       {