--- a/mm7_6.cpp	Fri Feb 22 20:03:15 2013 +0400
+++ b/mm7_6.cpp	Fri Feb 22 22:27:45 2013 +0400
@@ -1402,7 +1402,7 @@
   {
     if ( pItemsTable->pItems[pActor->array_000234[3].uItemID].uEquipType != 18 )
       goto LABEL_9;
-    v14 = pActor->array_000234[3].uAdditionalValue;
+    v14 = pActor->array_000234[3].uSpecEnchantmentType;
     pActor->array_000234[3].Reset();
   }
   if ( v14 )
@@ -1432,7 +1432,7 @@
       v4 = Dst.uItemID;
     }
     if ( pItemsTable->pItems[v5].uEquipType == 14 && v4 != 220 )
-      Dst._bonus_type = 2 * rand() % 4 + 2;
+      Dst.uEncantmentType = 2 * rand() % 4 + 2;
     pItemsTable->SetSpecialBonus(&Dst);
     if ( !pParty->AddItem(&Dst) )
       pParty->SetHoldingItem(&Dst);
@@ -4012,14 +4012,14 @@
         {
           if (!v730c->Broken())
           {
-            if ( v730c->uAdditionalValue == v1 )
+            if ( v730c->uSpecEnchantmentType == v1 )
             {
-              if ( v730c->_bonus_type == v1 )
+              if ( v730c->uEncantmentType == v1 )
               {
                 v68 = BYTE4(v726->pConditions[3]);
                 if ( !v68 || v68 == 1 || v68 == 2 )
                 {
-                  if ( !pItemsTable->_456D5E_is_some_material(v730c) )
+                  if ( !pItemsTable->IsMaterialNonCommon(v730c) )
                   {
                     v69 = v730c;
                     v14 = v731 == 4;
@@ -5421,8 +5421,8 @@
           {
             if ( v731 != 4
               || (v245 = (int)&v726->pInventoryItems[a2], v246 = *(int *)v245, *(int *)v245 > 134)
-              || v726->pInventoryItems[a2].uAdditionalValue != v1
-              || v726->pInventoryItems[a2]._bonus_type != v1
+              || v726->pInventoryItems[a2].uSpecEnchantmentType != v1
+              || v726->pInventoryItems[a2].uEncantmentType != v1
               || v726->pInventoryItems[a2]._bonus_strength != v1
               || (_this = (ItemGen *)((char *)&v726->pInventoryItems[a2] + 20), v726->pInventoryItems[a2].Broken()) )
               goto LABEL_616;
@@ -5526,8 +5526,8 @@
         v290 = v289->uItemID;
         LODWORD(v725) = (int)(char *)&pItemsTable + 48 * v290 + 4;
         if ( v290 > 134
-          || _this->uAdditionalValue != v1
-          || _this->_bonus_type != v1
+          || _this->uSpecEnchantmentType != v1
+          || _this->uEncantmentType != v1
           || _this->_bonus_strength != v1
           || (v291 = pItemsTable->pItems[v290].uEquipType) == 0
           || v291 == 1
@@ -5579,7 +5579,7 @@
           }
           v302 = rand() % SLODWORD(v725);
           v303 = v679;
-          v294->uAdditionalValue = v679;
+          v294->uSpecEnchantmentType = v679;
           v304 = pItemsTable->pSpecialEnchantments[v303].to_item_apply[pItemsTable->pItems[v294->uItemID].uEquipType + 4];
           v305 = v302 + 1;
           if ( v304 < v305 )
@@ -5589,26 +5589,26 @@
               v307 = (int)(jj + 1);
               v732 = v307;
               v308 = *(int *)v307;
-              v294->uAdditionalValue = v308;
+              v294->uSpecEnchantmentType = v308;
               v304 += pItemsTable->pSpecialEnchantments[v308].to_item_apply[pItemsTable->pItems[v294->uItemID].uEquipType + 4];
               if ( v304 >= v305 )
                 break;
             }
           }
-          ++v294->uAdditionalValue;
+          ++v294->uSpecEnchantmentType;
         }
         else
         {
           v293 = rand();
           v294 = _this;
           v295 = v293 % 10;// pItemsTable->field_116D8[pItemsTable->pItems[_this->uItemID].uEquipType];
-          _this->_bonus_type = 0;
+          _this->uEncantmentType = 0;
           for ( kk = pItemsTable->pEnchantments[0].to_item[pItemsTable->pItems[v294->uItemID].uEquipType + 1];
                 ;
-                kk += pItemsTable->pEnchantments[v294->_bonus_type].to_item[pItemsTable->pItems[v294->uItemID].uEquipType
+                kk += pItemsTable->pEnchantments[v294->uEncantmentType].to_item[pItemsTable->pItems[v294->uItemID].uEquipType
                                                                          + 1] )
           {
-            ++v294->_bonus_type;
+            ++v294->uEncantmentType;
             if ( kk >= v295 )
               break;
           }
@@ -7335,7 +7335,7 @@
           || *(int *)(HIDWORD(v733) + 12) != v1
           || *(int *)(HIDWORD(v733) + 4) != v1
           || (v591 = *(char *)(v732 + 28)) != 0 && v591 != 1 && v591 != 2
-          || pItemsTable->_456D5E_is_some_material((ItemGen *)HIDWORD(v733)) )
+          || pItemsTable->IsMaterialNonCommon((ItemGen *)HIDWORD(v733)) )
           goto LABEL_199;
         v592 = HIDWORD(v733);
         v14 = v731 == 4;