From d4de58703636721c3e9b873c8e5b16b68497bd52 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sat, 26 Nov 2011 12:02:26 +0100
Subject: Core/Items: Removed obsolete field from ItemTemplate

---
 src/server/game/Entities/Item/ItemPrototype.h | 19 ++++++++++---------
 src/server/game/Entities/Player/Player.cpp    |  2 --
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h
index 0234b90e7f5..5d72e5b0114 100755
--- a/src/server/game/Entities/Item/ItemPrototype.h
+++ b/src/server/game/Entities/Item/ItemPrototype.h
@@ -591,7 +591,6 @@ struct ItemTemplate
     uint32 Quality;
     uint32 Flags;
     uint32 Flags2;
-    uint32 BuyCount;
     int32  BuyPrice;
     uint32 SellPrice;
     uint32 InventoryType;
@@ -609,20 +608,14 @@ struct ItemTemplate
     int32  MaxCount;                                        // <= 0: no limit
     int32  Stackable;                                       // 0: not allowed, -1: put in player coin info tab and don't limit stacking (so 1 slot)
     uint32 ContainerSlots;
-    uint32 StatsCount;
     _ItemStat ItemStat[MAX_ITEM_PROTO_STATS];
     uint32 ScalingStatDistribution;                         // id from ScalingStatDistribution.dbc
-    float  DamageMin;
-    float  DamageMax;
     uint32 DamageType;                                      // id from Resistances.dbc
-    float  DPS;
-    uint32 Armor;
     uint32 Delay;
     float  RangedModRange;
     _Spell Spells[MAX_ITEM_PROTO_SPELLS];
-    float  SpellPPMRate;
     uint32 Bonding;
-    std::string  Description;
+    std::string Description;
     uint32 PageText;
     uint32 LanguageID;
     uint32 PageMaterial;
@@ -641,7 +634,6 @@ struct ItemTemplate
     _Socket Socket[MAX_ITEM_PROTO_SOCKETS];
     uint32 socketBonus;                                     // id from SpellItemEnchantment.dbc
     uint32 GemProperties;                                   // id from GemProperties.dbc
-    uint32 RequiredDisenchantSkill;
     float  ArmorDamageModifier;
     int32  Duration;                                        // negative = realtime, positive = ingame time
     uint32 ItemLimitCategory;                               // id from ItemLimitCategory.dbc
@@ -649,8 +641,17 @@ struct ItemTemplate
     float  StatScalingFactor;
     int32  Field130;
     int32  Field131;
+
+    // extra fields, not part of db2 files
+    uint32 BuyCount;
+    float  DamageMin;
+    float  DamageMax;
+    float  DPS;
+    uint32 Armor;
+    float  SpellPPMRate;
     uint32 ScriptId;
     uint32 DisenchantID;
+    uint32 RequiredDisenchantSkill;
     uint32 FoodType;
     uint32 MinMoneyLoot;
     uint32 MaxMoneyLoot;
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index fcf5e872f15..ba7d57df137 100755
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -7825,8 +7825,6 @@ void Player::_ApplyItemBonuses(ItemTemplate const* proto, uint8 slot, bool apply
         }
         else
         {
-            if (i >= proto->StatsCount)
-                continue;
             statType = proto->ItemStat[i].ItemStatType;
             val = proto->ItemStat[i].ItemStatValue;
         }
-- 
cgit v1.2.3