diff Items.cpp @ 498:89e360b3a0fd

Слияние
author Ritor1
date Wed, 27 Feb 2013 09:26:16 +0600
parents 4bd56919f075
children 214d9d47cf1f
line wrap: on
line diff
--- a/Items.cpp	Wed Feb 27 09:14:15 2013 +0600
+++ b/Items.cpp	Wed Feb 27 09:26:16 2013 +0600
@@ -1695,13 +1695,13 @@
     v16 = 0;
     v56 = 0;
     do
-      v56 += pParty->field_7BA[v16++];
+      v56 += pParty->pIsArtifactFound[v16++];
     while ( v16 < 29 );
     v17 = rand() % 29;
 
-    if ( v6 == 5 && rand() % 100 < 5 && !pParty->field_7BA[v17] && v56 < 13 )
+    if ( v6 == 5 && rand() % 100 < 5 && !pParty->pIsArtifactFound[v17] && v56 < 13 )
     {
-      pParty->field_7BA[v17] = 1;
+      pParty->pIsArtifactFound[v17] = 1;
       out_item->uAttributes = 0;
       out_item->uItemID = v17 + 500;
       SetSpecialBonus(out_item);
@@ -1732,7 +1732,7 @@
 	out_item->uEncantmentType = out_item->uEncantmentType * treasure_level; 
   }
   if ( v4->uItemID == ITEM_SPELLBOOK_LIGHT_DIVINE_INTERVENTION
-    && !(unsigned __int16)_449B57_test_bit(pParty->_award_bits, 239) )
+    && !(unsigned __int16)_449B57_test_bit(pParty->_quest_bits, 239) )
     v4->uItemID = ITEM_SPELLBOOK_LIGHT_SUN_BURST;
   if ( pItemsTable->pItems[v4->uItemID + 1].uItemID_Rep_St )
     v4->uAttributes = 0;
@@ -1921,7 +1921,7 @@
   uNumArtifactsNotFound = 0;
 
   for (int i=500;i<529;++i)
-     if ( !pParty->field_3C.pIsArtifactFound[i] )
+     if ( !pParty->pIsArtifactFound[i-500] )
         artifacts_list[uNumArtifactsNotFound++] = i;
 
   Reset();