diff mm7_2.cpp @ 89:98cd93e14777

pointer fixes
author zipi
date Wed, 06 Feb 2013 21:19:42 +0000
parents 1faa29fd4c2d
children d61f6bc04bf2
line wrap: on
line diff
--- a/mm7_2.cpp	Mon Feb 04 17:21:02 2013 +0600
+++ b/mm7_2.cpp	Wed Feb 06 21:19:42 2013 +0000
@@ -5067,7 +5067,7 @@
 {
   char *v1; // eax@2
   unsigned int result; // eax@3
-  char *v3; // eax@7
+  Player *v3; // eax@7
   char *v4; // ST24_4@9
   int v5; // eax@9
   char *v6; // eax@10
@@ -5084,7 +5084,7 @@
   unsigned int v18; // [sp+B4h] [bp-1Ch]@5
   unsigned int v19; // [sp+B8h] [bp-18h]@5
   int v20; // [sp+BCh] [bp-14h]@7
-  int i; // [sp+C0h] [bp-10h]@7
+  Player *i; // [sp+C0h] [bp-10h]@7
   GUIFont *pFont; // [sp+C4h] [bp-Ch]@1
   unsigned __int64 v23; // [sp+C8h] [bp-8h]@5
 
@@ -5138,14 +5138,15 @@
     v19 = 1;
   pRenderer->BeginScene();
   pWindow.DrawTitleText(pFont, 1u, 0x23u, 1u, pGlobalTXT_LocalizationStrings[9], 3u);
-  v3 = pParty->pPlayers[0].pName;
+  v3 = pParty->pPlayers;//[0].pName;
   v23 = 0i64;
   v20 = 0;
-  for ( i = (int)pParty->pPlayers[0].pName; ; v3 = (char *)i )
-  {
-    v4 = pClassNames[(unsigned __int8)v3[17]];
-    v5 = ((Player *)(v3 - 168))->GetBaseLevel();
-    sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[129], i, v5, v4);
+  //for ( i = (int)pParty->pPlayers[0].pName; ; v3 = (char *)i )
+  for ( i = pParty->pPlayers; ; v3 = i )
+  {
+	v4 = pClassNames[v3->uClass];
+    v5 = v3->GetBaseLevel();
+	sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[129], i->pName, v5, v4);
     pWindow.DrawTitleText(
       pFont,
       1u,
@@ -5153,10 +5154,10 @@
       1u,
       pTmpBuf,
       3u);
-    v23 += __PAIR__(*(int *)(i - 4), *(int *)(i - 8));
+	v23 += i->uExperience;//__PAIR__(*(int *)(i - 4), *(int *)(i - 8));
     ++v20;
-    i += 6972;
-    if ( i >= (signed int)&pParty->pPickedItem.uNumCharges )
+    ++i;
+	if ( i > &pParty->pPlayers[3] )
       break;
   }
   v23 = (signed __int64)v23 / v19;