diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-13 17:24:37 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-13 17:24:37 +0100 |
| commit | 528b9d4f7d11c71665bb7de9923c5167bfe0b6f4 (patch) | |
| tree | 4917dae7b06d18dd9de7577cad5992ee9ee595f3 /src/server/game/Globals/ObjectMgr.cpp | |
| parent | ed1ece2bb78d6e473872ff1691343295cd573309 (diff) | |
| parent | f03e650474463ad7454294e0fb5d6f169719ecbd (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/Entities/Item/ItemPrototype.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/shared/Packets/ByteBuffer.h
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index d26011a552a..fdc1a26f6a4 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2249,7 +2249,7 @@ void ObjectMgr::LoadItemTemplates() itemTemplate.ItemId = itemId; itemTemplate.Class = db2Data->Class; itemTemplate.SubClass = db2Data->SubClass; - itemTemplate.Unk0 = db2Data->Unk0; + itemTemplate.SoundOverrideSubclass = db2Data->SoundOverrideSubclass; itemTemplate.Name1 = sparse->Name; itemTemplate.DisplayInfoID = db2Data->DisplayId; itemTemplate.Quality = sparse->Quality; @@ -2348,7 +2348,7 @@ void ObjectMgr::LoadItemTemplates() // Load missing items from item_template AND overwrite data from Item-sparse.db2 (item_template is supposed to contain Item-sparse.adb data) // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 - QueryResult result = WorldDatabase.Query("SELECT entry, Class, SubClass, Unk0, Name, DisplayId, Quality, Flags, FlagsExtra, Unk430_1, Unk430_2, BuyCount, BuyPrice, SellPrice, " + QueryResult result = WorldDatabase.Query("SELECT entry, Class, SubClass, SoundOverrideSubclass, Name, DisplayId, Quality, Flags, FlagsExtra, Unk430_1, Unk430_2, BuyCount, BuyPrice, SellPrice, " // 14 15 16 17 18 19 20 21 "InventoryType, AllowableClass, AllowableRace, ItemLevel, RequiredLevel, RequiredSkill, RequiredSkillRank, RequiredSpell, " // 22 23 24 25 26 27 28 @@ -2401,7 +2401,7 @@ void ObjectMgr::LoadItemTemplates() itemTemplate.ItemId = itemId; itemTemplate.Class = uint32(fields[1].GetUInt8()); itemTemplate.SubClass = uint32(fields[2].GetUInt8()); - itemTemplate.Unk0 = fields[3].GetInt32(); + itemTemplate.SoundOverrideSubclass = fields[3].GetInt32(); itemTemplate.Name1 = fields[4].GetString(); itemTemplate.DisplayInfoID = fields[5].GetUInt32(); itemTemplate.Quality = uint32(fields[6].GetUInt8()); |