Mercurial > mm7

diff mm7_5.cpp @ 359:57d81602e72c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 21 Feb 2013 17:24:15 +0600
parents 4a236657a0be b07cf89108d5
children 38bfbee60146 2bc1c8d68f41
line wrap: on
line diff
--- a/mm7_5.cpp	Thu Feb 21 17:23:53 2013 +0600
+++ b/mm7_5.cpp	Thu Feb 21 17:24:15 2013 +0600
@@ -13669,15 +13669,15 @@
           }
           if ( v6->pLevelOfDetail0 )
           {
-            v7 = 2 * (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v4]);
-            v19 = pViewport->uViewportY + dword_4E20D0[v7 + 1];
-            v17 = pViewport->uViewportX + dword_4E20D0[v7];
+            v7 =  (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v4]);
+            v19 = pViewport->uViewportY + pIconPos[v7].Ypos;
+            v17 = pViewport->uViewportX + pIconPos[v7].Xpos;
             if ( BYTE1(v6->pBits) & 2 )
               pRenderer->DrawTextureTransparent(v17, v19, v6);
             else
               pRenderer->DrawTextureIndexed(v17, v19, v6);
-            v8 = 2 * (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v4]);
-            pRenderer->_4A612A(dword_4E20D0[v8], dword_4E20D0[v8 + 1], v23, v4);
+            v8 = (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v4]);
+            pRenderer->_4A612A(pIconPos[v8].Xpos,pIconPos[v8].Ypos, v23, v4);
           }
         }
       }
@@ -13693,9 +13693,9 @@
     if ( v11->pLevelOfDetail0 )
     {
       v21 = dword_5063D8[v10];
-      v12 = 2 * (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v10]);
-      v20 = pViewport->uViewportY + dword_4E20D0[v12 + 1];
-      v18 = pViewport->uViewportX + dword_4E20D0[v12];
+      v12 = (12 * v0->lastOpenedSpellbookPage + pSpellbookSpellIndices[v0->lastOpenedSpellbookPage][v10]);
+      v20 = pViewport->uViewportY + pIconPos[v12].Ypos;
+      v18 = pViewport->uViewportX + pIconPos[v12].Xpos;
       if ( BYTE1(v11->pBits) & 2 )
         pRenderer->DrawTextureTransparent(v18, v20, v21);
       else