diff mm7_2.cpp @ 467:5d2667144526

m
author Ritor1
date Mon, 25 Feb 2013 11:09:55 +0600
parents 91e1ba340f39
children 8822405efad2
line wrap: on
line diff
--- a/mm7_2.cpp	Mon Feb 25 09:09:08 2013 +0600
+++ b/mm7_2.cpp	Mon Feb 25 11:09:55 2013 +0600
@@ -3709,7 +3709,7 @@
 }
 
 //----- (004BCACC) --------------------------------------------------------
-void __fastcall sub_4BCACC_bounties(signed int a1)
+void __fastcall DrawLearnSkillDialog(signed int uMessageParam)
 {
   unsigned int v1; // edi@1
   //signed int v2; // ebx@1
@@ -3779,7 +3779,7 @@
     goto LABEL_13;
   if ( dword_F8B198 == 30 )
   {
-    if ( a1 == 17 )
+    if ( uMessageParam == 17 )
     {
       v4 = 0;
       v5 = 0;
@@ -3799,8 +3799,8 @@
   }
   v8 = window_SpeakInHouse;
   if ( (dword_F8B198 == 27 || dword_F8B198 == 28)
-    && (v1 = 0, *(&byte_4F09B1[32 * (unsigned __int8)*(&byte_4F0CCF[4 * (unsigned int)window_SpeakInHouse->ptr_1C] + a1)] + pParty->uDaysPlayed % 7))
-    || dword_F8B198 != 23 || a1 != 10 )
+    && (v1 = 0, *(&byte_4F09B1[32 * (unsigned __int8)*(&byte_4F0CCF[4 * (unsigned int)window_SpeakInHouse->ptr_1C] + uMessageParam)] + pParty->uDaysPlayed % 7))
+    || dword_F8B198 != 23 || uMessageParam != 10 )
   {
 LABEL_9:
     pDialogueWindow->Release();
@@ -3820,7 +3820,7 @@
     goto LABEL_10;
   }
 LABEL_11:
-  dword_F8B19C = a1;
+  dword_F8B19C = uMessageParam;
   if ( dword_F8B198 < 19 )
   {
     v9 = pIcons_LOD->LoadTexture(off_4F03B8[dword_F8B198], TEXTURE_16BIT_PALETTE);
@@ -3886,7 +3886,7 @@
         }
         if ( dword_F8B198 != 17 )
           return;
-        if ( a1 == 99 )
+        if ( uMessageParam == 99 )
         {
           v10 = (int)((char *)v8->ptr_1C - 102);
           v56 = v10;
@@ -4084,7 +4084,7 @@
           }
           goto LABEL_196;
         }
-        if ( a1 == 100 )
+        if ( uMessageParam == 100 )
         {
           pKeyActionMap->EnterText(1, 10, v8);
           goto LABEL_196;
@@ -4092,10 +4092,10 @@
       }
     }
   }
-  if ( a1 > 95 )
+  if ( uMessageParam > 95 )
   {
 LABEL_196:
-    switch ( a1 )
+    switch ( uMessageParam )
     {
       case 96:
         pDialogueWindow->eWindowType = WINDOW_MainMenu;
@@ -4127,25 +4127,25 @@
     }
     return;
   }
-  if ( a1 != 95 && a1 != 2 )
-  {
-    if ( a1 == 3 )
+  if ( uMessageParam != 95 && uMessageParam != 2 )
+  {
+    if ( uMessageParam == 3 )
     {
       dword_F8B19C = 3;
     }
     else
     {
-      if ( a1 == 4 )
+      if ( uMessageParam == 4 )
       {
         dword_F8B19C = 4;
       }
       else
       {
-        if ( a1 != 5 )
-        {
-          if ( a1 > 35 )
-          {
-            if ( a1 <= 72 )
+        if ( uMessageParam != 5 )
+        {
+          if ( uMessageParam > 35 )
+          {
+            if ( uMessageParam <= 72 )
             {
               v35 = pPlayers[uActiveCharacter];
               //v36 = (signed __int64)(*(float *)&p2DEvents_minus1__24[13 * (unsigned int)v8->ptr_1C] * 500.0);
@@ -4164,7 +4164,7 @@
               if (false)
               //if ( *(&byte_4ED94C[37 * v35->uClass] + v55) )
               {
-                v38 = (int)(&v35->uIntelligence + a1);
+                v38 = (int)(&v35->uIntelligence + uMessageParam);
                 if ( !*(short *)v38 )
                 {
                   if ( pParty->uNumGold < v37 )
@@ -4188,7 +4188,7 @@
             }
             else
             {
-              if ( a1 == 94 )
+              if ( uMessageParam == 94 )
               {
                 pDialogueWindow->eWindowType = WINDOW_MainMenu;
                 UI_CreateEndConversationButton();
@@ -4224,7 +4224,7 @@
   v43 = 0;
   //v44 = p2DEvents_minus1___00[26 * (unsigned int)v8->ptr_1C];
   v44 = p2DEvents[(unsigned int)v8->ptr_1C - 1].uType;
-  if ( a1 == 2 )
+  if ( uMessageParam == 2 )
   {
     if ( _4F063C_smthn_by_2da_uType[v44] )
     {