Mercurial > mm7

diff Player.cpp @ 377:243418228760

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GetIdentifiedName
author Gloval
date Fri, 22 Feb 2013 22:27:45 +0400
parents 7f5538ed7875
children 4a42c2f97aa2 0a1ea44b4a0a
line wrap: on
line diff
--- a/Player.cpp	Fri Feb 22 20:03:15 2013 +0400
+++ b/Player.cpp	Fri Feb 22 22:27:45 2013 +0400
@@ -2796,7 +2796,7 @@
     v12 = pItemsTable->pItems[v8].uDamageMod + v28;
     if ( !uTargetActorID )
       goto LABEL_28;
-    v13 = v6->uAdditionalValue;
+    v13 = v6->uSpecEnchantmentType;
     if ( v13 == 64 || v7 == 507 || v7 == 508 || v7 == 527 )
     {
       v14 = (MONSTER_SUPERTYPE)1;
@@ -2867,7 +2867,7 @@
         v4 = pItemsTable->pItems[v17].uDamageMod + v29;
         if ( !uTargetActorID )
           goto LABEL_57;
-        v19 = v15->uAdditionalValue;
+        v19 = v15->uSpecEnchantmentType;
         if ( v19 == 64 || v16 == 507 || v16 == 508 || v16 == 527 )
         {
           v20 = (MONSTER_SUPERTYPE)1;
@@ -3048,7 +3048,7 @@
   v9 = pItemsTable->pItems[v6].uDamageMod + v17;
   if ( a2 )
   {
-    v10 = v4->uAdditionalValue;
+    v10 = v4->uSpecEnchantmentType;
     if ( v10 == 64 )
     {
       v11 = (MONSTER_SUPERTYPE)1;
@@ -3371,7 +3371,7 @@
   for (uint i = 0; i < 16; ++i)
   {
     if (HasItemEquipped((ITEM_EQUIP_TYPE)i) &&
-      pInventoryItems[i].uAdditionalValue == uEnchantment)
+      pInventoryItems[i].uSpecEnchantmentType == uEnchantment)
       //  *(int *)&this->field_1F6[36 * pEquipment[i] + 6] != uEnchantment)
       return true;
   }
@@ -3532,9 +3532,9 @@
           }
           if ( pItemsTable->pItems[v5->array_000234[3].uItemID].uEquipType != 18 )
             return _steal_perma;
-          v20 = (int)&v5->array_000234[3].uAdditionalValue;
-          if ( (signed int)v19 > v5->array_000234[3].uAdditionalValue )
-            v19 = v5->array_000234[3].uAdditionalValue;
+          v20 = (int)&v5->array_000234[3].uSpecEnchantmentType;
+          if ( (signed int)v19 > v5->array_000234[3].uSpecEnchantmentType )
+            v19 = v5->array_000234[3].uSpecEnchantmentType;
           v21 = *(int *)v20 == v19;
           *(int *)v20 -= v19;
           if ( v21 )
@@ -3580,7 +3580,7 @@
               if ( pItemsTable->pItems[v17].uEquipType == 14 )
               {
                 if ( v16 != 220 )
-                  v27._bonus_type = 2 * rand() % 4 + 2;
+                  v27.uEncantmentType = 2 * rand() % 4 + 2;
               }
             }
             else
@@ -4661,7 +4661,7 @@
     if ( (signed int)v3 >= 16 )
       return v2;
   }
-  if ( a2 != 24 || this->pInventoryItems[v5].uAdditionalValue != 24 )
+  if ( a2 != 24 || this->pInventoryItems[v5].uSpecEnchantmentType != 24 )
     goto LABEL_11;
   return 5;
 }
@@ -4900,8 +4900,8 @@
       }
       v63 = (int)((char *)v6 + 36 * v31);
       attra = (ItemGen *)(v63 + 532);
