--- a/Items.cpp	Sun Feb 17 23:04:07 2013 +0000
+++ b/Items.cpp	Sun Feb 17 23:40:46 2013 +0000
@@ -1381,7 +1381,7 @@
   v1 = this;
   uBaseValue = pItemsTable->pItems[this->uItemID].uValue;
   if ( this->uAttributes & ITEM_TEMP_BONUS || pItemsTable->_456D5E_is_some_material(this) )
-    goto LABEL_12;
+    return uBaseValue;
   if ( v1->_bonus_type )
   {
     v3 = 100 * v1->_bonus_strength;
@@ -1390,12 +1390,11 @@
   v4 = v1->uAdditionalValue;
   if ( !v4 )
   {
-LABEL_12:
     result = uBaseValue;
   }
   else
   {
-    v3 = *(unsigned int *)&pItemsTable->pEnchantments[23].to_item[28 * v4 + 8];
+	v3 = pItemsTable->pSpecialEnchantments[v4].iTreasureLevel;
     if ( (unsigned int)v3 > 0xA )
       return uBaseValue + v3;
     result = uBaseValue * v3;
@@ -1437,7 +1436,6 @@
     v11 = pItemsTable->pItems[v2].pName;
     v4 = item__getname_buffer;
     v10 = "%s";
-LABEL_10:
     sprintf(v4, v10, v11);
     return v4;
   }
@@ -1457,7 +1455,8 @@
           v10 = pGlobalTXT_LocalizationStrings[655];
         else
           v10 = pGlobalTXT_LocalizationStrings[654];
-        goto LABEL_10;
+		sprintf(v4, v10, v11);
+		return v4;
       }
     }
   }
@@ -1491,12 +1490,12 @@
         sprintf(
           item__getname_buffer,
           "%s %s",
-          *(unsigned int *)&pItemsTable->pEnchantments[22].to_item[28 * v7 + 8],
+		  pItemsTable->pSpecialEnchantments[v7].pBonusStatement,
           pItemsTable->pItems[v1->uItemID].pName);
         return v4;
       }
       strcat(item__getname_buffer, " ");
-      v9 = *(const char **)&pItemsTable->pEnchantments[22].to_item[28 * v1->uAdditionalValue + 8];
+	  v9 = pItemsTable->pSpecialEnchantments[v1->uAdditionalValue].pBonusStatement;
     }
     strcat(item__getname_buffer, v9);
   }