diff mm7_2.cpp @ 160:062e8a8e09bc

LoadWindow(work) 30.11.12
author Ritor1
date Fri, 30 Nov 2012 17:29:38 +0600
parents f07a29f328e8
children 62585ad07024
line wrap: on
line diff
--- a/mm7_2.cpp	Fri Nov 30 09:40:51 2012 +0600
+++ b/mm7_2.cpp	Fri Nov 30 17:29:38 2012 +0600
@@ -11428,7 +11428,7 @@
   int v21; // eax@32
   const char *v22; // ST14_4@32
   int v23; // eax@32
-  const char *v24; // edi@36
+  const char *Str; // edi@36
   int v25; // eax@43
   GUIWindow Dst; // [sp+Ch] [bp-78h]@8
   /*unsigned int Dst; // [sp+Ch] [bp-78h]@8
@@ -11472,7 +11472,7 @@
   }
   if ( pSavegameUsedSlots[uLoadGameUI_SelectedSlot] )
   {
-    memset(&Dst, 0, 0x54u);
+    memset(&Dst, 0, 0x54);
     Dst.uFrameX = pGUIWindow_CurrentMenu->uFrameX + 240;
     v4 = pGUIWindow_CurrentMenu->uFrameY - pFontSmallnum->uFontHeight;
     Dst.uFrameWidth = 220;
@@ -11485,14 +11485,11 @@
     v6 = uLoadGameUI_SelectedSlot;
     if (pSavegameThumbnails[uLoadGameUI_SelectedSlot].pPixels)
     {
-      pRenderer->DrawTextureRGB(
-        pGUIWindow_CurrentMenu->uFrameX + 276,
-        pGUIWindow_CurrentMenu->uFrameY + 171,
-        pSavegameThumbnails + uLoadGameUI_SelectedSlot);
+      pRenderer->DrawTextureRGB(pGUIWindow_CurrentMenu->uFrameX + 276, pGUIWindow_CurrentMenu->uFrameY + 171, pSavegameThumbnails + uLoadGameUI_SelectedSlot);
       v6 = uLoadGameUI_SelectedSlot;
     }
     v7 = pMapStats->GetMapInfo(pSavegameHeader[v6].pLocationName);
-    Dst.DrawText2(pFontSmallnum, 0, 0, 0, pMapStats->pInfos[v7].pName, 3u);
+    Dst.DrawText2(pFontSmallnum, 0, 0, 0, pMapStats->pInfos[v7].pName, 3);
     v8 = (signed __int64)(pSavegameHeader[uLoadGameUI_SelectedSlot].uWordTime * 0.234375) / 60;
     HIDWORD(v32) = (unsigned __int64)((signed __int64)(pSavegameHeader[uLoadGameUI_SelectedSlot].uWordTime * 0.234375) / 60) >> 32;
     v9 = v8;
@@ -11539,14 +11536,7 @@
     auto _a = aAMPMNames[HIDWORD(v35)];
     auto _m = aMonthNames[v33];
     sprintf(pTmpBuf, "%s %d:%02d%s\n%d %s %d", _d, v17, (int)32, _a, 3, _m, v36);
-    sprintf(pTmpBuf, "%s %d:%02d%s\n%d %s %d",
-      _d,
-      v17,
-      (int)v32,
-      _a,
-      7 * v16 + HIDWORD(v15) % 7 + 1,
-      _m,
-      v36);
+    sprintf(pTmpBuf, "%s %d:%02d%s\n%d %s %d", _d, v17, (int)v32, _a, 7 * v16 + HIDWORD(v15) % 7 + 1, _m, v36);
     Dst.DrawText2(pFontSmallnum, 0, 0, 0, pTmpBuf, 3u);
     v1 = 255;
   }
@@ -11573,9 +11563,7 @@
     v19 = pFontSmallnum->AlignText_Center(0xBAu, pGlobalTXT_LocalizationStrings[135]);
     pGUIWindow_CurrentMenu->DrawText(pFontSmallnum, v19 + 25, 220, 0, v18, 0, 0, 0);
     v20 = (const char *)(pSavegameHeader + uLoadGameUI_SelectedSlot);
-    v21 = pFontSmallnum->AlignText_Center(
-            0xBAu,
-            (const char *)pSavegameHeader + 100 * uLoadGameUI_SelectedSlot);
+    v21 = pFontSmallnum->AlignText_Center(0xBAu, (const char *)pSavegameHeader + 100 * uLoadGameUI_SelectedSlot);
     pGUIWindow_CurrentMenu->DrawTextInRect(pFontSmallnum, v21 + 25, 0x106u, 0, v20, 185, 0);
     v22 = pGlobalTXT_LocalizationStrings[165];
     v23 = pFontSmallnum->AlignText_Center(0xBAu, pGlobalTXT_LocalizationStrings[165]);
@@ -11589,35 +11577,25 @@
       v34 = uNumSavegameFiles;
     a4 = 199;
     v36 = dword_6A0C9C;
-    v24 = (const char *)(&pSavegameHeader[dword_6A0C9C]);
+    Str = (const char *)(&pSavegameHeader[dword_6A0C9C]);
     do
     {
       if ( v36 >= (signed int)v34 )
         break;
       short clr;
-      HIDWORD(v35) = clr = (v36 == uLoadGameUI_SelectedSlot ? GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(
-                                                         v1,
-                                                         v1,
-                                                         0x64) : 0);
+      HIDWORD(v35) = clr = (v36 == uLoadGameUI_SelectedSlot ? GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(v1, v1, 0x64) : 0);
       if ( pGUIWindow_CurrentMenu->field_40 != 1 || v36 != uLoadGameUI_SelectedSlot )
       {
-        pGUIWindow_CurrentMenu->DrawTextInRect(pFontSmallnum, 0x1Bu, a4, clr, v24, 185, 0);
+        pGUIWindow_CurrentMenu->DrawTextInRect(pFontSmallnum, 0x1B, a4, clr, Str, 185, 0);
       }
       else
       {
-        v25 = pGUIWindow_CurrentMenu->DrawTextInRect(
-                pFontSmallnum,
-                0x1Bu,
-                a4,
-                clr,
-                (const char *)pKeyActionMap->pPressedKeysBuffer,
-                175,
-                1);
+        v25 = pGUIWindow_CurrentMenu->DrawTextInRect(pFontSmallnum, 0x1B, a4, clr, (const char *)pKeyActionMap->pPressedKeysBuffer, 175, 1);
         pGUIWindow_CurrentMenu->DrawFlashingInputCursor(v25 + 27, a4, pFontSmallnum);
       }
       a4 += 21;
       ++v36;
-      v24 += 100;
+      Str += 100;
     }
     while ( a4 < 346 );
   }
@@ -11717,7 +11695,7 @@
   this_.Reset();
   strcpy(this_.LodVersion, "MMVII");
   strcpy(this_.LodDescription, "newmaps for MMVII");
-  this_.dword_0000A4 = 100;
+  this_.LODSize = 100;
   this_.dword_0000A8 = 0;
   a3.dword_000018 = 0;
   a3.word_00001E = 0;