diff mm7_4.cpp @ 2373:b4a79e3ef2f0

Arena dialogue and other
author Ritor1
date Sun, 01 Jun 2014 17:20:22 +0600
parents bddcaf5d5db2
children 802460e60eee
line wrap: on
line diff
--- a/mm7_4.cpp	Sun Jun 01 15:18:00 2014 +0600
+++ b/mm7_4.cpp	Sun Jun 01 17:20:22 2014 +0600
@@ -142,8 +142,6 @@
     array_77EC08[i].field_108 = 0;
 }
 
-
-
 //----- (00491E3A) --------------------------------------------------------
 void sub_491E3A()
 {
@@ -1282,23 +1280,23 @@
         case 12:
           pReputation = npc->rep;
           if ( pReputation >= 25 )
-            pText = pGlobalTXT_LocalizationStrings[379];
+            pText = pGlobalTXT_LocalizationStrings[379];//Ненавистный
           else
           {
             if ( pReputation < 6 )
             {
               if ( pReputation >= -5 )
-                pText = pGlobalTXT_LocalizationStrings[399];
+                pText = pGlobalTXT_LocalizationStrings[399];//Нейтральная
               else
               {
                 if ( pReputation < -24 )
-                  pText = pGlobalTXT_LocalizationStrings[434];
+                  pText = pGlobalTXT_LocalizationStrings[434];//Почтенная
                 else
-                  pText = pGlobalTXT_LocalizationStrings[402];
+                  pText = pGlobalTXT_LocalizationStrings[402];//Дружелюбный
               }
             }
             else
-              pText = pGlobalTXT_LocalizationStrings[392];
+              pText = pGlobalTXT_LocalizationStrings[392];//Недружелюбный
           }
           strcat(pTmpBuf2.data(), pText);
           dst = strlen(pTmpBuf2.data());
@@ -1501,10 +1499,6 @@
 //----- (0049B04D) --------------------------------------------------------
 void stru154::GetFacePlaneAndClassify(ODMFace *a2, BSPVertexBuffer *a3)
 {
-  //stru154 *v3; // edi@1
-  //signed int v4; // eax@1
-  //signed int result; // eax@9
-  //signed int v6; // [sp-8h] [bp-18h]@8
   Vec3_float_ v; // [sp+4h] [bp-Ch]@1
   float v7;
 
@@ -1660,18 +1654,12 @@
 void OracleDialogue()
 {
   __int16 *v0; // edi@1
-//  int v1; // ebx@3
-//  Player *v2; // esi@3
-//  int v3; // eax@4
   signed int v4; // eax@9
   int v5; // ebx@11
-//  Player *v6; // esi@13
-//  ItemGen *v7; // eax@14
   signed int v8; // edi@14
   ItemGen *v9; // [sp+Ch] [bp-Ch]@11
   signed int v10; // [sp+10h] [bp-8h]@13
   int v11; // [sp+14h] [bp-4h]@1
-//  Player *v12; // [sp+14h] [bp-4h]@11
 
   contract_approved = 0;
   v11 = 0;
@@ -1688,7 +1676,7 @@
       for ( uint pl = 0; pl < 4; pl++ )
       {
         //LOBYTE(v3) = pParty->pPlayers[pl].CompareVariable(VAR_PlayerItemInHands, *(v0+1));
-        if ( pParty->pPlayers[pl].CompareVariable(VAR_PlayerItemInHands, *(v0+1)) )
+        if ( pParty->pPlayers[pl].CompareVariable(VAR_PlayerItemInHands, *(v0 + 1)) )
           break;
         //++v2;
         //++v1;
@@ -2055,7 +2043,7 @@
   pDialogueWindow = GUIWindow::Create(0, 0, window->GetWidth(), window->GetHeight(), WINDOW_Dialogue, 1, 0);
   if ( pNPCStats->pProfessions[v0->uProfession].pBenefits)//*(&pNPCStats->field_13A5C + 5 * v0->uProfession) )
   {
-    pDialogueWindow->CreateButton(480, 160, 140, 28, 1, 0, UIMSG_SelectNPCDialogueOption, 77, 0, pGlobalTXT_LocalizationStrings[407], 0);
+    pDialogueWindow->CreateButton(480, 160, 140, 28, 1, 0, UIMSG_SelectNPCDialogueOption, 77, 0, pGlobalTXT_LocalizationStrings[407], 0);//Подробнее
     v1 = 1;
   }
   pDialogueWindow->CreateButton(480, 30 * v1 + 160, 140, 30, 1, 0, UIMSG_SelectNPCDialogueOption, 76, 0, pGlobalTXT_LocalizationStrings[406], 0);//Нанять