diff Items.cpp @ 1627:361b63797bdf

Слияние
author Ritor1
date Fri, 13 Sep 2013 10:10:53 +0600
parents c58916c53d8e
children 4b79ff62df3a
line wrap: on
line diff
--- a/Items.cpp	Fri Sep 13 10:10:44 2013 +0600
+++ b/Items.cpp	Fri Sep 13 10:10:53 2013 +0600
@@ -255,7 +255,7 @@
   this->uAttributes = 0;
   this->uNumCharges = 0;
   this->uSpecEnchantmentType = 0;
-  this->_bonus_strength = 0;
+  this->m_enchantmentStrength = 0;
   this->uEnchantmentType = 0;
   this->uItemID = 0;
   this->uBodyAnchor = 0;
@@ -1254,7 +1254,7 @@
   {
     pItem->uEnchantmentType = pItems[pItem->uItemID]._bonus_type;
     pItem->uSpecEnchantmentType = pItems[pItem->uItemID]._additional_value;
-    pItem->_bonus_strength = pItems[pItem->uItemID]._bonus_strength;
+    pItem->m_enchantmentStrength = pItems[pItem->uItemID]._bonus_strength;
   }
 }
 
@@ -1443,7 +1443,7 @@
 	if ( this->uAttributes & ITEM_TEMP_BONUS || pItemsTable->IsMaterialNonCommon(this) )
 		return uBaseValue;
 	if (uEnchantmentType )
-		return uBaseValue + 100 * _bonus_strength;;
+		return uBaseValue + 100 * m_enchantmentStrength;;
 	if (uSpecEnchantmentType )
 		{
 		bonus = pItemsTable->pSpecialEnchantments[uSpecEnchantmentType].iTreasureLevel;
@@ -1797,12 +1797,12 @@
             ++out_item->uEnchantmentType;
 
             v33 = rand() % (bonus_ranges[v6].maxR - bonus_ranges[v6].minR + 1);
-            out_item->_bonus_strength = v33 + bonus_ranges[v6].minR;
+            out_item->m_enchantmentStrength = v33 + bonus_ranges[v6].minR;
             v32 = out_item->uEnchantmentType - 1;
             if ( v32 == 21 || v32 == 22 || v32 == 23 ) //Armsmaster skill, Dodge skill, Unarmed skill 
-                out_item->_bonus_strength = out_item->_bonus_strength/2;
-            if ( out_item->_bonus_strength <= 0 )
-                out_item->_bonus_strength = 1;
+                out_item->m_enchantmentStrength = out_item->m_enchantmentStrength/2;
+            if ( out_item->m_enchantmentStrength <= 0 )
+                out_item->m_enchantmentStrength = 1;
             return;
             
             }