diff mm7_4.cpp @ 249:9a8d37c07e50

.
author Nomad
date Mon, 18 Feb 2013 07:13:20 +0200
parents 37dcbe8f3cca
children 83f85ab6079a
line wrap: on
line diff
--- a/mm7_4.cpp	Mon Feb 18 07:11:43 2013 +0200
+++ b/mm7_4.cpp	Mon Feb 18 07:13:20 2013 +0200
@@ -4892,21 +4892,21 @@
   char a1[100]; // [sp+B8h] [bp-80h]@3
   unsigned int v59; // [sp+11Ch] [bp-1Ch]@3
   size_t v60; // [sp+120h] [bp-18h]@3
-  Player *v61; // [sp+124h] [bp-14h]@3
-  char *Str; // [sp+128h] [bp-10h]@1
+  //Player *v61; // [sp+124h] [bp-14h]@3
+  //char *Str; // [sp+128h] [bp-10h]@1
   int v63; // [sp+12Ch] [bp-Ch]@32
   int v64; // [sp+130h] [bp-8h]@6
   NPCData *v65; // [sp+134h] [bp-4h]@6
 
   v6 = uPlayerID;
-  Str = lpsz;
+  //Str = lpsz;
   if ( IsBadStringPtrA(lpsz, 1u) )
     return "Invalid String Passed";
-  v60 = strlen(Str);
+  v60 = strlen(lpsz);
   a1[0] = 0;
   pPlayer = &pParty->pPlayers[v6];
   v59 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(255, 255, 155);
-  v61 = pPlayer;
+  //v61 = pPlayer;
   memset(pTmpBuf2, 0, 0x7D0u);
   if ( dword_5C35D4 )
   {
@@ -4925,7 +4925,7 @@
     v13 = a3;
     while ( 1 )
     {
-      v14 = Str[v12];
+      v14 = lpsz[v12];
       if ( v14 == 37 )
         break;
       pTmpBuf2[v10++] = v14;
@@ -4935,8 +4935,8 @@
       if ( v12 >= (signed int)v60 )
         return pTmpBuf2;
     }
-    v15 = &Str[v12 + 1];
-    v16 = (unsigned __int8)Str[v12 + 2];
+    v15 = &lpsz[v12 + 1];
+    v16 = (unsigned __int8)lpsz[v12 + 2];
     v17 = v16 + 10 * (unsigned __int8)*v15 - 528;
     if ( v17 <= 15 )
     {
@@ -4987,7 +4987,7 @@
           case 0x218:
             v19 = 0;
             v63 = 0;
-            v20 = (unsigned __int8 *)v61->field_152;
+            v20 = (unsigned __int8 *)pPlayer->field_152;
             do
             {
               if ( (unsigned __int16)_449B57_test_bit(v20, word_4EE150[v19]) )
@@ -5015,7 +5015,7 @@
             {
               v11 = (char *)pNPCTopics[55].pText;
             }
-            pPlayer = v61;
+            //pPlayer = v61;
             v13 = a3;
             goto LABEL_118;
           case 0x21A: