Mercurial > mm7

changeset 241:f305a0ece6ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
MonsterPopup text fixed
author zipi
date Sun, 17 Feb 2013 22:49:12 +0000
parents e9fabaf75628
children 578b4a1e58ba
files mm7_1.cpp
diffstat 1 files changed, 50 insertions(+), 78 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_1.cpp	Sun Feb 17 21:51:35 2013 +0000
+++ b/mm7_1.cpp	Sun Feb 17 22:49:12 2013 +0000
@@ -2853,7 +2853,6 @@
   int v58; // eax@132
   Actor *v59; // ecx@133
   unsigned __int8 v60; // dl@138
-  char *v61; // eax@145
   char *v62; // eax@147
   int v63; // eax@152
   char *result; // eax@152
@@ -2877,27 +2876,8 @@
   DDBLTFX Dst; // [sp+Ch] [bp-1E0h]@18
   DDSURFACEDESC2 pDesc; // [sp+70h] [bp-17Ch]@18
   RECT v84; // [sp+ECh] [bp-100h]@26
-  char *v85; // [sp+FCh] [bp-F0h]@145
-  char *v86; // [sp+100h] [bp-ECh]@145
-  char *v87; // [sp+104h] [bp-E8h]@145
-  char *v88; // [sp+108h] [bp-E4h]@145
-  char *v89; // [sp+10Ch] [bp-E0h]@145
-  char *v90; // [sp+110h] [bp-DCh]@145
-  char *v91; // [sp+114h] [bp-D8h]@145
-  char *v92; // [sp+118h] [bp-D4h]@145
-  char *v93; // [sp+11Ch] [bp-D0h]@145
-  char *v94; // [sp+120h] [bp-CCh]@145
-  char *v95; // [sp+124h] [bp-C8h]@127
-  char *v96; // [sp+128h] [bp-C4h]@127
-  char *v97; // [sp+12Ch] [bp-C0h]@127
-  char *v98; // [sp+130h] [bp-BCh]@127
-  char *v99; // [sp+134h] [bp-B8h]@127
-  char *v100; // [sp+138h] [bp-B4h]@127
-  char *v101; // [sp+13Ch] [bp-B0h]@127
-  char *v102; // [sp+140h] [bp-ACh]@127
-  char *v103; // [sp+144h] [bp-A8h]@127
-  char *v104; // [sp+148h] [bp-A4h]@127
-  char *v105; // [sp+14Ch] [bp-A0h]@127
+  char *v85[10]; // [sp+FCh] [bp-F0h]@145
+  char *v95[11]; // [sp+124h] [bp-C8h]@127
   RenderBillboardTransform_local0 v106; // [sp+150h] [bp-9Ch]@3
   unsigned int v107; // [sp+1A0h] [bp-4Ch]@18
   unsigned __int16 *v108; // [sp+1A4h] [bp-48h]@34
@@ -2976,7 +2956,7 @@
   v10 = pSpriteFrameTable->GetFrame(
           v3->pSpriteIDs[(signed __int16)pMonsterInfoUI_Doll.uCurrentActionAnimation],
           pMonsterInfoUI_Doll.uCurrentActionTime);
-  v11 = 40 * v10->pHwSpriteIDs[0] + 7218180;
+  v11 = (int)pSprites_LOD[v10->pHwSpriteIDs[0]].pSpriteHeaders;//40 * v10->pHwSpriteIDs[0] + 7218180;
   v106.pTarget = pRenderer->pTargetSurface;
   v106.pTargetZ = pRenderer->pActiveZBuffer;
   v106.uTargetPitch = pRenderer->uTargetSurfacePitch;
