diff mm7_4.cpp @ 296:af7e848d6def

Merge
author Nomad
date Tue, 19 Feb 2013 13:31:50 +0200
parents 640a176c030f 0ea5fbd16edb
children 0f2541245f65 3dcc9d945eeb
line wrap: on
line diff
--- a/mm7_4.cpp	Tue Feb 19 13:29:02 2013 +0200
+++ b/mm7_4.cpp	Tue Feb 19 13:31:50 2013 +0200
@@ -3089,9 +3089,9 @@
         v9 = v23;
         pRenderer->DrawTextureIndexed(pHiredNPCsIconsOffsetsX[v9], pHiredNPCsIconsOffsetsY[v9], (Texture *)(v8 != -1 ? &pIcons_LOD->pTextures[v8] : 0));
         v10 = (unsigned __int8)pTmpBuf[i];
-        if ( pParty->pHirelings[v10].bDrawSomeAnim == 1 )
-        {
-          uFrameID = pParty->pHirelings[v10]._anim_current_time;
+        if ( pParty->pHirelings[v10].evt_A == 1 )
+        {
+          uFrameID = pParty->pHirelings[v10].evt_B;
           v11 = pHiredNPCsIconsOffsetsX[v9];
           v12 = pHiredNPCsIconsOffsetsY[v9];
           v17 = v11;
@@ -5542,7 +5542,7 @@
     pGUIWindow_CurrentMenu->DrawText(pFontCreate, uX, v122, v34, pTmpBuf, 0, 0, 0);
     v35 = player->GetActualLuck();
     sprintf(pTmpBuf, "%s\r%03d%d", pGlobalTXT_LocalizationStrings[136], v129, v35);// "Luck"
-    LOWORD(v36) = player->GetStatColor(6u);
+    LOWORD(v36) = player->GetStatColor(6);
     pGUIWindow_CurrentMenu->DrawText(pFontCreate, uX, v119, v36, pTmpBuf, 0, 0, 0);
     v37 = player->GetSkillIdxByOrder(0);
     pTextCenter = pFontCreate->AlignText_Center(0x96u, pSkillNames[v37]);
@@ -9416,13 +9416,13 @@
   {
     if ( a1 == 23 )
     {
-      v3 = v2->evte;
+      v3 = v2->evt_E;
     }
     else
     {
       if ( a1 == 13 )
       {
-        ptr_F8B1E8 = (char *)*(&pNPCStats->field_13A64 + 5 * v2->uProfession);
+        ptr_F8B1E8 = pNPCStats->pProfessions[v2->uProfession].pJoinText;//(char *)*(&pNPCStats->field_13A64 + 5 * v2->uProfession);
         ptr_F8B1E8 = BuilDialogueString((char *)ptr_F8B1E8, uActiveCharacter - 1, 0, 0, 0, 0);
         sub_4B40E6();
         dialogue_show_profession_details = false;
@@ -9431,18 +9431,18 @@
       switch ( a1 )
       {
         case 19:
-          v3 = v2->bDrawSomeAnim;
+          v3 = v2->evt_A;
           break;
         case 20:
-          v3 = v2->_anim_current_time;
+          v3 = v2->evt_B;
           break;
         case 21:
-          v3 = v2->_anim_end_time;
+          v3 = v2->evt_C;
           break;
         default:
           if ( a1 != 22 )
             goto _return;
-          v3 = v2->evtd;
+          v3 = v2->evt_D;
           break;
       }
     }
@@ -9450,7 +9450,7 @@
   }
   if ( a1 == 24 )
   {
-    v3 = v2->evtf;
+    v3 = v2->evt_F;
 LABEL_84:
     if ( v3 < 200 || v3 > 310 )
     {
@@ -9553,36 +9553,36 @@
           switch ( dword_F8B1D8 )
           {
             case 19:
-              v10 = v2->bDrawSomeAnim;
+              v10 = v2->evt_A;
               if ( (signed int)v10 >= 400 && (signed int)v10 <= 416 )
-                v2->bDrawSomeAnim = 0;
+                v2->evt_A = 0;
               break;
             case 20:
-              v9 = v2->_anim_current_time;
+              v9 = v2->evt_B;
               if ( v9 >= 400 && v9 <= 416 )
-                v2->_anim_current_time = 0;
+                v2->evt_B = 0;
               break;
             case 21:
-              v8 = v2->_anim_end_time;
+              v8 = v2->evt_C;
               if ( v8 >= 400 && v8 <= 416 )
-                v2->_anim_end_time = 0;
+                v2->evt_C = 0;
               break;
             case 22:
-              v7 = v2->evtd;
+              v7 = v2->evt_D;
               if ( v7 >= 400 && v7 <= 416 )
-                v2->evtd = 0;
+                v2->evt_D = 0;
               break;
             case 23:
-              v6 = v2->evte;
+              v6 = v2->evt_E;
               if ( v6 >= 400 && v6 <= 416 )
-                v2->evte = 0;
+                v2->evt_E = 0;
               break;
             case 24:
-              v5 = v2->evtf;
+              v5 = v2->evt_F;
               if ( v5 >= 400 )
               {
                 if ( v5 <= 416 )
-                  v2->evtf = 0;
+                  v2->evt_F = 0;
               }
               break;
           }
@@ -10228,7 +10228,7 @@
       {
         if ( v17 == 24 )
         {
-          v23 = v58->evtf;
+          v23 = v58->evt_F;
 LABEL_33:
           v15 = (char *)pNPCTopics[v23-1].pTopic;//(&dword_721660)[8 * v23];
           if ( !v15 )
@@ -10244,13 +10244,13 @@
           v19 = v18 - 6;
           if ( !v19 )
           {
-            v23 = v58->bDrawSomeAnim;
+            v23 = v58->evt_A;
             goto LABEL_33;
           }
           v20 = v19 - 1;
           if ( !v20 )
           {
-            v15 = (char *)pNPCTopics[v58->_anim_current_time-1].pTopic;//(&dword_721660)[8 * v58->evtb];
+            v15 = (char *)pNPCTopics[v58->evt_B-1].pTopic;//(&dword_721660)[8 * v58->evtb];
             if ( !v15 )
             {
               v16->uControlParam = 0;
@@ -10266,18 +10266,18 @@
           v21 = v20 - 1;
           if ( !v21 )
           {
-            v23 = v58->_anim_end_time;
+            v23 = v58->evt_C;
             goto LABEL_33;
           }
           v22 = v21 - 1;
           if ( !v22 )
           {
-            v23 = v58->evtd;
+            v23 = v58->evt_D;
             goto LABEL_33;
           }
           if ( v22 == 1 )
           {
-            v23 = v58->evte;
+            v23 = v58->evt_E;
             goto LABEL_33;
           }
 LABEL_41:
@@ -11052,7 +11052,7 @@
   pDialogueWindow->eWindowType = WINDOW_MainMenu;
   pDialogueWindow->Release();
   pDialogueWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_Dialogue, 1, 0);
-  if ( *(&pNPCStats->field_13A5C + 5 * v0->uProfession) )
+  if ( pNPCStats->pProfessions[v0->uProfession].pBenefits)//*(&pNPCStats->field_13A5C + 5 * v0->uProfession) )
   {
     pDialogueWindow->CreateButton(480, 160, 140, 28, 1, 0, 136, 77, 0, pGlobalTXT_LocalizationStrings[407], 0);
     v1 = 1;
@@ -11163,7 +11163,7 @@
                  (Texture *)(uTextureID_506438 != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_506438] : 0),
                  0);
   pDialogueWindow->CreateButton(0, 0, 0, 0, 1, 0, 0x51u, 0, 0, "", 0);
-  if ( *(&pNPCStats->field_13A5C + 5 * v1->uProfession) )
+  if ( pNPCStats->pProfessions[v1->uProfession].pBenefits)//*(&pNPCStats->field_13A5C + 5 * v1->uProfession) )
   {
     pDialogueWindow->CreateButton(
       0x1E0u,
@@ -11303,7 +11303,7 @@
         v1 = 1;
         pDialogueWindow->CreateButton(480u, 160u, 140u, 30u, 1, 0, 0xAFu, 0xDu, 0, "", 0);
       }
-      v5 = (void *)v17->bDrawSomeAnim;
+      v5 = (void *)v17->evt_A;
       if ( v5 )
       {
         if ( v1 < 4 )
@@ -11324,7 +11324,7 @@
               0);
         }
       }
-      v7 = (void *)v17->_anim_current_time;
+      v7 = (void *)v17->evt_B;
       if ( v7 )
       {
         if ( v1 < 4 )
@@ -11345,7 +11345,7 @@
               0);
         }
       }
-      v9 = (void *)v17->_anim_end_time;
+      v9 = (void *)v17->evt_C;
       if ( v9 )
       {
         if ( v1 < 4 )
@@ -11366,7 +11366,7 @@
               0);
         }
       }
-      v11 = (void *)v17->evtd;
+      v11 = (void *)v17->evt_D;
       if ( v11 )
       {
         if ( v1 < 4 )
@@ -11387,7 +11387,7 @@
               0);
         }
       }
