diff mm7_2.cpp @ 726:9d13d2ec35a6

Слияние
author Ritor1
date Fri, 22 Mar 2013 01:29:46 +0600
parents 737d7fec67f0 e7c86528a2b3
children 9f596a163257
line wrap: on
line diff
--- a/mm7_2.cpp	Fri Mar 22 01:29:25 2013 +0600
+++ b/mm7_2.cpp	Fri Mar 22 01:29:46 2013 +0600
@@ -4777,13 +4777,13 @@
     v4 = v24;
   }
   v5 = v2->pTextures;
-  v2->uNumTextures = v4;
+  v2->sNumTextures = v4;
   v6 = pAllocator->AllocNamedChunk(v5, 20 * v4, "Txt Frames");
   v2->pTextures = (TextureFrame *)v6;
   if ( !v6 )
     Abortf("CTextureFrameTable::load - Out of Memory!");
   v7 = File;
-  v2->uNumTextures = 0;
+  v2->sNumTextures = 0;
   fseek(v7, 0, 0);
   for ( i = fgets(&Buf, 490, File); i; i = fgets(&Buf, 490, File) )
   {
@@ -4791,23 +4791,23 @@
     memcpy(&v21, txt_file_frametable_parser(&Buf, &v20), 0x7Cu);
     if ( v21 && *Str1 != 47 )
     {
-      strcpy(v2->pTextures[v2->uNumTextures].pTextureName, Str1);
-      v2->pTextures[v2->uNumTextures].uAnimTime = atoi(Str);
+      strcpy(v2->pTextures[v2->sNumTextures].pTextureName, Str1);
+      v2->pTextures[v2->sNumTextures].uAnimTime = atoi(Str);
       v9 = 2;
-      for ( v2->pTextures[v2->uNumTextures].uFlags = 0; v9 < v21; ++v9 )
+      for ( v2->pTextures[v2->sNumTextures].uFlags = 0; v9 < v21; ++v9 )
       {
         if ( !_strcmpi((&Str1)[4 * v9], "New") )
         {
-          v10 = (int)&v2->pTextures[v2->uNumTextures].uFlags;
+          v10 = (int)&v2->pTextures[v2->sNumTextures].uFlags;
           *(char *)v10 |= 2u;
         }
       }
-      ++v2->uNumTextures;
+      ++v2->sNumTextures;
     }
   }
   fclose(File);
   v11 = 0;
-  if ( (signed int)(v2->uNumTextures - 1) > 0 )
+  if ( (signed int)(v2->sNumTextures - 1) > 0 )
   {
     v12 = 0;
     do
@@ -4818,9 +4818,9 @@
       ++v11;
       ++v12;
     }
-    while ( v11 < (signed int)(v2->uNumTextures - 1) );
-  }
-  for ( j = 0; j < (signed int)v2->uNumTextures; *(short *)(Argsa + 16) = v16 )
+    while ( v11 < (signed int)(v2->sNumTextures - 1) );
+  }
+  for ( j = 0; j < (signed int)v2->sNumTextures; *(short *)(Argsa + 16) = v16 )
   {
     v15 = v2->pTextures;
     Argsa = (int)&v15[j];
@@ -11102,7 +11102,7 @@
     if ( a1 <= 782 )
     {
       uTextureID_720980 = pIcons_LOD->LoadTexture("leather", TEXTURE_16BIT_PALETTE);
-      pGUIWindow_ScrollWindow = GUIWindow::Create(0, 0, 640, 480, (enum WindowType)30, v1 - 700, 0);
+      pGUIWindow_ScrollWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Scroll, v1 - 700, 0);
     }
   }
 }