diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-07-20 10:17:21 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-07-20 10:17:21 +0200 |
| commit | 420d096b6a477856979e2810a8f68d38cbce3349 (patch) | |
| tree | 9db91ca3a079240afc0ab9422594b7899235b8b7 /src | |
| parent | 8ff5b35be1256d03b85438b130dcec7cd4cae6e1 (diff) | |
Core: Fixed merge errors
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Item/Item.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellInfo.h | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index 919b060b582..3eb15636366 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -493,6 +493,10 @@ void Item::SaveToDB(SQLTransaction& trans) stmt->setUInt64(0, GetGUID().GetCounter()); trans->Append(stmt); + stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_ITEM_INSTANCE_TRANSMOG); + stmt->setUInt64(0, GetGUID().GetCounter()); + trans->Append(stmt); + if (HasFlag(ITEM_FIELD_FLAGS, ITEM_FIELD_FLAG_WRAPPED)) { stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_GIFT); @@ -605,8 +609,7 @@ bool Item::LoadFromDB(ObjectGuid::LowType guid, ObjectGuid ownerGuid, Field* fie SetUInt32Value(ITEM_FIELD_CREATE_PLAYED_TIME, fields[11].GetUInt32()); SetText(fields[12].GetString()); - SetModifier(ITEM_MODIFIER_BATTLE_PET_DISPLAY_ID, fields[19].GetUInt32()); - uint32 upgradeId = fields[14].GetUInt32(); + uint32 upgradeId = fields[13].GetUInt32(); ItemUpgradeEntry const* rulesetUpgrade = sItemUpgradeStore.LookupEntry(sDB2Manager.GetRulesetItemUpgrade(entry)); ItemUpgradeEntry const* upgrade = sItemUpgradeStore.LookupEntry(upgradeId); if (!rulesetUpgrade || !upgrade || rulesetUpgrade->ItemUpgradePathID != upgrade->ItemUpgradePathID) diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h index 0888c7ebb6e..9f2c455feeb 100644 --- a/src/server/game/Spells/SpellInfo.h +++ b/src/server/game/Spells/SpellInfo.h @@ -38,6 +38,7 @@ struct SpellRangeEntry; struct SpellRadiusEntry; struct SpellEntry; struct SpellCastTimesEntry; +struct SpellEffectScalingEntry; struct Condition; enum SpellCastTargetFlags |