diff mm7_4.cpp @ 267:ac44e716d051

DrawDialogueUI logic restored
author Nomad
date Mon, 18 Feb 2013 10:55:38 +0200
parents fb890fb66cad
children 4776715a964b 640a176c030f ada52edca264
line wrap: on
line diff
--- a/mm7_4.cpp	Mon Feb 18 10:06:38 2013 +0200
+++ b/mm7_4.cpp	Mon Feb 18 10:55:38 2013 +0200
@@ -9507,7 +9507,7 @@
       {
         if ( dword_F8B1A8 )
         {
-          Party::TakeGold(dword_F8B1B4);
+          Party::TakeGold(gold_transaction_amount);
           if ( uActiveCharacter )
           {
             v12 = (char *)&pPlayers[uActiveCharacter]->pActiveSkills[dword_F8B1AC_something_todo_with_awards];
@@ -9542,7 +9542,7 @@
       {
         if ( a1 == 82 && dword_F8B1A8 )
         {
-          Party::TakeGold(dword_F8B1B4);
+          Party::TakeGold(gold_transaction_amount);
           v4 = pParty->pPlayers;
           do
           {
@@ -9721,21 +9721,21 @@
   {
     if ( v2 == 1 )
     {
-      dword_F8B1B4 = 5000;
+      gold_transaction_amount = 5000;
       dword_F8B1B0 = 3;
     }
     else
     {
       if ( v2 == 2 )
       {
-        dword_F8B1B4 = 8000;
+        gold_transaction_amount = 8000;
         dword_F8B1B0 = 4;
       }
     }
   }
   else
   {
-    dword_F8B1B4 = 2000;
+    gold_transaction_amount = 2000;
     dword_F8B1B0 = 2;
   }
   v5 = v1->classType;
@@ -9824,7 +9824,7 @@
           case 16:
           case 17:
           case 18:
-            dword_F8B1B4 = 4000;
+            gold_transaction_amount = 4000;
             goto LABEL_42;
           case 19:
             v19 = 114;
@@ -9839,7 +9839,7 @@
             v20 = v1->GetBaseWillpower();
             goto LABEL_61;
           case 24:
-            dword_F8B1B4 = 2500;
+            gold_transaction_amount = 2500;
             v20 = v1->GetBaseEndurance();
             goto LABEL_61;
           case 36:
@@ -9856,13 +9856,13 @@
           case 32:
           case 34:
           case 35:
-            dword_F8B1B4 = 2500;
+            gold_transaction_amount = 2500;
             goto LABEL_42;
           case 8:
           case 9:
           case 10:
           case 11:
-            dword_F8B1B4 = 3000;
+            gold_transaction_amount = 3000;
             goto LABEL_42;
           case 7:
             goto LABEL_67;
@@ -9918,19 +9918,19 @@
           case 32:
           case 34:
           case 35:
-            dword_F8B1B4 = 6000;
+            gold_transaction_amount = 6000;
             goto LABEL_42;
           case 8:
           case 9:
           case 10:
           case 11:
-            dword_F8B1B4 = 7000;
+            gold_transaction_amount = 7000;
             goto LABEL_42;
           case 7:
             break;
         }
 LABEL_67:
-        dword_F8B1B4 = 0;
+        gold_transaction_amount = 0;
         goto LABEL_41;
       }
     }
@@ -9946,19 +9946,19 @@
       && (dword_F8B1AC_something_todo_with_awards <= 33 || dword_F8B1AC_something_todo_with_awards > 35) )
     {
 LABEL_41:
-      if ( !dword_F8B1B4 )
+      if ( !gold_transaction_amount )
         goto LABEL_79;
       goto LABEL_42;
     }
 LABEL_87:
-    dword_F8B1B4 = 500;
+    gold_transaction_amount = 500;
     goto LABEL_41;
   }
   if ( dword_F8B1AC_something_todo_with_awards >= 23 )
     goto LABEL_87;
   if ( dword_F8B1AC_something_todo_with_awards == 7 )
   {
-    dword_F8B1B4 = 0;
+    gold_transaction_amount = 0;
     goto LABEL_79;
   }
   if ( dword_F8B1AC_something_todo_with_awards <= 7 )
@@ -9969,29 +9969,29 @@
       goto LABEL_41;
     goto LABEL_87;
   }
-  dword_F8B1B4 = 1000;
+  gold_transaction_amount = 1000;
 LABEL_42:
-  if ( dword_F8B1B4 > pParty->uNumGold )
+  if ( gold_transaction_amount > pParty->uNumGold )
     return (char *)pNPCTopics[124].pText;
 LABEL_79:
   dword_F8B1A8 = 1;
   if ( v34 == 2 )
   {
-    v27 = dword_F8B1B4;
+    v27 = gold_transaction_amount;
     v24 = pSkillNames[v17];
     v21 = pGlobalTXT_LocalizationStrings[433];
     goto LABEL_90;
   }
   if ( v34 == 3 )
   {
-    v27 = dword_F8B1B4;
+    v27 = gold_transaction_amount;
     v24 = pSkillNames[v17];
     v21 = pGlobalTXT_LocalizationStrings[432];
     goto LABEL_90;
   }
   if ( v34 == 4 )
   {
-    v27 = dword_F8B1B4;
+    v27 = gold_transaction_amount;
     v24 = pSkillNames[v17];
     v21 = pGlobalTXT_LocalizationStrings[225];
 LABEL_90:
@@ -10016,7 +10016,7 @@
   v3 = a1 + 50;
   v4 = pPlayers[uActiveCharacter];
   dword_F8B1AC_something_todo_with_awards = v3;
-  dword_F8B1B4 = dword_4F08EC[v1];
+  gold_transaction_amount = dword_4F08EC[v1];
   if ( v4->CanAct() )
   {
     if ( (unsigned __int16)_449B57_test_bit((unsigned __int8 *)v2->field_152, dword_F8B1AC_something_todo_with_awards) )
@@ -10025,7 +10025,7 @@
     }
     else
     {
-      if ( dword_F8B1B4 <= pParty->uNumGold )
+      if ( gold_transaction_amount <= pParty->uNumGold )
       {
         dword_F8B1A8 = 1;
         return pNPCTopics[v1 + 110].pText;