changeset 102:8a10c9780e17

Слияние
author Ritor1
date Fri, 08 Feb 2013 16:00:04 +0600
parents 2fb33d31ca0d (current diff) 81e93310f73c (diff)
children dd570dea0632
files mm7_2.cpp mm7_4.cpp
diffstat 6 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/Actor.cpp	Fri Feb 08 15:59:32 2013 +0600
+++ b/Actor.cpp	Fri Feb 08 16:00:04 2013 +0600
@@ -3930,11 +3930,11 @@
   if ( !v7 )
   {
     if ( (!v2 || (signed __int64)v2->pActorBuffs[12].uExpireTime > 0 || !(v2->uAttributes & 0x80000))
-      && !*((unsigned char *)&pFactionTable->relations + 89 * v8) )
+      && !pFactionTable->relations[v8][0]) 
     {
 LABEL_56:
       if ( v8 < 89 )
-        return *((unsigned char *)&pFactionTable->relations + 89 * v7 + v8);
+        return pFactionTable->relations[v7][v8];
       return 0;
     }
     return 4;
--- a/GUIWindow.cpp	Fri Feb 08 15:59:32 2013 +0600
+++ b/GUIWindow.cpp	Fri Feb 08 16:00:04 2013 +0600
@@ -906,9 +906,9 @@
   {
     pTextures_5064A0[i] = pIcons_LOD->LoadTexturePtr(texNames[i], TEXTURE_16BIT_PALETTE);
 
-    sprintf(pTmpBuf, "tab%da", i);
+    sprintf(pTmpBuf, "tab%da", i+1);
     pTextures_tabs[i][0] = pIcons_LOD->LoadTexturePtr(pTmpBuf, TEXTURE_16BIT_PALETTE);
-    sprintf(pTmpBuf, "tab%db", i);
+    sprintf(pTmpBuf, "tab%db", i+1);
     pTextures_tabs[i][1] = pIcons_LOD->LoadTexturePtr(pTmpBuf, TEXTURE_16BIT_PALETTE);
   }
 }
--- a/Player.cpp	Fri Feb 08 15:59:32 2013 +0600
+++ b/Player.cpp	Fri Feb 08 16:00:04 2013 +0600
@@ -6995,7 +6995,7 @@
       goto LABEL_173;
     }
 LABEL_172:
-    ((Player *)&stru_AA1058[3].pSounds[6972 * a2 + 40552])->SetCondition(6u, 1);
+    pParty->pPlayers[a2-1].SetCondition(6u, 1);
     goto LABEL_173;
   }
   if ( pItemsTable->pItems[pParty->pPickedItem.uItemID].uEquipType == 14 )
@@ -7760,7 +7760,7 @@
   char v20; // cl@124
   DDM_DLV_Header *v21; // eax@126
   unsigned int v22; // edi@129
-  ItemGen *v23; // esi@134
+  Player *v23; // esi@134
   ItemGen *v24; // ecx@135
   signed int v25; // edx@135
   ITEM_EQUIP_TYPE v26; // ebx@155
@@ -7835,10 +7835,10 @@
         goto _cmp_against_arg;
       case VAR_CircusPrises:
         v4 = 0;
-        v23 = pParty->pPlayers[0].pInventoryItems;
+        v23 = pParty->pPlayers;//[0].pInventoryItems;
         do
         {
-          v24 = v23;
+		  v24 = v23->pInventoryItems;
           v25 = 138;
           do
           {
@@ -7858,9 +7858,9 @@
             --v25;
           }
           while ( v25 );
-          v23 = (ItemGen *)((char *)v23 + 6972);
+          ++v23;
         }
-        while ( (signed int)v23 < (signed int)&pParty->field_777C[85] );
+        while ( v23 <= &pParty->pPlayers[3] );
         goto _cmp_against_arg;
       case VAR_MonthEquals2:
         v17 = pParty->uCurrentMonth == a1;
--- a/mm7_2.cpp	Fri Feb 08 15:59:32 2013 +0600
+++ b/mm7_2.cpp	Fri Feb 08 16:00:04 2013 +0600
@@ -10096,10 +10096,10 @@
   int v7; // esi@9
   signed int v8; // [sp+4h] [bp-Ch]@3
   signed int v9; // [sp+8h] [bp-8h]@4
-  FactionTable *v10; // [sp+Ch] [bp-4h]@1
+  char *v10; // [sp+Ch] [bp-4h]@1
 
   v1 = 0;
-  v10 = this;
+  v10 = (char *)relations;
   if ( pHostileTXT_Raw )
     pAllocator->FreeChunk(pHostileTXT_Raw);
   pHostileTXT_Raw = 0;
@@ -10111,7 +10111,7 @@
     v2 = strtok(v1, "\r") + 1;
     v3 = 0;
     v9 = (signed int)v1;
-    v4 = (int)((char *)&v10[-7] + v8 - 5);
+    v4 = (int)&v10[v8-89];
     do
     {
       v5 = *v2;
--- a/mm7_4.cpp	Fri Feb 08 15:59:32 2013 +0600
+++ b/mm7_4.cpp	Fri Feb 08 16:00:04 2013 +0600
@@ -3946,8 +3946,8 @@
     while ( 1 )
     {
       if ( pPlayers[v12]->WearsItem(516, 3)
-        || v13->HasEnchantedItemEquipped(71)
-        || (signed __int64)v13->pPlayerBuffs[23].uExpireTime > 0 )
+        || pPlayers[v12]->HasEnchantedItemEquipped(71)
+        || pPlayers[v12]->pPlayerBuffs[23].uExpireTime > 0 )
       {
         v58 = 0;
       }
--- a/mm7_5.cpp	Fri Feb 08 15:59:32 2013 +0600
+++ b/mm7_5.cpp	Fri Feb 08 16:00:04 2013 +0600
@@ -13284,7 +13284,7 @@
 
   v0 = 0;
   if ( uActiveCharacter )
-    v0 = *((char *)&pParty->pPartyBuffs[5].uExpireTime + 6972 * uActiveCharacter + 2);
+	  v0 = pParty->pPlayers[uActiveCharacter-1].pNumSpellBookPage;//*((char *)&pParty->pPartyBuffs[5].uExpireTime + 6972 * uActiveCharacter + 2);
   pRenderer->DrawTextureIndexed(8u, 8u, pTextures_5064A0[v0]);
   pRenderer->DrawTextureIndexed(0x1DCu, 0x1C2u, pTexture_50643C);
   pRenderer->DrawTextureIndexed(0x231u, 0x1C2u, pTexture_506448);