Mercurial > mm7

changeset 125:b5c3f448cd74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pPaperdollRings
author Ritor1
date Mon, 11 Feb 2013 21:09:13 +0600
parents eeb0a8222d59
children fa3b930d0ccf
files mm7_5.cpp mm7_data.cpp mm7_data.h
diffstat 3 files changed, 8 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_5.cpp	Mon Feb 11 19:13:38 2013 +0600
+++ b/mm7_5.cpp	Mon Feb 11 21:09:13 2013 +0600
@@ -8634,10 +8634,8 @@
   v47 = pPlayers[uPlayerID];
   pIcons_LOD->LoadTexture("sptext01", TEXTURE_16BIT_PALETTE);
   CharacterUI_DrawPaperdoll(v1);
-  pRenderer->DrawTextureTransparent(0x1D9u, 0,
-    (Texture *)(uTextureID_BACKHAND != -1 ? &pIcons_LOD->pTextures[uTextureID_BACKHAND] : 0));
-  pRenderer->DrawTextureTransparent(0x1D4u, 0,
-    (Texture *)(uTextureID_507B04 != -1 ? &pIcons_LOD->pTextures[uTextureID_507B04] : 0));
+  pRenderer->DrawTextureTransparent(0x1D9u, 0, (Texture *)(uTextureID_BACKHAND != -1 ? &pIcons_LOD->pTextures[uTextureID_BACKHAND] : 0));
+  pRenderer->DrawTextureTransparent(0x1D4u, 0, (Texture *)(uTextureID_507B04 != -1 ? &pIcons_LOD->pTextures[uTextureID_507B04] : 0));
   pRenderer->DrawTextureIndexed(pCharacterScreen_DetalizBtn->uX, pCharacterScreen_DetalizBtn->uY,
     (Texture *)(uTextureID_5118C8 != -1 ? &pIcons_LOD->pTextures[uTextureID_5118C8] : 0));
   v3 = 0;
@@ -8649,8 +8647,8 @@
       goto LABEL_24;
     v39 = *(int *)v46;
     v4 = (int)&pPlayer->spellbook.pDarkSpellbook.bIsSpellAvailable[36 * *(int *)v46 + 5];
-    a3 = *(int *)((char *)dword_4E5C34 + v3);
-    a2 = *(int *)((char *)dword_4E5C1C + v3);
+    a3 = pPaperdollRingsX[v3];
+    a2 = pPaperdollRingsX[v3];
     v5 = pIcons_LOD->LoadTexture(pItemsTable->pItems[*(int *)v4].pIconName, TEXTURE_16BIT_PALETTE);
     v6 = *(int *)(v4 + 20);
     if ( *(int *)(v4 + 20) & 0xF0 )
--- a/mm7_data.cpp	Mon Feb 11 19:13:38 2013 +0600
+++ b/mm7_data.cpp	Mon Feb 11 21:09:13 2013 +0600
@@ -701,8 +701,8 @@
   0x1F, 0xB8,
 };
 int pPaperdollLeftEmptyHand[8];
-int dword_4E5C1C[6];
-int dword_4E5C34[6];
+int pPaperdollRingsX[6] = {0x1EA, 0x21A, 0x248, 0x1EA, 0x21A, 0x248};
+int pPaperdollRingsY[6] = {0x0CA, 0x0CA, 0x0CA, 0x0FA, 0x0FA, 0x0FA};
 char aItem092v3[777]; // idb
 char aIbCd5D[777]; // idb
 char aAr_dn_dn[777]; // idb
--- a/mm7_data.h	Mon Feb 11 19:13:38 2013 +0600
+++ b/mm7_data.h	Mon Feb 11 21:09:13 2013 +0600
@@ -648,8 +648,8 @@
 extern int pPaperdoll_SecondLeftHand[8];
 extern int pPaperdoll_RightHand[8];
 extern int pPaperdollLeftEmptyHand[8];
-extern int dword_4E5C1C[6];
-extern int dword_4E5C34[6];
+extern int pPaperdollRingsX[6];
+extern int pPaperdollRingsY[6];
 extern char aItem092v3[]; // idb
 extern char aIbCd5D[]; // idb
 extern char aAr_dn_dn[]; // idb