--- a/mm7_5.cpp	Fri Feb 22 20:03:15 2013 +0400
+++ b/mm7_5.cpp	Fri Feb 22 22:27:45 2013 +0400
@@ -5174,7 +5174,7 @@
   v19 = v4->stru_24.uItemID == 0;
   uDamageAmount = v17;
   v57 = 0;
-  if ( !v19 && v4->stru_24.uAdditionalValue == 3 )
+  if ( !v19 && v4->stru_24.uSpecEnchantmentType == 3 )
   {
     a2 = 0;
     v57 = (PlayerEquipment *)1;
@@ -15273,7 +15273,7 @@
                 else
                 {
                   if ( v26 >= 221 && v26 < 271 )
-                    pItemGen._bonus_type = rand() % 10 + 1;
+                    pItemGen.uEncantmentType = rand() % 10 + 1;
                 }
                 pItemsTable->SetSpecialBonus(&pItemGen);
                 pParty->SetHoldingItem(&pItemGen);
@@ -15742,7 +15742,7 @@
       v27 = &v0->pInventoryItems[pOut.z];
       v28 = v27->uItemID;
       v51 = pItemsTable->pItems[v27->uItemID].uEquipType;
-      v29 = (ItemGen *)(1800 * pParty->pPickedItem._bonus_type);
+      v29 = (ItemGen *)(1800 * pParty->pPickedItem.uEncantmentType);
       if ( pParty->pPickedItem.uItemID != 233 )
       {
         if ( pParty->pPickedItem.uItemID == 236 )
@@ -15763,15 +15763,15 @@
             v33 = v27->uItemID;
             if ( (signed int)v27->uItemID >= 64 && (signed int)v33 <= 65
               || (pOut.y = v27->uAttributes, pOut.y & 2)
-              || v27->uAdditionalValue
-              || v27->_bonus_type
+              || v27->uSpecEnchantmentType
+              || v27->uEncantmentType
               || v51 && v51 != 1 && v51 != 2
               || (signed int)v33 >= 500 )
               goto LABEL_92;
             v34 = *(int *)&aSbwb00[4 * pParty->pPickedItem.uItemID + 4];
             a2.y = (int)v29 << 7;
             v31 = (double)(signed int)((int)v29 << 7);
-            v27->uAdditionalValue = v34;
+            v27->uSpecEnchantmentType = v34;
           }
           else
           {
@@ -15779,13 +15779,13 @@
               || (v27->UpdateTempBonus(pParty->uTimePlayed), v30 = v27->uItemID, (signed int)v27->uItemID >= 64)
               && (signed int)v30 <= 65
               || (pOut.y = v27->uAttributes, pOut.y & 2)
-              || v27->uAdditionalValue
-              || v27->_bonus_type
+              || v27->uSpecEnchantmentType
+              || v27->uEncantmentType
               || v51 && v51 != 1 && v51 != 2
               || (signed int)v30 >= 500 )
               goto LABEL_92;
             a2.y = (int)v29 << 7;
-            v27->uAdditionalValue = 40;
+            v27->uSpecEnchantmentType = 40;
             v31 = (double)a2.y;
           }
           v32 = pParty->uTimePlayed + (signed int)(signed __int64)(v31 * 0.033333335);
@@ -15798,7 +15798,7 @@
         dword_50C9A8 = 256;
         goto LABEL_92;
       }
-      v36 = (70.0 - (double)pParty->pPickedItem._bonus_type) * 0.01;
+      v36 = (70.0 - (double)pParty->pPickedItem.uEncantmentType) * 0.01;
       if ( v36 < 0.0 )
         v36 = 0.0;
       if ( v51 != 12 )
@@ -15945,8 +15945,8 @@
                 *(int *)&v0->field_1F5[36 * v19 + 15] = 1;
               v20 = v47 + 50 * v15;
               v0->pInventoryItems[pOut.z].uItemID = v51;
-              v0->pInventoryItems[pOut.z]._bonus_type = (pParty->pPickedItem._bonus_type
-                                                       + v0->pInventoryItems[pOut.z]._bonus_type)
+              v0->pInventoryItems[pOut.z].uEncantmentType = (pParty->pPickedItem.uEncantmentType
+                                                       + v0->pInventoryItems[pOut.z].uEncantmentType)
                                                       / 2;
               v0->SetVariable(VAR_AutoNotes, *(short *)&pItemsTable->potion_note[2 * v20 ]);//field_10168  + 388
 LABEL_74:
@@ -15963,7 +15963,7 @@
               if ( *(int *)(a2.y + 532) == 221 )
                 *(int *)(a2.y + 532) = pParty->pPickedItem.uItemID;
               else
-                *(int *)(a2.y + 536) = pParty->pPickedItem._bonus_type;
+                *(int *)(a2.y + 536) = pParty->pPickedItem.uEncantmentType;
               v21 = v0->AddItem(0xFFFFFFFFu, 0xDCu);
               if ( v21 )
                 *(int *)&v0->field_1F5[36 * v21 + 15] = 1;