diff mm7_5.cpp @ 244:bb9e946cbcbf

cleaning, ring fixed
author zipi
date Sun, 17 Feb 2013 23:59:30 +0000
parents a6a8fa73b4ec
children fb8a876f41e1
line wrap: on
line diff
--- a/mm7_5.cpp	Sun Feb 17 23:40:46 2013 +0000
+++ b/mm7_5.cpp	Sun Feb 17 23:59:30 2013 +0000
@@ -8586,7 +8586,7 @@
   unsigned int v1; // ebx@1
   Player *pPlayer; // edi@1
   int v3; // ecx@1
-  int v4; // edi@3
+  int *v4; // edi@3
   unsigned int v5; // ebx@3
   int v6; // eax@3
   LODFile_IconsBitmaps *v7; // ecx@7
@@ -8628,7 +8628,7 @@
   int v43; // [sp+10h] [bp-20h]@47
   unsigned int a3; // [sp+14h] [bp-1Ch]@3
   unsigned int a2; // [sp+18h] [bp-18h]@3
-  int v46; // [sp+1Ch] [bp-14h]@1
+  unsigned int *v46; // [sp+1Ch] [bp-14h]@1
   Player *v47; // [sp+20h] [bp-10h]@1
   int v48; // [sp+24h] [bp-Ch]@1
   int v49; // [sp+24h] [bp-Ch]@26
@@ -8643,17 +8643,17 @@
   pRenderer->DrawTextureIndexed(pCharacterScreen_DetalizBtn->uX, pCharacterScreen_DetalizBtn->uY,
     (Texture *)(uTextureID_5118C8 != -1 ? &pIcons_LOD->pTextures[uTextureID_5118C8] : 0));
   v3 = 0;
-  v46 = (int)&pPlayer->pEquipment.field_28;
+  v46 = &pPlayer->pEquipment.field_28;
   v48 = 0;
   do
   {
-    if ( !*(int *)v46 )
+    if ( !*v46 )
       goto LABEL_24;
-    v39 = *(int *)v46;
-    v4 = (int)&pPlayer->spellbook.pDarkSpellbook.bIsSpellAvailable[36 * *(int *)v46 + 5];
+    v39 = *v46;
+	v4 = (int *)&pPlayer->pInventoryItems[*v46-1].uItemID;
     a3 = pPaperdollRingsY[v3];
     a2 = pPaperdollRingsX[v3];
-    v5 = pIcons_LOD->LoadTexture(pItemsTable->pItems[*(int *)v4].pIconName, TEXTURE_16BIT_PALETTE);
+    v5 = pIcons_LOD->LoadTexture(pItemsTable->pItems[*v4].pIconName, TEXTURE_16BIT_PALETTE);
     v6 = *(int *)(v4 + 20);
     if ( *(int *)(v4 + 20) & 0xF0 )
     {