diff GameUIs.cpp @ 454:5e5dfedcc0ad

Слияние
author Ritor1
date Sun, 24 Feb 2013 09:18:17 +0600
parents 88c30918eef7
children 797e1ec9fb83
line wrap: on
line diff
--- a/GameUIs.cpp	Sun Feb 24 09:18:03 2013 +0600
+++ b/GameUIs.cpp	Sun Feb 24 09:18:17 2013 +0600
@@ -35,7 +35,6 @@
   uDialogueType_ = uDialogueType;
   dword_6BE138 = -1;
   ++pIcons_LOD->uTexturePacksCount;
-  v16 = 0;
   if ( !pIcons_LOD->uNumPrevLoadedFiles )
     pIcons_LOD->uNumPrevLoadedFiles = pIcons_LOD->uNumLoadedFiles;
   memset(pSavegameUsedSlots, 0, sizeof(pSavegameUsedSlots));
@@ -82,11 +81,7 @@
   //v3 = 0;
   for (uint i = 0; i < uNumSavegameFiles; ++i)
   {
-    //Dest = pSavegameHeader;
-    //pTex = pSavegameThumbnails;
-    //Str1 = (const char *)pSavegameList->pSavesNames;
-    //while ( 1 )
-    //{
+   
     sprintf(pTmpBuf, "saves\\%s", pSavegameList->pFileList[i].pSaveFileName);
     if (_access(pTmpBuf, 6))
     {
@@ -112,33 +107,20 @@
       pLODFile.CloseWriteFile();
       pSavegameUsedSlots[i] = 1;
     }
-//LABEL_23:
-      //Str1 += 280;
-      //++pTex;
-      //++Dest;
-      //++v3;
-      //if ( v3 >= (signed int)uNumSavegameFiles )
-      //  goto LABEL_24;
-    //}
-    //goto LABEL_22;
   }
 
 //LABEL_24:
   pLODFile.FreeSubIndexAndIO();
   if ( pCurrentScreen == SCREEN_SAVEGAME )
   {
-    v6 = pIcons_LOD->LoadTexture("x_d", TEXTURE_16BIT_PALETTE);
-    v10 = (TEXTURE_TYPE)2;
-    v8 = "LS_saveD";
+    uTextureID_x_d = pIcons_LOD->LoadTexture("x_d", TEXTURE_16BIT_PALETTE);
+    uTextureID_LS_ = pIcons_LOD->LoadTexture("LS_saveD",TEXTURE_16BIT_PALETTE);
   }
   else
   {
-    v6 = pIcons_LOD->LoadTexture("x_d", TEXTURE_16BIT_PALETTE);
-    v10 = (TEXTURE_TYPE)2;
-    v8 = "LS_loadD";
+    uTextureID_x_d = pIcons_LOD->LoadTexture("x_d", TEXTURE_16BIT_PALETTE);
+    uTextureID_LS_ = pIcons_LOD->LoadTexture("LS_loadD",TEXTURE_16BIT_PALETTE);
   }
-  uTextureID_x_d = v6;
-  uTextureID_LS_ = pIcons_LOD->LoadTexture(v8, v10);
   uTextureID_AR_UP_DN = pIcons_LOD->LoadTexture("AR_UP_DN", TEXTURE_16BIT_PALETTE);
   uTextureID_AR_DN_DN = pIcons_LOD->LoadTexture("AR_DN_DN", TEXTURE_16BIT_PALETTE);
   pGUIWindow_CurrentMenu->CreateButton(21, 198, 191, 18, 1, 0, 0xA5, 0, 0, "", 0);
@@ -156,8 +138,7 @@
                  (Texture *)(uTextureID_AR_UP_DN != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_AR_UP_DN] : 0), 0);
   pBtnDownArrow = pGUIWindow_CurrentMenu->CreateButton(215, 0x143, 0x11, 0x11, 1, 0, 0xA3, uNumSavegameFiles, 0, "",
          (Texture *)(uTextureID_AR_DN_DN != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_AR_DN_DN] : 0), 0);
-  v16 = -1;
-  //ptr_69BD58 = v7;
+
 }
 
 //----- (0045E93E) --------------------------------------------------------