diff mm7_5.cpp @ 574:f90753ebabe3

Merge
author Nomad
date Wed, 06 Mar 2013 06:41:36 +0200
parents 7c0763248a87 f54481c85df8
children c697d17c5179 96f48cfdd657
line wrap: on
line diff
--- a/mm7_5.cpp	Wed Mar 06 06:41:05 2013 +0200
+++ b/mm7_5.cpp	Wed Mar 06 06:41:36 2013 +0200
@@ -15430,7 +15430,7 @@
       v27 = &v0->pInventoryItems[pOut.z];
       v28 = v27->uItemID;
       v51 = pItemsTable->pItems[v27->uItemID].uEquipType;
-      v29 = (ItemGen *)(1800 * pParty->pPickedItem.uEncantmentType);
+      v29 = (ItemGen *)(1800 * pParty->pPickedItem.uEnchantmentType);
       if ( pParty->pPickedItem.uItemID != 233 )
       {
         if ( pParty->pPickedItem.uItemID == 236 )
@@ -15452,7 +15452,7 @@
             if ( (signed int)v27->uItemID >= 64 && (signed int)v33 <= 65
               || (pOut.y = v27->uAttributes, pOut.y & 2)
               || v27->uSpecEnchantmentType
-              || v27->uEncantmentType
+              || v27->uEnchantmentType
               || v51 && v51 != 1 && v51 != 2
               || (signed int)v33 >= 500 )
               goto LABEL_92;
@@ -15468,7 +15468,7 @@
               && (signed int)v30 <= 65
               || (pOut.y = v27->uAttributes, pOut.y & 2)
               || v27->uSpecEnchantmentType
-              || v27->uEncantmentType
+              || v27->uEnchantmentType
               || v51 && v51 != 1 && v51 != 2
               || (signed int)v30 >= 500 )
               goto LABEL_92;
@@ -15486,7 +15486,7 @@
         dword_50C9A8 = 256;
         goto LABEL_92;
       }
-      v36 = (70.0 - (double)pParty->pPickedItem.uEncantmentType) * 0.01;
+      v36 = (70.0 - (double)pParty->pPickedItem.uEnchantmentType) * 0.01;
       if ( v36 < 0.0 )
         v36 = 0.0;
       if ( v51 != 12 )
@@ -15635,8 +15635,8 @@
                 *(int *)&v0->field_1F5[36 * v19 + 15] = 1;
               v20 = v47 + 50 * v15;
               v0->pInventoryItems[pOut.z].uItemID = v51;
-              v0->pInventoryItems[pOut.z].uEncantmentType = (pParty->pPickedItem.uEncantmentType
-                                                       + v0->pInventoryItems[pOut.z].uEncantmentType)
+              v0->pInventoryItems[pOut.z].uEnchantmentType = (pParty->pPickedItem.uEnchantmentType
+                                                       + v0->pInventoryItems[pOut.z].uEnchantmentType)
                                                       / 2;
               v0->SetVariable(VAR_AutoNotes, *(short *)&pItemsTable->potion_note[2 * v20 ]);//field_10168  + 388
 LABEL_74:
@@ -15653,7 +15653,7 @@
               if ( *(int *)(a2.y + 532) == 221 )
                 *(int *)(a2.y + 532) = pParty->pPickedItem.uItemID;
               else
-                *(int *)(a2.y + 536) = pParty->pPickedItem.uEncantmentType;
+                *(int *)(a2.y + 536) = pParty->pPickedItem.uEnchantmentType;
               v21 = v0->AddItem(0xFFFFFFFFu, 0xDCu);
               if ( v21 )
                 *(int *)&v0->field_1F5[36 * v21 + 15] = 1;