From 31c9efd2192daf1322bbb73feb4099ee9c453743 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Wed, 20 Oct 2010 08:49:27 +0400 Subject: [PATCH] [10629] Drop function GuidHigh2TypeId Added ObjectGuid version Aura::GetCasterGuid() But for prevent big problen with backporting AuraHolder to mangos-0.12 in most cases still used old uint64 version Aura::GetCasterGUID. Recommended use new version where possible in clean way as done for some cases in commit already. --- sql/mangos.sql | 4 +-- sql/updates/10629_01_mangos_mangos_string.sql | 6 ++++ sql/updates/Makefile.am | 2 ++ src/game/AuctionHouseHandler.cpp | 4 +-- src/game/BattleGroundHandler.cpp | 4 +-- src/game/GossipDef.cpp | 6 ++-- src/game/GossipDef.h | 3 +- src/game/Level3.cpp | 4 +-- src/game/Object.cpp | 18 ----------- src/game/Object.h | 2 -- src/game/QuestHandler.cpp | 10 +++--- src/game/SpellAuras.cpp | 32 +++++++++---------- src/game/SpellAuras.h | 3 +- src/game/SpellEffects.cpp | 10 +++--- src/game/Unit.cpp | 8 ++--- src/shared/revision_nr.h | 2 +- src/shared/revision_sql.h | 2 +- 17 files changed, 54 insertions(+), 66 deletions(-) create mode 100644 sql/updates/10629_01_mangos_mangos_string.sql diff --git a/sql/mangos.sql b/sql/mangos.sql index 06b884368..e63075d6d 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -24,7 +24,7 @@ CREATE TABLE `db_version` ( `version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL, `cache_id` int(10) default '0', - `required_10628_01_mangos_mangos_string` bit(1) default NULL + `required_10629_01_mangos_mangos_string` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -3398,7 +3398,7 @@ INSERT INTO `mangos_string` VALUES (467,'Target unit has %d auras:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (468,'id: %d eff: %d type: %d duration: %d maxduration: %d name: %s%s%s caster: %s %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (469,'Target unit has %d auras of type %d:',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(470,'id: %d eff: %d name: %s%s%s caster: %s %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(470,'id: %d eff: %d name: %s%s%s caster: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (471,'Quest %u not found.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (472,'Quest %u started from item. For correct work, please, add item to inventory and start quest in normal way: .additem %u',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), (473,'Quest removed.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), diff --git a/sql/updates/10629_01_mangos_mangos_string.sql b/sql/updates/10629_01_mangos_mangos_string.sql new file mode 100644 index 000000000..6345221a3 --- /dev/null +++ b/sql/updates/10629_01_mangos_mangos_string.sql @@ -0,0 +1,6 @@ +ALTER TABLE db_version CHANGE COLUMN required_10628_01_mangos_mangos_string required_10629_01_mangos_mangos_string bit; + +DELETE FROM mangos_string WHERE entry IN (470); + +INSERT INTO mangos_string VALUES +(470,'id: %d eff: %d name: %s%s%s caster: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 7c056e031..08ebac8cb 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -108,6 +108,7 @@ pkgdata_DATA = \ 10604_01_mangos_spell_proc_event.sql \ 10621_01_mangos_quest_template.sql \ 10628_01_mangos_mangos_string.sql \ + 10629_01_mangos_mangos_string.sql \ README ## Additional files to include when running 'make dist' @@ -196,4 +197,5 @@ EXTRA_DIST = \ 10604_01_mangos_spell_proc_event.sql \ 10621_01_mangos_quest_template.sql \ 10628_01_mangos_mangos_string.sql \ + 10629_01_mangos_mangos_string.sql \ README diff --git a/src/game/AuctionHouseHandler.cpp b/src/game/AuctionHouseHandler.cpp index 947d19e6e..c09da336e 100644 --- a/src/game/AuctionHouseHandler.cpp +++ b/src/game/AuctionHouseHandler.cpp @@ -635,8 +635,8 @@ void WorldSession::HandleAuctionListItems( WorldPacket & recv_data ) if(GetPlayer()->hasUnitState(UNIT_STAT_DIED)) GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH); - //DEBUG_LOG("Auctionhouse search (GUID: %u TypeId: %u)", , list from: %u, searchedname: %s, levelmin: %u, levelmax: %u, auctionSlotID: %u, auctionMainCategory: %u, auctionSubCategory: %u, quality: %u, usable: %u", - // GUID_LOPART(guid),GuidHigh2TypeId(GUID_HIPART(guid)), listfrom, searchedname.c_str(), levelmin, levelmax, auctionSlotID, auctionMainCategory, auctionSubCategory, quality, usable); + //DEBUG_LOG("Auctionhouse search %s list from: %u, searchedname: %s, levelmin: %u, levelmax: %u, auctionSlotID: %u, auctionMainCategory: %u, auctionSubCategory: %u, quality: %u, usable: %u", + // auctioneerGuid.GetString().c_str(), listfrom, searchedname.c_str(), levelmin, levelmax, auctionSlotID, auctionMainCategory, auctionSubCategory, quality, usable); WorldPacket data( SMSG_AUCTION_LIST_RESULT, (4+4+4) ); uint32 count = 0; diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp index 4894b8b6e..79940001a 100644 --- a/src/game/BattleGroundHandler.cpp +++ b/src/game/BattleGroundHandler.cpp @@ -76,7 +76,7 @@ void WorldSession::SendBattlegGroundList( ObjectGuid guid, BattleGroundTypeId bg void WorldSession::HandleBattlemasterJoinOpcode( WorldPacket & recv_data ) { - uint64 guid; + ObjectGuid guid; uint32 bgTypeId_; uint32 instanceId; uint8 joinAsGroup; @@ -96,7 +96,7 @@ void WorldSession::HandleBattlemasterJoinOpcode( WorldPacket & recv_data ) BattleGroundTypeId bgTypeId = BattleGroundTypeId(bgTypeId_); - DEBUG_LOG( "WORLD: Recvd CMSG_BATTLEMASTER_JOIN Message from (GUID: %u TypeId:%u)", GUID_LOPART(guid), GuidHigh2TypeId(GUID_HIPART(guid))); + DEBUG_LOG( "WORLD: Recvd CMSG_BATTLEMASTER_JOIN Message from %s", guid.GetString().c_str()); // can do this, since it's battleground, not arena BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(bgTypeId, 0); diff --git a/src/game/GossipDef.cpp b/src/game/GossipDef.cpp index 30875f379..b8a934635 100644 --- a/src/game/GossipDef.cpp +++ b/src/game/GossipDef.cpp @@ -430,14 +430,14 @@ void PlayerMenu::SendQuestGiverQuestList( QEmote eEmote, const std::string& Titl DEBUG_LOG("WORLD: Sent SMSG_QUESTGIVER_QUEST_LIST NPC Guid=%u", GUID_LOPART(npcGUID)); } -void PlayerMenu::SendQuestGiverStatus( uint8 questStatus, uint64 npcGUID ) +void PlayerMenu::SendQuestGiverStatus( uint8 questStatus, ObjectGuid npcGUID ) { WorldPacket data( SMSG_QUESTGIVER_STATUS, 9 ); - data << uint64(npcGUID); + data << npcGUID; data << uint8(questStatus); GetMenuSession()->SendPacket( &data ); - DEBUG_LOG( "WORLD: Sent SMSG_QUESTGIVER_STATUS NPC Guid=%u, status=%u", GUID_LOPART(npcGUID), questStatus); + DEBUG_LOG( "WORLD: Sent SMSG_QUESTGIVER_STATUS for %s", npcGUID.GetString().c_str()); } void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID, bool ActivateAccept ) diff --git a/src/game/GossipDef.h b/src/game/GossipDef.h index 60b98bc41..391ccb9df 100644 --- a/src/game/GossipDef.h +++ b/src/game/GossipDef.h @@ -22,6 +22,7 @@ #include "Common.h" #include "QuestDef.h" #include "NPCHandler.h" +#include "ObjectGuid.h" class WorldSession; @@ -273,7 +274,7 @@ class MANGOS_DLL_SPEC PlayerMenu /*********************************************************/ /*** QUEST SYSTEM ***/ /*********************************************************/ - void SendQuestGiverStatus( uint8 questStatus, uint64 npcGUID ); + void SendQuestGiverStatus( uint8 questStatus, ObjectGuid npcGUID ); void SendQuestGiverQuestList( QEmote eEmote, const std::string& Title, uint64 npcGUID ); diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index a7748120a..5d051483a 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -4610,13 +4610,13 @@ bool ChatHandler::HandleListAurasCommand (char* /*args*/) PSendSysMessage(LANG_COMMAND_TARGET_AURASIMPLE, (*itr)->GetId(), (*itr)->GetEffIndex(), ss_name.str().c_str(),((*itr)->GetHolder()->IsPassive() ? passiveStr : ""),(talent ? talentStr : ""), - IS_PLAYER_GUID((*itr)->GetCasterGUID()) ? "player" : "creature",GUID_LOPART((*itr)->GetCasterGUID())); + (*itr)->GetCasterGuid().GetString().c_str()); } else { PSendSysMessage(LANG_COMMAND_TARGET_AURASIMPLE, (*itr)->GetId(), (*itr)->GetEffIndex(), name,((*itr)->GetHolder()->IsPassive() ? passiveStr : ""),(talent ? talentStr : ""), - IS_PLAYER_GUID((*itr)->GetCasterGUID()) ? "player" : "creature",GUID_LOPART((*itr)->GetCasterGUID())); + (*itr)->GetCasterGuid().GetString().c_str()); } } } diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 60c52acf5..61677ccae 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -44,24 +44,6 @@ #include "TemporarySummon.h" -uint32 GuidHigh2TypeId(uint32 guid_hi) -{ - switch(guid_hi) - { - case HIGHGUID_ITEM: return TYPEID_ITEM; - //case HIGHGUID_CONTAINER: return TYPEID_CONTAINER; HIGHGUID_CONTAINER==HIGHGUID_ITEM currently - case HIGHGUID_UNIT: return TYPEID_UNIT; - case HIGHGUID_PET: return TYPEID_UNIT; - case HIGHGUID_PLAYER: return TYPEID_PLAYER; - case HIGHGUID_GAMEOBJECT: return TYPEID_GAMEOBJECT; - case HIGHGUID_DYNAMICOBJECT:return TYPEID_DYNAMICOBJECT; - case HIGHGUID_CORPSE: return TYPEID_CORPSE; - case HIGHGUID_MO_TRANSPORT: return TYPEID_GAMEOBJECT; - case HIGHGUID_VEHICLE: return TYPEID_UNIT; - } - return TYPEID_OBJECT; // unknown -} - Object::Object( ) { m_objectTypeId = TYPEID_OBJECT; diff --git a/src/game/Object.h b/src/game/Object.h index 9da8b345f..653b169b4 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -42,8 +42,6 @@ #define MAX_STEALTH_DETECT_RANGE 45.0f -uint32 GuidHigh2TypeId(uint32 guid_hi); - enum TempSummonType { TEMPSUMMON_TIMED_OR_DEAD_DESPAWN = 1, // despawns after a specified time OR when the creature disappears diff --git a/src/game/QuestHandler.cpp b/src/game/QuestHandler.cpp index d8bc812bb..432eba3a1 100644 --- a/src/game/QuestHandler.cpp +++ b/src/game/QuestHandler.cpp @@ -32,7 +32,7 @@ void WorldSession::HandleQuestgiverStatusQueryOpcode( WorldPacket & recv_data ) { - uint64 guid; + ObjectGuid guid; recv_data >> guid; uint8 dialogStatus = DIALOG_STATUS_NONE; @@ -40,16 +40,16 @@ void WorldSession::HandleQuestgiverStatusQueryOpcode( WorldPacket & recv_data ) if (!questgiver) { - DETAIL_LOG("Error in CMSG_QUESTGIVER_STATUS_QUERY, called for not found questgiver (Typeid: %u GUID: %u)", GuidHigh2TypeId(GUID_HIPART(guid)), GUID_LOPART(guid)); + DETAIL_LOG("Error in CMSG_QUESTGIVER_STATUS_QUERY, called for not found questgiver %s", guid.GetString().c_str()); return; } + DEBUG_LOG("WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for %s", guid.GetString().c_str()); + switch(questgiver->GetTypeId()) { case TYPEID_UNIT: { - DEBUG_LOG("WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for npc, guid = %u", uint32(GUID_LOPART(guid))); - Creature* cr_questgiver = (Creature*)questgiver; if (!cr_questgiver->IsHostileTo(_player)) // not show quest status to enemies @@ -63,8 +63,6 @@ void WorldSession::HandleQuestgiverStatusQueryOpcode( WorldPacket & recv_data ) } case TYPEID_GAMEOBJECT: { - DEBUG_LOG("WORLD: Received CMSG_QUESTGIVER_STATUS_QUERY for GameObject guid = %u", uint32(GUID_LOPART(guid))); - GameObject* go_questgiver = (GameObject*)questgiver; dialogStatus = Script->GODialogStatus(_player, go_questgiver); diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 58ef2ba1d..534875933 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -610,7 +610,7 @@ void Aura::Update(uint32 diff) void AreaAura::Update(uint32 diff) { // update for the caster of the aura - if(GetCasterGUID() == GetTarget()->GetGUID()) + if(GetCasterGuid() == GetTarget()->GetObjectGuid()) { Unit* caster = GetTarget(); @@ -1088,10 +1088,10 @@ void Aura::HandleAddModifier(bool apply, bool Real) void Aura::TriggerSpell() { - const uint64& casterGUID = GetCasterGUID(); + ObjectGuid casterGUID = GetCasterGuid(); Unit* triggerTarget = GetTriggerTarget(); - if (!casterGUID || !triggerTarget) + if (casterGUID.IsEmpty() || !triggerTarget) return; // generic casting code with custom spells and target/caster customs @@ -1840,7 +1840,7 @@ void Aura::TriggerSpell() // 2) maybe aura must be replace by new with accumulative stat mods instead stacking // prevent cast by triggered auras - if (casterGUID == triggerTarget->GetGUID()) + if (casterGUID == triggerTarget->GetObjectGuid()) return; // stop triggering after each affected stats lost > 90 @@ -6570,8 +6570,8 @@ void Aura::PeriodicTick() target->CalculateDamageAbsorbAndResist(pCaster, GetSpellSchoolMask(spellProto), DOT, pdamage, &absorb, &resist, !(GetSpellProto()->AttributesEx2 & SPELL_ATTR_EX2_CANT_REFLECTED)); - DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %u (TypeId: %u) attacked %u (TypeId: %u) for %u dmg inflicted by %u abs is %u", - GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), pdamage, GetId(),absorb); + DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %s attacked %s for %u dmg inflicted by %u abs is %u", + GetCasterGuid().GetString().c_str(), target->GetObjectGuid().GetString().c_str(), pdamage, GetId(),absorb); pCaster->DealDamageMods(target, pdamage, &absorb); @@ -6664,8 +6664,8 @@ void Aura::PeriodicTick() if(target->GetHealth() < pdamage) pdamage = uint32(target->GetHealth()); - DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %u (TypeId: %u) health leech of %u (TypeId: %u) for %u dmg inflicted by %u abs is %u", - GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), pdamage, GetId(),absorb); + DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %s health leech of %s for %u dmg inflicted by %u abs is %u", + GetCasterGuid().GetString().c_str(), target->GetObjectGuid().GetString().c_str(), pdamage, GetId(),absorb); pCaster->DealDamageMods(target, pdamage, &absorb); @@ -6755,8 +6755,8 @@ void Aura::PeriodicTick() pCaster->CalculateHealAbsorb(pdamage, &absorbHeal); pdamage -= absorbHeal; - DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %u (TypeId: %u) heal of %u (TypeId: %u) for %u health (absorbed %u) inflicted by %u", - GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), pdamage, absorbHeal, GetId()); + DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %s heal of %s for %u health (absorbed %u) inflicted by %u", + GetCasterGuid().GetString().c_str(), target->GetObjectGuid().GetString().c_str(), pdamage, absorbHeal, GetId()); int32 gain = target->ModifyHealth(pdamage); SpellPeriodicAuraLogInfo pInfo(this, pdamage, (pdamage - uint32(gain)), absorbHeal, 0, 0.0f, isCrit); @@ -6850,8 +6850,8 @@ void Aura::PeriodicTick() pdamage = maxmana; } - DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %u (TypeId: %u) power leech of %u (TypeId: %u) for %u dmg inflicted by %u", - GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), pdamage, GetId()); + DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %s power leech of %s for %u dmg inflicted by %u", + GetCasterGuid().GetString().c_str(), target->GetObjectGuid().GetString().c_str(), pdamage, GetId()); int32 drain_amount = target->GetPower(power) > pdamage ? pdamage : target->GetPower(power); @@ -6892,8 +6892,8 @@ void Aura::PeriodicTick() // ignore non positive values (can be result apply spellmods to aura damage uint32 pdamage = m_modifier.m_amount > 0 ? m_modifier.m_amount : 0; - DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %u (TypeId: %u) energize %u (TypeId: %u) for %u dmg inflicted by %u", - GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), pdamage, GetId()); + DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %s energize %s (TypeId: %u) for %u dmg inflicted by %u", + GetCasterGuid().GetString().c_str(), target->GetObjectGuid().GetString().c_str(), pdamage, GetId()); if(m_modifier.m_miscvalue < 0 || m_modifier.m_miscvalue >= MAX_POWERS) break; @@ -6923,8 +6923,8 @@ void Aura::PeriodicTick() uint32 pdamage = uint32(target->GetMaxPower(POWER_MANA) * amount / 100); - DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %u (TypeId: %u) energize %u (TypeId: %u) for %u mana inflicted by %u", - GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), target->GetGUIDLow(), target->GetTypeId(), pdamage, GetId()); + DETAIL_FILTER_LOG(LOG_FILTER_PERIODIC_AFFECTS, "PeriodicTick: %s energize %s for %u mana inflicted by %u", + GetCasterGuid().GetString().c_str(), target->GetObjectGuid().GetString().c_str(), pdamage, GetId()); if(target->GetMaxPower(POWER_MANA) == 0) break; diff --git a/src/game/SpellAuras.h b/src/game/SpellAuras.h index b08bcc47b..2b8d1a621 100644 --- a/src/game/SpellAuras.h +++ b/src/game/SpellAuras.h @@ -375,7 +375,8 @@ class MANGOS_DLL_SPEC Aura SpellEntry const* GetSpellProto() const { return GetHolder()->GetSpellProto(); } uint32 GetId() const{ return GetHolder()->GetSpellProto()->Id; } uint64 GetCastItemGUID() const { return GetHolder()->GetCastItemGUID(); } - uint64 const& GetCasterGUID() const { return GetHolder()->GetCasterGUID(); } + uint64 const& GetCasterGUID() const { return GetHolder()->GetCasterGUID(); }//can't be easy replaced by GetCasterGuid until AuraHolders backporting ig we don't want create additional problems for this. + ObjectGuid GetCasterGuid() const { return GetHolder()->GetCasterGUID(); } Unit* GetCaster() const { return GetHolder()->GetCaster(); } Unit* GetTarget() const { return GetHolder()->GetTarget(); } diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 345aabfd5..4a42df086 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -466,7 +466,7 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx) uint32 counter = 0; Unit::AuraList const& dotAuras = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE); for(Unit::AuraList::const_iterator itr = dotAuras.begin(); itr!=dotAuras.end(); ++itr) - if ((*itr)->GetCasterGUID() == owner->GetGUID()) + if ((*itr)->GetCasterGuid() == owner->GetObjectGuid()) ++counter; if (counter) @@ -482,7 +482,7 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx) { // for caster applied auras only if ((*i)->GetSpellProto()->SpellFamilyName != SPELLFAMILY_WARLOCK || - (*i)->GetCasterGUID()!=m_caster->GetGUID()) + (*i)->GetCasterGuid() != m_caster->GetObjectGuid()) continue; // Immolate @@ -574,9 +574,9 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx) // Lookup for Deadly poison (only attacker applied) Unit::AuraList const& auras = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE); for(Unit::AuraList::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr) - if( (*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_ROGUE && + if ((*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_ROGUE && ((*itr)->GetSpellProto()->SpellFamilyFlags & UI64LIT(0x10000)) && - (*itr)->GetCasterGUID()==m_caster->GetGUID() ) + (*itr)->GetCasterGuid() == m_caster->GetObjectGuid()) { poison = *itr; break; @@ -718,7 +718,7 @@ void Spell::EffectSchoolDMG(SpellEffectIndex effect_idx) Unit::AuraList const& auras = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE); for(Unit::AuraList::const_iterator itr = auras.begin(); itr!=auras.end(); ++itr) { - if( ((*itr)->GetId() == debuf_id) && (*itr)->GetCasterGUID()==m_caster->GetGUID()) + if (((*itr)->GetId() == debuf_id) && (*itr)->GetCasterGuid()==m_caster->GetObjectGuid()) { stacks = (*itr)->GetStackAmount(); break; diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index aa5ddd613..75375dd63 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -1115,7 +1115,7 @@ void Unit::CastSpell(Unit* Victim, SpellEntry const *spellInfo, bool triggered, if (triggeredByAura) { if(originalCaster.IsEmpty()) - originalCaster = triggeredByAura->GetCasterGUID(); + originalCaster = triggeredByAura->GetCasterGuid(); triggeredBy = triggeredByAura->GetSpellProto(); } @@ -1161,7 +1161,7 @@ void Unit::CastCustomSpell(Unit* Victim, SpellEntry const *spellInfo, int32 cons if (triggeredByAura) { if(originalCaster.IsEmpty()) - originalCaster = triggeredByAura->GetCasterGUID(); + originalCaster = triggeredByAura->GetCasterGuid(); triggeredBy = triggeredByAura->GetSpellProto(); } @@ -1218,7 +1218,7 @@ void Unit::CastSpell(float x, float y, float z, SpellEntry const *spellInfo, boo if (triggeredByAura) { if(originalCaster.IsEmpty()) - originalCaster = triggeredByAura->GetCasterGUID(); + originalCaster = triggeredByAura->GetCasterGuid(); triggeredBy = triggeredByAura->GetSpellProto(); } @@ -7866,7 +7866,7 @@ bool Unit::isVisibleForOrDetect(Unit const* u, WorldObject const* viewPoint, boo // Hunter mark functionality AuraList const& auras = GetAurasByType(SPELL_AURA_MOD_STALKED); for(AuraList::const_iterator iter = auras.begin(); iter != auras.end(); ++iter) - if((*iter)->GetCasterGUID()==u->GetGUID()) + if ((*iter)->GetCasterGuid() == u->GetObjectGuid()) return true; // else apply detecting check for stealth diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 32a99f680..3e4f91203 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10628" + #define REVISION_NR "10629" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 1b46280d2..1e887f499 100644 --- a/src/shared/revision_sql.h +++ b/src/shared/revision_sql.h @@ -1,6 +1,6 @@ #ifndef __REVISION_SQL_H__ #define __REVISION_SQL_H__ #define REVISION_DB_CHARACTERS "required_10568_01_characters_character_tutorial" - #define REVISION_DB_MANGOS "required_10628_01_mangos_mangos_string" + #define REVISION_DB_MANGOS "required_10629_01_mangos_mangos_string" #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version" #endif // __REVISION_SQL_H__