-      v13 = (void *)v17->evte;
+      v13 = (void *)v17->evt_E;
       if ( v13 )
       {
         if ( v1 < 4 )
@@ -11408,7 +11408,7 @@
               0);
         }
       }
-      v15 = (void *)v17->evtf;
+      v15 = (void *)v17->evt_F;
       if ( v15 )
       {
         if ( v1 < 4 )
@@ -12567,12 +12567,12 @@
   {
     if ( newDialogueType == DIALOGUE_23 )
     {
-      v4 = v2->evte;
+      v4 = v2->evt_E;
       goto LABEL_74;
     }
     if (newDialogueType == DIALOGUE_24)
     {
-      v4 = v2->evtf;
+      v4 = v2->evt_F;
       goto LABEL_74;
     }
     if (newDialogueType != DIALOGUE_76)
@@ -12691,7 +12691,7 @@
   }
   if (newDialogueType == DIALOGUE_22)
   {
-    v4 = v2->evtd;
+    v4 = v2->evt_D;
     goto LABEL_74;
   }
   if (newDialogueType == DIALOGUE_9)
@@ -12739,17 +12739,17 @@
   }
   if (newDialogueType == DIALOGUE_19)
   {
-    v4 = v2->bDrawSomeAnim;
+    v4 = v2->evt_A;
     goto LABEL_74;
   }
   if (newDialogueType == DIALOGUE_20)
   {
-    v4 = v2->_anim_current_time;
+    v4 = v2->evt_B;
     goto LABEL_74;
   }
   if (newDialogueType == DIALOGUE_21)
   {
-    v4 = v2->_anim_end_time;
+    v4 = v2->evt_C;
 LABEL_74:
     if ( v4 < 200 || v4 > 310 )
     {