@@ -3432,51 +3412,48 @@
   a4 = (char *)v106.uViewportY;
   if ( v119 )
   {
-    __debugbreak(); // following format strings are decompiled incorrectly
-    sprintf(pTmpBuf, "%s", pGlobalTXT_LocalizationStrings[108], 0, v121->pMonsterInfo.uHP);
+    sprintf(pTmpBuf, "%s\f%05u\t100%d\n", pGlobalTXT_LocalizationStrings[108], 0, v121->pMonsterInfo.uHP);
     a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
     a4 = &a4[LOBYTE(v56->uFontHeight) - 3];
     v79 = v121->pMonsterInfo.uAC;
     v75 = 0;
     v70 = pGlobalTXT_LocalizationStrings[12];
-    v67 = "%s";
+    v67 = "%s\f%05u\t100%d\n";
   }
   else
   {
-    __debugbreak(); // following format strings are decompiled incorrectly
-    sprintf(pTmpBuf, "%s", pGlobalTXT_LocalizationStrings[108], 0, pGlobalTXT_LocalizationStrings[630]);
+    sprintf(pTmpBuf, "%s\f%05u\t100%s\n", pGlobalTXT_LocalizationStrings[108], 0, pGlobalTXT_LocalizationStrings[630]);
     a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
     v79 = (unsigned int)pGlobalTXT_LocalizationStrings[630];
     v75 = 0;
     v70 = pGlobalTXT_LocalizationStrings[12];
     a4 = &a4[LOBYTE(v56->uFontHeight) - 3];
-    v67 = "%s";
+    v67 = "%s\f%05u\t100%s\n";
   }
   sprintf(pTmpBuf, v67, v70, v75, v79);
   a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
   a4 = &a4[LOBYTE(v56->uFontHeight) - 6] + LOBYTE(v56->uFontHeight);
