diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-11-09 16:57:56 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-11-09 16:57:56 +0100 |
| commit | 543bea32e16bbe317171d24888a5f0c751ea19e8 (patch) | |
| tree | 3475ec61c0812ab9a6025cea6b4e4cd8696b2757 /src/server/game/Globals/ObjectMgr.cpp | |
| parent | 18cce601b91e34b360a82a07365b6a3491a30ccb (diff) | |
Core/DBLayer: Fixed a few mismatched types and possible invalid memory access with aggregate fields in queries
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 13e390bc362..576ebf4f547 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2678,7 +2678,7 @@ void ObjectMgr::LoadItemTemplates() itemTemplate.ItemId = itemId; itemTemplate.Class = uint32(fields[1].GetUInt8()); itemTemplate.SubClass = uint32(fields[2].GetUInt8()); - itemTemplate.SoundOverrideSubclass = fields[3].GetInt32(); + itemTemplate.SoundOverrideSubclass = fields[3].GetInt8(); itemTemplate.Name1 = fields[4].GetString(); itemTemplate.DisplayInfoID = fields[5].GetUInt32(); itemTemplate.Quality = uint32(fields[6].GetUInt8()); @@ -6365,11 +6365,11 @@ void ObjectMgr::SetHighestGuids() result = WorldDatabase.Query("SELECT MAX(guid) FROM gameobject"); if (result) - _gameObjectGuidGenerator.Set((*result)[0].GetUInt32() + 1); + _gameObjectGuidGenerator.Set((*result)[0].GetUInt64() + 1); result = WorldDatabase.Query("SELECT MAX(guid) FROM transports"); if (result) - _moTransportGuidGenerator.Set((*result)[0].GetUInt32() + 1); + _moTransportGuidGenerator.Set((*result)[0].GetUInt64() + 1); result = CharacterDatabase.Query("SELECT MAX(id) FROM auctionhouse"); if (result) @@ -8832,8 +8832,8 @@ void ObjectMgr::LoadCreatureClassLevelStats() } } - stats.BaseMana = fields[8].GetUInt16(); - stats.BaseArmor = fields[9].GetUInt16(); + stats.BaseMana = fields[8].GetUInt32(); + stats.BaseArmor = fields[9].GetUInt32(); stats.AttackPower = fields[10].GetUInt16(); stats.RangedAttackPower = fields[11].GetUInt16(); |