diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-07-14 18:59:09 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-07-14 18:59:09 +0100 |
| commit | b87f794e168e7de1b024f8a576c473490956abb4 (patch) | |
| tree | f25aa63fda15d0a4455262bee2cf29c0a45a5ed7 /src/server/game/Globals/ObjectMgr.cpp | |
| parent | b56b282eeeba5e21bc256c2ce2ff27edef5f08d9 (diff) | |
| parent | 8b0cea7a5eea1e61d9c1f179d48bd85a61c8c5ca (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 949f3b61dd0..504c7f86654 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2542,7 +2542,7 @@ void ObjectMgr::LoadItemTemplates() itemTemplate.Name1 = fields[4].GetString(); itemTemplate.DisplayInfoID = fields[5].GetUInt32(); itemTemplate.Quality = uint32(fields[6].GetUInt8()); - itemTemplate.Flags = uint32(fields[7].GetInt64()); + itemTemplate.Flags = uint32(fields[7].GetUInt32()); itemTemplate.Flags2 = fields[8].GetUInt32(); itemTemplate.Unk430_1 = fields[9].GetFloat(); itemTemplate.Unk430_2 = fields[10].GetFloat(); |