-      if ( pItemsTable->_456D5E_is_some_material((ItemGen *)(v63 + 532)) == 1
-        && !pItemsTable->_456D43_is_material_equals_3(attra) )
+      if ( pItemsTable->IsMaterialNonCommon((ItemGen *)(v63 + 532)) == 1
+        && !pItemsTable->IsMaterialSpecial(attra) )
       {
         v34 = attra->uItemID;
         switch ( attra->uItemID )
@@ -6969,10 +6969,10 @@
     switch ( pParty->pPickedItem.uItemID )
     {
       case 0xDEu:
-        v25 = pParty->pPickedItem._bonus_type + 10;
+        v25 = pParty->pPickedItem.uEncantmentType + 10;
         goto LABEL_110;
       case 0xDFu:
-        v26 = pParty->pPickedItem._bonus_type + 10;
+        v26 = pParty->pPickedItem.uEncantmentType + 10;
         goto LABEL_114;
       case 0xE0u:
         LODWORD(v3->pConditions[1]) = 0;
@@ -7005,7 +7005,7 @@
         v59 = 0;
         v50 = 5;
         v46 = 3;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[7];
         goto LABEL_147;
       case 0xE5u:
@@ -7013,7 +7013,7 @@
         v59 = 0;
         v50 = 5;
         v46 = 3;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[8];
         goto LABEL_147;
       case 0xE6u:
@@ -7021,23 +7021,23 @@
         v59 = 0;
         v50 = 5;
         v46 = 3;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[1];
         goto LABEL_147;
       case 0xE7u:
         v70 = 0;
         v59 = 0;
-        v50 = 3 * LOWORD(pParty->pPickedItem._bonus_type);
+        v50 = 3 * LOWORD(pParty->pPickedItem.uEncantmentType);
         v46 = 0;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[11];
         goto LABEL_147;
       case 0xE8u:
         v70 = 0;
         v59 = 0;
-        v50 = 3 * LOWORD(pParty->pPickedItem._bonus_type);
+        v50 = 3 * LOWORD(pParty->pPickedItem.uEncantmentType);
         v46 = 0;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[13];
         goto LABEL_147;
       case 0xEAu:
@@ -7045,12 +7045,12 @@
         v59 = 0;
         v50 = 5;
         v46 = 3;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[14];
         goto LABEL_147;
       case 0xEBu:
         v3->pPlayerBuffs[23].Apply(
-          pParty->uTimePlayed + (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335),
+          pParty->uTimePlayed + (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335),
           3u,
           5u,
           0,
@@ -7071,49 +7071,49 @@
       case 0xF0u:
         v70 = 0;
         v59 = 0;
-        v50 = 3 * LOWORD(pParty->pPickedItem._bonus_type);
+        v50 = 3 * LOWORD(pParty->pPickedItem.uEncantmentType);
         v46 = 0;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[19];
         goto LABEL_147;
       case 0xF1u:
         v70 = 0;
         v59 = 0;
-        v50 = 3 * LOWORD(pParty->pPickedItem._bonus_type);
+        v50 = 3 * LOWORD(pParty->pPickedItem.uEncantmentType);
         v46 = 0;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[17];
         goto LABEL_147;
       case 0xF2u:
         v70 = 0;
         v59 = 0;
-        v50 = 3 * LOWORD(pParty->pPickedItem._bonus_type);
+        v50 = 3 * LOWORD(pParty->pPickedItem.uEncantmentType);
         v46 = 0;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[20];
         goto LABEL_147;
       case 0xF3u:
         v70 = 0;
         v59 = 0;
-        v50 = 3 * LOWORD(pParty->pPickedItem._bonus_type);
+        v50 = 3 * LOWORD(pParty->pPickedItem.uEncantmentType);
         v46 = 0;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[16];
         goto LABEL_147;
       case 0xF4u:
         v70 = 0;
         v59 = 0;
-        v50 = 3 * LOWORD(pParty->pPickedItem._bonus_type);
+        v50 = 3 * LOWORD(pParty->pPickedItem.uEncantmentType);
         v46 = 0;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[21];
         goto LABEL_147;
       case 0xF5u:
         v70 = 0;
         v59 = 0;
-        v50 = 3 * LOWORD(pParty->pPickedItem._bonus_type);
+        v50 = 3 * LOWORD(pParty->pPickedItem.uEncantmentType);
         v46 = 0;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[15];
         goto LABEL_147;
       case 0xFBu:
@@ -7136,12 +7136,12 @@
         HIDWORD(v3->pConditions[16]) = v35;
         goto LABEL_112;
       case 0xFDu:
-        v25 = 5 * pParty->pPickedItem._bonus_type;
+        v25 = 5 * pParty->pPickedItem.uEncantmentType;
 LABEL_110:
         v69 = v25;
         goto LABEL_111;
       case 0xFEu:
-        v26 = 5 * pParty->pPickedItem._bonus_type;
+        v26 = 5 * pParty->pPickedItem.uEncantmentType;
 LABEL_114:
         v27 = (char *)&v3->sMana;
         *(int *)v27 += v26;
@@ -7149,57 +7149,57 @@
       case 0xFFu:
         v70 = 0;
         v59 = 0;
-        v50 = 3 * LOWORD(pParty->pPickedItem._bonus_type);
+        v50 = 3 * LOWORD(pParty->pPickedItem.uEncantmentType);
         v46 = 0;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[18];
         goto LABEL_147;
       case 0x100u:
         v70 = 0;
         v59 = 0;
-        v50 = 3 * LOWORD(pParty->pPickedItem._bonus_type);
+        v50 = 3 * LOWORD(pParty->pPickedItem.uEncantmentType);
         v46 = 0;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[5];
         goto LABEL_147;
       case 0x101u:
         v70 = 0;
         v59 = 0;
-        v50 = 3 * LOWORD(pParty->pPickedItem._bonus_type);
+        v50 = 3 * LOWORD(pParty->pPickedItem.uEncantmentType);
         v46 = 0;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)v3->pPlayerBuffs;
         goto LABEL_147;
       case 0x102u:
         v70 = 0;
         v59 = 0;
-        v50 = 3 * LOWORD(pParty->pPickedItem._bonus_type);
+        v50 = 3 * LOWORD(pParty->pPickedItem.uEncantmentType);
         v46 = 0;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[22];
         goto LABEL_147;
       case 0x103u:
         v70 = 0;
         v59 = 0;
-        v50 = 3 * LOWORD(pParty->pPickedItem._bonus_type);
+        v50 = 3 * LOWORD(pParty->pPickedItem.uEncantmentType);
         v46 = 0;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[3];
         goto LABEL_147;
       case 0x104u:
         v70 = 0;
         v59 = 0;
-        v50 = 3 * LOWORD(pParty->pPickedItem._bonus_type);
+        v50 = 3 * LOWORD(pParty->pPickedItem.uEncantmentType);
         v46 = 0;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[9];
         goto LABEL_147;
       case 0x105u:
         v70 = 0;
         v59 = 0;
-        v50 = 3 * LOWORD(pParty->pPickedItem._bonus_type);
+        v50 = 3 * LOWORD(pParty->pPickedItem.uEncantmentType);
         v46 = 0;
-        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem._bonus_type) * 0.033333335);
+        v28 = (signed __int64)((double)(230400 * pParty->pPickedItem.uEncantmentType) * 0.033333335);
         v29 = (char *)&v3->pPlayerBuffs[2];
 LABEL_147:
         ((SpellBuff *)v29)->Apply(pParty->uTimePlayed + v28, v46, v50, v59, v70);