changeset 1674:2a5f2aaec367

Слияние
author Ritor1
date Thu, 19 Sep 2013 09:29:30 +0600
parents 53291e8f3848 (diff) f3986fd1a122 (current diff)
children f1cdf8c062d4
files UI/UIMainMenu.cpp
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/UI/UIMainMenu.cpp	Wed Sep 18 20:36:18 2013 +0600
+++ b/UI/UIMainMenu.cpp	Thu Sep 19 09:29:30 2013 +0600
@@ -199,7 +199,6 @@
   unsigned int pSize; // esi@7
   __int16 pHeight; // ax@9
   void *v7; // eax@9
-  unsigned int pNumPixels; // ST2C_4@9
   unsigned int v10; // ST2C_4@19
   MSG Msg; // [sp+84h] [bp-B8h]@10
   int v17; // [sp+A0h] [bp-9Ch]@9
@@ -248,9 +247,8 @@
   pTexture2.uHeight = pHeight + 2 * credit_window.uFrameHeight;
   pTexture2.uNumPixels = (signed __int16)pTexture2.uWidth * (signed __int16)pTexture2.uHeight;
   v7 = malloc(2 * pTexture2.uNumPixels);//, "scrollermap");
-  pNumPixels = pTexture2.uNumPixels;
   pTexture2.pPixels = (unsigned __int16 *)v7;
-  fill_pixels_fast(TargetColor(0, 0xFFu, 0xFFu), pTexture2.pPixels, pNumPixels);
+  fill_pixels_fast(TargetColor(0, 0xFFu, 0xFFu), pTexture2.pPixels, pTexture2.uNumPixels);
   pTexture2._allocation_flags = 0;
   pString = (char *)malloc(2 * pSize);
   strncpy(pString, ptr, pSize);