-  v95 = pGlobalTXT_LocalizationStrings[87];
-  v96 = pGlobalTXT_LocalizationStrings[6];
-  v97 = pGlobalTXT_LocalizationStrings[240];
-  v98 = pGlobalTXT_LocalizationStrings[70];
-  v99 = pGlobalTXT_LocalizationStrings[624];
-  v100 = pGlobalTXT_LocalizationStrings[138];
-  v101 = pGlobalTXT_LocalizationStrings[214];
-  v102 = pGlobalTXT_LocalizationStrings[142];
-  v103 = pGlobalTXT_LocalizationStrings[29];
-  v104 = pGlobalTXT_LocalizationStrings[133];
-  v105 = pGlobalTXT_LocalizationStrings[54];
+  v95[0] = pGlobalTXT_LocalizationStrings[87];
+  v95[1] = pGlobalTXT_LocalizationStrings[6];
+  v95[2] = pGlobalTXT_LocalizationStrings[240];
+  v95[3] = pGlobalTXT_LocalizationStrings[70];
+  v95[4] = pGlobalTXT_LocalizationStrings[624];
+  v95[5] = pGlobalTXT_LocalizationStrings[138];
+  v95[6] = pGlobalTXT_LocalizationStrings[214];
+  v95[7] = pGlobalTXT_LocalizationStrings[142];
+  v95[8] = pGlobalTXT_LocalizationStrings[29];
+  v95[9] = pGlobalTXT_LocalizationStrings[133];
+  v95[10] = pGlobalTXT_LocalizationStrings[54];
   if ( v116 )
   {
-    __debugbreak(); // following format strings are decompiled incorrectly
-    sprintf(pTmpBuf, "%s", pGlobalTXT_LocalizationStrings[18], 0, (&v95)[4 * v121->pMonsterInfo.uAttack1Type]);
+    sprintf(pTmpBuf, "%s\f%05u\t080%s\n", pGlobalTXT_LocalizationStrings[18], 0, v95[v121->pMonsterInfo.uAttack1Type]);
     a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
     a4 = &a4[LOBYTE(v56->uFontHeight) - 3];
     v57 = v121->pMonsterInfo.uAttack1DamageBonus;
     if ( v57 )
       sprintf(
         pTmpBuf,
-        "%s",
+        "%s\f%05u\t080%dd%d+%d\n",
         pGlobalTXT_LocalizationStrings[53],
         0,
         v121->pMonsterInfo.uAttack1DamageDiceRolls,
@@ -3485,7 +3462,7 @@
     else
       sprintf(
         pTmpBuf,
-        "%s",
+        "%s\f%05u\t080%dd%d\n",
         pGlobalTXT_LocalizationStrings[53],
         0,
         v121->pMonsterInfo.uAttack1DamageDiceRolls,
@@ -3493,11 +3470,10 @@
   }
   else
   {
-    __debugbreak(); // following format strings are decompiled incorrectly
-    sprintf(pTmpBuf, "%s", pGlobalTXT_LocalizationStrings[18], 0, pGlobalTXT_LocalizationStrings[630]);
+    sprintf(pTmpBuf, "%s\f%05u\t080%s\n", pGlobalTXT_LocalizationStrings[18], 0, pGlobalTXT_LocalizationStrings[630]);
     a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
     a4 = &a4[LOBYTE(v56->uFontHeight) - 3];
-    sprintf(pTmpBuf, "%s", pGlobalTXT_LocalizationStrings[53], 0, pGlobalTXT_LocalizationStrings[630]);
+    sprintf(pTmpBuf, "%s\f%05u\t080%s\n", pGlobalTXT_LocalizationStrings[53], 0, pGlobalTXT_LocalizationStrings[630]);
   }
   a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
   v58 = LOBYTE(v56->uFontHeight);
@@ -3507,7 +3483,7 @@
     v80 = pGlobalTXT_LocalizationStrings[630];
     v76 = 0;
     v71 = pGlobalTXT_LocalizationStrings[628];
-    v68 = "%s";
+    v68 = "%s\f%05u\t080%s\n";
     goto LABEL_144;
   }
   v120 = (SpellBuff *)pGlobalTXT_LocalizationStrings[628];
@@ -3517,7 +3493,7 @@
     v120 = (SpellBuff *)pGlobalTXT_LocalizationStrings[629];
   if ( v114 )
   {
-    sprintf(pTmpBuf, "%s", v120, 0, pSpellStats->pInfos[v114].pShortName);
+    sprintf(pTmpBuf, "%s\f%05u\t060%s\n", v120, 0, pSpellStats->pInfos[v114].pShortName);
     a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
     v58 = LOBYTE(v56->uFontHeight);
     a4 = &a4[v58 - 3];
@@ -3526,9 +3502,7 @@
   v60 = v59->pMonsterInfo.uSpell2ID;
   if ( v60 )
   {
-    __debugbreak();
-    const char *fmt = "\xC\x25\x30\x35\x75\x9\x30\x36\x30\x25\x73\n";
-    sprintf(pTmpBuf, fmt, 0, pSpellStats->pInfos[v60].pShortName);
+    sprintf(pTmpBuf, "\f%05u\t060%s\n", 0, pSpellStats->pInfos[v60].pShortName);
     a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
     v58 = LOBYTE(v56->uFontHeight);
     a4 = &a4[v58 - 3];
@@ -3539,7 +3513,7 @@
     v80 = pGlobalTXT_LocalizationStrings[153];
     v76 = 0;
     v71 = pGlobalTXT_LocalizationStrings[628];
-    v68 = "%s";
+    v68 = "%s\f%05u\t060%s\n";
 LABEL_144:
     sprintf(pTmpBuf, v68, v71, v76, v80);
     a1->DrawText(v56, 150, (int)a4, a5, pTmpBuf, 0, 0, 0);
@@ -3549,33 +3523,32 @@
   a4 = &a4[v58 - 3];
   a1->DrawText(v56, 150, (int)a4, a5, pGlobalTXT_LocalizationStrings[626], 0, 0, 0);
   a4 = &a4[LOBYTE(v56->uFontHeight) - 3];
-  v85 = pGlobalTXT_LocalizationStrings[87];
-  v86 = pGlobalTXT_LocalizationStrings[6];
-  v87 = pGlobalTXT_LocalizationStrings[240];
-  v88 = pGlobalTXT_LocalizationStrings[70];
-  v89 = pGlobalTXT_LocalizationStrings[142];
-  v90 = pGlobalTXT_LocalizationStrings[214];
-  v91 = pGlobalTXT_LocalizationStrings[29];
-  v92 = pGlobalTXT_LocalizationStrings[133];
-  v93 = pGlobalTXT_LocalizationStrings[54];
-  v94 = pGlobalTXT_LocalizationStrings[624];
-  v96 = (char *)v121->pMonsterInfo.uResFire;
-  v97 = (char *)v121->pMonsterInfo.uResAir;
-  v98 = (char *)v121->pMonsterInfo.uResWater;
-  v99 = (char *)v121->pMonsterInfo.uResEarth;
-  v100 = (char *)v121->pMonsterInfo.uResMind;
-  v101 = (char *)v121->pMonsterInfo.uResSpirit;
-  v102 = (char *)v121->pMonsterInfo.uResBody;
-  v103 = (char *)v121->pMonsterInfo.uResLight;
-  v61 = (char *)v121->pMonsterInfo.uResPhysical;
-  v104 = (char *)v121->pMonsterInfo.uResDark;
-  v105 = v61;
+  v85[0] = pGlobalTXT_LocalizationStrings[87];
+  v85[1] = pGlobalTXT_LocalizationStrings[6];
+  v85[2] = pGlobalTXT_LocalizationStrings[240];
+  v85[3] = pGlobalTXT_LocalizationStrings[70];
+  v85[4] = pGlobalTXT_LocalizationStrings[142];
+  v85[5] = pGlobalTXT_LocalizationStrings[214];
+  v85[6] = pGlobalTXT_LocalizationStrings[29];
+  v85[7] = pGlobalTXT_LocalizationStrings[133];
+  v85[8] = pGlobalTXT_LocalizationStrings[54];
+  v85[9] = pGlobalTXT_LocalizationStrings[624];
+  v95[1] = (char *)v121->pMonsterInfo.uResFire;
+  v95[2] = (char *)v121->pMonsterInfo.uResAir;
+  v95[3] = (char *)v121->pMonsterInfo.uResWater;
+  v95[4] = (char *)v121->pMonsterInfo.uResEarth;
+  v95[5] = (char *)v121->pMonsterInfo.uResMind;
+  v95[6] = (char *)v121->pMonsterInfo.uResSpirit;
+  v95[7] = (char *)v121->pMonsterInfo.uResBody;
+  v95[8] = (char *)v121->pMonsterInfo.uResLight;
+  v95[9] = (char *)v121->pMonsterInfo.uResPhysical;
+  v95[10] = (char *)v121->pMonsterInfo.uResDark;
   if ( v112 )
   {
     v124 = 0;
     do
     {
-      v62 = (&v96)[v124];
+      v62 = v95[v124+1];
       if ( v62 == (char *)200 )
       {
         v81 = pGlobalTXT_LocalizationStrings[625];
@@ -3587,7 +3560,7 @@
         else
           v81 = pGlobalTXT_LocalizationStrings[153];
       }
-      sprintf(pTmpBuf, "%s", (&v85)[v124], 0, v81);
+      sprintf(pTmpBuf, "%s\f%05u\t070%s\n", v85[v124], 0, v81);
       a1->DrawText(v56, 170, (int)a4, a5, pTmpBuf, 0, 0, 0);
       v63 = LOBYTE(v56->uFontHeight);
       v124 += 4;
@@ -3601,8 +3574,7 @@
     i = 0;
     do
     {
-      __debugbreak(); // string argument is decompiled incorrectry
-      sprintf(pTmpBuf, "%s", (&v85)[4 * i], 0, pGlobalTXT_LocalizationStrings[630]); // "?"
+      sprintf(pTmpBuf, "%s\f%05u\t070%s\n", v85[i], 0, pGlobalTXT_LocalizationStrings[630]); // "?"
       a1->DrawText(v56, 170, (int)a4, a5, pTmpBuf, 0, 0, 0);
       v65 = LOBYTE(v56->uFontHeight);
       ++i;