From 2a4ba49664540e38ef3eee9873c7f4a4bc2b85cb Mon Sep 17 00:00:00 2001 From: joschiwald Date: Mon, 26 Nov 2012 08:48:51 +0100 Subject: [PATCH 01/23] Core/Guilds: Fix bank money log after 58ec4e53 (due to bad opcode structure). Closes #8432 --- src/server/game/Guilds/Guild.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index a03e94ff190..8609e1a7735 100755 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -249,7 +249,7 @@ void Guild::BankEventLogEntry::WritePacket(WorldPacket& data) const data << uint8(m_destTabId); break; default: - data << uint64(m_itemOrMoney); + data << uint32(m_itemOrMoney); } data << uint32(time(NULL) - m_timestamp); From 5e9acb33413de381e9eff1b515acccab36a33282 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 26 Nov 2012 10:34:11 +0100 Subject: [PATCH 02/23] Core/Player: Fixed crashes happening when player logs in to a battleground which has ended and doesn't have valid return location stored in database. Closes #5441 Closes #7093 Closes #8242 --- src/server/game/Entities/Player/Player.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 215902cb30f..85f12812014 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -16875,7 +16875,9 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) const WorldLocation& _loc = GetBattlegroundEntryPoint(); mapId = _loc.GetMapId(); instanceId = 0; - if (mapId == MAPID_INVALID) // Battleground Entry Point not found (???) + // Db field type is type int16, so it can never be MAPID_INVALID + //if (mapId == MAPID_INVALID) -- code kept for reference + if (int16(mapId) == int16(-1)) // Battleground Entry Point not found (???) { sLog->outError(LOG_FILTER_PLAYER, "Player (guidlow %d) was in BG in database, but BG was not found, and entry point was invalid! Teleport to default race/class locations.", guid); RelocateToHomebind(); From 4dffccb93ff02dc47efabb1183a4e093519213e2 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 26 Nov 2012 11:11:30 +0100 Subject: [PATCH 03/23] Core/Spells: Corrected radius calculation --- src/server/game/DataStores/DBCStructure.h | 6 +++--- src/server/game/DataStores/DBCfmt.h | 2 +- src/server/game/Entities/GameObject/GameObject.cpp | 2 +- src/server/game/Spells/SpellInfo.cpp | 11 ++++++++--- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index 20eab098add..f57724fe58b 100755 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -1677,9 +1677,9 @@ struct SpellFocusObjectEntry struct SpellRadiusEntry { uint32 ID; - float radiusMin; - //uint32 Unk //always 0 - float radiusMax; + float RadiusMin; + float RadiusPerLevel; + float RadiusMax; }; struct SpellRangeEntry diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h index 0fe82ea3311..bb671d4dd72 100755 --- a/src/server/game/DataStores/DBCfmt.h +++ b/src/server/game/DataStores/DBCfmt.h @@ -106,7 +106,7 @@ const std::string CustomSpellEntryIndex = "Id"; char const SpellFocusObjectfmt[]="nxxxxxxxxxxxxxxxxx"; char const SpellItemEnchantmentfmt[]="nxiiiiiixxxiiissssssssssssssssxiiiiiii"; char const SpellItemEnchantmentConditionfmt[]="nbbbbbxxxxxbbbbbbbbbbiiiiiXXXXX"; -char const SpellRadiusfmt[]="nfxf"; +char const SpellRadiusfmt[]="nfff"; char const SpellRangefmt[]="nffffixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; char const SpellRuneCostfmt[]="niiii"; char const SpellShapeshiftfmt[]="nxxxxxxxxxxxxxxxxxxiixiiixxiiiiiiii"; diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 214df2672cb..bf27015e8e3 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1698,7 +1698,7 @@ void GameObject::CastSpell(Unit* target, uint32 spellId) { trigger->setFaction(owner->getFaction()); // needed for GO casts for proper target validation checks - trigger->SetUInt64Value(UNIT_FIELD_SUMMONEDBY, owner->GetGUID()); + trigger->SetOwnerGUID(owner->GetGUID()); trigger->CastSpell(target ? target : trigger, spellInfo, true, 0, 0, owner->GetGUID()); } else diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index be4c522956c..fcfa441455e 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -499,9 +499,14 @@ float SpellEffectInfo::CalcRadius(Unit* caster, Spell* spell) const if (!HasRadius()) return 0.0f; - float radius = RadiusEntry->radiusMax; - if (Player* modOwner = (caster ? caster->GetSpellModOwner() : NULL)) - modOwner->ApplySpellMod(_spellInfo->Id, SPELLMOD_RADIUS, radius, spell); + float radius = RadiusEntry->RadiusMin; + if (caster) + { + radius += RadiusEntry->RadiusPerLevel * caster->getLevel(); + radius = std::min(radius, RadiusEntry->RadiusMax); + if (Player* modOwner = caster->GetSpellModOwner()) + modOwner->ApplySpellMod(_spellInfo->Id, SPELLMOD_RADIUS, radius, spell); + } return radius; } From ad6b5fb419f8fc940e9ac8f3257c7d629ad53f88 Mon Sep 17 00:00:00 2001 From: Spp Date: Mon, 26 Nov 2012 20:20:47 +0100 Subject: [PATCH 04/23] Core/Dungeon Finder: Fix reward for last member of each group being disbanded to join new lfg group - Move some messages to Trace - Add some cases where internal data wasn't updated with new state - Reverts 441712fbb and ae507e5 (Old State should only store those states you can Restore from a Rolecheck/Proposal) Closes #8339 Closes #8420 Closes #8421 --- .../game/DungeonFinding/LFGGroupData.cpp | 6 +- src/server/game/DungeonFinding/LFGMgr.cpp | 173 +++++++++++------- src/server/game/DungeonFinding/LFGMgr.h | 4 +- .../game/DungeonFinding/LFGPlayerData.cpp | 18 +- .../game/DungeonFinding/LFGPlayerData.h | 4 +- src/server/game/DungeonFinding/LFGQueue.cpp | 7 +- src/server/game/DungeonFinding/LFGScripts.cpp | 1 - src/server/game/Groups/Group.cpp | 11 +- src/server/game/Handlers/LFGHandler.cpp | 2 +- 9 files changed, 133 insertions(+), 93 deletions(-) diff --git a/src/server/game/DungeonFinding/LFGGroupData.cpp b/src/server/game/DungeonFinding/LFGGroupData.cpp index c7cf6f23ce9..68e7ab82c32 100644 --- a/src/server/game/DungeonFinding/LFGGroupData.cpp +++ b/src/server/game/DungeonFinding/LFGGroupData.cpp @@ -34,10 +34,12 @@ void LfgGroupData::SetState(LfgState state) { switch (state) { - case LFG_STATE_FINISHED_DUNGEON: case LFG_STATE_NONE: + m_Dungeon = 0; + m_KicksLeft = LFG_GROUP_MAX_KICKS; + case LFG_STATE_FINISHED_DUNGEON: case LFG_STATE_DUNGEON: - m_OldState = m_State; + m_OldState = state; // No break on purpose default: m_State = state; diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index da279016255..0eec334c603 100755 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -370,11 +370,13 @@ void LFGMgr::Update(uint32 diff) for (LfgRolesMap::const_iterator itRoles = roleCheck.roles.begin(); itRoles != roleCheck.roles.end(); ++itRoles) { uint64 guid = itRoles->first; - ClearState(guid, "Remove Obsolete RoleCheck"); + RestoreState(guid, "Remove Obsolete RoleCheck"); SendLfgRoleCheckUpdate(guid, roleCheck); if (guid == roleCheck.leader) SendLfgJoinResult(guid, LfgJoinResultData(LFG_JOIN_FAILED, LFG_ROLECHECK_MISSING_ROLE)); } + + RestoreState(itRoleCheck->first, "Remove Obsolete RoleCheck"); RoleChecksStore.erase(itRoleCheck); } @@ -754,7 +756,7 @@ void LFGMgr::JoinLfg(Player* player, uint8 roles, LfgDungeonSet& dungeons, const */ void LFGMgr::LeaveLfg(uint64 guid) { - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::Leave: [" UI64FMTD "]", guid); + sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::LeaveLfg: [" UI64FMTD "]", guid); uint64 gguid = IS_GROUP(guid) ? guid : GetGroup(guid); LfgState state = GetState(guid); @@ -765,13 +767,12 @@ void LFGMgr::LeaveLfg(uint64 guid) { LFGQueue& queue = GetQueue(gguid); queue.RemoveFromQueue(gguid); - RestoreState(gguid, "Leave queue"); + SetState(gguid, LFG_STATE_NONE); const LfgGuidSet& players = GetPlayers(gguid); for (LfgGuidSet::const_iterator it = players.begin(); it != players.end(); ++it) { - uint64 guid = (*it); - ClearState(guid, "Leave queue"); - SendLfgUpdateParty(guid, LfgUpdateData(LFG_UPDATETYPE_REMOVED_FROM_QUEUE)); + SetState(*it, LFG_STATE_NONE); + SendLfgUpdateParty(*it, LfgUpdateData(LFG_UPDATETYPE_REMOVED_FROM_QUEUE)); } } else @@ -779,7 +780,7 @@ void LFGMgr::LeaveLfg(uint64 guid) LFGQueue& queue = GetQueue(guid); queue.RemoveFromQueue(guid); SendLfgUpdatePlayer(guid, LfgUpdateData(LFG_UPDATETYPE_REMOVED_FROM_QUEUE)); - ClearState(guid, "Leave queue"); + SetState(guid, LFG_STATE_NONE); } break; case LFG_STATE_ROLECHECK: @@ -808,7 +809,20 @@ void LFGMgr::LeaveLfg(uint64 guid) RemoveProposal(it, LFG_UPDATETYPE_PROPOSAL_DECLINED); break; } - default: + case LFG_STATE_BOOT: + if (guid != gguid) // Player + { + UpdateBoot(guid); // Forcing LFG_ANSWER_PENDING (Removal of player) + SetState(guid, LFG_STATE_NONE); + } + break; + case LFG_STATE_NONE: + case LFG_STATE_RAIDBROWSER: + break; + case LFG_STATE_DUNGEON: + case LFG_STATE_FINISHED_DUNGEON: + if (guid != gguid) // Player + SetState(guid, LFG_STATE_NONE); break; } } @@ -882,7 +896,7 @@ void LFGMgr::UpdateRoleCheck(uint64 gguid, uint64 guid /* = 0 */, uint8 roles /* if (roleCheck.leader == pguid) SendLfgJoinResult(pguid, joinData); SendLfgUpdateParty(pguid, LfgUpdateData(LFG_UPDATETYPE_ROLECHECK_FAILED)); - ClearState(pguid, "Role check Failed"); + RestoreState(pguid, "Rolecheck Failed"); break; } } @@ -1007,7 +1021,7 @@ bool LFGMgr::CheckGroupRoles(LfgRolesMap& groles, bool removeLeaderFlag /*= true Makes a new group given a proposal @param[in] proposal Proposal to get info from */ -void LFGMgr::MakeNewGroup(const LfgProposal& proposal) +void LFGMgr::MakeNewGroup(LfgProposal const& proposal) { LfgGuidList players; LfgGuidList playersToTeleport; @@ -1038,7 +1052,7 @@ void LFGMgr::MakeNewGroup(const LfgProposal& proposal) Group* group = player->GetGroup(); if (group && group != grp) - player->RemoveFromGroup(); + group->RemoveMember(player->GetGUID()); if (!grp) { @@ -1243,10 +1257,11 @@ void LFGMgr::RemoveProposal(LfgProposalContainer::iterator itProposal, LfgUpdate updateData.updateType = LFG_UPDATETYPE_REMOVED_FROM_QUEUE; sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::RemoveProposal: [" UI64FMTD "] in same group that someone that didn't accept. Removing from queue and compatible cache", guid); } - ClearState(guid, "Proposal Fail (didn't accepted or in group with someone that didn't accept"); + + RestoreState(guid, "Proposal Fail (didn't accepted or in group with someone that didn't accept"); if (gguid != guid) { - RestoreState(gguid, "Proposal Fail (someone in group didn't accepted)"); + RestoreState(it->second.group, "Proposal Fail (someone in group didn't accepted)"); SendLfgUpdateParty(guid, updateData); } else @@ -1325,9 +1340,9 @@ void LFGMgr::InitBoot(uint64 gguid, uint64 kicker, uint64 victim, std::string co Update Boot info with player answer @param[in] guid Player who has answered - @param[in] accept player answer + @param[in] player answer */ -void LFGMgr::UpdateBoot(uint64 guid, bool accept) +void LFGMgr::UpdateBoot(uint64 guid, LfgAnswer answer) { uint64 gguid = GetGroup(guid); if (!gguid) @@ -1339,26 +1354,42 @@ void LFGMgr::UpdateBoot(uint64 guid, bool accept) LfgPlayerBoot& boot = itBoot->second; - if (boot.votes[guid] != LFG_ANSWER_PENDING) // Cheat check: Player can't vote twice - return; - - boot.votes[guid] = LfgAnswer(accept); - uint8 votesNum = 0; uint8 agreeNum = 0; - for (LfgAnswerContainer::const_iterator itVotes = boot.votes.begin(); itVotes != boot.votes.end(); ++itVotes) + + if (guid == boot.victim) + agreeNum = LFG_GROUP_KICK_VOTES_NEEDED + 1; // +1 on purpose to skip kick code + else if (answer == LFG_ANSWER_PENDING) { - if (itVotes->second != LFG_ANSWER_PENDING) + boot.votes.erase(guid); + // If we don't have enough members - force boot fail + if (boot.votes.size() <= LFG_GROUP_KICK_VOTES_NEEDED) { - ++votesNum; - if (itVotes->second == LFG_ANSWER_AGREE) - ++agreeNum; + agreeNum = 0; + votesNum = boot.votes.size(); } } + else + { + if (boot.votes[guid] != LFG_ANSWER_PENDING) // Cheat check: Player can't vote twice + return; - // if we don't have enough votes (agree or deny) do nothing - if (agreeNum < LFG_GROUP_KICK_VOTES_NEEDED && (votesNum - agreeNum) < LFG_GROUP_KICK_VOTES_NEEDED) - return; + boot.votes[guid] = answer; + + for (LfgAnswerContainer::const_iterator itVotes = boot.votes.begin(); itVotes != boot.votes.end(); ++itVotes) + { + if (itVotes->second != LFG_ANSWER_PENDING) + { + ++votesNum; + if (itVotes->second == LFG_ANSWER_AGREE) + ++agreeNum; + } + } + + // if we don't have enough votes (agree or deny) do nothing + if (agreeNum < LFG_GROUP_KICK_VOTES_NEEDED && (votesNum - agreeNum) < LFG_GROUP_KICK_VOTES_NEEDED) + return; + } // Send update info to all players boot.inProgress = false; @@ -1517,7 +1548,6 @@ void LFGMgr::RewardDungeonDoneFor(const uint32 dungeonId, Player* player) // Clear player related lfg stuff uint32 rDungeonId = (*GetSelectedDungeons(guid).begin()); - ClearState(guid, "Dungeon Finished"); SetState(guid, LFG_STATE_FINISHED_DUNGEON); // Give rewards only if its a random or seasonal dungeon @@ -1621,14 +1651,14 @@ LfgState LFGMgr::GetState(uint64 guid) else state = PlayersStore[guid].GetState(); - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetState: [" UI64FMTD "] = %u", guid, state); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::GetState: [" UI64FMTD "] = %u", guid, state); return state; } uint32 LFGMgr::GetDungeon(uint64 guid, bool asId /*= true */) { uint32 dungeon = GroupsStore[guid].GetDungeon(asId); - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetDungeon: [" UI64FMTD "] asId: %u = %u", guid, asId, dungeon); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::GetDungeon: [" UI64FMTD "] asId: %u = %u", guid, asId, dungeon); return dungeon; } @@ -1640,20 +1670,20 @@ uint32 LFGMgr::GetDungeonMapId(uint64 guid) if (LFGDungeonData const* dungeon = GetLFGDungeon(dungeonId)) mapId = dungeon->map; - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetDungeonMapId: [" UI64FMTD "] = %u (DungeonId = %u)", guid, mapId, dungeonId); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::GetDungeonMapId: [" UI64FMTD "] = %u (DungeonId = %u)", guid, mapId, dungeonId); return mapId; } uint8 LFGMgr::GetRoles(uint64 guid) { uint8 roles = PlayersStore[guid].GetRoles(); - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetRoles: [" UI64FMTD "] = %u", guid, roles); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::GetRoles: [" UI64FMTD "] = %u", guid, roles); return roles; } const std::string& LFGMgr::GetComment(uint64 guid) { - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetComment: [" UI64FMTD "] = %s", guid, PlayersStore[guid].GetComment().c_str()); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::GetComment: [" UI64FMTD "] = %s", guid, PlayersStore[guid].GetComment().c_str()); return PlayersStore[guid].GetComment(); } @@ -1669,48 +1699,50 @@ bool LFGMgr::IsTeleported(uint64 pguid) const LfgDungeonSet& LFGMgr::GetSelectedDungeons(uint64 guid) { - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetSelectedDungeons: [" UI64FMTD "]", guid); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::GetSelectedDungeons: [" UI64FMTD "]", guid); return PlayersStore[guid].GetSelectedDungeons(); } const LfgLockMap& LFGMgr::GetLockedDungeons(uint64 guid) { - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetLockedDungeons: [" UI64FMTD "]", guid); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::GetLockedDungeons: [" UI64FMTD "]", guid); return PlayersStore[guid].GetLockedDungeons(); } uint8 LFGMgr::GetKicksLeft(uint64 guid) { uint8 kicks = GroupsStore[guid].GetKicksLeft(); - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetKicksLeft: [" UI64FMTD "] = %u", guid, kicks); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::GetKicksLeft: [" UI64FMTD "] = %u", guid, kicks); return kicks; } void LFGMgr::RestoreState(uint64 guid, char const *debugMsg) { - LfgGroupData& data = GroupsStore[guid]; - if (sLog->ShouldLog(LOG_FILTER_LFG, LOG_LEVEL_DEBUG)) + if (IS_GROUP(guid)) { - std::string const& ps = GetStateString(data.GetState()); - std::string const& os = GetStateString(data.GetOldState()); - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::RestoreState: Group: [" UI64FMTD "] (%s) State: %s, oldState: %s", - guid, debugMsg, ps.c_str(), os.c_str()); + LfgGroupData& data = GroupsStore[guid]; + if (sLog->ShouldLog(LOG_FILTER_LFG, LOG_LEVEL_DEBUG)) + { + std::string const& ps = GetStateString(data.GetState()); + std::string const& os = GetStateString(data.GetOldState()); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::RestoreState: Group: [" UI64FMTD "] (%s) State: %s, oldState: %s", + guid, debugMsg, ps.c_str(), os.c_str()); + } + + data.RestoreState(); } - - data.RestoreState(); -} - -void LFGMgr::ClearState(uint64 guid, char const *debugMsg) -{ - LfgPlayerData& data = PlayersStore[guid]; - if (sLog->ShouldLog(LOG_FILTER_LFG, LOG_LEVEL_DEBUG)) + else { - std::string const& ps = GetStateString(data.GetState()); - std::string const& os = GetStateString(data.GetOldState()); - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::ClearState: Player: [" UI64FMTD "] (%s) State: %s, oldState: %s", - guid, debugMsg, ps.c_str(), os.c_str()); + LfgPlayerData& data = PlayersStore[guid]; + if (sLog->ShouldLog(LOG_FILTER_LFG, LOG_LEVEL_DEBUG)) + { + std::string const& ps = GetStateString(data.GetState()); + std::string const& os = GetStateString(data.GetOldState()); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::RestoreState: Player: [" UI64FMTD "] (%s) State: %s, oldState: %s", + guid, debugMsg, ps.c_str(), os.c_str()); + } + data.RestoreState(); } - data.ClearState(); } void LFGMgr::SetState(uint64 guid, LfgState state) @@ -1723,7 +1755,7 @@ void LFGMgr::SetState(uint64 guid, LfgState state) std::string const& ns = GetStateString(state); std::string const& ps = GetStateString(data.GetState()); std::string const& os = GetStateString(data.GetOldState()); - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetState: Group: [" UI64FMTD "] newState: %s, previous: %s, oldState: %s", + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::SetState: Group: [" UI64FMTD "] newState: %s, previous: %s, oldState: %s", guid, ns.c_str(), ps.c_str(), os.c_str()); } data.SetState(state); @@ -1736,7 +1768,7 @@ void LFGMgr::SetState(uint64 guid, LfgState state) std::string const& ns = GetStateString(state); std::string const& ps = GetStateString(data.GetState()); std::string const& os = GetStateString(data.GetOldState()); - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetState: Player: [" UI64FMTD "] newState: %s, previous: %s, oldState: %s", + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::SetState: Player: [" UI64FMTD "] newState: %s, previous: %s, oldState: %s", guid, ns.c_str(), ps.c_str(), os.c_str()); } data.SetState(state); @@ -1745,43 +1777,43 @@ void LFGMgr::SetState(uint64 guid, LfgState state) void LFGMgr::SetDungeon(uint64 guid, uint32 dungeon) { - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetDungeon: [" UI64FMTD "] dungeon %u", guid, dungeon); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::SetDungeon: [" UI64FMTD "] dungeon %u", guid, dungeon); GroupsStore[guid].SetDungeon(dungeon); } void LFGMgr::SetRoles(uint64 guid, uint8 roles) { - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetRoles: [" UI64FMTD "] roles: %u", guid, roles); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::SetRoles: [" UI64FMTD "] roles: %u", guid, roles); PlayersStore[guid].SetRoles(roles); } void LFGMgr::SetComment(uint64 guid, const std::string& comment) { - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetComment: [" UI64FMTD "] comment: %s", guid, comment.c_str()); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::SetComment: [" UI64FMTD "] comment: %s", guid, comment.c_str()); PlayersStore[guid].SetComment(comment); } void LFGMgr::SetSelectedDungeons(uint64 guid, const LfgDungeonSet& dungeons) { - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetSelectedDungeons: [" UI64FMTD "]", guid); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::SetSelectedDungeons: [" UI64FMTD "]", guid); PlayersStore[guid].SetSelectedDungeons(dungeons); } void LFGMgr::SetLockedDungeons(uint64 guid, const LfgLockMap& lock) { - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetLockedDungeons: [" UI64FMTD "]", guid); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::SetLockedDungeons: [" UI64FMTD "]", guid); PlayersStore[guid].SetLockedDungeons(lock); } void LFGMgr::DecreaseKicksLeft(uint64 guid) { - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::DecreaseKicksLeft: [" UI64FMTD "]", guid); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::DecreaseKicksLeft: [" UI64FMTD "]", guid); GroupsStore[guid].DecreaseKicksLeft(); } void LFGMgr::RemovePlayerData(uint64 guid) { - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::RemovePlayerData: [" UI64FMTD "]", guid); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::RemovePlayerData: [" UI64FMTD "]", guid); LfgPlayerDataContainer::iterator it = PlayersStore.find(guid); if (it != PlayersStore.end()) PlayersStore.erase(it); @@ -1789,18 +1821,23 @@ void LFGMgr::RemovePlayerData(uint64 guid) void LFGMgr::RemoveGroupData(uint64 guid) { - sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::RemoveGroupData: [" UI64FMTD "]", guid); + sLog->outTrace(LOG_FILTER_LFG, "LFGMgr::RemoveGroupData: [" UI64FMTD "]", guid); LfgGroupDataContainer::iterator it = GroupsStore.find(guid); if (it == GroupsStore.end()) return; + LfgState state = GetState(guid); + // If group is being formed after proposal success do nothing more LfgGuidSet const& players = it->second.GetPlayers(); for (LfgGuidSet::const_iterator it = players.begin(); it != players.end(); ++it) { uint64 guid = (*it); - ClearState(*it, "Group Disband"); SetGroup(*it, 0); - SendLfgUpdateParty(guid, LfgUpdateData(LFG_UPDATETYPE_REMOVED_FROM_QUEUE)); + if (state != LFG_STATE_PROPOSAL) + { + SetState(*it, LFG_STATE_NONE); + SendLfgUpdateParty(guid, LfgUpdateData(LFG_UPDATETYPE_REMOVED_FROM_QUEUE)); + } } GroupsStore.erase(it); } diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h index 9c023d1daf8..158514a080a 100755 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -254,7 +254,7 @@ struct LfgPlayerBoot { time_t cancelTime; ///< Time left to vote bool inProgress; ///< Vote in progress - LfgAnswerContainer votes; ///< Player votes (-1 not answer | 0 Not agree | 1 agree) + LfgAnswerContainer votes; ///< Player votes (-1 not answer | 0 Not agree | 1 agree) uint64 victim; ///< Player guid to be kicked (can't vote) std::string reason; ///< kick reason }; @@ -322,7 +322,7 @@ class LFGMgr // Vote kick void InitBoot(uint64 gguid, uint64 kguid, uint64 vguid, std::string const& reason); - void UpdateBoot(uint64 guid, bool accept); + void UpdateBoot(uint64 guid, LfgAnswer accept = LFG_ANSWER_PENDING); void InitializeLockedDungeons(Player* player, uint8 level = 0); diff --git a/src/server/game/DungeonFinding/LFGPlayerData.cpp b/src/server/game/DungeonFinding/LFGPlayerData.cpp index f1281875598..deee0ddae3c 100644 --- a/src/server/game/DungeonFinding/LFGPlayerData.cpp +++ b/src/server/game/DungeonFinding/LFGPlayerData.cpp @@ -33,23 +33,27 @@ void LfgPlayerData::SetState(LfgState state) case LFG_STATE_FINISHED_DUNGEON: m_Roles = 0; m_SelectedDungeons.clear(); + m_Comment = ""; // No break on purpose case LFG_STATE_DUNGEON: - m_OldState = m_State; + m_OldState = state; // No break on purpose default: m_State = state; } } -void LfgPlayerData::ClearState() +void LfgPlayerData::RestoreState() { - m_SelectedDungeons.clear(); - m_Roles = 0; + if (m_OldState == LFG_STATE_NONE) + { + m_SelectedDungeons.clear(); + m_Roles = 0; + } m_State = m_OldState; } -void LfgPlayerData::SetLockedDungeons(const LfgLockMap& lockStatus) +void LfgPlayerData::SetLockedDungeons(LfgLockMap const& lockStatus) { m_LockedDungeons = lockStatus; } @@ -69,12 +73,12 @@ void LfgPlayerData::SetRoles(uint8 roles) m_Roles = roles; } -void LfgPlayerData::SetComment(const std::string& comment) +void LfgPlayerData::SetComment(std::string const& comment) { m_Comment = comment; } -void LfgPlayerData::SetSelectedDungeons(const LfgDungeonSet& dungeons) +void LfgPlayerData::SetSelectedDungeons(LfgDungeonSet const& dungeons) { m_SelectedDungeons = dungeons; } diff --git a/src/server/game/DungeonFinding/LFGPlayerData.h b/src/server/game/DungeonFinding/LFGPlayerData.h index 0682ad66698..589404cf65c 100644 --- a/src/server/game/DungeonFinding/LFGPlayerData.h +++ b/src/server/game/DungeonFinding/LFGPlayerData.h @@ -31,7 +31,7 @@ class LfgPlayerData // General void SetState(LfgState state); - void ClearState(); + void RestoreState(); void SetLockedDungeons(LfgLockMap const& lock); void SetTeam(uint8 team); void SetGroup(uint64 group); @@ -56,7 +56,7 @@ class LfgPlayerData private: // General LfgState m_State; ///< State if group in LFG - LfgState m_OldState; ///< Old State + LfgState m_OldState; ///< Old State - Used to restore state after failed Rolecheck/Proposal // Player LfgLockMap m_LockedDungeons; ///< Dungeons player can't do and reason uint8 m_Team; ///< Player team - determines the queue to join diff --git a/src/server/game/DungeonFinding/LFGQueue.cpp b/src/server/game/DungeonFinding/LFGQueue.cpp index 3bcd1ee5643..bfcf17dc270 100644 --- a/src/server/game/DungeonFinding/LFGQueue.cpp +++ b/src/server/game/DungeonFinding/LFGQueue.cpp @@ -483,12 +483,7 @@ LfgCompatibility LFGQueue::CheckCompatibility(LfgGuidList check) } proposal.queues = check; - if (check.size() == 1) - { - for (LfgGroupsMap::const_iterator it = proposalGroups.begin(); it != proposalGroups.end(); ++it) - if (proposal.group && it->second != proposal.group) - proposal.isNew = false; - } + proposal.isNew = numLfgGroups != 1; if (!sLFGMgr->AllQueued(check)) { diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp index f9e3c02fe98..32dc8319215 100644 --- a/src/server/game/DungeonFinding/LFGScripts.cpp +++ b/src/server/game/DungeonFinding/LFGScripts.cpp @@ -161,7 +161,6 @@ void LFGGroupScript::OnRemoveMember(Group* group, uint64 guid, RemoveMethod meth } sLFGMgr->LeaveLfg(guid); - sLFGMgr->SetState(guid, LFG_STATE_NONE); sLFGMgr->SetGroup(guid, 0); uint8 players = sLFGMgr->RemovePlayerFromGroup(gguid, guid); diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 45473f792c4..1eeb2b3fe7b 100755 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -368,10 +368,13 @@ bool Group::AddMember(Player* player) if (player) { player->SetGroupInvite(NULL); - if (player->GetGroup() && (isBGGroup() || isBFGroup())) // if player is in group and he is being added to BG raid group, then call SetBattlegroundRaid() - player->SetBattlegroundOrBattlefieldRaid(this, subGroup); - else if (player->GetGroup()) //if player is in bg raid and we are adding him to normal group, then call SetOriginalGroup() - player->SetOriginalGroup(this, subGroup); + if (player->GetGroup()) + { + if (isBGGroup() || isBFGroup()) // if player is in group and he is being added to BG raid group, then call SetBattlegroundRaid() + player->SetBattlegroundOrBattlefieldRaid(this, subGroup); + else //if player is in bg raid and we are adding him to normal group, then call SetOriginalGroup() + player->SetOriginalGroup(this, subGroup); + } else //if player is not in group, then call set group player->SetGroup(this, subGroup); diff --git a/src/server/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp index 3f33b60329b..177815d7454 100755 --- a/src/server/game/Handlers/LFGHandler.cpp +++ b/src/server/game/Handlers/LFGHandler.cpp @@ -146,7 +146,7 @@ void WorldSession::HandleLfgSetBootVoteOpcode(WorldPacket& recvData) uint64 guid = GetPlayer()->GetGUID(); sLog->outDebug(LOG_FILTER_LFG, "CMSG_LFG_SET_BOOT_VOTE %s agree: %u", GetPlayerInfo().c_str(), agree ? 1 : 0); - sLFGMgr->UpdateBoot(guid, agree); + sLFGMgr->UpdateBoot(guid, agree ? LFG_ANSWER_AGREE : LFG_ANSWER_DENY); } void WorldSession::HandleLfgTeleportOpcode(WorldPacket& recvData) From bdbafc018414f9831d045a03cf8cefe1c8e9b6f6 Mon Sep 17 00:00:00 2001 From: Subv Date: Mon, 26 Nov 2012 14:34:23 -0500 Subject: [PATCH 05/23] Core/Conditions: Add CONDITION_GENDER = 20 --- src/server/game/Conditions/ConditionMgr.cpp | 22 +++++++++++++++++++++ src/server/game/Conditions/ConditionMgr.h | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 029272b3841..dbde48bd257 100755 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -105,6 +105,12 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) condMeets = unit->getRaceMask() & ConditionValue1; break; } + case CONDITION_GENDER: + { + if (Player* player = object->ToPlayer()) + condMeets = player->getGender() == ConditionValue1; + break; + } case CONDITION_SKILL: { if (Player* player = object->ToPlayer()) @@ -442,6 +448,8 @@ uint32 Condition::GetSearcherTypeMaskForCondition() case CONDITION_SPAWNMASK: mask |= GRID_MAP_TYPE_MASK_ALL; break; + case CONDITION_GENDER: + mask |= GRID_MAP_TYPE_MASK_PLAYER; default: ASSERT(false && "Condition::GetSearcherTypeMaskForCondition - missing condition handling!"); break; @@ -1616,6 +1624,20 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) sLog->outError(LOG_FILTER_SQL, "Race condition has useless data in value3 (%u)!", cond->ConditionValue3); break; } + case CONDITION_GENDER: + { + if (!Player::IsValidGender(uint8(cond->ConditionValue1))) + { + sLog->outError(LOG_FILTER_SQL, "Gender condition has invalid gender (%u), skipped", cond->ConditionValue1); + return false; + } + + if (cond->ConditionValue2) + sLog->outError(LOG_FILTER_SQL, "Gender condition has useless data in value2 (%u)!", cond->ConditionValue2); + if (cond->ConditionValue3) + sLog->outError(LOG_FILTER_SQL, "Gender condition has useless data in value3 (%u)!", cond->ConditionValue3); + break; + } case CONDITION_MAPID: { MapEntry const* me = sMapStore.LookupEntry(cond->ConditionValue1); diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index 7ffb6ff584c..0adf44a2d5a 100755 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -53,7 +53,7 @@ enum ConditionTypes CONDITION_ACHIEVEMENT = 17, // achievement_id 0 0 true if achievement is complete CONDITION_TITLE = 18, // title id 0 0 true if player has title CONDITION_SPAWNMASK = 19, // spawnMask 0 0 true if in spawnMask - CONDITION_UNUSED_20 = 20, // + CONDITION_GENDER = 20, // gender 0 0 true if player's gender is equal to gender CONDITION_UNUSED_21 = 21, // CONDITION_MAPID = 22, // map_id 0 0 true if in map_id CONDITION_AREAID = 23, // area_id 0 0 true if in area_id From 4762ad726f9fb95c7236a8eb12e745ac8435469b Mon Sep 17 00:00:00 2001 From: click Date: Mon, 26 Nov 2012 22:42:23 +0100 Subject: [PATCH 06/23] Core/Buildsystem: Start cleaning up the mess created after "implementing" support for clang/OSX-based compiles - initial cleanup, more will come If OSX-compile fucks up because of this, then report fixes on the tracker as usual, not through hotpatches going through other lead devs. --- cmake/macros/CheckPlatform.cmake | 2 -- cmake/platform/osx/settings.cmake | 33 ------------------------------ cmake/platform/unix/settings.cmake | 2 ++ 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 cmake/platform/osx/settings.cmake diff --git a/cmake/macros/CheckPlatform.cmake b/cmake/macros/CheckPlatform.cmake index addc619207f..e08aaed8db2 100644 --- a/cmake/macros/CheckPlatform.cmake +++ b/cmake/macros/CheckPlatform.cmake @@ -11,8 +11,6 @@ include("${CMAKE_SOURCE_DIR}/cmake/platform/settings.cmake") if(WIN32) include("${CMAKE_SOURCE_DIR}/cmake/platform/win/settings.cmake") -elseif(APPLE) - include("${CMAKE_SOURCE_DIR}/cmake/platform/osx/settings.cmake") elseif(UNIX) include("${CMAKE_SOURCE_DIR}/cmake/platform/unix/settings.cmake") endif() diff --git a/cmake/platform/osx/settings.cmake b/cmake/platform/osx/settings.cmake deleted file mode 100644 index 3d232c5a1f0..00000000000 --- a/cmake/platform/osx/settings.cmake +++ /dev/null @@ -1,33 +0,0 @@ -set(MACOSX 1) - -# set default configuration directory -if( NOT CONF_DIR ) - set(CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc) - message(STATUS "OSX: Using default configuration directory") -endif() - -# set default library directory -if( NOT LIBSDIR ) - set(LIBSDIR ${CMAKE_INSTALL_PREFIX}/lib) - message(STATUS "OSX: Using default library directory") -endif() - -# configure uninstaller -configure_file( - "${CMAKE_SOURCE_DIR}/cmake/platform/cmake_uninstall.in.cmake" - "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY -) -message(STATUS "OSX: Configuring uninstall target") - -# create uninstaller target (allows for using "make uninstall") -add_custom_target(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" -) -message(STATUS "OSX: Created uninstall target") - -if (CMAKE_COMPILER_IS_GNUCC) - include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake) -elseif (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") - include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake) -endif() diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake index c79cfc4ed4f..a851c8acf7a 100644 --- a/cmake/platform/unix/settings.cmake +++ b/cmake/platform/unix/settings.cmake @@ -36,4 +36,6 @@ if(CMAKE_C_COMPILER MATCHES "gcc") include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake) elseif(CMAKE_C_COMPILER MATCHES "icc") include(${CMAKE_SOURCE_DIR}/cmake/compiler/icc/settings.cmake) +elseif(CMAKE_C_COMPILER MATCHES "clang") + include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake) endif() From 44f3930cf0cdaddf7e5c193bead13817edee9359 Mon Sep 17 00:00:00 2001 From: w1sht0l1v3 Date: Mon, 26 Nov 2012 23:50:14 +0200 Subject: [PATCH 07/23] Fix compile after bdbafc018414f9831d045a03cf8cefe1c8e9b6f6 --- src/server/game/Conditions/ConditionMgr.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index dbde48bd257..85d0cb36ca4 100755 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -450,6 +450,7 @@ uint32 Condition::GetSearcherTypeMaskForCondition() break; case CONDITION_GENDER: mask |= GRID_MAP_TYPE_MASK_PLAYER; + break; default: ASSERT(false && "Condition::GetSearcherTypeMaskForCondition - missing condition handling!"); break; @@ -1897,9 +1898,6 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) } break; } - case CONDITION_UNUSED_20: - sLog->outError(LOG_FILTER_SQL, "Found ConditionTypeOrReference = CONDITION_UNUSED_20 in `conditions` table - ignoring"); - return false; case CONDITION_UNUSED_21: sLog->outError(LOG_FILTER_SQL, "Found ConditionTypeOrReference = CONDITION_UNUSED_21 in `conditions` table - ignoring"); return false; From 7accb42cc4e6959586dd783c2b3a542faf1f2018 Mon Sep 17 00:00:00 2001 From: Gacko Date: Mon, 26 Nov 2012 15:32:30 +0100 Subject: [PATCH 08/23] Core/DB: Convert 25 more scripts to creature text --- .../2012_11_24_02_world_creature_text.sql | 338 ++++++++++++++++++ .../MoltenCore/boss_baron_geddon.cpp | 7 +- .../MoltenCore/boss_magmadar.cpp | 4 +- .../MoltenCore/boss_majordomo_executus.cpp | 27 +- .../ScarletEnclave/chapter1.cpp | 65 ++-- .../ScarletEnclave/chapter2.cpp | 42 +-- .../EasternKingdoms/Stratholme/stratholme.cpp | 12 +- .../EasternKingdoms/ZulGurub/boss_arlokk.cpp | 14 +- .../EasternKingdoms/ZulGurub/boss_hakkar.cpp | 33 +- .../EasternKingdoms/ZulGurub/boss_jeklik.cpp | 34 +- .../EasternKingdoms/ZulGurub/boss_jindo.cpp | 27 +- .../ZulGurub/boss_mandokir.cpp | 43 +-- .../EasternKingdoms/ZulGurub/boss_marli.cpp | 31 +- .../EasternKingdoms/ZulGurub/boss_thekal.cpp | 14 +- .../EasternKingdoms/eversong_woods.cpp | 11 +- .../EasternKingdoms/isle_of_queldanas.cpp | 14 +- .../EasternKingdoms/redridge_mountains.cpp | 20 +- .../EasternKingdoms/silverpine_forest.cpp | 53 ++- .../EasternKingdoms/tirisfal_glades.cpp | 2 +- .../EasternKingdoms/western_plaguelands.cpp | 36 +- .../scripts/Examples/example_creature.cpp | 37 +- .../scripts/Examples/example_escort.cpp | 49 +-- .../Examples/example_gossip_codebox.cpp | 16 +- src/server/scripts/Examples/example_misc.cpp | 7 +- src/server/scripts/Kalimdor/boss_azuregos.cpp | 4 +- src/server/scripts/Kalimdor/ungoro_crater.cpp | 81 ++--- 26 files changed, 659 insertions(+), 362 deletions(-) create mode 100644 sql/updates/world/2012_11_24_02_world_creature_text.sql diff --git a/sql/updates/world/2012_11_24_02_world_creature_text.sql b/sql/updates/world/2012_11_24_02_world_creature_text.sql new file mode 100644 index 00000000000..4f6499e072f --- /dev/null +++ b/sql/updates/world/2012_11_24_02_world_creature_text.sql @@ -0,0 +1,338 @@ +-- ------------------------------- -- +-- Creature text conversion part 3 -- +-- ------------------------------- -- +-- crusader +DELETE FROM `creature_text` WHERE `entry` IN (28939,28610,28940) AND `groupid` IN (6,7,8); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +-- Scarlet Preacher +(28939,6,0,12,0,100,"break crusader SAY_PERSUADED5","LIES! The pain you are about to endure will be talked about for years to come!"), +(28939,7,0,12,0,100,"break crusader SAY_PERSUADED6","NO! PLEASE! There is one more thing that I forgot to mention... A courier comes soon... From Hearthglen. It..."), +(28939,8,0,12,0,100,"player SAY_PERSUADE1","I'll tear the secrets from your soul! Tell me about the \"Crimson Dawn\" and your life may be spared!"), +(28939,8,1,12,0,100,"player SAY_PERSUADE2","Tell me what you know about \"Crimson Dawn\" or the beatings will continue!"), +(28939,8,2,12,0,100,"player SAY_PERSUADE3","I'm through being courteous with your kind, human! What is the \"Crimson Dawn\"?"), +(28939,8,3,12,0,100,"player SAY_PERSUADE4","Is your life worth so little? Just tell me what I need to know about \"Crimson Dawn\" and I'll end your suffering quickly."), +(28939,8,4,12,0,100,"player SAY_PERSUADE5","I can keep this up for a very long time, Scarlet dog! Tell me about the \"Crimson Dawn\"!"), +(28939,8,5,12,0,100,"player SAY_PERSUADE6","What is the \"Crimson Dawn\"?"), +(28939,8,6,12,0,100,"player SAY_PERSUADE7","\"Crimson Dawn\"! What is it! Speak!"), +-- Scarlet Crusader +(28940,6,0,12,0,100,"break crusader SAY_PERSUADED5","LIES! The pain you are about to endure will be talked about for years to come!"), +(28940,7,0,12,0,100,"break crusader SAY_PERSUADED6","NO! PLEASE! There is one more thing that I forgot to mention... A courier comes soon... From Hearthglen. It..."), +(28940,8,0,12,0,100,"player SAY_PERSUADE1","I'll tear the secrets from your soul! Tell me about the \"Crimson Dawn\" and your life may be spared!"), +(28940,8,1,12,0,100,"player SAY_PERSUADE2","Tell me what you know about \"Crimson Dawn\" or the beatings will continue!"), +(28940,8,2,12,0,100,"player SAY_PERSUADE3","I'm through being courteous with your kind, human! What is the \"Crimson Dawn\"?"), +(28940,8,3,12,0,100,"player SAY_PERSUADE4","Is your life worth so little? Just tell me what I need to know about \"Crimson Dawn\" and I'll end your suffering quickly."), +(28940,8,4,12,0,100,"player SAY_PERSUADE5","I can keep this up for a very long time, Scarlet dog! Tell me about the \"Crimson Dawn\"!"), +(28940,8,5,12,0,100,"player SAY_PERSUADE6","What is the \"Crimson Dawn\"?"), +(28940,8,6,12,0,100,"player SAY_PERSUADE7","\"Crimson Dawn\"! What is it! Speak!"), +-- Scarlet Marksman +(28610,6,0,12,0,100,"break crusader SAY_PERSUADED5","LIES! The pain you are about to endure will be talked about for years to come!"), +(28610,7,0,12,0,100,"break crusader SAY_PERSUADED6","NO! PLEASE! There is one more thing that I forgot to mention... A courier comes soon... From Hearthglen. It..."), +(28610,8,0,12,0,100,"player SAY_PERSUADE1","I'll tear the secrets from your soul! Tell me about the \"Crimson Dawn\" and your life may be spared!"), +(28610,8,1,12,0,100,"player SAY_PERSUADE2","Tell me what you know about \"Crimson Dawn\" or the beatings will continue!"), +(28610,8,2,12,0,100,"player SAY_PERSUADE3","I'm through being courteous with your kind, human! What is the \"Crimson Dawn\"?"), +(28610,8,3,12,0,100,"player SAY_PERSUADE4","Is your life worth so little? Just tell me what I need to know about \"Crimson Dawn\" and I'll end your suffering quickly."), +(28610,8,4,12,0,100,"player SAY_PERSUADE5","I can keep this up for a very long time, Scarlet dog! Tell me about the \"Crimson Dawn\"!"), +(28610,8,5,12,0,100,"player SAY_PERSUADE6","What is the \"Crimson Dawn\"?"), +(28610,8,6,12,0,100,"player SAY_PERSUADE7","\"Crimson Dawn\"! What is it! Speak!"); + +-- unworthy initiate +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1609016 AND -1609000; +DELETE FROM `creature_text` WHERE `entry` IN (29519,29520,29565,29566,29567); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(29519,0,0,12,0,100,"unworthy initiate SAY_EVENT_START_1","You have made a grave error, fiend!"), +(29519,0,1,12,0,100,"unworthy initiate SAY_EVENT_START_2","I was a soldier of the Light once... Look at what I have become... "), +(29519,0,2,12,0,100,"unworthy initiate SAY_EVENT_START_3","You are hopelessly outmatched, $R."), +(29519,0,3,12,0,100,"unworthy initiate SAY_EVENT_START_4","They brand me unworthy? I will show them unmorthy!"), +(29519,0,4,12,0,100,"unworthy initiate SAY_EVENT_START_5","You will allow me a weapon and armor, yes?"), +(29519,0,5,12,0,100,"unworthy initiate SAY_EVENT_START_6","I will win my freedom and leave this cursed place!"), +(29519,0,6,12,0,100,"unworthy initiate SAY_EVENT_START_7","I will dismantle this festering hellhole!"), +(29519,0,7,12,0,100,"unworthy initiate SAY_EVENT_START_8","There can be only one survivor!"), +(29519,1,0,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_1","To battle!"), +(29519,1,1,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_2","Let your fears consume you!"), +(29519,1,2,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_3","HAH! You can barely hold a blade! Yours will be a quick death."), +(29519,1,3,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_4","And now you die"), +(29519,1,4,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_5","To battle!"), +(29519,1,5,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_6","There is no hope for our future..."), +(29519,1,6,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_7","Sate your hunger on cold steel, $R"), +(29519,1,7,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_8","It ends here!"), +(29519,1,8,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_9","Death is the only cure!"), +(29520,0,0,12,0,100,"unworthy initiate SAY_EVENT_START_1","You have made a grave error, fiend!"), +(29520,0,1,12,0,100,"unworthy initiate SAY_EVENT_START_2","I was a soldier of the Light once... Look at what I have become... "), +(29520,0,2,12,0,100,"unworthy initiate SAY_EVENT_START_3","You are hopelessly outmatched, $R."), +(29520,0,3,12,0,100,"unworthy initiate SAY_EVENT_START_4","They brand me unworthy? I will show them unmorthy!"), +(29520,0,4,12,0,100,"unworthy initiate SAY_EVENT_START_5","You will allow me a weapon and armor, yes?"), +(29520,0,5,12,0,100,"unworthy initiate SAY_EVENT_START_6","I will win my freedom and leave this cursed place!"), +(29520,0,6,12,0,100,"unworthy initiate SAY_EVENT_START_7","I will dismantle this festering hellhole!"), +(29520,0,7,12,0,100,"unworthy initiate SAY_EVENT_START_8","There can be only one survivor!"), +(29520,1,0,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_1","To battle!"), +(29520,1,1,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_2","Let your fears consume you!"), +(29520,1,2,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_3","HAH! You can barely hold a blade! Yours will be a quick death."), +(29520,1,3,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_4","And now you die"), +(29520,1,4,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_5","To battle!"), +(29520,1,5,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_6","There is no hope for our future..."), +(29520,1,6,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_7","Sate your hunger on cold steel, $R"), +(29520,1,7,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_8","It ends here!"), +(29520,1,8,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_9","Death is the only cure!"), +(29565,0,0,12,0,100,"unworthy initiate SAY_EVENT_START_1","You have made a grave error, fiend!"), +(29565,0,1,12,0,100,"unworthy initiate SAY_EVENT_START_2","I was a soldier of the Light once... Look at what I have become... "), +(29565,0,2,12,0,100,"unworthy initiate SAY_EVENT_START_3","You are hopelessly outmatched, $R."), +(29565,0,3,12,0,100,"unworthy initiate SAY_EVENT_START_4","They brand me unworthy? I will show them unmorthy!"), +(29565,0,4,12,0,100,"unworthy initiate SAY_EVENT_START_5","You will allow me a weapon and armor, yes?"), +(29565,0,5,12,0,100,"unworthy initiate SAY_EVENT_START_6","I will win my freedom and leave this cursed place!"), +(29565,0,6,12,0,100,"unworthy initiate SAY_EVENT_START_7","I will dismantle this festering hellhole!"), +(29565,0,7,12,0,100,"unworthy initiate SAY_EVENT_START_8","There can be only one survivor!"), +(29565,1,0,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_1","To battle!"), +(29565,1,1,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_2","Let your fears consume you!"), +(29565,1,2,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_3","HAH! You can barely hold a blade! Yours will be a quick death."), +(29565,1,3,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_4","And now you die"), +(29565,1,4,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_5","To battle!"), +(29565,1,5,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_6","There is no hope for our future..."), +(29565,1,6,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_7","Sate your hunger on cold steel, $R"), +(29565,1,7,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_8","It ends here!"), +(29565,1,8,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_9","Death is the only cure!"), +(29566,0,0,12,0,100,"unworthy initiate SAY_EVENT_START_1","You have made a grave error, fiend!"), +(29566,0,1,12,0,100,"unworthy initiate SAY_EVENT_START_2","I was a soldier of the Light once... Look at what I have become... "), +(29566,0,2,12,0,100,"unworthy initiate SAY_EVENT_START_3","You are hopelessly outmatched, $R."), +(29566,0,3,12,0,100,"unworthy initiate SAY_EVENT_START_4","They brand me unworthy? I will show them unmorthy!"), +(29566,0,4,12,0,100,"unworthy initiate SAY_EVENT_START_5","You will allow me a weapon and armor, yes?"), +(29566,0,5,12,0,100,"unworthy initiate SAY_EVENT_START_6","I will win my freedom and leave this cursed place!"), +(29566,0,6,12,0,100,"unworthy initiate SAY_EVENT_START_7","I will dismantle this festering hellhole!"), +(29566,0,7,12,0,100,"unworthy initiate SAY_EVENT_START_8","There can be only one survivor!"), +(29566,1,0,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_1","To battle!"), +(29566,1,1,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_2","Let your fears consume you!"), +(29566,1,2,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_3","HAH! You can barely hold a blade! Yours will be a quick death."), +(29566,1,3,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_4","And now you die"), +(29566,1,4,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_5","To battle!"), +(29566,1,5,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_6","There is no hope for our future..."), +(29566,1,6,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_7","Sate your hunger on cold steel, $R"), +(29566,1,7,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_8","It ends here!"), +(29566,1,8,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_9","Death is the only cure!"), +(29567,0,0,12,0,100,"unworthy initiate SAY_EVENT_START_1","You have made a grave error, fiend!"), +(29567,0,1,12,0,100,"unworthy initiate SAY_EVENT_START_2","I was a soldier of the Light once... Look at what I have become... "), +(29567,0,2,12,0,100,"unworthy initiate SAY_EVENT_START_3","You are hopelessly outmatched, $R."), +(29567,0,3,12,0,100,"unworthy initiate SAY_EVENT_START_4","They brand me unworthy? I will show them unmorthy!"), +(29567,0,4,12,0,100,"unworthy initiate SAY_EVENT_START_5","You will allow me a weapon and armor, yes?"), +(29567,0,5,12,0,100,"unworthy initiate SAY_EVENT_START_6","I will win my freedom and leave this cursed place!"), +(29567,0,6,12,0,100,"unworthy initiate SAY_EVENT_START_7","I will dismantle this festering hellhole!"), +(29567,0,7,12,0,100,"unworthy initiate SAY_EVENT_START_8","There can be only one survivor!"), +(29567,1,0,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_1","To battle!"), +(29567,1,1,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_2","Let your fears consume you!"), +(29567,1,2,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_3","HAH! You can barely hold a blade! Yours will be a quick death."), +(29567,1,3,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_4","And now you die"), +(29567,1,4,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_5","To battle!"), +(29567,1,5,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_6","There is no hope for our future..."), +(29567,1,6,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_7","Sate your hunger on cold steel, $R"), +(29567,1,7,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_8","It ends here!"), +(29567,1,8,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_9","Death is the only cure!"); + +-- dk initiate +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1609088 AND -1609080; +DELETE FROM `creature_text` WHERE `entry`=28406; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(28406,0,0,12,0,100,"dk initiate SAY_DUEL_A","No potions!"), +(28406,0,1,12,0,100,"dk initiate SAY_DUEL_B","Remember this day, $n, for it is the day that you will be thoroughly owned."), +(28406,0,2,12,0,100,"dk initiate SAY_DUEL_C","I'm going to tear your heart out, cupcake!"), +(28406,0,3,12,0,100,"dk initiate SAY_DUEL_D","Don't make me laugh."), +(28406,0,4,12,0,100,"dk initiate SAY_DUEL_E","Here come the tears..."), +(28406,0,5,12,0,100,"dk initiate SAY_DUEL_F","You have challenged death itself!"), +(28406,0,6,12,0,100,"dk initiate SAY_DUEL_G","The Lich King will see his true champion on this day!"), +(28406,0,7,12,0,100,"dk initiate SAY_DUEL_H","You're going down!"), +(28406,0,8,12,0,100,"dk initiate SAY_DUEL_I","You don't stand a chance, $n"); + +-- geddon +DELETE FROM `script_texts` WHERE `entry`=-1409000; +DELETE FROM `creature_text` WHERE `entry`=12056; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(12056,0,0,16,0,100,"geddon EMOTE_SERVICE","%s performs one last service for Ragnaros."); + +-- majordomo +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1409012 AND -1409003; +DELETE FROM `creature_text` WHERE `entry`=12018; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(12018,0,0,14,8035,100,"majordomo SAY_AGGRO","Reckless mortals, none may challenge the sons of the living flame!"), +(12018,1,0,14,8039,100,"majordomo SAY_SPAWN","The runes of warding have been destroyed! Hunt down the infedels my bretheren."), +(12018,2,0,14,8037,100,"majordomo SAY_SLAY","Ashes to Ashes!"), +(12018,3,0,14,8036,100,"majordomo SAY_SPECIAL","Burn mortals! Burn for this transgression!"), +(12018,4,0,14,8038,100,"majordomo SAY_DEFEAT","Impossible! Stay your attack mortals! I submitt! I submitt! Brashly you have come to rest the secrets of the living flame. You will soon regret the recklessness of your quest. I go now to summon the lord whos house this is. Should you seek an audiance with him your paltry lives will surly be forfit. Nevertheless seek out his lair if you dare!"), +(12018,5,0,14,8040,100,"majordomo SAY_SUMMON_MAJ","Behold Ragnaros, the Firelord! He who was ancient when this world was young! Bow before him, mortals! Bow before your ending!"), +(12018,6,0,14,8041,100,"majordomo SAY_ARRIVAL2_MAJ","These mortal infidels, my lord! They have invaded your sanctum, and seek to steal your secrets!"); + +-- magmadar +DELETE FROM `script_texts` WHERE `entry`=-1409001; +DELETE FROM `creature_text` WHERE `entry`=11982; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(11982,0,0,16,0,100,"magmadar EMOTE_FRENZY","%s goes into a killing frenzy!"); + +-- calvin montague +DELETE FROM `script_texts` WHERE `entry`=-1000431; +DELETE FROM `creature_text` WHERE `entry`=6784; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(6784,0,0,12,0,100,"calvin montague SAY_RIN_END_6","Ugh."); + +-- corporal keeshan +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000468 AND -1000464; +DELETE FROM `creature_text` WHERE `entry`=349; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(349,0,0,12,0,100,"corporal keeshan SAY_CORPORAL_1","My wounds are grave. Forgive my slow pace but my injuries won't allow me to walk any faster."), +(349,1,0,12,0,100,"corporal keeshan SAY_CORPORAL_2","Ah,fresh air,at last! I need a moment to reset."), +(349,2,0,12,0,100,"corporal keeshan SAY_CORPORAL_3","The Blackrock infestation is thick in these parts. I will do my best to keep the pace. Let's go!"), +(349,3,0,12,0,100,"corporal keeshan SAY_CORPORAL_4","Marshal Marris,sir. Corporal Keeshan of the 12th Sabre Regiment returned from battle and reporting for duty!"), +(349,4,0,12,0,100,"corporal keeshan SAY_CORPORAL_5","Brave adventurer,thank you for rescuing me! I am sure Marshal Marris will reward your kind deed."); + +-- anchorite truuen +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1800070 AND -1800064; +DELETE FROM `creature_text` WHERE `entry` IN (17238,1854,17233); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(17238,0,0,12,0,100,"anchorite truuen SAY_WP_0","Beware! We are attacked!"), +(17238,1,0,12,0,100,"anchorite truuen SAY_WP_1","It must be the purity of the Mark of the Lightbringer that is drawing forth the Scourge to attack us. We must proceed with caution lest we be overwhelmed!"), +(17238,2,0,12,0,100,"anchorite truuen SAY_WP_2","This land truly needs to be cleansed by the Light! Let us continue on to the tomb. It isn't far now..."), +(1854,0,0,12,0,100,"anchorite truuen SAY_WP_3","Be welcome, friends!"), +(17233,0,0,12,0,100,"anchorite truuen SAY_WP_4","Thank you for coming here in remembrance of me. Your efforts in recovering that symbol, while unnecessary, are certainly touching to an old man's heart. "), +(17233,1,0,12,0,100,"anchorite truuen SAY_WP_5","Please, rise my friend. Keep the Blessing as a symbol of the strength of the Light and how heroes long gone might once again rise in each of us to inspire. "), +(17233,2,0,12,0,100,"anchorite truuen SAY_WP_6","Thank you my friend for making this possible. This is a day that I shall never forget! I think I will stay a while. Please return to High Priestess MacDonnell at the camp. I know that she'll be keenly interested to know of what has transpired here."); + +-- hakkar +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1309023 AND -1309020; +DELETE FROM `creature_text` WHERE `entry`=14834; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(14834,0,0,14,8414,100,"hakkar SAY_AGGRO","PRIDE HERALDS THE END OF YOUR WORLD. COME, MORTALS! FACE THE WRATH OF THE SOULFLAYER!"), +(14834,1,0,14,0,100,"hakkar SAY_FLEEING","Fleeing will do you no good, mortals!"), +(14834,2,0,14,0,100,"hakkar SAY_MINION_DESTROY","You dare set foot upon Hakkari holy ground? Minions of Hakkar, destroy the infidels!"), +(14834,3,0,14,0,100,"hakkar SAY_PROTECT_ALTAR","Minions of Hakkar, hear your God. The sanctity of this temple has been compromised. Invaders encroach upon holy ground! The Altar of Blood must be protected. Kill them all!"); + +-- thekal +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1309010 AND -1309009; +DELETE FROM `creature_text` WHERE `entry`=14509; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(14509,0,0,14,8419,100,"thekal SAY_AGGRO","Shirvallah, fill me with your RAGE!"), +(14509,1,0,14,8424,100,"thekal SAY_DEATH","Hakkar binds me no more! Peace at last!"); + +-- jeklik +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1309004 AND -1309002; +DELETE FROM `creature_text` WHERE `entry`=14517; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(14517,0,0,14,8417,100,"jeklik SAY_AGGRO","Lord Hir'eek, grant me wings of vengance!"), +(14517,1,0,14,0,100,"jeklik SAY_RAIN_FIRE","I command you to rain fire down upon these invaders!"), +(14517,2,0,14,8422,100,"jeklik SAY_DEATH","Finally ...death. Curse you Hakkar! Curse you!"); + +-- arlokk +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1309013 AND -1309011; +DELETE FROM `creature_text` WHERE `entry`=14515; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(14515,0,0,14,8416,100,"arlokk SAY_AGGRO","Bethekk, your priestess calls upon your might!"), +(14515,1,0,14,0,100,"arlokk SAY_FEAST_PANTHER","Feast on $n, my pretties!"), +(14515,2,0,14,8412,100,"arlokk SAY_DEATH","At last, I am free of the Soulflayer!"); + +-- mandokir +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1309019 AND -1309015; +DELETE FROM `creature_text` WHERE `entry` IN (11382,11380); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(11382,0,0,14,8413,100,"mandokir SAY_AGGRO","I'll feed your souls to Hakkar himself!"), +(11382,1,0,14,0,100,"mandokir SAY_DING_KILL","DING!"), +(11382,2,0,14,0,100,"mandokir SAY_WATCH","I'm keeping my eye on you, $N!"), +(11382,3,0,14,0,100,"mandokir SAY_WATCH_WHISPER","Don't make me angry. You won't like it when I'm angry."), +(11380,0,0,14,0,100,"mandokir SAY_GRATS_JINDO","GRATS!"); + +-- jindo +DELETE FROM `script_texts` WHERE `entry`=-1309014; +DELETE FROM `creature_text` WHERE `entry`=11380; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(11380,0,0,14,8425,100,"jindo SAY_AGGRO","Welcome to da great show friends! Step right up to die!"); + +-- marli +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1309008 AND -1309005; +DELETE FROM `creature_text` WHERE `entry`=14510; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(14510,0,0,14,8418,100,"marli SAY_AGGRO","Draw me to your web mistress Shadra. Unleash your venom!"), +(14510,1,0,14,0,100,"marli SAY_TRANSFORM","Shadra, make of me your avatar!"), +(14510,2,0,14,0,100,"marli SAY_SPIDER_SPAWN","Aid me my brood!"), +(14510,3,0,14,8423,100,"marli SAY_DEATH","Bless you mortal for this release. Hakkar controls me no longer..."); + +-- clintar +DELETE FROM `script_texts` WHERE `entry`=-1000283; +DELETE FROM `creature_text` WHERE `entry`=16364; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(16364,0,0,12,0,100,"clintar SAY_RELIC1","That's the first relic, but there are still two more. Follow me, $N."); + +-- freed soul +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1329003 AND -1329000; +DELETE FROM `creature_text` WHERE `entry`=11136; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(11136,0,0,12,0,100,"freed soul SAY_ZAPPED0","Thanks to Egan"), +(11136,0,1,12,0,100,"freed soul SAY_ZAPPED1","Rivendare must die"), +(11136,0,2,12,0,100,"freed soul SAY_ZAPPED2","Who you gonna call?"), +(11136,0,3,12,0,100,"freed soul SAY_ZAPPED3","Don't cross those beams!"); + +-- erland +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000317 AND -1000306; +DELETE FROM `creature_text` WHERE `entry` IN (1978,1950,1951); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(1978,0,0,12,0,100,"erland SAY_QUESTACCEPT","Let's get to the others, and keep an eye open for those wolves cutside..."), +(1978,1,0,12,0,100,"erland SAY_START","Be careful, $N. Those wolves like to hide among the trees."), +(1978,2,0,12,0,100,"erland SAY_AGGRO_1","A $C attacks!"), +(1978,2,1,12,0,100,"erland SAY_AGGRO_2","Beware! I am under attack!"), +(1978,2,2,12,0,100,"erland SAY_AGGRO_3","Oh no! A $C is upon us!"), +(1978,3,0,12,0,100,"erland SAY_PROGRESS","We're almost there!"), +(1978,4,0,12,0,100,"erland SAY_LAST","We made it! Thanks, $N. I couldn't have gotten without you."), +(1950,0,0,12,0,100,"erland SAY_RANE","It's good to see you again, Erland. What is your report?"), +(1978,5,0,12,0,100,"erland SAY_RANE_ANSWER","Masses of wolves are to the east, and whoever lived at Malden's Orchard is gone."), +(1978,6,0,12,0,100,"erland SAY_MOVE_QUINN","If I am excused, then I'd like to check on Quinn..."), +(1978,7,0,12,0,100,"erland SAY_QUINN","Hello, Quinn. How are you faring?"), +(1951,0,0,12,0,100,"erland SAY_QUINN_ANSWER","I've been better. Ivar the Foul got the better of me..."), +(1978,8,0,12,0,100,"erland SAY_BYE","Try to take better care of yourself, Quinn. You were lucky this time."); + +-- converted sentry +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000189 AND -1000188; +DELETE FROM `creature_text` WHERE `entry`=24981; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(24981,0,0,12,0,100,"converted sentry SAY_CONVERTED_1","Deployment sucessful. Trespassers will be neutralized."), +(24981,0,1,12,0,100,"converted sentry SAY_CONVERTED_2","Objective acquired. Initiating security routines."); + +-- example creature +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1999910 AND -1999900; + +-- example escort +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1999921 AND -1999910; + +-- example gossip codebox +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1999924 AND -1999922; + +-- azuregos +DELETE FROM `script_texts` WHERE `entry`=-1000100; +DELETE FROM `creature_text` WHERE `entry`=6109; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(6109,0,0,14,0,100,"azuregos SAY_TELEPORT","Come, little ones. Face me!"); + +-- ame +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000522 AND -1000517; +DELETE FROM `creature_text` WHERE `entry`=9623; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(9623,0,0,12,0,100,"ame SAY_READY","A-Me good. Good, A-Me. Follow... follow A-Me. Home. A-Me go home."), +(9623,1,0,12,0,100,"ame SAY_AGGRO1","$c, no hurt A-Me. A-Me good."), +(9623,2,0,12,0,100,"ame SAY_SEARCH","Good... good, A-Me. A-Me good. Home. Find home."), +(9623,3,0,12,0,100,"ame SAY_AGGRO2","Danger. Danger! $c try hurt A-Me."), +(9623,4,0,12,0,100,"ame SAY_AGGRO3","Bad, $c. $c, bad!"), +(9623,5,0,12,0,100,"ame SAY_FINISH","A-Me home! A-Me good! Good A-Me. Home. Home. Home."); + +-- ringo +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000433 AND -1000416; +DELETE FROM `creature_text` WHERE `entry` IN (9999,9997); +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(9999,0,0,12,0,100,"ringo SAY_RIN_START_1","Well, I'm not sure how far I'll make it in this state... I'm feeling kind of faint..."), +(9999,0,1,12,0,100,"ringo SAY_RIN_START_2","Remember, if I faint again, the water that Spraggle gave you will revive me."), +(9999,1,0,12,0,100,"ringo SAY_FAINT_1","The heat... I can't take it..."), +(9999,1,1,12,0,100,"ringo SAY_FAINT_2","Maybe... you could carry me?"), +(9999,1,2,12,0,100,"ringo SAY_FAINT_3","Uuuuuuggggghhhhh...."), +(9999,1,3,12,0,100,"ringo SAY_FAINT_4","I'm not feeling so well..."), +(9999,2,0,12,0,100,"ringo SAY_WAKE_1","Where... Where am I?"), +(9999,2,1,12,0,100,"ringo SAY_WAKE_2","I am feeling a little better now, thank you."), +(9999,2,2,12,0,100,"ringo SAY_WAKE_3","Yes, I must go on."), +(9999,2,3,12,0,100,"ringo SAY_WAKE_4","How am I feeling? Quite soaked, thank you."), +(9999,3,0,12,0,100,"ringo SAY_RIN_END_1","Spraggle! I didn't think I'd make it back!"), +(9997,0,0,12,0,100,"ringo SAY_SPR_END_2","Ringo! You're okay!"), +(9999,4,0,12,0,100,"ringo SAY_RIN_END_3","Oh... I'm feeling faint..."), +(9999,5,0,16,0,100,"ringo EMOTE_RIN_END_4","%s collapses onto the ground."), +(9999,6,0,16,0,100,"ringo EMOTE_RIN_END_5","%s stands up after a short pause."), +(9999,7,0,12,0,100,"ringo SAY_RIN_END_6","Ugh."), +(9997,1,0,12,0,100,"ringo SAY_SPR_END_7","Ringo? Wake up! Don't worry, I'll take care of you."), +(9999,8,0,16,0,100,"ringo EMOTE_RIN_END_8","%s fades away after a long pause."); diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp index f792b861c99..85a54398511 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp @@ -28,7 +28,10 @@ EndScriptData */ #include "ScriptedCreature.h" #include "molten_core.h" -#define EMOTE_SERVICE -1409000 +enum Emotes +{ + EMOTE_SERVICE = 0 +}; enum Spells { @@ -76,7 +79,7 @@ class boss_baron_geddon : public CreatureScript { me->InterruptNonMeleeSpells(true); DoCast(me, SPELL_ARMAGEDDON); - DoScriptText(EMOTE_SERVICE, me); + Talk(EMOTE_SERVICE); return; } diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp index 65a630a58f7..42952580d54 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_magmadar.cpp @@ -30,7 +30,7 @@ EndScriptData */ enum Texts { - EMOTE_FRENZY = -1409001, + EMOTE_FRENZY = 0 }; enum Spells @@ -88,7 +88,7 @@ class boss_magmadar : public CreatureScript switch (eventId) { case EVENT_FRENZY: - DoScriptText(EMOTE_FRENZY, me); + Talk(EMOTE_FRENZY); DoCast(me, SPELL_FRENZY); events.ScheduleEvent(EVENT_FRENZY, 15000); break; diff --git a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp index c7d6b31d2ea..043e5b16330 100644 --- a/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp @@ -32,17 +32,14 @@ EndScriptData */ enum Texts { - SAY_AGGRO = -1409003, - SAY_SPAWN = -1409004, - SAY_SLAY = -1409005, - SAY_SPECIAL = -1409006, - SAY_DEFEAT = -1409007, + SAY_AGGRO = 0, + SAY_SPAWN = 1, + SAY_SLAY = 2, + SAY_SPECIAL = 3, + SAY_DEFEAT = 4, - SAY_SUMMON_MAJ = -1409008, - SAY_ARRIVAL1_RAG = -1409009, - SAY_ARRIVAL2_MAJ = -1409010, - SAY_ARRIVAL3_RAG = -1409011, - SAY_ARRIVAL5_RAG = -1409012, + SAY_SUMMON_MAJ = 5, + SAY_ARRIVAL2_MAJ = 6 }; enum Spells @@ -84,13 +81,13 @@ class boss_majordomo : public CreatureScript void KilledUnit(Unit* /*victim*/) { if (urand(0, 99) < 25) - DoScriptText(SAY_SLAY, me); + Talk(SAY_SLAY); } void EnterCombat(Unit* who) { BossAI::EnterCombat(who); - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); events.ScheduleEvent(EVENT_MAGIC_REFLECTION, 30000); events.ScheduleEvent(EVENT_DAMAGE_REFLECTION, 15000); events.ScheduleEvent(EVENT_BLAST_WAVE, 10000); @@ -111,7 +108,7 @@ class boss_majordomo : public CreatureScript instance->UpdateEncounterState(ENCOUNTER_CREDIT_KILL_CREATURE, me->GetEntry(), me); me->setFaction(35); me->AI()->EnterEvadeMode(); - DoScriptText(SAY_DEFEAT, me); + Talk(SAY_DEFEAT); _JustDied(); events.ScheduleEvent(EVENT_OUTRO_1, 32000); return; @@ -168,7 +165,7 @@ class boss_majordomo : public CreatureScript instance->instance->SummonCreature(NPC_RAGNAROS, RagnarosSummonPos); break; case EVENT_OUTRO_3: - DoScriptText(SAY_ARRIVAL2_MAJ, me); + Talk(SAY_ARRIVAL2_MAJ); break; default: break; @@ -182,7 +179,7 @@ class boss_majordomo : public CreatureScript if (action == ACTION_START_RAGNAROS) { me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - DoScriptText(SAY_SUMMON_MAJ, me); + Talk(SAY_SUMMON_MAJ); events.ScheduleEvent(EVENT_OUTRO_2, 8000); events.ScheduleEvent(EVENT_OUTRO_3, 24000); } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 0cb2bd7f7bc..4a29a7d929b 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -25,6 +25,7 @@ #include "PassiveAI.h" #include "Player.h" #include "SpellInfo.h" +#include "CreatureTextMgr.h" /*###### ##Quest 12848 @@ -32,7 +33,7 @@ #define GCD_CAST 1 -enum eDeathKnightSpells +enum UnworthyInitiate { SPELL_SOUL_PRISON_CHAIN_SELF = 54612, SPELL_SOUL_PRISON_CHAIN = 54613, @@ -41,25 +42,24 @@ enum eDeathKnightSpells SPELL_ICY_TOUCH = 52372, SPELL_PLAGUE_STRIKE = 52373, SPELL_BLOOD_STRIKE = 52374, - SPELL_DEATH_COIL = 52375 + SPELL_DEATH_COIL = 52375, + + SAY_EVENT_START = 0, + SAY_EVENT_ATTACK = 1, + + EVENT_ICY_TOUCH = 1, + EVENT_PLAGUE_STRIKE = 2, + EVENT_BLOOD_STRIKE = 3, + EVENT_DEATH_COIL = 4 }; -#define EVENT_ICY_TOUCH 1 -#define EVENT_PLAGUE_STRIKE 2 -#define EVENT_BLOOD_STRIKE 3 -#define EVENT_DEATH_COIL 4 - -//used by 29519, 29520, 29565, 29566, 29567 but signed for 29519 -int32 say_event_start[8] = +enum UnworthyInitiatePhase { - -1609000, -1609001, -1609002, -1609003, - -1609004, -1609005, -1609006, -1609007 -}; - -int32 say_event_attack[9] = -{ - -1609008, -1609009, -1609010, -1609011, -1609012, - -1609013, -1609014, -1609015, -1609016 + PHASE_CHAINED, + PHASE_TO_EQUIP, + PHASE_EQUIPING, + PHASE_TO_ATTACK, + PHASE_ATTACKING, }; uint32 acherus_soul_prison[12] = @@ -87,15 +87,6 @@ uint32 acherus_unworthy_initiate[5] = 29567 }; -enum UnworthyInitiatePhase -{ - PHASE_CHAINED, - PHASE_TO_EQUIP, - PHASE_EQUIPING, - PHASE_TO_ATTACK, - PHASE_ATTACKING, -}; - class npc_unworthy_initiate : public CreatureScript { public: @@ -155,7 +146,7 @@ public: me->CastSpell(me, SPELL_DK_INITIATE_VISUAL, true); if (Player* starter = Unit::GetPlayer(*me, playerGUID)) - DoScriptText(say_event_attack[rand()%9], me, starter); + sCreatureTextMgr->SendChat(me, SAY_EVENT_ATTACK, 0, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_OTHER, false, starter); phase = PHASE_TO_ATTACK; } @@ -174,7 +165,7 @@ public: anchor->GetContactPoint(me, anchorX, anchorY, z, 1.0f); playerGUID = target->GetGUID(); - DoScriptText(say_event_start[rand()%8], me, target); + sCreatureTextMgr->SendChat(me, SAY_EVENT_START, 0, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_OTHER, false, target); } void UpdateAI(const uint32 diff) @@ -341,15 +332,7 @@ public: enum eDuelEnums { - SAY_DUEL_A = -1609080, - SAY_DUEL_B = -1609081, - SAY_DUEL_C = -1609082, - SAY_DUEL_D = -1609083, - SAY_DUEL_E = -1609084, - SAY_DUEL_F = -1609085, - SAY_DUEL_G = -1609086, - SAY_DUEL_H = -1609087, - SAY_DUEL_I = -1609088, + SAY_DUEL = 0, SPELL_DUEL = 52996, //SPELL_DUEL_TRIGGERED = 52990, @@ -360,11 +343,6 @@ enum eDuelEnums FACTION_HOSTILE = 2068 }; -int32 m_auiRandomSay[] = -{ - SAY_DUEL_A, SAY_DUEL_B, SAY_DUEL_C, SAY_DUEL_D, SAY_DUEL_E, SAY_DUEL_F, SAY_DUEL_G, SAY_DUEL_H, SAY_DUEL_I -}; - class npc_death_knight_initiate : public CreatureScript { public: @@ -389,8 +367,7 @@ public: creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_15); - int32 uiSayId = rand()% (sizeof(m_auiRandomSay)/sizeof(int32)); - DoScriptText(m_auiRandomSay[uiSayId], creature, player); + sCreatureTextMgr->SendChat(creature, SAY_EVENT_ATTACK, 0, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_OTHER, false, player); player->CastSpell(creature, SPELL_DUEL, false); player->CastSpell(player, SPELL_DUEL_FLAG, true); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 78fc8d127b2..2b21bb26804 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -20,6 +20,7 @@ #include "ScriptedEscortAI.h" #include "Player.h" #include "SpellInfo.h" +#include "CreatureTextMgr.h" //How to win friends and influence enemies // texts signed for creature 28939 but used for 28939, 28940, 28610 @@ -30,22 +31,14 @@ enum win_friends SAY_PERSUADED2 = 3, SAY_PERSUADED3 = 4, SAY_PERSUADED4 = 5, - SAY_PERSUADED6 = 6, + SAY_PERSUADED5 = 6, + SAY_PERSUADED6 = 7, + SAY_PERSUADE_RAND = 8, SPELL_PERSUASIVE_STRIKE = 52781, SPELL_THREAT_PULSE = 58111, QUEST_HOW_TO_WIN_FRIENDS = 12720, }; -#define SAY_PERSUADED5 "LIES! The pain you are about to endure will be talked about for years to come!" - -#define SAY_PERSUADE1 "I'll tear the secrets from your soul! Tell me about the \"Crimson Dawn\" and your life may be spared!" -#define SAY_PERSUADE2 "Tell me what you know about \"Crimson Dawn\" or the beatings will continue!" -#define SAY_PERSUADE3 "I'm through being courteous with your kind, human! What is the \"Crimson Dawn\"?" -#define SAY_PERSUADE4 "Is your life worth so little? Just tell me what I need to know about \"Crimson Dawn\" and I'll end your suffering quickly." -#define SAY_PERSUADE5 "I can keep this up for a very long time, Scarlet dog! Tell me about the \"Crimson Dawn\"!" -#define SAY_PERSUADE6 "What is the \"Crimson Dawn\"?" -#define SAY_PERSUADE7 "\"Crimson Dawn\"! What is it! Speak!" - class npc_crusade_persuaded : public CreatureScript { public: @@ -90,30 +83,7 @@ public: me->SetReactState(REACT_PASSIVE); DoCastAOE(SPELL_THREAT_PULSE, true); - switch (urand(1, 7)) - { - case 1: - player->Say(SAY_PERSUADE1, LANG_UNIVERSAL); - break; - case 2: - player->Say(SAY_PERSUADE2, LANG_UNIVERSAL); - break; - case 3: - player->Say(SAY_PERSUADE3, LANG_UNIVERSAL); - break; - case 4: - player->Say(SAY_PERSUADE4, LANG_UNIVERSAL); - break; - case 5: - player->Say(SAY_PERSUADE5, LANG_UNIVERSAL); - break; - case 6: - player->Say(SAY_PERSUADE6, LANG_UNIVERSAL); - break; - case 7: - player->Say(SAY_PERSUADE7, LANG_UNIVERSAL); - break; - } + sCreatureTextMgr->SendChat(me, SAY_PERSUADE_RAND, 0, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_OTHER, false, player); Talk(SAY_CRUSADER); } } @@ -156,7 +126,7 @@ public: break; case 5: - player->Say(SAY_PERSUADED5, LANG_UNIVERSAL); + sCreatureTextMgr->SendChat(me, SAY_PERSUADED5, 0, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_OTHER, false, player); speechTimer = 8000; break; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 467b532163b..5da38e21d2f 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -83,12 +83,10 @@ public: /*###### ## mob_freed_soul ######*/ - -//Possibly more of these quotes around. -#define SAY_ZAPPED0 -1329000 -#define SAY_ZAPPED1 -1329001 -#define SAY_ZAPPED2 -1329002 -#define SAY_ZAPPED3 -1329003 +enum FreedSoul +{ + SAY_ZAPPED = 0 +}; class mob_freed_soul : public CreatureScript { @@ -106,7 +104,7 @@ public: void Reset() { - DoScriptText(RAND(SAY_ZAPPED0, SAY_ZAPPED1, SAY_ZAPPED2, SAY_ZAPPED3), me); + Talk(SAY_ZAPPED); } void EnterCombat(Unit* /*who*/) {} diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index 17c3f5e8ff4..c5639a68860 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -29,9 +29,9 @@ EndScriptData */ enum eYells { - SAY_AGGRO = -1309011, - SAY_FEAST_PANTHER = -1309012, - SAY_DEATH = -1309013, + SAY_AGGRO = 0, + SAY_FEAST_PANTHER = 1, + SAY_DEATH = 2, }; enum eSpells @@ -106,7 +106,7 @@ class boss_arlokk : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void JustReachedHome() @@ -120,7 +120,7 @@ class boss_arlokk : public CreatureScript void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); me->SetDisplayId(MODEL_ID_NORMAL); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -131,8 +131,8 @@ class boss_arlokk : public CreatureScript void DoSummonPhanters() { - if (Unit* pMarkedTarget = Unit::GetUnit(*me, MarkedTargetGUID)) - DoScriptText(SAY_FEAST_PANTHER, me, pMarkedTarget); + if (MarkedTargetGUID) + Talk(SAY_FEAST_PANTHER, MarkedTargetGUID); me->SummonCreature(NPC_ZULIAN_PROWLER, -11532.7998f, -1649.6734f, 41.4800f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); me->SummonCreature(NPC_ZULIAN_PROWLER, -11532.9970f, -1606.4840f, 41.2979f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index 6cb657f4cff..7d80de88beb 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -27,23 +27,26 @@ EndScriptData */ #include "ScriptedCreature.h" #include "zulgurub.h" -#define SAY_AGGRO -1309020 -#define SAY_FLEEING -1309021 -#define SAY_MINION_DESTROY -1309022 //where does it belong? -#define SAY_PROTECT_ALTAR -1309023 //where does it belong? +enum Hakkar +{ + SAY_AGGRO = 0, + SAY_FLEEING = 1, + SAY_MINION_DESTROY = 2, //where does it belong? + SAY_PROTECT_ALTAR = 3, //where does it belong? -#define SPELL_BLOODSIPHON 24322 -#define SPELL_CORRUPTEDBLOOD 24328 -#define SPELL_CAUSEINSANITY 24327 //Not working disabled. -#define SPELL_WILLOFHAKKAR 24178 -#define SPELL_ENRAGE 24318 + SPELL_BLOODSIPHON = 24322, + SPELL_CORRUPTEDBLOOD = 24328, + SPELL_CAUSEINSANITY = 24327, //Not working disabled. + SPELL_WILLOFHAKKAR = 24178, + SPELL_ENRAGE = 24318, // The Aspects of all High Priests -#define SPELL_ASPECT_OF_JEKLIK 24687 -#define SPELL_ASPECT_OF_VENOXIS 24688 -#define SPELL_ASPECT_OF_MARLI 24686 -#define SPELL_ASPECT_OF_THEKAL 24689 -#define SPELL_ASPECT_OF_ARLOKK 24690 + SPELL_ASPECT_OF_JEKLIK = 24687, + SPELL_ASPECT_OF_VENOXIS = 24688, + SPELL_ASPECT_OF_MARLI = 24686, + SPELL_ASPECT_OF_THEKAL = 24689, + SPELL_ASPECT_OF_ARLOKK = 24690 +}; class boss_hakkar : public CreatureScript { @@ -108,7 +111,7 @@ class boss_hakkar : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index 156ccab5eae..3a2da6fdba9 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -27,22 +27,24 @@ EndScriptData */ #include "ScriptedCreature.h" #include "zulgurub.h" -#define SAY_AGGRO -1309002 -#define SAY_RAIN_FIRE -1309003 -#define SAY_DEATH -1309004 +enum Jeklik +{ + SAY_AGGRO = 0, + SAY_RAIN_FIRE = 1, + SAY_DEATH = 2, -#define SPELL_CHARGE 22911 -#define SPELL_SONICBURST 23918 -#define SPELL_SCREECH 6605 -#define SPELL_SHADOW_WORD_PAIN 23952 -#define SPELL_MIND_FLAY 23953 -#define SPELL_CHAIN_MIND_FLAY 26044 //Right ID unknown. So disabled -#define SPELL_GREATERHEAL 23954 -#define SPELL_BAT_FORM 23966 + SPELL_CHARGE = 22911, + SPELL_SONICBURST = 23918, + SPELL_SCREECH = 6605, + SPELL_SHADOW_WORD_PAIN = 23952, + SPELL_MIND_FLAY = 23953, + SPELL_CHAIN_MIND_FLAY = 26044, //Right ID unknown. So disabled + SPELL_GREATERHEAL = 23954, + SPELL_BAT_FORM = 23966, -// Batriders Spell - -#define SPELL_BOMB 40332 //Wrong ID but Magmadars bomb is not working... + // Batriders Spell + SPELL_BOMB = 40332 //Wrong ID but Magmadars bomb is not working... +}; class boss_jeklik : public CreatureScript { @@ -91,13 +93,13 @@ class boss_jeklik : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); DoCast(me, SPELL_BAT_FORM); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_JEKLIK, DONE); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index f8d23947e9c..10df778eb7f 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -27,20 +27,23 @@ EndScriptData */ #include "ScriptedCreature.h" #include "zulgurub.h" -#define SAY_AGGRO -1309014 +enum Jindo +{ + SAY_AGGRO = 0, -#define SPELL_BRAINWASHTOTEM 24262 -#define SPELL_POWERFULLHEALINGWARD 24309 //We will not use this spell. We will summon a totem by script cause the spell totems will not cast. -#define SPELL_HEX 24053 -#define SPELL_DELUSIONSOFJINDO 24306 -#define SPELL_SHADEOFJINDO 24308 //We will not use this spell. We will summon a shade by script. + SPELL_BRAINWASHTOTEM = 24262, + SPELL_POWERFULLHEALINGWARD = 24309, //We will not use this spell. We will summon a totem by script cause the spell totems will not cast. + SPELL_HEX = 24053, + SPELL_DELUSIONSOFJINDO = 24306, + SPELL_SHADEOFJINDO = 24308, //We will not use this spell. We will summon a shade by script. -//Healing Ward Spell -#define SPELL_HEAL 38588 //Totems are not working right. Right heal spell ID is 24311 but this spell is not casting... + //Healing Ward Spell + SPELL_HEAL = 38588, //Totems are not working right. Right heal spell ID is 24311 but this spell is not casting... -//Shade of Jindo Spell -#define SPELL_SHADOWSHOCK 19460 -#define SPELL_INVISIBLE 24699 + //Shade of Jindo Spell + SPELL_SHADOWSHOCK = 19460, + SPELL_INVISIBLE = 24699 +}; class boss_jindo : public CreatureScript { @@ -72,7 +75,7 @@ class boss_jindo : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 32831eb047b..9f3aa315efa 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -27,25 +27,28 @@ EndScriptData */ #include "ScriptedCreature.h" #include "zulgurub.h" -#define SAY_AGGRO -1309015 -#define SAY_DING_KILL -1309016 -#define SAY_GRATS_JINDO -1309017 -#define SAY_WATCH -1309018 -#define SAY_WATCH_WHISPER -1309019 //is this text for real? easter egg? +enum Mandokir +{ + SAY_AGGRO = 0, + SAY_DING_KILL = 1, + SAY_WATCH = 2, + SAY_WATCH_WHISPER = 3, //is this text for real? easter egg? + SAY_GRATS_JINDO = 0, -#define SPELL_CHARGE 24408 -#define SPELL_CLEAVE 7160 -#define SPELL_FEAR 29321 -#define SPELL_WHIRLWIND 15589 -#define SPELL_MORTAL_STRIKE 16856 -#define SPELL_ENRAGE 24318 -#define SPELL_WATCH 24314 -#define SPELL_LEVEL_UP 24312 + SPELL_CHARGE = 24408, + SPELL_CLEAVE = 7160, + SPELL_FEAR = 29321, + SPELL_WHIRLWIND = 15589, + SPELL_MORTAL_STRIKE = 16856, + SPELL_ENRAGE = 24318, + SPELL_WATCH = 24314, + SPELL_LEVEL_UP = 24312, //Ohgans Spells -#define SPELL_SUNDERARMOR 24317 + SPELL_SUNDERARMOR = 24317, -#define NPC_SPEAKER 11391 + NPC_SPEAKER = 11391 +}; class boss_mandokir : public CreatureScript { @@ -119,17 +122,17 @@ class boss_mandokir : public CreatureScript if (KillCount == 3) { - DoScriptText(SAY_DING_KILL, me); + Talk(SAY_DING_KILL); if (instance) { uint64 JindoGUID = instance->GetData64(DATA_JINDO); if (JindoGUID) { - if (Unit* jTemp = Unit::GetUnit(*me, JindoGUID)) + if (Creature* jTemp = Creature::GetCreature(*me, JindoGUID)) { if (jTemp->isAlive()) - DoScriptText(SAY_GRATS_JINDO, jTemp); + jTemp->AI()->Talk(SAY_GRATS_JINDO); } } } @@ -141,7 +144,7 @@ class boss_mandokir : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void UpdateAI(const uint32 diff) @@ -205,7 +208,7 @@ class boss_mandokir : public CreatureScript { if (Unit* p = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoScriptText(SAY_WATCH, me, p); + Talk(SAY_WATCH, p->GetGUID()); DoCast(p, SPELL_WATCH); WatchTarget = p->GetGUID(); someWatched = true; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index 8e0deda1d0b..17b268b92ef 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -27,19 +27,22 @@ EndScriptData */ #include "ScriptedCreature.h" #include "zulgurub.h" -#define SAY_AGGRO -1309005 -#define SAY_TRANSFORM -1309006 -#define SAY_SPIDER_SPAWN -1309007 -#define SAY_DEATH -1309008 +enum Marli +{ + SAY_AGGRO = 0, + SAY_TRANSFORM = 1, + SAY_SPIDER_SPAWN = 2, + SAY_DEATH = 3, -#define SPELL_CHARGE 22911 -#define SPELL_ASPECT_OF_MARLI 24686 // A stun spell -#define SPELL_ENVOLWINGWEB 24110 -#define SPELL_POISONVOLLEY 24099 -#define SPELL_SPIDER_FORM 24084 + SPELL_CHARGE = 22911, + SPELL_ASPECT_OF_MARLI = 24686, // A stun spell + SPELL_ENVOLWINGWEB = 24110, + SPELL_POISONVOLLEY = 24099, + SPELL_SPIDER_FORM = 24084, //The Spider Spells -#define SPELL_LEVELUP 24312 //Not right Spell. + SPELL_LEVELUP = 24312 //Not right Spell. +}; class boss_marli : public CreatureScript { @@ -86,12 +89,12 @@ class boss_marli : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_MARLI, DONE); } @@ -117,7 +120,7 @@ class boss_marli : public CreatureScript if (!Spawned && SpawnStartSpiders_Timer <= diff) { - DoScriptText(SAY_SPIDER_SPAWN, me); + Talk(SAY_SPIDER_SPAWN); Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!target) @@ -155,7 +158,7 @@ class boss_marli : public CreatureScript if (!PhaseTwo && Transform_Timer <= diff) { - DoScriptText(SAY_TRANSFORM, me); + Talk(SAY_TRANSFORM); DoCast(me, SPELL_SPIDER_FORM); const CreatureTemplate* cinfo = me->GetCreatureTemplate(); me->SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, (cinfo->mindmg +((cinfo->mindmg/100) * 35))); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index 29495f77f2a..3ea5d932ab0 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -27,11 +27,11 @@ EndScriptData */ #include "ScriptedCreature.h" #include "zulgurub.h" -#define SAY_AGGRO -1309009 -#define SAY_DEATH -1309010 - -enum eSpells +enum Thekal { + SAY_AGGRO = 0, + SAY_DEATH = 1, + SPELL_MORTALCLEAVE = 22859, SPELL_SILENCE = 22666, SPELL_FRENZY = 8269, @@ -53,7 +53,7 @@ enum eSpells SPELL_SINISTERSTRIKE = 15581, SPELL_GOUGE = 12540, SPELL_KICK = 15614, - SPELL_BLIND = 21060, + SPELL_BLIND = 21060 }; class boss_thekal : public CreatureScript @@ -106,12 +106,12 @@ class boss_thekal : public CreatureScript void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_THEKAL, DONE); } diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/eversong_woods.cpp index f62273e583d..c5f9522b23d 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/eversong_woods.cpp @@ -517,9 +517,12 @@ public: ## npc_infused_crystal ######*/ -#define MOB_ENRAGED_WRAITH 17086 -#define EMOTE -1000283 -#define QUEST_POWERING_OUR_DEFENSES 8490 +enum InfusedCrystal +{ + MOB_ENRAGED_WRAITH = 17086, + EMOTE = 0, + QUEST_POWERING_OUR_DEFENSES = 8490 +}; struct Location { @@ -597,7 +600,7 @@ public: { if (EndTimer < diff && Progress) { - DoScriptText(EMOTE, me); + Talk(EMOTE); Completed = true; if (PlayerGUID) if (Player* player = Unit::GetPlayer(*me, PlayerGUID)) diff --git a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp index c3a725f2f45..5625b6994d7 100644 --- a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp @@ -37,11 +37,13 @@ EndContentData */ /*###### ## npc_converted_sentry ######*/ +enum ConvertedSentry +{ + SAY_CONVERTED = 0, -#define SAY_CONVERTED_1 -1000188 -#define SAY_CONVERTED_2 -1000189 + SPELL_CONVERT_CREDIT = 45009 +}; -#define SPELL_CONVERT_CREDIT 45009 class npc_converted_sentry : public CreatureScript { @@ -75,11 +77,7 @@ public: { if (Timer <= diff) { - uint32 i = urand(1, 2); - if (i == 1) - DoScriptText(SAY_CONVERTED_1, me); - else - DoScriptText(SAY_CONVERTED_2, me); + Talk(SAY_CONVERTED); DoCast(me, SPELL_CONVERT_CREDIT); if (me->isPet()) diff --git a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp index f04b0111da7..9fa8ac70eed 100644 --- a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp +++ b/src/server/scripts/EasternKingdoms/redridge_mountains.cpp @@ -30,11 +30,11 @@ enum eCorporalKeeshan { QUEST_MISSING_IN_ACTION = 219, - SAY_CORPORAL_1 = -1000464, - SAY_CORPORAL_2 = -1000465, - SAY_CORPORAL_3 = -1000466, - SAY_CORPORAL_4 = -1000467, - SAY_CORPORAL_5 = -1000468, + SAY_CORPORAL_1 = 0, + SAY_CORPORAL_2 = 1, + SAY_CORPORAL_3 = 2, + SAY_CORPORAL_4 = 3, + SAY_CORPORAL_5 = 4, SPELL_MOCKING_BLOW = 21008, SPELL_SHIELD_BASH = 11972, @@ -50,7 +50,7 @@ public: if (quest->GetQuestId() == QUEST_MISSING_IN_ACTION) { CAST_AI(npc_corporal_keeshan::npc_corporal_keeshanAI, creature->AI())->Start(true, false, player->GetGUID(), quest); - DoScriptText(SAY_CORPORAL_1, creature); + creature->AI()->Talk(SAY_CORPORAL_1); } return false; @@ -124,23 +124,23 @@ public: uiPhase = 2; break; case 2: - DoScriptText(SAY_CORPORAL_2, me); + Talk(SAY_CORPORAL_2); uiTimer = 15000; uiPhase = 3; break; case 3: - DoScriptText(SAY_CORPORAL_3, me); + Talk(SAY_CORPORAL_3); me->SetStandState(UNIT_STAND_STATE_STAND); SetEscortPaused(false); uiTimer = 0; uiPhase = 0; break; case 4: - DoScriptText(SAY_CORPORAL_4, me); + Talk(SAY_CORPORAL_4); uiTimer = 2500; uiPhase = 5; case 5: - DoScriptText(SAY_CORPORAL_5, me); + Talk(SAY_CORPORAL_5); uiTimer = 0; uiPhase = 0; } diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp index 905d34221ed..1960d90f28f 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/silverpine_forest.cpp @@ -39,20 +39,19 @@ EndContentData */ enum eErland { - SAY_QUESTACCEPT = -1000306, - SAY_START = -1000307, - SAY_AGGRO_1 = -1000308, - SAY_AGGRO_2 = -1000309, - SAY_LAST = -1000310, + SAY_QUESTACCEPT = 0, + SAY_START = 1, + SAY_AGGRO = 2, + SAY_PROGRESS = 3, + SAY_LAST = 4, - SAY_THANKS = -1000311, - SAY_RANE = -1000312, - SAY_ANSWER = -1000313, - SAY_MOVE_QUINN = -1000314, + SAY_RANE = 0, + SAY_RANE_ANSWER = 5, + SAY_MOVE_QUINN = 6, - SAY_GREETINGS = -1000315, - SAY_QUINN = -1000316, - SAY_ON_BYE = -1000317, + SAY_QUINN = 7, + SAY_QUINN_ANSWER = 0, + SAY_BYE = 8, QUEST_ESCORTING = 435, NPC_RANE = 1950, @@ -77,34 +76,34 @@ public: switch (waypointId) { case 1: - DoScriptText(SAY_START, me, player); + Talk(SAY_START, player->GetGUID()); + break; + case 10: + Talk(SAY_PROGRESS); break; case 13: - DoScriptText(SAY_LAST, me, player); + Talk(SAY_LAST, player->GetGUID()); player->GroupEventHappens(QUEST_ESCORTING, me); break; - case 14: - DoScriptText(SAY_THANKS, me, player); - break; case 15: - if (Unit* Rane = me->FindNearestCreature(NPC_RANE, 20)) - DoScriptText(SAY_RANE, Rane); + if (Creature* rane = me->FindNearestCreature(NPC_RANE, 20.0f)) + rane->AI()->Talk(SAY_RANE); break; case 16: - DoScriptText(SAY_ANSWER, me); + Talk(SAY_RANE_ANSWER); break; case 17: - DoScriptText(SAY_MOVE_QUINN, me); + Talk(SAY_MOVE_QUINN); break; case 24: - DoScriptText(SAY_GREETINGS, me); + Talk(SAY_QUINN); break; case 25: - if (Unit* Quinn = me->FindNearestCreature(NPC_QUINN, 20)) - DoScriptText(SAY_QUINN, Quinn); + if (Creature* quinn = me->FindNearestCreature(NPC_QUINN, 20.0f)) + quinn->AI()->Talk(SAY_QUINN_ANSWER); break; case 26: - DoScriptText(SAY_ON_BYE, me, NULL); + Talk(SAY_BYE); break; } } @@ -113,7 +112,7 @@ public: void EnterCombat(Unit* who) { - DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2), me, who); + Talk(SAY_AGGRO, who->GetGUID()); } }; @@ -121,7 +120,7 @@ public: { if (quest->GetQuestId() == QUEST_ESCORTING) { - DoScriptText(SAY_QUESTACCEPT, creature, player); + creature->AI()->Talk(SAY_QUESTACCEPT, player->GetGUID()); if (npc_escortAI* pEscortAI = CAST_AI(npc_deathstalker_erland::npc_deathstalker_erlandAI, creature->AI())) pEscortAI->Start(true, false, player->GetGUID()); diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp index 041f5976a6e..87c28ddd206 100644 --- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp @@ -128,7 +128,7 @@ public: switch (m_uiPhase) { case 1: - DoScriptText(SAY_COMPLETE, me); + Talk(SAY_COMPLETE); ++m_uiPhase; break; case 2: diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp index 1c2f2624b34..79b49b6a438 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/western_plaguelands.cpp @@ -281,13 +281,13 @@ enum eTruuen QUEST_TOMB_LIGHTBRINGER = 9446, - SAY_WP_0 = -1800064, //Beware! We are attacked! - SAY_WP_1 = -1800065, //It must be the purity of the Mark of the Lightbringer that is drawing forth the Scourge to attack us. We must proceed with caution lest we be overwhelmed! - SAY_WP_2 = -1800066, //This land truly needs to be cleansed by the Light! Let us continue on to the tomb. It isn't far now... - SAY_WP_3 = -1800067, //Be welcome, friends! - SAY_WP_4 = -1800068, //Thank you for coming here in remembrance of me. Your efforts in recovering that symbol, while unnecessary, are certainly touching to an old man's heart. - SAY_WP_5 = -1800069, //Please, rise my friend. Keep the Blessing as a symbol of the strength of the Light and how heroes long gone might once again rise in each of us to inspire. - SAY_WP_6 = -1800070 //Thank you my friend for making this possible. This is a day that I shall never forget! I think I will stay a while. Please return to High Priestess MacDonnell at the camp. I know that she'll be keenly interested to know of what has transpired here. + SAY_WP_0 = 0, //Beware! We are attacked! + SAY_WP_1 = 1, //It must be the purity of the Mark of the Lightbringer that is drawing forth the Scourge to attack us. We must proceed with caution lest we be overwhelmed! + SAY_WP_2 = 2, //This land truly needs to be cleansed by the Light! Let us continue on to the tomb. It isn't far now... + SAY_WP_3 = 0, //Be welcome, friends! + SAY_WP_4 = 0, //Thank you for coming here in remembrance of me. Your efforts in recovering that symbol, while unnecessary, are certainly touching to an old man's heart. + SAY_WP_5 = 1, //Please, rise my friend. Keep the Blessing as a symbol of the strength of the Light and how heroes long gone might once again rise in each of us to inspire. + SAY_WP_6 = 2 //Thank you my friend for making this possible. This is a day that I shall never forget! I think I will stay a while. Please return to High Priestess MacDonnell at the camp. I know that she'll be keenly interested to know of what has transpired here. }; class npc_anchorite_truuen : public CreatureScript @@ -339,12 +339,12 @@ public: switch (waypointId) { case 8: - DoScriptText(SAY_WP_0, me); + Talk(SAY_WP_0); me->SummonCreature(NPC_GHOUL, me->GetPositionX()+7.0f, me->GetPositionY()+7.0f, me->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 90000); me->SummonCreature(NPC_GHOUL, me->GetPositionX()+5.0f, me->GetPositionY()+5.0f, me->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 90000); break; case 9: - DoScriptText(SAY_WP_1, me); + Talk(SAY_WP_1); break; case 14: me->SummonCreature(NPC_GHOUL, me->GetPositionX()+7.0f, me->GetPositionY()+7.0f, me->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 90000); @@ -353,25 +353,31 @@ public: me->SummonCreature(NPC_GHOUL, me->GetPositionX()+8.0f, me->GetPositionY()+8.0f, me->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 90000); break; case 15: - DoScriptText(SAY_WP_2, me); + Talk(SAY_WP_2); case 21: Theldanis = GetClosestCreatureWithEntry(me, NPC_THEL_DANIS, 150); - DoScriptText(SAY_WP_3, Theldanis); + if (Theldanis) + Theldanis->AI()->Talk(SAY_WP_3); break; case 22: break; case 23: Ughost = me->SummonCreature(NPC_GHOST_UTHER, 971.86f, -1825.42f, 81.99f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); - Ughost->SetDisableGravity(true); - DoScriptText(SAY_WP_4, Ughost, me); + if (Ughost) + { + Ughost->SetDisableGravity(true); + Ughost->AI()->Talk(SAY_WP_4, me->GetGUID()); + } m_uiChatTimer = 4000; break; case 24: - DoScriptText(SAY_WP_5, Ughost, me); + if (Ughost) + Ughost->AI()->Talk(SAY_WP_5, me->GetGUID()); m_uiChatTimer = 4000; break; case 25: - DoScriptText(SAY_WP_6, Ughost, me); + if (Ughost) + Ughost->AI()->Talk(SAY_WP_6, me->GetGUID()); m_uiChatTimer = 4000; break; case 26: diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp index 1ef15c0ca61..0baa9814970 100644 --- a/src/server/scripts/Examples/example_creature.cpp +++ b/src/server/scripts/Examples/example_creature.cpp @@ -45,17 +45,18 @@ enum Yells //List of text id's. The text is stored in database, also in a localized version //(if translation not exist for the textId, default english text will be used) //Not required to define in this way, but simplify if changes are needed. - SAY_AGGRO = -1999900, - SAY_RANDOM_0 = -1999901, - SAY_RANDOM_1 = -1999902, - SAY_RANDOM_2 = -1999903, - SAY_RANDOM_3 = -1999904, - SAY_RANDOM_4 = -1999905, - SAY_BERSERK = -1999906, - SAY_PHASE = -1999907, - SAY_DANCE = -1999908, - SAY_SALUTE = -1999909, - SAY_EVADE = -1999910, + //These texts must be added to the creature texts of the npc for which the script is assigned. + SAY_AGGRO = 0, // "Let the games begin." + SAY_RANDOM = 1, // "I see endless suffering. I see torment. I see rage. I see everything.", + // "Muahahahaha", + // "These mortal infedels my lord, they have invaded your sanctum and seek to steal your secrets.", + // "You are already dead.", + // "Where to go? What to do? So many choices that all end in pain, end in death." + SAY_BERSERK = 2, // "$N, I sentance you to death!" + SAY_PHASE = 3, // "The suffering has just begun!" + SAY_DANCE = 4, // "I always thought I was a good dancer." + SAY_SALUTE = 5, // "Move out Soldier!" + SAY_EVADE = 6 // "Help $N! I'm under attack!" }; enum Spells @@ -127,7 +128,7 @@ class example_creature : public CreatureScript void EnterCombat(Unit* who) { //Say some stuff - DoScriptText(SAY_AGGRO, me, who); + Talk(SAY_AGGRO, who->GetGUID()); } // *** HANDLED FUNCTION *** @@ -142,7 +143,7 @@ class example_creature : public CreatureScript // Called when going out of combat. Reset is called just after. void EnterEvadeMode() { - DoScriptText(SAY_EVADE, me); + Talk(SAY_EVADE); } // *** HANDLED FUNCTION *** @@ -154,10 +155,10 @@ class example_creature : public CreatureScript switch (uiTextEmote) { case TEXT_EMOTE_DANCE: - DoScriptText(SAY_DANCE, me); + Talk(SAY_DANCE); break; case TEXT_EMOTE_SALUTE: - DoScriptText(SAY_SALUTE, me); + Talk(SAY_SALUTE); break; } } @@ -173,7 +174,7 @@ class example_creature : public CreatureScript if (m_uiSayTimer <= uiDiff) { //Random switch between 5 outcomes - DoScriptText(RAND(SAY_RANDOM_0, SAY_RANDOM_1, SAY_RANDOM_2, SAY_RANDOM_3, SAY_RANDOM_4), me); + Talk(SAY_RANDOM); m_uiSayTimer = 45000; //Say something agian in 45 seconds } @@ -235,7 +236,7 @@ class example_creature : public CreatureScript if (m_uiBeserkTimer <= uiDiff) { //Say our line then cast uber death spell - DoScriptText(SAY_BERSERK, me, me->getVictim()); + Talk(SAY_BERSERK, me->getVictim() ? me->getVictim()->GetGUID() : 0); DoCast(me->getVictim(), SPELL_BERSERK); //Cast our beserk spell agian in 12 seconds if we didn't kill everyone @@ -250,7 +251,7 @@ class example_creature : public CreatureScript { //Go to next phase ++m_uiPhase; - DoScriptText(SAY_PHASE, me); + Talk(SAY_PHASE); DoCast(me, SPELL_FRENZY); } else diff --git a/src/server/scripts/Examples/example_escort.cpp b/src/server/scripts/Examples/example_escort.cpp index 8cf0dad25d2..cd680b31577 100644 --- a/src/server/scripts/Examples/example_escort.cpp +++ b/src/server/scripts/Examples/example_escort.cpp @@ -28,6 +28,7 @@ EndScriptData */ #include "ScriptedGossip.h" #include "ScriptedEscortAI.h" #include "Player.h" +#include "CreatureTextMgr.h" enum eEnums { @@ -37,18 +38,18 @@ enum eEnums SPELL_ELIXIR_OF_FORTITUDE = 3593, SPELL_BLUE_FIREWORK = 11540, - SAY_AGGRO1 = -1999910, - SAY_AGGRO2 = -1999911, - SAY_WP_1 = -1999912, - SAY_WP_2 = -1999913, - SAY_WP_3 = -1999914, - SAY_WP_4 = -1999915, - SAY_DEATH_1 = -1999916, - SAY_DEATH_2 = -1999917, - SAY_DEATH_3 = -1999918, - SAY_SPELL = -1999919, - SAY_RAND_1 = -1999920, - SAY_RAND_2 = -1999921 + SAY_AGGRO1 = 0, + SAY_AGGRO2 = 1, + SAY_WP_1 = 2, + SAY_WP_2 = 3, + SAY_WP_3 = 4, + SAY_WP_4 = 5, + SAY_DEATH_1 = 6, + SAY_DEATH_2 = 7, + SAY_DEATH_3 = 8, + SAY_SPELL = 9, + SAY_RAND_1 = 10, + SAY_RAND_2 = 11 }; #define GOSSIP_ITEM_1 "Click to Test Escort(Attack, Run)" @@ -83,19 +84,19 @@ class example_escort : public CreatureScript switch (waypointId) { case 1: - DoScriptText(SAY_WP_1, me); + Talk(SAY_WP_1); break; case 3: - DoScriptText(SAY_WP_2, me); + Talk(SAY_WP_2); me->SummonCreature(NPC_FELBOAR, me->GetPositionX()+5.0f, me->GetPositionY()+7.0f, me->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 3000); break; case 4: if (Player* player = GetPlayerForEscort()) { //pTmpPlayer is the target of the text - DoScriptText(SAY_WP_3, me, player); + Talk(SAY_WP_3, player->GetGUID()); //pTmpPlayer is the source of the text - DoScriptText(SAY_WP_4, player); + sCreatureTextMgr->SendChat(me, SAY_WP_4, 0, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_OTHER, false, player); } break; } @@ -106,10 +107,10 @@ class example_escort : public CreatureScript if (HasEscortState(STATE_ESCORT_ESCORTING)) { if (Player* player = GetPlayerForEscort()) - DoScriptText(SAY_AGGRO1, me, player); + Talk(SAY_AGGRO1, player->GetGUID()); } else - DoScriptText(SAY_AGGRO2, me); + Talk(SAY_AGGRO2); } void Reset() @@ -126,13 +127,13 @@ class example_escort : public CreatureScript { // not a likely case, code here for the sake of example if (killer == me) - DoScriptText(SAY_DEATH_1, me, player); + Talk(SAY_DEATH_1, player->GetGUID()); else - DoScriptText(SAY_DEATH_2, me, player); + Talk(SAY_DEATH_2, player->GetGUID()); } } else - DoScriptText(SAY_DEATH_3, me); + Talk(SAY_DEATH_3); } void UpdateAI(const uint32 uiDiff) @@ -145,7 +146,7 @@ class example_escort : public CreatureScript { if (m_uiDeathCoilTimer <= uiDiff) { - DoScriptText(SAY_SPELL, me); + Talk(SAY_SPELL); DoCast(me->getVictim(), SPELL_DEATH_COIL, false); m_uiDeathCoilTimer = 4000; } @@ -161,12 +162,12 @@ class example_escort : public CreatureScript { if (me->HasAura(SPELL_ELIXIR_OF_FORTITUDE, 0)) { - DoScriptText(SAY_RAND_1, me); + Talk(SAY_RAND_1); DoCast(me, SPELL_BLUE_FIREWORK, false); } else { - DoScriptText(SAY_RAND_2, me); + Talk(SAY_RAND_2); DoCast(me, SPELL_ELIXIR_OF_FORTITUDE, false); } diff --git a/src/server/scripts/Examples/example_gossip_codebox.cpp b/src/server/scripts/Examples/example_gossip_codebox.cpp index 352c43fc1de..b6be4ce3ce1 100644 --- a/src/server/scripts/Examples/example_gossip_codebox.cpp +++ b/src/server/scripts/Examples/example_gossip_codebox.cpp @@ -34,9 +34,10 @@ enum eEnums SPELL_POLYMORPH = 12826, SPELL_MARK_OF_THE_WILD = 26990, - SAY_NOT_INTERESTED = -1999922, - SAY_WRONG = -1999923, - SAY_CORRECT = -1999924 + //These texts must be added to the creature texts of the npc for which the script is assigned. + SAY_NOT_INTERESTED = 0, // "Normal select, guess you're not interested." + SAY_WRONG = 1, // "Wrong!" + SAY_CORRECT = 2 // "You're right, you are allowed to see my inner secrets." }; #define GOSSIP_ITEM_1 "A quiz: what's your name?" @@ -66,7 +67,8 @@ class example_gossip_codebox : public CreatureScript player->PlayerTalkClass->ClearMenus(); if (action == GOSSIP_ACTION_INFO_DEF+2) { - DoScriptText(SAY_NOT_INTERESTED, creature); + //Read comment in enum + creature->AI()->Talk(SAY_NOT_INTERESTED); player->CLOSE_GOSSIP_MENU(); } @@ -83,12 +85,14 @@ class example_gossip_codebox : public CreatureScript case GOSSIP_ACTION_INFO_DEF+1: if (player->GetName() != code) { - DoScriptText(SAY_WRONG, creature); + //Read comment in enum + creature->AI()->Talk(SAY_WRONG); creature->CastSpell(player, SPELL_POLYMORPH, true); } else { - DoScriptText(SAY_CORRECT, creature); + //Read comment in enum + creature->AI()->Talk(SAY_CORRECT); creature->CastSpell(player, SPELL_MARK_OF_THE_WILD, true); } player->CLOSE_GOSSIP_MENU(); diff --git a/src/server/scripts/Examples/example_misc.cpp b/src/server/scripts/Examples/example_misc.cpp index 5ff66c4a7ed..68986b44496 100644 --- a/src/server/scripts/Examples/example_misc.cpp +++ b/src/server/scripts/Examples/example_misc.cpp @@ -26,11 +26,6 @@ EndScriptData */ #include "ScriptMgr.h" #include "Player.h" -enum eSay -{ - SAY_HI = -1999925 -}; - class AT_example_areatrigger : public AreaTriggerScript { public: @@ -42,7 +37,7 @@ class AT_example_areatrigger : public AreaTriggerScript bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) { - DoScriptText(SAY_HI, player); + player->Kill(player); return true; } }; diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 3b431d55a2c..7bc2e96e0dc 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -28,7 +28,7 @@ EndScriptData */ enum Say { - SAY_TELEPORT = -1000100 + SAY_TELEPORT = 0 }; enum Spells @@ -89,7 +89,7 @@ public: if (TeleportTimer <= diff) { - DoScriptText(SAY_TELEPORT, me); + Talk(SAY_TELEPORT); ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList(); ThreatContainer::StorageType::const_iterator i = threatlist.begin(); for (i = threatlist.begin(); i != threatlist.end(); ++i) diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp index e00ea566c8f..801855e7249 100644 --- a/src/server/scripts/Kalimdor/ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp @@ -37,12 +37,12 @@ EndContentData */ enum AmeData { - SAY_READY = -1000517, - SAY_AGGRO1 = -1000518, - SAY_SEARCH = -1000519, - SAY_AGGRO2 = -1000520, - SAY_AGGRO3 = -1000521, - SAY_FINISH = -1000522, + SAY_READY = 0, + SAY_AGGRO1 = 1, + SAY_SEARCH = 2, + SAY_AGGRO2 = 3, + SAY_AGGRO3 = 4, + SAY_FINISH = 5, SPELL_DEMORALIZINGSHOUT = 13730, @@ -62,7 +62,7 @@ public: if (quest->GetQuestId() == QUEST_CHASING_AME) { CAST_AI(npc_escortAI, (creature->AI()))->Start(false, false, player->GetGUID()); - DoScriptText(SAY_READY, creature, player); + creature->AI()->Talk(SAY_READY, player->GetGUID()); creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); // Change faction so mobs attack creature->setFaction(113); @@ -89,21 +89,21 @@ public: { case 19: me->SummonCreature(ENTRY_STOMPER, -6391.69f, -1730.49f, -272.83f, 4.96f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - DoScriptText(SAY_AGGRO1, me, player); + Talk(SAY_AGGRO1, player->GetGUID()); break; case 28: - DoScriptText(SAY_SEARCH, me, player); + Talk(SAY_SEARCH, player->GetGUID()); break; case 38: me->SummonCreature(ENTRY_TARLORD, -6370.75f, -1382.84f, -270.51f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - DoScriptText(SAY_AGGRO2, me, player); + Talk(SAY_AGGRO2, player->GetGUID()); break; case 49: me->SummonCreature(ENTRY_TARLORD1, -6324.44f, -1181.05f, -270.17f, 4.34f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - DoScriptText(SAY_AGGRO3, me, player); + Talk(SAY_AGGRO3, player->GetGUID()); break; case 55: - DoScriptText(SAY_FINISH, me, player); + Talk(SAY_FINISH, player->GetGUID()); player->GroupEventHappens(QUEST_CHASING_AME, me); break; } @@ -147,27 +147,20 @@ public: enum Ringo { - SAY_RIN_START_1 = -1000416, - SAY_RIN_START_2 = -1000417, + SAY_RIN_START = 0, - SAY_FAINT_1 = -1000418, - SAY_FAINT_2 = -1000419, - SAY_FAINT_3 = -1000420, - SAY_FAINT_4 = -1000421, + SAY_FAINT = 1, - SAY_WAKE_1 = -1000422, - SAY_WAKE_2 = -1000423, - SAY_WAKE_3 = -1000424, - SAY_WAKE_4 = -1000425, + SAY_WAKE = 2, - SAY_RIN_END_1 = -1000426, - SAY_SPR_END_2 = -1000427, - SAY_RIN_END_3 = -1000428, - EMOTE_RIN_END_4 = -1000429, - EMOTE_RIN_END_5 = -1000430, - SAY_RIN_END_6 = -1000431, // signed for 6784 - SAY_SPR_END_7 = -1000432, - EMOTE_RIN_END_8 = -1000433, + SAY_RIN_END_1 = 3, + SAY_SPR_END_2 = 0, + SAY_RIN_END_3 = 4, + EMOTE_RIN_END_4 = 5, + EMOTE_RIN_END_5 = 6, + SAY_RIN_END_6 = 7, + SAY_SPR_END_7 = 1, + EMOTE_RIN_END_8 = 8, SPELL_REVIVE_RINGO = 15591, QUEST_A_LITTLE_HELP = 4491, @@ -184,10 +177,10 @@ public: { if (quest->GetQuestId() == QUEST_A_LITTLE_HELP) { - if (npc_ringoAI* pRingoAI = CAST_AI(npc_ringo::npc_ringoAI, creature->AI())) + if (npc_ringoAI* ringoAI = CAST_AI(npc_ringo::npc_ringoAI, creature->AI())) { creature->SetStandState(UNIT_STAND_STATE_STAND); - pRingoAI->StartFollow(player, FACTION_ESCORTEE, quest); + ringoAI->StartFollow(player, FACTION_ESCORTEE, quest); } } @@ -249,7 +242,7 @@ public: { SetFollowPaused(true); - DoScriptText(RAND(SAY_FAINT_1, SAY_FAINT_2, SAY_FAINT_3, SAY_FAINT_4), me); + Talk(SAY_FAINT); } //what does actually happen here? Emote? Aura? @@ -263,7 +256,7 @@ public: if (HasFollowState(STATE_FOLLOW_POSTEVENT)) return; - DoScriptText(RAND(SAY_WAKE_1, SAY_WAKE_2, SAY_WAKE_3, SAY_WAKE_4), me); + Talk(SAY_WAKE); SetFollowPaused(false); } @@ -276,8 +269,8 @@ public: { if (EndEventTimer <= Diff) { - Unit* pSpraggle = Unit::GetUnit(*me, SpraggleGUID); - if (!pSpraggle || !pSpraggle->isAlive()) + Creature* spraggle = Creature::GetCreature(*me, SpraggleGUID); + if (!spraggle || !spraggle->isAlive()) { SetFollowComplete(); return; @@ -286,37 +279,37 @@ public: switch (EndEventProgress) { case 1: - DoScriptText(SAY_RIN_END_1, me); + Talk(SAY_RIN_END_1); EndEventTimer = 3000; break; case 2: - DoScriptText(SAY_SPR_END_2, pSpraggle); + spraggle->AI()->Talk(SAY_SPR_END_2); EndEventTimer = 5000; break; case 3: - DoScriptText(SAY_RIN_END_3, me); + Talk(SAY_RIN_END_3); EndEventTimer = 1000; break; case 4: - DoScriptText(EMOTE_RIN_END_4, me); + Talk(EMOTE_RIN_END_4); SetFaint(); EndEventTimer = 9000; break; case 5: - DoScriptText(EMOTE_RIN_END_5, me); + Talk(EMOTE_RIN_END_5); ClearFaint(); EndEventTimer = 1000; break; case 6: - DoScriptText(SAY_RIN_END_6, me); + Talk(SAY_RIN_END_6); EndEventTimer = 3000; break; case 7: - DoScriptText(SAY_SPR_END_7, pSpraggle); + spraggle->AI()->Talk(SAY_SPR_END_7); EndEventTimer = 10000; break; case 8: - DoScriptText(EMOTE_RIN_END_8, me); + Talk(EMOTE_RIN_END_8); EndEventTimer = 5000; break; case 9: From b67afe1fa0fdb9091cb513b8eb36c016421cc4d2 Mon Sep 17 00:00:00 2001 From: w1sht0l1v3 Date: Mon, 26 Nov 2012 23:56:48 +0200 Subject: [PATCH 09/23] Core/Scripts/Quests: Implement The Battle for Crusaders' Pinnacle. --- .../world/2012_11_26_03_world_misc.sql | 115 ++++++ src/server/scripts/Northrend/icecrown.cpp | 373 ++++++++++++++++++ 2 files changed, 488 insertions(+) create mode 100644 sql/updates/world/2012_11_26_03_world_misc.sql diff --git a/sql/updates/world/2012_11_26_03_world_misc.sql b/sql/updates/world/2012_11_26_03_world_misc.sql new file mode 100644 index 00000000000..01ac81d4377 --- /dev/null +++ b/sql/updates/world/2012_11_26_03_world_misc.sql @@ -0,0 +1,115 @@ +-- The Battle For Crusaders' Pinnacle (13141) + +SET @SPELL_ITEM_BANNER := 58013; -- Plant Blessed Banner +SET @SPELL_TORCH := 58121; +SET @SPELL_TORCH_EFFECT := 58125; + +SET @NPC_BLESSED_BANNER := 30891; -- Blessed Banner of the Crusade +SET @NPC_CRUSADER_DALFORS := 31003; -- Crusader Lord Dalfors +SET @NPC_BATTLE_PRIEST := 30919; -- Argent Battle-priest +SET @NPC_MASON := 30900; -- Argent Mason +SET @NPC_TORCH_DUMMY := 31004; -- (Wave 0) Torch Dummy +SET @NPC_LK := 31013; -- The Lich King +SET @NPC_CAPTAIN := 30986; +SET @NPC_DRUDGE := 30984; +SET @NPC_PLAGEBRINGER := 30987; +SET @NPC_HALOF := 30989; + +SET @EVENT_SCRIPT := 20082; + +DELETE FROM `spell_target_position` WHERE `id`=@SPELL_ITEM_BANNER; +INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES +(@SPELL_ITEM_BANNER,571,6418.42,422.97,511.11,0); + +UPDATE `creature_template` SET `faction_A`=2140,`faction_H`=2140,`ScriptName`='npc_blessed_banner' WHERE `entry`=@NPC_BLESSED_BANNER; +UPDATE `creature_template` SET `faction_A`=2131,`faction_H`=2131,`AIName`='SmartAI',`unit_flags`=32768,`equipment_id`=@NPC_CRUSADER_DALFORS WHERE `entry`=@NPC_CRUSADER_DALFORS; +UPDATE `creature_template` SET `faction_A`=2131,`faction_H`=2131,`AIName`='SmartAI',`unit_flags`=32768,`equipment_id`=@NPC_BATTLE_PRIEST WHERE `entry`=@NPC_BATTLE_PRIEST; +UPDATE `creature_template` SET `faction_A`=2070,`faction_H`=2070,`unit_flags`=32768,`AIName`='SmartAI',`equipment_id`=@NPC_MASON WHERE `entry`=@NPC_MASON; +UPDATE `creature_template` SET `unit_flags`=33554432,`InhabitType`=4,`AIName`='SmartAI',`flags_extra`=128 WHERE `entry`=@NPC_TORCH_DUMMY; +UPDATE `creature_template` SET `unit_flags`=33554432,`flags_extra`=128 WHERE `entry`=@NPC_LK; +UPDATE `creature_template` SET `faction_A`=2068,`faction_H`=2068,`unit_flags`=32768,`AIName`='SmartAI' WHERE `entry`=@NPC_CAPTAIN; +UPDATE `creature_template` SET `faction_A`=2068,`faction_H`=2068,`unit_flags`=32768,`AIName`='SmartAI' WHERE `entry`=@NPC_DRUDGE; +UPDATE `creature_template` SET `faction_A`=2068,`faction_H`=2068,`unit_flags`=32768,`AIName`='SmartAI' WHERE `entry`=@NPC_PLAGEBRINGER; +UPDATE `creature_template` SET `faction_A`=2068,`faction_H`=2068,`unit_flags`=32768 WHERE `entry`=@NPC_HALOF; + +DELETE FROM `creature_template_addon` WHERE `entry` IN (@NPC_BLESSED_BANNER,@NPC_CRUSADER_DALFORS,@NPC_BATTLE_PRIEST,@NPC_MASON); +INSERT INTO `creature_template_addon` (`entry`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES +(@NPC_BLESSED_BANNER, 0, 0x0, 0x1, '58026'), -- Blessing of the Crusade +(@NPC_CRUSADER_DALFORS,2786,0x0,0x1,'58110'), -- Threat Pulse +(@NPC_BATTLE_PRIEST,0,0x0,0x1,'58110'), -- Threat Pulse +(@NPC_MASON,0,0x0,0x1,''); + +DELETE FROM `creature_equip_template` WHERE `entry` IN (@NPC_CRUSADER_DALFORS,@NPC_BATTLE_PRIEST,@NPC_MASON); +INSERT INTO `creature_equip_template` (`entry`,`itemEntry1`,`itemEntry2`,`itemEntry3`) VALUES +(@NPC_CRUSADER_DALFORS,39290,40596,0), +(@NPC_BATTLE_PRIEST,42544,42543,0), +(@NPC_MASON,1906,2081,0); + +DELETE FROM `creature_text` WHERE `entry` IN (@NPC_BLESSED_BANNER,@NPC_CRUSADER_DALFORS,@NPC_LK); +INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES +(@NPC_BLESSED_BANNER,0,0,'The Blessed Banner of the Crusade has been planted.\n Defend the banner from all attackers!',41,0,100,0,0,0,'Blessed Banner of the Crusade'), +(@NPC_CRUSADER_DALFORS,0,0,'BY THE LIGHT! Those damned monsters! Look at what they''ve done to our people!',12,0,100,5,0,0,'Crusader Lord Dalfors'), +(@NPC_CRUSADER_DALFORS,1,0,'Burn it down, boys. Burn it all down.',12,0,100,1,0,0,'Crusader Lord Dalfors'), +(@NPC_CRUSADER_DALFORS,2,0,'Let ''em come. They''ll pay for what they''ve done!',12,0,100,1,0,0,'Crusader Lord Dalfors'), +(@NPC_CRUSADER_DALFORS,3,0,'We''ve done it, lads! We''ve taken the pinnacle from the Scourge! Report to Father Gustav at once and tell him the good news! We''re gonna get to buildin'' and settin'' up! Go!',14,0,100,71,0,0,'Crusader Lord Dalfors'), +(@NPC_LK,0,0,'Leave no survivors!',14,0,100,0,0,14793,'The Lich King'), +(@NPC_LK,1,0,'Cower before my terrible creations!',14,0,100,0,0,14800,'The Lich King'), +(@NPC_LK,2,0,'Feast my children! Feast upon the flesh of the living!',14,0,100,0,0,14801,'The Lich King'), +(@NPC_LK,3,0,'Lay down your arms and surrender your souls!',14,0,100,0,0,14802,'The Lich King'); + +DELETE FROM `event_scripts` WHERE `id`=@EVENT_SCRIPT; +INSERT INTO `event_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `x`, `y`, `z`, `o`) VALUES +(@EVENT_SCRIPT,0,10,@NPC_BLESSED_BANNER,600000,6418.422,422.9706,511.1964,5.8119); + +SET @CGUID := 85714; -- need 18 (85714<->85731) +DELETE FROM `creature` WHERE `id` IN (@NPC_TORCH_DUMMY,@NPC_LK); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`MovementType`) VALUES +(@CGUID+0,@NPC_TORCH_DUMMY,571,1,128,6405.316,431.9516,518.2324,0.296706,120,0,0), +(@CGUID+1,@NPC_TORCH_DUMMY,571,1,128,6408.057,424.2077,511.3653,1.256637,120,0,0), +(@CGUID+2,@NPC_TORCH_DUMMY,571,1,128,6371.181,452.4539,513.5053,1.204277,120,0,0), +(@CGUID+3,@NPC_TORCH_DUMMY,571,1,128,6391.331,460.3002,511.3657,1.745329,120,0,0), +(@CGUID+4,@NPC_TORCH_DUMMY,571,1,128,6393.723,427.9692,538.7354,1.692969,120,0,0), +(@CGUID+5,@NPC_TORCH_DUMMY,571,1,128,6374.808,445.4873,517.7629,4.031711,120,0,0), +(@CGUID+6,@NPC_TORCH_DUMMY,571,1,128,6382.271,451.9008,537.9304,1.32645,120,0,0), +(@CGUID+7,@NPC_TORCH_DUMMY,571,1,128,6366.836,459.1225,530.3361,0.7330383,120,0,0), +(@CGUID+8,@NPC_TORCH_DUMMY,571,1,128,6372.479,447.4598,511.3725,0.2443461,120,0,0), +(@CGUID+9,@NPC_TORCH_DUMMY,571,1,128,6394.698,427.4731,523.7177,1.850049,120,0,0), +(@CGUID+10,@NPC_TORCH_DUMMY,571,1,128,6367.246,459.7583,518.8009,3.857178,120,0,0), +(@CGUID+11,@NPC_TORCH_DUMMY,571,1,128,6396.961,432.8676,533.744,3.176499,120,0,0), +(@CGUID+12,@NPC_TORCH_DUMMY,571,1,128,6403.202,464.2955,535.6572,3.857178,120,0,0), +(@CGUID+13,@NPC_TORCH_DUMMY,571,1,128,6401.721,464.4387,543.1727,2.199115,120,0,0), +(@CGUID+14,@NPC_TORCH_DUMMY,571,1,128,6392.169,475.7449,512.7209,0.6283185,120,0,0), +(@CGUID+15,@NPC_TORCH_DUMMY,571,1,128,6397.238,475.2313,529.652,4.328416,120,0,0), +(@CGUID+16,@NPC_TORCH_DUMMY,571,1,128,6389.221,474.0008,511.365,1.553343,120,0,0), +(@CGUID+17,@NPC_LK,571,1,128,6389.73,451.2743,513.3198,1.32645,120,0,0); + +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (@NPC_TORCH_DUMMY,@NPC_MASON); +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@NPC_TORCH_DUMMY,0,0,0,8,0,100,0,@SPELL_TORCH,0,0,0,11,@SPELL_TORCH_EFFECT,0,0,0,0,0,1,0,0,0,0,0,0,0,'On spellhit - Cast Torch Visual'), +(@NPC_MASON,0,0,0,38,0,100,0,1,1,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'On data - Set phase 1'), +(@NPC_MASON,0,1,0,60,1,100,0,0,10000,10000,20000,11,@SPELL_TORCH,0,0,0,0,0,1,0,0,0,0,0,0,0,'On update - Cast spell Torch'); + +DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId`=13 AND `SourceEntry`=@SPELL_TORCH) OR (`SourceTypeOrReferenceId`=17 AND `SourceEntry`=@SPELL_ITEM_BANNER); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,@SPELL_TORCH,0,0,31,0,3,@NPC_TORCH_DUMMY,0,0,0,'','Spell Torch targets Torch Dummy'), +(17,0,@SPELL_ITEM_BANNER,0,0,29,0,@NPC_BLESSED_BANNER,10,0,1,0,'','Cast Plant Blessed Banner if no banner is already spawned.'); + +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (@NPC_CRUSADER_DALFORS,@NPC_BATTLE_PRIEST,@NPC_CAPTAIN,@NPC_DRUDGE,@NPC_PLAGEBRINGER); +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +-- Crusader Lord Dalfors +(@NPC_CRUSADER_DALFORS,0,0,0,2,0,100,1,0,50,0,0,11,58053,0,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Holy Light at 50% HP'), +(@NPC_CRUSADER_DALFORS,0,1,0,0,0,100,0,5000,8000,23000,29000,11,37554,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Shield'), +-- Argent Battle-priest +(@NPC_BATTLE_PRIEST,0,0,0,1,0,100,0,500,1000,600000,600000,11,58054,0,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Blessing of Kings on Spawn'), +(@NPC_BATTLE_PRIEST,0,1,0,2,0,100,1,0,50,0,0,11,58053,0,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Holy Light at 50% HP'), +(@NPC_BATTLE_PRIEST,0,2,0,14,0,100,0,50000,10,20000,30000,11,58053,0,0,0,0,0,7,0,0,0,0,0,0,0,'Cast Holy Light on Friendlies'), +-- Reanimated Captain +(@NPC_CAPTAIN,0,0,0,4,0,100,1,0,0,0,0,11,32674,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Avenger''s Shield on Aggro'), +(@NPC_CAPTAIN,0,1,0,0,0,100,0,5000,5000,17800,19800,11,58154,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Hammer of Injustice'), +(@NPC_CAPTAIN,0,2,0,2,0,100,1,0,45,0,0,11,58153,0,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Unholy Light at 45% HP'), +(@NPC_CAPTAIN,0,3,0,14,0,100,0,4000,10,20000,30000,11,58153,0,0,0,0,0,7,0,0,0,0,0,0,0,'Cast Unholy Light on Friendlies'), +-- Scourge Drudge +(@NPC_DRUDGE,0,0,0,0,0,100,0,5000,5000,11300,14500,11,51917,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Cleave'), +(@NPC_DRUDGE,0,1,0,0,0,100,0,7000,9000,17800,20200,11,49678,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Flesh Rot'), +-- Hideous Plaguebringer +(@NPC_PLAGEBRINGER,0,0,0,0,0,100,0,3400,4600,11400,16500,11,38761,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcing Smash'); \ No newline at end of file diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index 030df23028c..dc450a8fea4 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -494,6 +494,378 @@ class npc_tournament_training_dummy : public CreatureScript }; +// Battle for Crusaders' Pinnacle +enum BlessedBanner +{ + SPELL_BLESSING_OF_THE_CRUSADE = 58026, + SPELL_THREAT_PULSE = 58113, + SPELL_CRUSADERS_SPIRE_VICTORY = 58084, + SPELL_TORCH = 58121, + + NPC_BLESSED_BANNER = 30891, + NPC_CRUSADER_LORD_DALFORS = 31003, + NPC_ARGENT_BATTLE_PRIEST = 30919, + NPC_ARGENT_MASON = 30900, + NPC_REANIMATED_CAPTAIN = 30986, + NPC_SCOURGE_DRUDGE = 30984, + NPC_HIDEOUS_PLAGEBRINGER = 30987, + NPC_HALOF_THE_DEATHBRINGER = 30989, + NPC_LK = 31013, + + BANNER_SAY = 0, // "The Blessed Banner of the Crusade has been planted.\n Defend the banner from all attackers!" + DALFORS_SAY_PRE_1 = 0, // "BY THE LIGHT! Those damned monsters! Look at what they've done to our people!" + DALFORS_SAY_PRE_2 = 1, // "Burn it down, boys. Burn it all down." + DALFORS_SAY_START = 2, // "Let 'em come. They'll pay for what they've done!" + DALFORS_YELL_FINISHED = 3, // "We've done it, lads! We've taken the pinnacle from the Scourge! Report to Father Gustav at once and tell him the good news! We're gonna get to buildin' and settin' up! Go!" + LK_TALK_1 = 0, // "Leave no survivors!" + LK_TALK_2 = 1, // "Cower before my terrible creations!" + LK_TALK_3 = 2, // "Feast my children! Feast upon the flesh of the living!" + LK_TALK_4 = 3, // "Lay down your arms and surrender your souls!" + + EVENT_SPAWN = 1, + EVENT_INTRO_1 = 2, + EVENT_INTRO_2 = 3, + EVENT_INTRO_3 = 4, + EVENT_MASON_ACTION = 5, + EVENT_START_FIGHT = 6, + EVENT_WAVE_SPAWN = 7, + EVENT_HALOF = 8, + EVENT_ENDED = 9, +}; + +Position const DalforsPos[3] = +{ + {6458.703f, 403.858f, 490.498f, 3.1205f}, // Dalfors spawn point + {6422.950f, 423.335f, 510.451f, 0.0f}, // Dalfors intro pos + {6426.343f, 420.515f, 508.650f, 0.0f}, // Dalfors fight pos +}; + +Position const Priest1Pos[2] = +{ + {6462.025f, 403.681f, 489.721f, 3.1007f}, // priest1 spawn point + {6421.480f, 423.576f, 510.781f, 5.7421f}, // priest1 intro pos +}; + +Position const Priest2Pos[2] = +{ + {6463.969f, 407.198f, 489.240f, 2.2689f}, // priest2 spawn point + {6419.778f, 421.404f, 510.972f, 5.7421f}, // priest2 intro pos +}; + +Position const Priest3Pos[2] = +{ + {6464.371f, 400.944f, 489.186f, 6.1610f}, // priest3 spawn point + {6423.516f, 425.782f, 510.774f, 5.7421f}, // priest3 intro pos +}; + +Position const Mason1Pos[3] = +{ + {6462.929f, 409.826f, 489.392f, 3.0968f}, // mason1 spawn point + {6428.163f, 421.960f, 508.297f, 0.0f}, // mason1 intro pos + {6414.335f, 454.904f, 511.395f, 2.8972f}, // mason1 action pos +}; + +Position const Mason2Pos[3] = +{ + {6462.650f, 405.670f, 489.576f, 2.9414f}, // mason2 spawn point + {6426.250f, 419.194f, 508.219f, 0.0f}, // mason2 intro pos + {6415.014f, 446.849f, 511.395f, 3.1241f}, // mason2 action pos +}; + +Position const Mason3Pos[3] = +{ + {6462.646f, 401.218f, 489.601f, 2.7864f}, // mason3 spawn point + {6423.855f, 416.598f, 508.305f, 0.0f}, // mason3 intro pos + {6417.070f, 438.824f, 511.395f, 3.6651f}, // mason3 action pos +}; + +class npc_blessed_banner : public CreatureScript +{ +public: + npc_blessed_banner() : CreatureScript("npc_blessed_banner") { } + + struct npc_blessed_bannerAI : public Scripted_NoMovementAI + { + npc_blessed_bannerAI(Creature* creature) : Scripted_NoMovementAI(creature) , Summons(me) + { + HalofSpawned = false; + PhaseCount = 0; + Summons.DespawnAll(); + } + + EventMap events; + + bool HalofSpawned; + + uint32 PhaseCount; + + SummonList Summons; + + uint64 guidDalfors; + uint64 guidPriest[3]; + uint64 guidMason[3]; + uint64 guidHalof; + + void Reset() + { + me->setRegeneratingHealth(false); + DoCast(SPELL_THREAT_PULSE); + me->AI()->Talk(BANNER_SAY); + events.ScheduleEvent(EVENT_SPAWN,3000); + } + + void EnterCombat(Unit* /*who*/) {} + + void MoveInLineOfSight(Unit* /*who*/) {} + + void JustSummoned(Creature* Summoned) + { + Summons.Summon(Summoned); + } + + void JustDied(Unit* /*killer*/) + { + Summons.DespawnAll(); + me->DespawnOrUnsummon(); + } + + void UpdateAI(uint32 const diff) + { + events.Update(diff); + + switch (events.ExecuteEvent()) + { + case EVENT_SPAWN: + { + if (Creature* Dalfors = DoSummon(NPC_CRUSADER_LORD_DALFORS, DalforsPos[0])) + { + guidDalfors = Dalfors->GetGUID(); + Dalfors->GetMotionMaster()->MovePoint(0, DalforsPos[1]); + } + if (Creature* Priest1 = DoSummon(NPC_ARGENT_BATTLE_PRIEST, Priest1Pos[0])) + { + guidPriest[0] = Priest1->GetGUID(); + Priest1->GetMotionMaster()->MovePoint(0, Priest1Pos[1]); + } + if (Creature* Priest2 = DoSummon(NPC_ARGENT_BATTLE_PRIEST, Priest2Pos[0])) + { + guidPriest[1] = Priest2->GetGUID(); + Priest2->GetMotionMaster()->MovePoint(0, Priest2Pos[1]); + } + if (Creature* Priest3 = DoSummon(NPC_ARGENT_BATTLE_PRIEST, Priest3Pos[0])) + { + guidPriest[2] = Priest3->GetGUID(); + Priest3->GetMotionMaster()->MovePoint(0, Priest3Pos[1]); + } + if (Creature* Mason1 = DoSummon(NPC_ARGENT_MASON, Mason1Pos[0])) + { + guidMason[0] = Mason1->GetGUID(); + Mason1->GetMotionMaster()->MovePoint(0, Mason1Pos[1]); + } + if (Creature* Mason2 = DoSummon(NPC_ARGENT_MASON, Mason2Pos[0])) + { + guidMason[1] = Mason2->GetGUID(); + Mason2->GetMotionMaster()->MovePoint(0, Mason2Pos[1]); + } + if (Creature* Mason3 = DoSummon(NPC_ARGENT_MASON, Mason3Pos[0])) + { + guidMason[2] = Mason3->GetGUID(); + Mason3->GetMotionMaster()->MovePoint(0, Mason3Pos[1]); + } + events.ScheduleEvent(EVENT_INTRO_1,15000); + } + break; + case EVENT_INTRO_1: + { + if (Creature* Dalfors = me->GetCreature(*me,guidDalfors)) + Dalfors->AI()->Talk(DALFORS_SAY_PRE_1); + events.ScheduleEvent(EVENT_INTRO_2,5000); + } + break; + case EVENT_INTRO_2: + { + if (Creature* Dalfors = me->GetCreature(*me,guidDalfors)) + { + Dalfors->SetFacingTo(6.215f); + Dalfors->AI()->Talk(DALFORS_SAY_PRE_2); + } + events.ScheduleEvent(EVENT_INTRO_3,5000); + } + break; + case EVENT_INTRO_3: + { + if (Creature* Dalfors = me->GetCreature(*me,guidDalfors)) + { + Dalfors->GetMotionMaster()->MovePoint(0, DalforsPos[2]); + Dalfors->SetHomePosition(DalforsPos[2]); + } + if (Creature* Priest1 = me->GetCreature(*me,guidPriest[0])) + { + Priest1->SetFacingTo(5.7421f); + Priest1->SetHomePosition(Priest1Pos[1]); + } + if (Creature* Priest2 = me->GetCreature(*me,guidPriest[1])) + { + Priest2->SetFacingTo(5.7421f); + Priest2->SetHomePosition(Priest2Pos[1]); + } + if (Creature* Priest3 = me->GetCreature(*me,guidPriest[2])) + { + Priest3->SetFacingTo(5.7421f); + Priest3->SetHomePosition(Priest3Pos[1]); + } + if (Creature* Mason1 = me->GetCreature(*me,guidMason[0])) + { + Mason1->GetMotionMaster()->MovePoint(0, Mason1Pos[2]); + Mason1->SetHomePosition(Mason1Pos[2]); + } + if (Creature* Mason2 = me->GetCreature(*me,guidMason[1])) + { + Mason2->GetMotionMaster()->MovePoint(0, Mason2Pos[2]); + Mason2->SetHomePosition(Mason2Pos[2]); + } + if (Creature* Mason3 = me->GetCreature(*me,guidMason[2])) + { + Mason3->GetMotionMaster()->MovePoint(0, Mason3Pos[2]); + Mason3->SetHomePosition(Mason3Pos[2]); + } + events.ScheduleEvent(EVENT_START_FIGHT,5000); + events.ScheduleEvent(EVENT_MASON_ACTION,15000); + } + break; + case EVENT_MASON_ACTION: + { + if (Creature* Mason1 = me->GetCreature(*me,guidMason[0])) + { + Mason1->SetFacingTo(2.8972f); + Mason1->AI()->SetData(1,1); // triggers SAI actions on npc + } + if (Creature* Mason2 = me->GetCreature(*me,guidMason[1])) + { + Mason2->SetFacingTo(3.1241f); + Mason2->AI()->SetData(1,1); // triggers SAI actions on npc + } + if (Creature* Mason3 = me->GetCreature(*me,guidMason[2])) + { + Mason3->SetFacingTo(3.6651f); + Mason3->AI()->SetData(1,1); // triggers SAI actions on npc + } + } + break; + case EVENT_START_FIGHT: + { + if(Creature* LK = GetClosestCreatureWithEntry(me,NPC_LK,100)) + LK->AI()->Talk(LK_TALK_1); + if (Creature* Dalfors = me->GetCreature(*me,guidDalfors)) + Dalfors->AI()->Talk(DALFORS_SAY_START); + events.ScheduleEvent(EVENT_WAVE_SPAWN,1000); + } + break; + case EVENT_WAVE_SPAWN: + { + if (PhaseCount == 3) + { + if (Creature* LK = GetClosestCreatureWithEntry(me,NPC_LK,100)) + LK->AI()->Talk(LK_TALK_2); + } + else if (PhaseCount == 6) + { + if (Creature* LK = GetClosestCreatureWithEntry(me,NPC_LK,100)) + LK->AI()->Talk(LK_TALK_3); + } + if (Creature* tempsum = DoSummon(NPC_SCOURGE_DRUDGE,Mason3Pos[0])) + { + tempsum->SetHomePosition(DalforsPos[2]); + tempsum->AI()->AttackStart(GetClosestCreatureWithEntry(me,NPC_BLESSED_BANNER,100)); + } + if (urand(0,1) == 0) + { + if (Creature* tempsum = DoSummon(NPC_HIDEOUS_PLAGEBRINGER,Mason1Pos[0])) + { + tempsum->SetHomePosition(DalforsPos[2]); + tempsum->AI()->AttackStart(GetClosestCreatureWithEntry(me,NPC_BLESSED_BANNER,100)); + } + if (Creature* tempsum = DoSummon(NPC_HIDEOUS_PLAGEBRINGER,Mason2Pos[0])) + { + tempsum->SetHomePosition(DalforsPos[2]); + tempsum->AI()->AttackStart(GetClosestCreatureWithEntry(me,NPC_BLESSED_BANNER,100)); + } + } + else + { + if (Creature* tempsum = DoSummon(NPC_REANIMATED_CAPTAIN,Mason1Pos[0])) + { + tempsum->SetHomePosition(DalforsPos[2]); + tempsum->AI()->AttackStart(GetClosestCreatureWithEntry(me,NPC_BLESSED_BANNER,100)); + } + if (Creature* tempsum = DoSummon(NPC_REANIMATED_CAPTAIN,Mason2Pos[0])) + { + tempsum->SetHomePosition(DalforsPos[2]); + tempsum->AI()->AttackStart(GetClosestCreatureWithEntry(me,NPC_BLESSED_BANNER,100)); + } + } + + PhaseCount++; + + if (PhaseCount < 8) + events.ScheduleEvent(EVENT_WAVE_SPAWN,urand(10000,20000)); + else + events.ScheduleEvent(EVENT_HALOF,urand(10000,20000)); + } + break; + case EVENT_HALOF: + { + if (Creature* LK = GetClosestCreatureWithEntry(me,NPC_LK,100)) + LK->AI()->Talk(LK_TALK_4); + if (Creature* tempsum = DoSummon(NPC_SCOURGE_DRUDGE,Mason1Pos[0])) + { + tempsum->SetHomePosition(DalforsPos[2]); + tempsum->AI()->AttackStart(GetClosestCreatureWithEntry(me,NPC_BLESSED_BANNER,100)); + } + if (Creature* tempsum = DoSummon(NPC_SCOURGE_DRUDGE,Mason2Pos[0])) + { + tempsum->SetHomePosition(DalforsPos[2]); + tempsum->AI()->AttackStart(GetClosestCreatureWithEntry(me,NPC_BLESSED_BANNER,100)); + } + if (Creature* tempsum = DoSummon(NPC_HALOF_THE_DEATHBRINGER,DalforsPos[0])) + { + HalofSpawned = true; + guidHalof = tempsum->GetGUID(); + tempsum->SetHomePosition(DalforsPos[2]); + tempsum->AI()->AttackStart(GetClosestCreatureWithEntry(me,NPC_BLESSED_BANNER,100)); + } + } + break; + case EVENT_ENDED: + { + Summons.DespawnAll(); + me->DespawnOrUnsummon(); + } + break; + } + + if (PhaseCount == 8) + if (Creature* Halof = me->GetCreature(*me,guidHalof)) + if (Halof->isDead()) + { + DoCast(me,SPELL_CRUSADERS_SPIRE_VICTORY,true); + Summons.DespawnEntry(NPC_HIDEOUS_PLAGEBRINGER); + Summons.DespawnEntry(NPC_REANIMATED_CAPTAIN); + Summons.DespawnEntry(NPC_SCOURGE_DRUDGE); + Summons.DespawnEntry(NPC_HALOF_THE_DEATHBRINGER); + if (Creature* Dalfors = me->GetCreature(*me,guidDalfors)) + Dalfors->AI()->Talk(DALFORS_YELL_FINISHED); + events.ScheduleEvent(EVENT_ENDED,10000); + } + } + }; + + CreatureAI *GetAI(Creature *creature) const + { + return new npc_blessed_bannerAI(creature); + } +}; + void AddSC_icecrown() { new npc_arete; @@ -502,4 +874,5 @@ void AddSC_icecrown() new npc_guardian_pavilion; new npc_vereth_the_cunning; new npc_tournament_training_dummy; + new npc_blessed_banner(); } From 9129b440eae239ecd49bed24f029a043c42a93d8 Mon Sep 17 00:00:00 2001 From: WishToDie Date: Tue, 27 Nov 2012 00:06:05 +0200 Subject: [PATCH 10/23] Fix No newline at end of file. --- sql/updates/world/2012_11_26_03_world_misc.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/updates/world/2012_11_26_03_world_misc.sql b/sql/updates/world/2012_11_26_03_world_misc.sql index 01ac81d4377..d2f03f56dd5 100644 --- a/sql/updates/world/2012_11_26_03_world_misc.sql +++ b/sql/updates/world/2012_11_26_03_world_misc.sql @@ -112,4 +112,4 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type (@NPC_DRUDGE,0,0,0,0,0,100,0,5000,5000,11300,14500,11,51917,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Cleave'), (@NPC_DRUDGE,0,1,0,0,0,100,0,7000,9000,17800,20200,11,49678,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Flesh Rot'), -- Hideous Plaguebringer -(@NPC_PLAGEBRINGER,0,0,0,0,0,100,0,3400,4600,11400,16500,11,38761,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcing Smash'); \ No newline at end of file +(@NPC_PLAGEBRINGER,0,0,0,0,0,100,0,3400,4600,11400,16500,11,38761,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcing Smash'); From 3bfce150192ed68a5b130122a4fa852b4376923b Mon Sep 17 00:00:00 2001 From: Gacko Date: Mon, 26 Nov 2012 23:13:56 +0100 Subject: [PATCH 11/23] Core/DB: Corrections for creature text conversion --- .../2012_11_24_02_world_creature_text.sql | 26 ++++++++++++------- .../instance_shadowfang_keep.cpp | 2 +- .../EasternKingdoms/ZulGurub/boss_jindo.cpp | 2 +- .../EasternKingdoms/stormwind_city.cpp | 2 +- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/sql/updates/world/2012_11_24_02_world_creature_text.sql b/sql/updates/world/2012_11_24_02_world_creature_text.sql index 4f6499e072f..8797039d967 100644 --- a/sql/updates/world/2012_11_24_02_world_creature_text.sql +++ b/sql/updates/world/2012_11_24_02_world_creature_text.sql @@ -223,21 +223,16 @@ INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`, (14515,1,0,14,0,100,"arlokk SAY_FEAST_PANTHER","Feast on $n, my pretties!"), (14515,2,0,14,8412,100,"arlokk SAY_DEATH","At last, I am free of the Soulflayer!"); --- mandokir -DELETE FROM `script_texts` WHERE `entry` BETWEEN -1309019 AND -1309015; +-- mandokir / jindo +DELETE FROM `script_texts` WHERE `entry` BETWEEN -1309019 AND -1309014; DELETE FROM `creature_text` WHERE `entry` IN (11382,11380); INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES (11382,0,0,14,8413,100,"mandokir SAY_AGGRO","I'll feed your souls to Hakkar himself!"), (11382,1,0,14,0,100,"mandokir SAY_DING_KILL","DING!"), (11382,2,0,14,0,100,"mandokir SAY_WATCH","I'm keeping my eye on you, $N!"), (11382,3,0,14,0,100,"mandokir SAY_WATCH_WHISPER","Don't make me angry. You won't like it when I'm angry."), -(11380,0,0,14,0,100,"mandokir SAY_GRATS_JINDO","GRATS!"); - --- jindo -DELETE FROM `script_texts` WHERE `entry`=-1309014; -DELETE FROM `creature_text` WHERE `entry`=11380; -INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES -(11380,0,0,14,8425,100,"jindo SAY_AGGRO","Welcome to da great show friends! Step right up to die!"); +(11380,0,0,14,0,100,"mandokir SAY_GRATS_JINDO","GRATS!"), +(11380,1,0,14,8425,100,"jindo SAY_AGGRO","Welcome to da great show friends! Step right up to die!"); -- marli DELETE FROM `script_texts` WHERE `entry` BETWEEN -1309008 AND -1309005; @@ -336,3 +331,16 @@ INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`, (9999,7,0,12,0,100,"ringo SAY_RIN_END_6","Ugh."), (9997,1,0,12,0,100,"ringo SAY_SPR_END_7","Ringo? Wake up! Don't worry, I'll take care of you."), (9999,8,0,16,0,100,"ringo EMOTE_RIN_END_8","%s fades away after a long pause."); + +-- Corrections +DELETE FROM `creature_text` WHERE `entry`=3850; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`language`,`emote`,`comment`,`text`) VALUES +(3850,0,0,14,0,100,7,1,"prisoner ashcrombe SAY_FREE_AS","Follow me and I'll open the courtyard door for you."), +(3850,1,0,14,0,100,7,1,"prisoner ashcrombe SAY_OPEN_DOOR_AS","I have just the spell to get this door open. Too bad the cell doors weren't locked so haphazardly."), +(3850,2,0,14,0,100,7,1,"prisoner ashcrombe SAY_POST_DOOR_AS","There it is! Wide open. Good luck to you conquering what lies beyond. I must report back to the Kirin Tor at once!"), +(3850,3,0,12,0,100,7,1,"prisoner ashcrombe SAY_BOSS_DIE_AS","For once I agree with you... scum."); + +DELETE FROM `creature_text` WHERE `entry`=7766; +INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES +(7766,0,0,12,0,100,"tyrion spybot SAY_TYRION_1","Wait here. Spybot will make Lescovar come out as soon as possible. Be ready! Attack only after you've overheard their conversation."), +(7766,1,0,14,0,100,"lord gregor lescovar SAY_TYRION_2","That's it! That's what you were waiting for! KILL THEM!"); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 5d9df239870..1ec0eda171c 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -34,7 +34,7 @@ EndScriptData */ enum eEnums { SAY_BOSS_DIE_AD = 0, - SAY_BOSS_DIE_AS = 0, + SAY_BOSS_DIE_AS = 3, SAY_ARCHMAGE = 0, NPC_ASH = 3850, diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index 10df778eb7f..844a2b16800 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -29,7 +29,7 @@ EndScriptData */ enum Jindo { - SAY_AGGRO = 0, + SAY_AGGRO = 1, SPELL_BRAINWASHTOTEM = 24262, SPELL_POWERFULLHEALINGWARD = 24309, //We will not use this spell. We will summon a totem by script cause the spell totems will not cast. diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/stormwind_city.cpp index 188b3dcd2b1..f7d896a7cdb 100644 --- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/stormwind_city.cpp @@ -212,7 +212,7 @@ enum eLordGregorLescovar SAY_LESCOVAR_4 = 2, SAY_MARZON_1 = 0, SAY_MARZON_2 = 1, - SAY_TYRION_2 = 0, + SAY_TYRION_2 = 1, NPC_STORMWIND_ROYAL = 1756, NPC_MARZON_BLADE = 1755, From 371fbf5d315eed754e33aca45f6c9bdaa430e44c Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Mon, 26 Nov 2012 23:46:13 +0100 Subject: [PATCH 12/23] SQL: Fix sql import problem --- sql/updates/world/2012_11_26_03_world_misc.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/updates/world/2012_11_26_03_world_misc.sql b/sql/updates/world/2012_11_26_03_world_misc.sql index d2f03f56dd5..5a6140e6bf3 100644 --- a/sql/updates/world/2012_11_26_03_world_misc.sql +++ b/sql/updates/world/2012_11_26_03_world_misc.sql @@ -1,4 +1,4 @@ --- The Battle For Crusaders' Pinnacle (13141) +-- The Battle For Crusaders' Pinnacle (13141) SET @SPELL_ITEM_BANNER := 58013; -- Plant Blessed Banner SET @SPELL_TORCH := 58121; From 8ef48ecc99caa9c28b7d53bb45e6bd56872170a1 Mon Sep 17 00:00:00 2001 From: click Date: Tue, 27 Nov 2012 00:43:38 +0100 Subject: [PATCH 13/23] Core/Buildsystem: Clean up compileflags when compiling with warnings fully enabled. -Wwrite-strings is default enabled when -Wall is set in clang/gcc, hence removed. -Woverloaded-virtual is now enabled for C++-code only, this removes the useless warnings when dabbling with C-only code. --- CMakeLists.txt | 2 +- cmake/compiler/clang/settings.cmake | 4 ++-- cmake/compiler/gcc/settings.cmake | 4 ++-- cmake/compiler/icc/settings.cmake | 5 +---- src/server/worldserver/CMakeLists.txt | 1 - 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 49f0c31b15e..f8a97c7f553 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ project(TrinityCore) # CMake policies (can not be handled elsewhere) -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8) cmake_policy(SET CMP0005 OLD) # Set RPATH-handing (CMake parameters) diff --git a/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake index add9fa8694d..ae07b1fc39b 100644 --- a/cmake/compiler/clang/settings.cmake +++ b/cmake/compiler/clang/settings.cmake @@ -2,9 +2,9 @@ add_definitions(-D_BUILD_DIRECTIVE='"$(CONFIGURATION)"') if(WITH_WARNINGS) - set(WARNING_FLAGS "-W -Wall -Wextra -Wwrite-strings -Winit-self -Woverloaded-virtual -Wfatal-errors") + set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Wfatal-errors") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -Woverloaded-virtual") message(STATUS "Clang: All warnings enabled") endif() diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake index d74fc39031b..25ee96c8562 100644 --- a/cmake/compiler/gcc/settings.cmake +++ b/cmake/compiler/gcc/settings.cmake @@ -11,9 +11,9 @@ add_definitions(-DHAVE_SSE2 -D__SSE2__) message(STATUS "GCC: SFMT enabled, SSE2 flags forced") if( WITH_WARNINGS ) - set(WARNING_FLAGS "-W -Wall -Wextra -Wwrite-strings -Winit-self -Woverloaded-virtual -Winvalid-pch -Wfatal-errors") + set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Winvalid-pch -Wfatal-errors") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -Woverloaded-virtual") message(STATUS "GCC: All warnings enabled") endif() diff --git a/cmake/compiler/icc/settings.cmake b/cmake/compiler/icc/settings.cmake index b7e4cb742b3..58eb63b081d 100644 --- a/cmake/compiler/icc/settings.cmake +++ b/cmake/compiler/icc/settings.cmake @@ -9,10 +9,7 @@ endif() if( WITH_WARNINGS ) add_definitions(-w1) - message(STATUS "ICC All warnings enabled") -else() - add_definitions(-w) - message(STATUS "ICC: All warnings disabled") + message(STATUS "ICC: All warnings enabled") endif() if( WITH_COREDEBUG ) diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 58167aad703..556edb5a2c7 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -150,7 +150,6 @@ endif() add_dependencies(worldserver revision.h) - if( UNIX AND NOT NOJEM ) set(worldserver_LINK_FLAGS "-pthread -lncurses ${worldserver_LINK_FLAGS}") endif() From 1d7105914a8bf3c5ffda4f1c59f9a98576c1bcd2 Mon Sep 17 00:00:00 2001 From: click Date: Tue, 27 Nov 2012 02:24:12 +0100 Subject: [PATCH 14/23] Core: Fix some silly warnings (some stupid remnants from old times that has bugged me enough) No need to recompiling anything, it's just a visual change to make the compilers STFU about variable initializations --- dep/SFMT/SFMT.h | 4 ++- src/tools/map_extractor/dbcfile.h | 2 +- src/tools/vmap4_extractor/adtfile.h | 10 ++++---- src/tools/vmap4_extractor/model.h | 22 ++++++++--------- src/tools/vmap4_extractor/wdtfile.cpp | 2 +- src/tools/vmap4_extractor/wdtfile.h | 7 +++--- src/tools/vmap4_extractor/wmo.h | 35 ++++++++++++++------------- 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/dep/SFMT/SFMT.h b/dep/SFMT/SFMT.h index 5498b9ac5fb..f1c6f72d2d6 100644 --- a/dep/SFMT/SFMT.h +++ b/dep/SFMT/SFMT.h @@ -123,7 +123,8 @@ #define SFMT_PARITY 0x00000001, 0x00000000, 0x00000000, 0x5986f054 // Period certification vector #endif -// Functions used by SFMTRand::RandomInitByArray +// Functions used by SFMTRand::RandomInitByArray (UNUSED AND COMMENTED OUT) +/* static uint32_t func1(uint32_t x) { return (x ^ (x >> 27)) * 1664525U; } @@ -131,6 +132,7 @@ static uint32_t func1(uint32_t x) { static uint32_t func2(uint32_t x) { return (x ^ (x >> 27)) * 1566083941U; } +*/ // Subfunction for the sfmt algorithm static inline __m128i sfmt_recursion(__m128i const &a, __m128i const &b, diff --git a/src/tools/map_extractor/dbcfile.h b/src/tools/map_extractor/dbcfile.h index aef61df7aaa..6862678a73b 100644 --- a/src/tools/map_extractor/dbcfile.h +++ b/src/tools/map_extractor/dbcfile.h @@ -59,8 +59,8 @@ public: } private: Record(DBCFile &file, unsigned char *offset): file(file), offset(offset) {} - unsigned char *offset; DBCFile &file; + unsigned char *offset; friend class DBCFile; friend class DBCFile::Iterator; diff --git a/src/tools/vmap4_extractor/adtfile.h b/src/tools/vmap4_extractor/adtfile.h index 08814996f68..3de1dccfacd 100644 --- a/src/tools/vmap4_extractor/adtfile.h +++ b/src/tools/vmap4_extractor/adtfile.h @@ -109,6 +109,11 @@ struct MapChunkHeader class ADTFile { +private: + //size_t mcnk_offsets[256], mcnk_sizes[256]; + MPQFile ADT; + //mcell Mcell; + string Adtfilename; public: ADTFile(char* filename); ~ADTFile(); @@ -126,11 +131,6 @@ public: return Mcell; } */ -private: - //size_t mcnk_offsets[256], mcnk_sizes[256]; - MPQFile ADT; - //mcell Mcell; - string Adtfilename; }; const char * GetPlainName(const char * FileName); diff --git a/src/tools/vmap4_extractor/model.h b/src/tools/vmap4_extractor/model.h index 7dd69212b54..bf15d813ce8 100644 --- a/src/tools/vmap4_extractor/model.h +++ b/src/tools/vmap4_extractor/model.h @@ -30,6 +30,15 @@ Vec3D fixCoordSystem(Vec3D v); class Model { +private: + void _unload() + { + delete[] vertices; + delete[] indices; + vertices = NULL; + indices = NULL; + } + std::string filename; public: ModelHeader header; Vec3D* vertices; @@ -40,17 +49,6 @@ public: Model(std::string& filename); ~Model() { _unload(); } - -private: - void _unload() - { - delete[] vertices; - delete[] indices; - vertices = NULL; - indices = NULL; - } - - std::string filename; }; class ModelInstance @@ -63,7 +61,7 @@ public: unsigned int d1, scale; float w, sc; - ModelInstance() : model(NULL), d1(0), scale(0), w(0.0f), sc(0.0f), id(0) {} + ModelInstance() : model(NULL), id(0), d1(0), scale(0), w(0.0f), sc(0.0f) {} ModelInstance(MPQFile& f, char const* ModelInstName, uint32 mapID, uint32 tileX, uint32 tileY, FILE* pDirfile); }; diff --git a/src/tools/vmap4_extractor/wdtfile.cpp b/src/tools/vmap4_extractor/wdtfile.cpp index a799a928710..7420edfee2e 100644 --- a/src/tools/vmap4_extractor/wdtfile.cpp +++ b/src/tools/vmap4_extractor/wdtfile.cpp @@ -35,7 +35,7 @@ WDTFile::WDTFile(char* file_name, char* file_name1) : WDT(file_name), gWmoInstan filename.append(file_name1,strlen(file_name1)); } -bool WDTFile::init(char *map_id, unsigned int mapID) +bool WDTFile::init(char */*map_id*/, unsigned int mapID) { if (WDT.isEof()) { diff --git a/src/tools/vmap4_extractor/wdtfile.h b/src/tools/vmap4_extractor/wdtfile.h index 2c66dbceb92..5d6aed8f0bc 100644 --- a/src/tools/vmap4_extractor/wdtfile.h +++ b/src/tools/vmap4_extractor/wdtfile.h @@ -10,6 +10,9 @@ class ADTFile; class WDTFile { +private: + MPQFile WDT; + string filename; public: WDTFile(char* file_name, char* file_name1); ~WDTFile(void); @@ -19,10 +22,6 @@ public: int gnWMO; ADTFile* GetMap(int x, int z); - -private: - MPQFile WDT; - string filename; }; #endif diff --git a/src/tools/vmap4_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h index 74e666d3f82..d0333265851 100644 --- a/src/tools/vmap4_extractor/wmo.h +++ b/src/tools/vmap4_extractor/wmo.h @@ -44,9 +44,11 @@ static inline Vec3D fixCoords(const Vec3D &v){ return Vec3D(v.z, v.x, v.y); } class WMORoot { +private: + std::string filename; public: - uint32 nTextures, nGroups, nP, nLights, nModels, nDoodads, nDoodadSets, RootWMOID, liquidType; unsigned int col; + uint32 nTextures, nGroups, nP, nLights, nModels, nDoodads, nDoodadSets, RootWMOID, liquidType; float bbcorn1[3]; float bbcorn2[3]; @@ -55,8 +57,6 @@ public: bool open(); bool ConvertToVMAPRootWmo(FILE* output); -private: - std::string filename; }; struct WMOLiquidHeader @@ -77,9 +77,22 @@ struct WMOLiquidVert class WMOGroup { +private: + std::string filename; public: // MOGP - int groupName, descGroupName, mogpFlags; + + char* MOPY; + uint16* MOVI; + uint16* MoviEx; + float* MOVT; + uint16* MOBA; + int* MobaEx; + WMOLiquidHeader* hlq; + WMOLiquidVert* LiquEx; + char* LiquBytes; + int groupName, descGroupName; + int mogpFlags; float bbcorn1[3]; float bbcorn2[3]; uint16 moprIdx; @@ -92,15 +105,6 @@ public: int LiquEx_size; unsigned int nVertices; // number when loaded int nTriangles; // number when loaded - char* MOPY; - uint16* MOVI; - uint16* MoviEx; - float* MOVT; - uint16* MOBA; - int* MobaEx; - WMOLiquidHeader* hlq; - WMOLiquidVert* LiquEx; - char* LiquBytes; uint32 liquflags; WMOGroup(std::string const& filename); @@ -108,9 +112,6 @@ public: bool open(); int ConvertToVMAPGroupWmo(FILE* output, WMORoot* rootWMO, bool preciseVectorData); - -private: - std::string filename; }; class WMOInstance @@ -121,10 +122,10 @@ public: int currx; int curry; WMOGroup* wmo; + int doodadset; Vec3D pos; Vec3D pos2, pos3, rot; uint32 indx, id, d2, d3; - int doodadset; WMOInstance(MPQFile&f , char const* WmoInstName, uint32 mapID, uint32 tileX, uint32 tileY, FILE* pDirfile); From 0b177376b02c07316d8d0c6384dc8c836acc9ad7 Mon Sep 17 00:00:00 2001 From: click Date: Tue, 27 Nov 2012 02:32:47 +0100 Subject: [PATCH 15/23] Core: Move BF-handler invitation/queuing-logmessages to outDebug() (the information given there aren't really considered "errors"...) --- src/server/game/Battlefield/BattlefieldHandler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/game/Battlefield/BattlefieldHandler.cpp b/src/server/game/Battlefield/BattlefieldHandler.cpp index a2d8cec3936..c4225551311 100644 --- a/src/server/game/Battlefield/BattlefieldHandler.cpp +++ b/src/server/game/Battlefield/BattlefieldHandler.cpp @@ -102,7 +102,7 @@ void WorldSession::HandleBfQueueInviteResponse(WorldPacket & recvData) uint8 Accepted; recvData >> BattleId >> Accepted; - sLog->outError(LOG_FILTER_GENERAL, "HandleQueueInviteResponse: BattleID:%u Accepted:%u", BattleId, Accepted); + sLog->outDebug(LOG_FILTER_GENERAL, "HandleQueueInviteResponse: BattleID:%u Accepted:%u", BattleId, Accepted); Battlefield* Bf = sBattlefieldMgr->GetBattlefieldByBattleId(BattleId); if (!Bf) return; @@ -120,7 +120,7 @@ void WorldSession::HandleBfEntryInviteResponse(WorldPacket & recvData) uint8 Accepted; recvData >> BattleId >> Accepted; - sLog->outError(LOG_FILTER_GENERAL, "HandleBattlefieldInviteResponse: BattleID:%u Accepted:%u", BattleId, Accepted); + sLog->outDebug(LOG_FILTER_GENERAL, "HandleBattlefieldInviteResponse: BattleID:%u Accepted:%u", BattleId, Accepted); Battlefield* Bf = sBattlefieldMgr->GetBattlefieldByBattleId(BattleId); if (!Bf) return; @@ -142,7 +142,7 @@ void WorldSession::HandleBfExitRequest(WorldPacket & recvData) uint32 BattleId; recvData >> BattleId; - sLog->outError(LOG_FILTER_GENERAL, "HandleBfExitRequest: BattleID:%u ", BattleId); + sLog->outDebug(LOG_FILTER_GENERAL, "HandleBfExitRequest: BattleID:%u ", BattleId); Battlefield* Bf = sBattlefieldMgr->GetBattlefieldByBattleId(BattleId); if (!Bf) return; From 50944711c8b941bdd3fada4389033c693eacf659 Mon Sep 17 00:00:00 2001 From: click Date: Tue, 27 Nov 2012 02:44:30 +0100 Subject: [PATCH 16/23] Core: Change phrasing on the logmessage given when a gameobject loses its reference owner --- src/server/game/Entities/GameObject/GameObject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index bf27015e8e3..f72e36e2d30 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -118,7 +118,7 @@ void GameObject::RemoveFromOwner() else if (IS_PET_GUID(ownerGUID)) ownerType = "pet"; - sLog->outFatal(LOG_FILTER_GENERAL, "Delete GameObject (GUID: %u Entry: %u SpellId %u LinkedGO %u) that lost references to owner (GUID %u Type '%s') GO list. Crash possible later.", + sLog->outFatal(LOG_FILTER_GENERAL, "Removed GameObject (GUID: %u Entry: %u SpellId: %u LinkedGO: %u) that just lost any reference to the owner (GUID: %u Type: '%s') GO list", GetGUIDLow(), GetGOInfo()->entry, m_spellId, GetGOInfo()->GetLinkedGameObjectEntry(), GUID_LOPART(ownerGUID), ownerType); SetOwnerGUID(0); } From 4e03a67045237423d006fda4fdb40d5b36b2acbd Mon Sep 17 00:00:00 2001 From: Ne3x Date: Fri, 23 Nov 2012 19:10:23 -0800 Subject: [PATCH 17/23] Core/Spells: Fix Unholy Blight not stacking correctly Note: As of patch 3.2.0: The damage supposed to accumulate similar to Ignite and Deep wounds. Source: http://www.wowwiki.com/Unholy_Blight Closes: #8265 --- src/server/game/Entities/Unit/Unit.cpp | 12 +++++++++--- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 8 -------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index ab2c07e1925..686b944d967 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -7545,12 +7545,18 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // Unholy Blight if (dummySpell->Id == 49194) { + triggered_spell_id = 50536; + SpellInfo const* unholyBlight = sSpellMgr->GetSpellInfo(triggered_spell_id); + if (!unholyBlight) + return false; + basepoints0 = CalculatePct(int32(damage), triggerAmount); - // Glyph of Unholy Blight + + //Glyph of Unholy Blight if (AuraEffect* glyph=GetAuraEffect(63332, 0)) AddPct(basepoints0, glyph->GetAmount()); - - triggered_spell_id = 50536; + + basepoints0 = basepoints0 / (unholyBlight->GetMaxDuration() / unholyBlight->Effects[0].Amplitude); basepoints0 += victim->GetRemainingPeriodicAmount(GetGUID(), triggered_spell_id, SPELL_AURA_PERIODIC_DAMAGE); break; } diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index b29f1498152..10b38b2de65 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -658,14 +658,6 @@ int32 AuraEffect::CalculateAmount(Unit* caster) AddPct(amount, m_spellInfo->Effects[EFFECT_2].CalcValue(caster)); } } - // Unholy Blight damage over time effect - else if (GetId() == 50536) - { - m_canBeRecalculated = false; - // we're getting total damage on aura apply, change it to be damage per tick - amount = int32((float)amount / GetTotalTicks()); - } - break; case SPELL_AURA_PERIODIC_ENERGIZE: switch (m_spellInfo->Id) { From 611ffbb189ffab88f2c0c87399c4b2dd7dc0bff2 Mon Sep 17 00:00:00 2001 From: Spp Date: Tue, 27 Nov 2012 07:44:27 +0100 Subject: [PATCH 18/23] Core/Units: make SetHover virtual --- src/server/game/Entities/Player/Player.cpp | 8 -------- src/server/game/Entities/Player/Player.h | 2 -- src/server/game/Entities/Unit/Unit.h | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 85f12812014..99795193b85 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -25560,14 +25560,6 @@ bool Player::IsInWhisperWhiteList(uint64 guid) return false; } -bool Player::SetHover(bool enable) -{ - if (!Unit::SetHover(enable)) - return false; - - return true; -} - void Player::SendMovementSetCanFly(bool apply) { WorldPacket data(apply ? SMSG_MOVE_SET_CAN_FLY : SMSG_MOVE_UNSET_CAN_FLY, 12); diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 3e4b3e8a971..4cd90f27875 100755 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2279,8 +2279,6 @@ class Player : public Unit, public GridObject m_mover->m_movedPlayer = this; } - bool SetHover(bool enable); - void SetSeer(WorldObject* target) { m_seer = target; } void SetViewpoint(WorldObject* target, bool apply); WorldObject* GetViewpoint() const; diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 1f999477f9a..7b2308c2a51 100755 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1618,7 +1618,7 @@ class Unit : public WorldObject bool IsWalking() const { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_WALKING);} virtual bool SetWalk(bool enable); virtual bool SetDisableGravity(bool disable, bool packetOnly = false); - bool SetHover(bool enable); + virtual bool SetHover(bool enable); void SetInFront(Unit const* target); void SetFacingTo(float ori); From e9ede295929d77bce7cbacb1e56a361c4a5311a4 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 27 Nov 2012 11:25:29 +0100 Subject: [PATCH 19/23] Core/Auras: Added missing break in AuraEffect::CalculateAmount (accidentally removed in cea752fadf3f86a6317768d8a1c4dac1cb2b0a23) --- src/server/game/Spells/Auras/SpellAuraEffects.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 10b38b2de65..24bc9540ab7 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -658,6 +658,7 @@ int32 AuraEffect::CalculateAmount(Unit* caster) AddPct(amount, m_spellInfo->Effects[EFFECT_2].CalcValue(caster)); } } + break; case SPELL_AURA_PERIODIC_ENERGIZE: switch (m_spellInfo->Id) { From 02aae2858b477c6ed98497053625f270000a72c6 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 27 Nov 2012 11:30:48 +0100 Subject: [PATCH 20/23] Core/Authserver: Always send realm address to clients in dotted ip format. --- src/server/authserver/Realms/RealmList.cpp | 16 ++++++++-------- src/server/authserver/Realms/RealmList.h | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/server/authserver/Realms/RealmList.cpp b/src/server/authserver/Realms/RealmList.cpp index 453efd5bf72..79df2b15605 100755 --- a/src/server/authserver/Realms/RealmList.cpp +++ b/src/server/authserver/Realms/RealmList.cpp @@ -31,7 +31,7 @@ void RealmList::Initialize(uint32 updateInterval) UpdateRealms(true); } -void RealmList::UpdateRealm(uint32 ID, const std::string& name, const std::string& address, uint16 port, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build) +void RealmList::UpdateRealm(uint32 ID, const std::string& name, ACE_INET_Addr const& address, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build) { // Create new if not exist or update existed Realm& realm = m_realms[name]; @@ -45,9 +45,7 @@ void RealmList::UpdateRealm(uint32 ID, const std::string& name, const std::strin realm.populationLevel = popu; // Append port to IP address. - std::ostringstream ss; - ss << address << ':' << port; - realm.address = ss.str(); + address.addr_to_string(realm.address, ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16); realm.gamebuild = build; } @@ -80,8 +78,8 @@ void RealmList::UpdateRealms(bool init) { Field* fields = result->Fetch(); uint32 realmId = fields[0].GetUInt32(); - const std::string& name = fields[1].GetString(); - const std::string& address = fields[2].GetString(); + std::string name = fields[1].GetString(); + std::string address = fields[2].GetString(); uint16 port = fields[3].GetUInt16(); uint8 icon = fields[4].GetUInt8(); RealmFlags flag = RealmFlags(fields[5].GetUInt8()); @@ -90,10 +88,12 @@ void RealmList::UpdateRealms(bool init) float pop = fields[8].GetFloat(); uint32 build = fields[9].GetUInt32(); - UpdateRealm(realmId, name, address, port, icon, flag, timezone, (allowedSecurityLevel <= SEC_ADMINISTRATOR ? AccountTypes(allowedSecurityLevel) : SEC_ADMINISTRATOR), pop, build); + ACE_INET_Addr addr(port, address.c_str(), AF_INET); + + UpdateRealm(realmId, name, addr, icon, flag, timezone, (allowedSecurityLevel <= SEC_ADMINISTRATOR ? AccountTypes(allowedSecurityLevel) : SEC_ADMINISTRATOR), pop, build); if (init) - sLog->outInfo(LOG_FILTER_AUTHSERVER, "Added realm \"%s\".", fields[1].GetCString()); + sLog->outInfo(LOG_FILTER_AUTHSERVER, "Added realm \"%s\" at %s.", name.c_str(), m_realms[name].address); } while (result->NextRow()); } diff --git a/src/server/authserver/Realms/RealmList.h b/src/server/authserver/Realms/RealmList.h index c8407b0fea1..52482897ea4 100755 --- a/src/server/authserver/Realms/RealmList.h +++ b/src/server/authserver/Realms/RealmList.h @@ -21,6 +21,7 @@ #include #include +#include #include "Common.h" enum RealmFlags @@ -39,7 +40,7 @@ enum RealmFlags // Storage object for a realm struct Realm { - std::string address; + char address[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16]; std::string name; uint8 icon; RealmFlags flag; @@ -71,7 +72,7 @@ public: private: void UpdateRealms(bool init=false); - void UpdateRealm(uint32 ID, const std::string& name, const std::string& address, uint16 port, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build); + void UpdateRealm(uint32 ID, const std::string& name, ACE_INET_Addr const& address, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build); RealmMap m_realms; uint32 m_UpdateInterval; From 8a7ec89883e24741c666577b496fbdfee3582358 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Tue, 27 Nov 2012 12:36:38 +0100 Subject: [PATCH 21/23] Core: Fix warnings --- .../MagistersTerrace/boss_selin_fireheart.cpp | 2 +- src/server/scripts/EasternKingdoms/tirisfal_glades.cpp | 10 +++++----- src/server/scripts/Northrend/icecrown.cpp | 2 +- src/server/scripts/World/npcs_special.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 4d9bd1f2192..dcf70b36df6 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -113,7 +113,7 @@ public: for (std::list::const_iterator itr = Crystals.begin(); itr != Crystals.end(); ++itr) { //Unit* unit = Unit::GetUnit(*me, FelCrystals[i]); - if (Creature *creature = Unit::GetCreature(*me, *itr)) + if (Creature* creature = Unit::GetCreature(*me, *itr)) { if (!creature->isAlive()) creature->Respawn(); // Let the core handle setting death state, etc. diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp index 87c28ddd206..22cd971a081 100644 --- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp @@ -37,9 +37,9 @@ EndContentData */ ## npc_calvin_montague ######*/ -enum eCalvin +enum Calvin { - SAY_COMPLETE = -1000431, + SAY_COMPLETE = 0, SPELL_DRINK = 2639, // possibly not correct spell (but iconId is correct) QUEST_590 = 590, FACTION_HOSTILE = 168 @@ -113,15 +113,15 @@ public: } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(uint32 const diff) { if (m_uiPhase) { - if (m_uiPhaseTimer <= uiDiff) + if (m_uiPhaseTimer <= diff) m_uiPhaseTimer = 7500; else { - m_uiPhaseTimer -= uiDiff; + m_uiPhaseTimer -= diff; return; } diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index dc450a8fea4..e08a9173715 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -860,7 +860,7 @@ public: } }; - CreatureAI *GetAI(Creature *creature) const + CreatureAI* GetAI(Creature* creature) const { return new npc_blessed_bannerAI(creature); } diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index b38530b2a4a..5ed799bbec1 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -2951,7 +2951,7 @@ public: me->GetMotionMaster()->MoveFollow(owner, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); } - void EnterCombat(Unit * /*who*/) { } + void EnterCombat(Unit* /*who*/) { } void DoAction(const int32 /*param*/) { From 2251d1bfae88b8f7d18d4111929f4bb03f4a4131 Mon Sep 17 00:00:00 2001 From: Spp Date: Tue, 27 Nov 2012 10:23:56 +0100 Subject: [PATCH 22/23] Core/Misc: Set mode 0644 for files --- src/server/authserver/Authentication/AuthCodes.h | 0 src/server/authserver/Main.cpp | 0 src/server/authserver/Realms/RealmList.cpp | 0 src/server/authserver/Realms/RealmList.h | 0 src/server/authserver/Server/AuthSocket.cpp | 0 src/server/authserver/Server/AuthSocket.h | 0 src/server/authserver/Server/RealmAcceptor.h | 0 src/server/authserver/Server/RealmSocket.cpp | 0 src/server/authserver/Server/RealmSocket.h | 0 src/server/authserver/authserver.rc | 0 src/server/collision/BoundingIntervalHierarchy.cpp | 0 src/server/collision/BoundingIntervalHierarchy.h | 0 src/server/collision/Management/IVMapManager.h | 0 src/server/collision/Management/VMapFactory.cpp | 0 src/server/collision/Management/VMapFactory.h | 0 src/server/collision/Management/VMapManager2.h | 0 src/server/collision/Maps/MapTree.h | 0 src/server/collision/Maps/TileAssembler.h | 0 src/server/collision/Models/ModelInstance.h | 0 src/server/collision/Models/WorldModel.h | 0 src/server/collision/VMapTools.h | 0 src/server/game/AI/CoreAI/CombatAI.cpp | 0 src/server/game/AI/CoreAI/CombatAI.h | 0 src/server/game/AI/CoreAI/GuardAI.cpp | 0 src/server/game/AI/CoreAI/GuardAI.h | 0 src/server/game/AI/CoreAI/PassiveAI.cpp | 0 src/server/game/AI/CoreAI/PassiveAI.h | 0 src/server/game/AI/CoreAI/PetAI.cpp | 0 src/server/game/AI/CoreAI/PetAI.h | 0 src/server/game/AI/CoreAI/ReactorAI.cpp | 0 src/server/game/AI/CoreAI/ReactorAI.h | 0 src/server/game/AI/CoreAI/TotemAI.cpp | 0 src/server/game/AI/CoreAI/TotemAI.h | 0 src/server/game/AI/CoreAI/UnitAI.cpp | 0 src/server/game/AI/CoreAI/UnitAI.h | 0 src/server/game/AI/CreatureAI.cpp | 0 src/server/game/AI/CreatureAI.h | 0 src/server/game/AI/CreatureAIFactory.h | 0 src/server/game/AI/CreatureAIImpl.h | 0 src/server/game/AI/CreatureAIRegistry.cpp | 0 src/server/game/AI/CreatureAIRegistry.h | 0 src/server/game/AI/CreatureAISelector.cpp | 0 src/server/game/AI/CreatureAISelector.h | 0 src/server/game/AI/EventAI/CreatureEventAI.cpp | 0 src/server/game/AI/EventAI/CreatureEventAI.h | 0 src/server/game/AI/EventAI/CreatureEventAIMgr.cpp | 0 src/server/game/AI/EventAI/CreatureEventAIMgr.h | 0 src/server/game/Accounts/AccountMgr.cpp | 0 src/server/game/Accounts/AccountMgr.h | 0 src/server/game/Achievements/AchievementMgr.cpp | 0 src/server/game/Achievements/AchievementMgr.h | 0 src/server/game/Addons/AddonMgr.cpp | 0 src/server/game/Addons/AddonMgr.h | 0 src/server/game/Battlegrounds/ArenaTeam.cpp | 0 src/server/game/Battlegrounds/ArenaTeam.h | 0 src/server/game/Battlegrounds/Battleground.cpp | 0 src/server/game/Battlegrounds/Battleground.h | 0 src/server/game/Battlegrounds/BattlegroundMgr.cpp | 0 src/server/game/Battlegrounds/BattlegroundMgr.h | 0 src/server/game/Battlegrounds/BattlegroundQueue.cpp | 0 src/server/game/Battlegrounds/BattlegroundQueue.h | 0 src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp | 0 src/server/game/Battlegrounds/Zones/BattlegroundAB.h | 0 src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp | 0 src/server/game/Battlegrounds/Zones/BattlegroundAV.h | 0 src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp | 0 src/server/game/Battlegrounds/Zones/BattlegroundBE.h | 0 src/server/game/Battlegrounds/Zones/BattlegroundDS.h | 0 src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp | 0 src/server/game/Battlegrounds/Zones/BattlegroundEY.h | 0 src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp | 0 src/server/game/Battlegrounds/Zones/BattlegroundIC.h | 0 src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp | 0 src/server/game/Battlegrounds/Zones/BattlegroundNA.h | 0 src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp | 0 src/server/game/Battlegrounds/Zones/BattlegroundRL.h | 0 src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp | 0 src/server/game/Battlegrounds/Zones/BattlegroundRV.h | 0 src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp | 0 src/server/game/Battlegrounds/Zones/BattlegroundSA.h | 0 src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp | 0 src/server/game/Battlegrounds/Zones/BattlegroundWS.h | 0 src/server/game/Chat/Channels/Channel.cpp | 0 src/server/game/Chat/Channels/Channel.h | 0 src/server/game/Chat/Channels/ChannelMgr.cpp | 0 src/server/game/Chat/Channels/ChannelMgr.h | 0 src/server/game/Chat/Chat.cpp | 0 src/server/game/Chat/Chat.h | 0 src/server/game/Combat/HostileRefManager.cpp | 0 src/server/game/Combat/HostileRefManager.h | 0 src/server/game/Combat/ThreatManager.cpp | 0 src/server/game/Combat/ThreatManager.h | 0 src/server/game/Combat/UnitEvents.h | 0 src/server/game/Conditions/ConditionMgr.cpp | 0 src/server/game/Conditions/ConditionMgr.h | 0 src/server/game/Conditions/DisableMgr.cpp | 0 src/server/game/Conditions/DisableMgr.h | 0 src/server/game/DataStores/DBCEnums.h | 0 src/server/game/DataStores/DBCStores.cpp | 0 src/server/game/DataStores/DBCStores.h | 0 src/server/game/DataStores/DBCStructure.h | 0 src/server/game/DataStores/DBCfmt.h | 0 src/server/game/DungeonFinding/LFG.h | 0 src/server/game/DungeonFinding/LFGMgr.cpp | 0 src/server/game/DungeonFinding/LFGMgr.h | 0 src/server/game/Entities/Corpse/Corpse.cpp | 0 src/server/game/Entities/Corpse/Corpse.h | 0 src/server/game/Entities/Creature/Creature.cpp | 0 src/server/game/Entities/Creature/Creature.h | 0 src/server/game/Entities/Creature/CreatureGroups.cpp | 0 src/server/game/Entities/Creature/CreatureGroups.h | 0 src/server/game/Entities/Creature/GossipDef.cpp | 0 src/server/game/Entities/Creature/GossipDef.h | 0 src/server/game/Entities/Creature/TemporarySummon.cpp | 0 src/server/game/Entities/Creature/TemporarySummon.h | 0 .../game/Entities/DynamicObject/DynamicObject.cpp | 0 src/server/game/Entities/DynamicObject/DynamicObject.h | 0 src/server/game/Entities/GameObject/GameObject.cpp | 0 src/server/game/Entities/GameObject/GameObject.h | 0 src/server/game/Entities/Item/Container/Bag.cpp | 0 src/server/game/Entities/Item/Container/Bag.h | 0 src/server/game/Entities/Item/Item.cpp | 0 src/server/game/Entities/Item/Item.h | 0 src/server/game/Entities/Item/ItemEnchantmentMgr.cpp | 0 src/server/game/Entities/Item/ItemEnchantmentMgr.h | 0 src/server/game/Entities/Item/ItemPrototype.h | 0 src/server/game/Entities/Object/Object.cpp | 0 src/server/game/Entities/Object/Object.h | 0 src/server/game/Entities/Object/ObjectDefines.h | 0 src/server/game/Entities/Object/ObjectPosSelector.cpp | 0 src/server/game/Entities/Object/ObjectPosSelector.h | 0 src/server/game/Entities/Object/Updates/UpdateData.cpp | 0 src/server/game/Entities/Object/Updates/UpdateData.h | 0 src/server/game/Entities/Object/Updates/UpdateFields.h | 0 src/server/game/Entities/Object/Updates/UpdateMask.h | 0 src/server/game/Entities/Pet/Pet.cpp | 0 src/server/game/Entities/Pet/Pet.h | 0 src/server/game/Entities/Player/Player.cpp | 0 src/server/game/Entities/Player/Player.h | 0 src/server/game/Entities/Player/SocialMgr.cpp | 0 src/server/game/Entities/Player/SocialMgr.h | 0 src/server/game/Entities/Totem/Totem.cpp | 0 src/server/game/Entities/Totem/Totem.h | 0 src/server/game/Entities/Transport/Transport.cpp | 0 src/server/game/Entities/Transport/Transport.h | 0 src/server/game/Entities/Unit/StatSystem.cpp | 0 src/server/game/Entities/Unit/Unit.cpp | 0 src/server/game/Entities/Unit/Unit.h | 0 src/server/game/Entities/Vehicle/Vehicle.cpp | 0 src/server/game/Entities/Vehicle/Vehicle.h | 0 src/server/game/Events/GameEventMgr.cpp | 0 src/server/game/Events/GameEventMgr.h | 0 src/server/game/Globals/ObjectAccessor.cpp | 0 src/server/game/Globals/ObjectAccessor.h | 0 src/server/game/Globals/ObjectMgr.cpp | 0 src/server/game/Globals/ObjectMgr.h | 0 src/server/game/Grids/Cells/Cell.h | 0 src/server/game/Grids/Grid.h | 0 src/server/game/Grids/GridLoader.h | 0 src/server/game/Grids/GridRefManager.h | 0 src/server/game/Grids/GridReference.h | 0 src/server/game/Grids/GridStates.cpp | 0 src/server/game/Grids/GridStates.h | 0 src/server/game/Grids/NGrid.h | 0 src/server/game/Grids/Notifiers/GridNotifiers.cpp | 0 src/server/game/Grids/Notifiers/GridNotifiers.h | 0 src/server/game/Grids/Notifiers/GridNotifiersImpl.h | 0 src/server/game/Grids/ObjectGridLoader.cpp | 0 src/server/game/Grids/ObjectGridLoader.h | 0 src/server/game/Groups/Group.cpp | 0 src/server/game/Groups/Group.h | 0 src/server/game/Groups/GroupRefManager.h | 0 src/server/game/Groups/GroupReference.cpp | 0 src/server/game/Groups/GroupReference.h | 0 src/server/game/Guilds/Guild.cpp | 0 src/server/game/Guilds/Guild.h | 0 src/server/game/Handlers/AddonHandler.cpp | 0 src/server/game/Handlers/AddonHandler.h | 0 src/server/game/Handlers/ArenaTeamHandler.cpp | 0 src/server/game/Handlers/AuctionHouseHandler.cpp | 0 src/server/game/Handlers/AuthHandler.cpp | 0 src/server/game/Handlers/BattleGroundHandler.cpp | 0 src/server/game/Handlers/CalendarHandler.cpp | 0 src/server/game/Handlers/ChannelHandler.cpp | 0 src/server/game/Handlers/ChatHandler.cpp | 0 src/server/game/Handlers/CombatHandler.cpp | 0 src/server/game/Handlers/DuelHandler.cpp | 0 src/server/game/Handlers/GroupHandler.cpp | 0 src/server/game/Handlers/GuildHandler.cpp | 0 src/server/game/Handlers/ItemHandler.cpp | 0 src/server/game/Handlers/LFGHandler.cpp | 0 src/server/game/Handlers/LootHandler.cpp | 0 src/server/game/Handlers/MailHandler.cpp | 0 src/server/game/Handlers/MiscHandler.cpp | 0 src/server/game/Handlers/MovementHandler.cpp | 0 src/server/game/Handlers/NPCHandler.cpp | 0 src/server/game/Handlers/NPCHandler.h | 0 src/server/game/Handlers/PetHandler.cpp | 0 src/server/game/Handlers/PetitionsHandler.cpp | 0 src/server/game/Handlers/QueryHandler.cpp | 0 src/server/game/Handlers/QuestHandler.cpp | 0 src/server/game/Handlers/SkillHandler.cpp | 0 src/server/game/Handlers/SpellHandler.cpp | 0 src/server/game/Handlers/TaxiHandler.cpp | 0 src/server/game/Handlers/TicketHandler.cpp | 0 src/server/game/Handlers/TradeHandler.cpp | 0 src/server/game/Handlers/VoiceChatHandler.cpp | 0 src/server/game/Instances/InstanceSaveMgr.cpp | 0 src/server/game/Instances/InstanceSaveMgr.h | 0 src/server/game/Instances/InstanceScript.cpp | 0 src/server/game/Instances/InstanceScript.h | 0 src/server/game/Loot/LootMgr.cpp | 0 src/server/game/Loot/LootMgr.h | 0 src/server/game/Mails/Mail.cpp | 0 src/server/game/Mails/Mail.h | 0 src/server/game/Maps/Map.cpp | 0 src/server/game/Maps/Map.h | 0 src/server/game/Maps/MapInstanced.cpp | 0 src/server/game/Maps/MapInstanced.h | 0 src/server/game/Maps/MapManager.cpp | 0 src/server/game/Maps/MapManager.h | 0 src/server/game/Maps/MapRefManager.h | 0 src/server/game/Maps/MapReference.h | 0 src/server/game/Maps/ZoneScript.h | 0 src/server/game/Miscellaneous/Formulas.h | 0 src/server/game/Miscellaneous/Language.h | 0 src/server/game/Miscellaneous/SharedDefines.h | 0 src/server/game/Movement/FollowerRefManager.h | 0 src/server/game/Movement/FollowerReference.cpp | 0 src/server/game/Movement/FollowerReference.h | 0 src/server/game/Movement/MotionMaster.cpp | 0 src/server/game/Movement/MotionMaster.h | 0 src/server/game/Movement/MovementGenerator.cpp | 0 src/server/game/Movement/MovementGenerator.h | 0 src/server/game/Movement/MovementGeneratorImpl.h | 0 .../MovementGenerators/ConfusedMovementGenerator.cpp | 0 .../MovementGenerators/ConfusedMovementGenerator.h | 0 .../MovementGenerators/FleeingMovementGenerator.cpp | 0 .../MovementGenerators/FleeingMovementGenerator.h | 0 .../MovementGenerators/HomeMovementGenerator.cpp | 0 .../MovementGenerators/HomeMovementGenerator.h | 0 .../MovementGenerators/IdleMovementGenerator.cpp | 0 .../MovementGenerators/IdleMovementGenerator.h | 0 .../MovementGenerators/PointMovementGenerator.cpp | 0 .../MovementGenerators/PointMovementGenerator.h | 0 .../MovementGenerators/RandomMovementGenerator.cpp | 0 .../MovementGenerators/RandomMovementGenerator.h | 0 .../MovementGenerators/TargetedMovementGenerator.cpp | 0 .../MovementGenerators/TargetedMovementGenerator.h | 0 .../MovementGenerators/WaypointMovementGenerator.cpp | 0 .../MovementGenerators/WaypointMovementGenerator.h | 0 src/server/game/Movement/Waypoints/Path.h | 0 src/server/game/Movement/Waypoints/WaypointManager.cpp | 0 src/server/game/Movement/Waypoints/WaypointManager.h | 0 src/server/game/OutdoorPvP/OutdoorPvP.cpp | 0 src/server/game/OutdoorPvP/OutdoorPvP.h | 0 src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp | 0 src/server/game/OutdoorPvP/OutdoorPvPMgr.h | 0 src/server/game/Pools/PoolMgr.cpp | 0 src/server/game/Pools/PoolMgr.h | 0 src/server/game/Quests/QuestDef.cpp | 0 src/server/game/Quests/QuestDef.h | 0 src/server/game/Reputation/ReputationMgr.cpp | 0 src/server/game/Reputation/ReputationMgr.h | 0 src/server/game/Scripting/MapScripts.cpp | 0 src/server/game/Scripting/ScriptLoader.cpp | 0 src/server/game/Scripting/ScriptMgr.cpp | 0 src/server/game/Scripting/ScriptMgr.h | 0 src/server/game/Scripting/ScriptSystem.cpp | 0 src/server/game/Server/Protocol/Opcodes.cpp | 0 src/server/game/Server/Protocol/Opcodes.h | 0 src/server/game/Server/WorldSession.cpp | 0 src/server/game/Server/WorldSession.h | 0 src/server/game/Server/WorldSocket.cpp | 0 src/server/game/Server/WorldSocket.h | 0 src/server/game/Server/WorldSocketMgr.cpp | 0 src/server/game/Server/WorldSocketMgr.h | 0 src/server/game/Skills/SkillDiscovery.cpp | 0 src/server/game/Skills/SkillDiscovery.h | 0 src/server/game/Skills/SkillExtraItems.cpp | 0 src/server/game/Skills/SkillExtraItems.h | 0 src/server/game/Spells/Auras/SpellAuraDefines.h | 0 src/server/game/Spells/Auras/SpellAuraEffects.cpp | 0 src/server/game/Spells/Auras/SpellAuras.cpp | 0 src/server/game/Spells/Auras/SpellAuras.h | 0 src/server/game/Spells/Spell.cpp | 0 src/server/game/Spells/Spell.h | 0 src/server/game/Spells/SpellEffects.cpp | 0 src/server/game/Spells/SpellMgr.cpp | 0 src/server/game/Spells/SpellMgr.h | 0 src/server/game/Spells/SpellScript.cpp | 0 src/server/game/Spells/SpellScript.h | 0 src/server/game/Texts/CreatureTextMgr.cpp | 0 src/server/game/Texts/CreatureTextMgr.h | 0 src/server/game/Tickets/TicketMgr.cpp | 0 src/server/game/Tickets/TicketMgr.h | 0 src/server/game/Tools/PlayerDump.h | 0 src/server/game/Weather/Weather.cpp | 0 src/server/game/Weather/Weather.h | 0 src/server/game/Weather/WeatherMgr.cpp | 0 src/server/game/Weather/WeatherMgr.h | 0 src/server/game/World/World.cpp | 0 src/server/game/World/World.h | 0 .../TrialOfTheCrusader/boss_anubarak_trial.cpp | 0 .../TrialOfTheCrusader/boss_faction_champions.cpp | 0 .../TrialOfTheCrusader/boss_lord_jaraxxus.cpp | 0 .../TrialOfTheCrusader/boss_northrend_beasts.cpp | 0 .../TrialOfTheCrusader/boss_twin_valkyr.cpp | 0 .../instance_trial_of_the_crusader.cpp | 0 .../TrialOfTheCrusader/trial_of_the_crusader.cpp | 0 .../IcecrownCitadel/boss_deathbringer_saurfang.cpp | 0 .../Northrend/IcecrownCitadel/boss_festergut.cpp | 0 .../IcecrownCitadel/boss_lady_deathwhisper.cpp | 0 .../Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp | 0 .../IcecrownCitadel/boss_professor_putricide.cpp | 0 .../Northrend/IcecrownCitadel/icecrown_citadel.h | 0 .../IcecrownCitadel/icecrown_citadel_teleport.cpp | 0 .../IcecrownCitadel/instance_icecrown_citadel.cpp | 0 src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp | 0 src/server/scripts/OutdoorPvP/OutdoorPvPEP.h | 0 src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp | 0 src/server/scripts/OutdoorPvP/OutdoorPvPHP.h | 0 src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp | 0 src/server/scripts/OutdoorPvP/OutdoorPvPNA.h | 0 src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp | 0 src/server/scripts/OutdoorPvP/OutdoorPvPSI.h | 0 src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp | 0 src/server/scripts/OutdoorPvP/OutdoorPvPTF.h | 0 src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp | 0 src/server/scripts/OutdoorPvP/OutdoorPvPZM.h | 0 src/server/scripts/World/achievement_scripts.cpp | 0 src/server/scripts/World/chat_log.cpp | 0 src/server/shared/Common.cpp | 0 src/server/shared/Common.h | 0 src/server/shared/CompilerDefs.h | 0 src/server/shared/Configuration/Config.cpp | 0 src/server/shared/Configuration/Config.h | 0 src/server/shared/Cryptography/ARC4.cpp | 0 src/server/shared/Cryptography/ARC4.h | 0 .../shared/Cryptography/Authentication/AuthCrypt.cpp | 0 .../shared/Cryptography/Authentication/AuthCrypt.h | 0 src/server/shared/Cryptography/BigNumber.cpp | 0 src/server/shared/Cryptography/BigNumber.h | 0 src/server/shared/Cryptography/HMACSHA1.cpp | 0 src/server/shared/Cryptography/HMACSHA1.h | 0 src/server/shared/Cryptography/SHA1.cpp | 0 src/server/shared/Cryptography/SHA1.h | 0 src/server/shared/DataStores/DBCFileLoader.cpp | 0 src/server/shared/DataStores/DBCFileLoader.h | 0 src/server/shared/DataStores/DBCStore.h | 10 +++++----- src/server/shared/Database/AdhocStatement.cpp | 0 src/server/shared/Database/AdhocStatement.h | 0 src/server/shared/Database/DatabaseEnv.h | 0 src/server/shared/Database/DatabaseWorker.h | 0 src/server/shared/Database/DatabaseWorkerPool.h | 0 src/server/shared/Database/Field.cpp | 0 src/server/shared/Database/Field.h | 0 .../shared/Database/Implementation/LoginDatabase.cpp | 0 .../shared/Database/Implementation/LoginDatabase.h | 0 .../shared/Database/Implementation/WorldDatabase.cpp | 0 .../shared/Database/Implementation/WorldDatabase.h | 0 src/server/shared/Database/MySQLConnection.cpp | 0 src/server/shared/Database/MySQLConnection.h | 0 src/server/shared/Database/MySQLThreading.h | 0 src/server/shared/Database/PreparedStatement.cpp | 0 src/server/shared/Database/PreparedStatement.h | 0 src/server/shared/Database/QueryHolder.cpp | 0 src/server/shared/Database/QueryHolder.h | 0 src/server/shared/Database/QueryResult.cpp | 0 src/server/shared/Database/QueryResult.h | 0 src/server/shared/Database/SQLOperation.h | 0 src/server/shared/Database/Transaction.cpp | 0 src/server/shared/Database/Transaction.h | 0 src/server/shared/Debugging/Errors.h | 0 src/server/shared/Define.h | 0 src/server/shared/Dynamic/FactoryHolder.h | 0 src/server/shared/Dynamic/LinkedList.h | 0 src/server/shared/Dynamic/LinkedReference/RefManager.h | 0 src/server/shared/Dynamic/LinkedReference/Reference.h | 0 src/server/shared/Dynamic/ObjectRegistry.h | 0 src/server/shared/Dynamic/TypeContainer.h | 0 src/server/shared/Dynamic/TypeContainerFunctions.h | 0 src/server/shared/Dynamic/TypeContainerVisitor.h | 0 src/server/shared/Dynamic/TypeList.h | 0 src/server/shared/Dynamic/UnorderedMap.h | 0 src/server/shared/Logging/Log.cpp | 0 src/server/shared/Logging/Log.h | 0 src/server/shared/Packets/ByteBuffer.h | 4 ++-- src/server/shared/Packets/WorldPacket.h | 0 src/server/shared/SystemConfig.h | 0 src/server/shared/Threading/Callback.h | 0 src/server/shared/Threading/LockedQueue.h | 0 src/server/shared/Threading/Threading.cpp | 0 src/server/shared/Threading/Threading.h | 0 src/server/shared/Utilities/ByteConverter.h | 0 src/server/shared/Utilities/EventProcessor.cpp | 0 src/server/shared/Utilities/EventProcessor.h | 0 src/server/shared/Utilities/ServiceWin32.cpp | 2 +- src/server/shared/Utilities/ServiceWin32.h | 0 src/server/shared/Utilities/SignalHandler.h | 0 src/server/shared/Utilities/Timer.h | 0 src/server/shared/Utilities/Util.cpp | 0 src/server/shared/Utilities/Util.h | 0 src/server/worldserver/CommandLine/CliRunnable.cpp | 0 src/server/worldserver/CommandLine/CliRunnable.h | 0 src/server/worldserver/Main.cpp | 0 src/server/worldserver/Master.cpp | 0 src/server/worldserver/Master.h | 0 src/server/worldserver/RemoteAccess/RASocket.cpp | 0 src/server/worldserver/RemoteAccess/RASocket.h | 0 src/server/worldserver/TCSoap/TCSoap.cpp | 0 src/server/worldserver/TCSoap/TCSoap.h | 0 src/server/worldserver/WorldThread/WorldRunnable.cpp | 0 src/server/worldserver/WorldThread/WorldRunnable.h | 0 src/server/worldserver/worldserver.rc | 0 415 files changed, 8 insertions(+), 8 deletions(-) mode change 100755 => 100644 src/server/authserver/Authentication/AuthCodes.h mode change 100755 => 100644 src/server/authserver/Main.cpp mode change 100755 => 100644 src/server/authserver/Realms/RealmList.cpp mode change 100755 => 100644 src/server/authserver/Realms/RealmList.h mode change 100755 => 100644 src/server/authserver/Server/AuthSocket.cpp mode change 100755 => 100644 src/server/authserver/Server/AuthSocket.h mode change 100755 => 100644 src/server/authserver/Server/RealmAcceptor.h mode change 100755 => 100644 src/server/authserver/Server/RealmSocket.cpp mode change 100755 => 100644 src/server/authserver/Server/RealmSocket.h mode change 100755 => 100644 src/server/authserver/authserver.rc mode change 100755 => 100644 src/server/collision/BoundingIntervalHierarchy.cpp mode change 100755 => 100644 src/server/collision/BoundingIntervalHierarchy.h mode change 100755 => 100644 src/server/collision/Management/IVMapManager.h mode change 100755 => 100644 src/server/collision/Management/VMapFactory.cpp mode change 100755 => 100644 src/server/collision/Management/VMapFactory.h mode change 100755 => 100644 src/server/collision/Management/VMapManager2.h mode change 100755 => 100644 src/server/collision/Maps/MapTree.h mode change 100755 => 100644 src/server/collision/Maps/TileAssembler.h mode change 100755 => 100644 src/server/collision/Models/ModelInstance.h mode change 100755 => 100644 src/server/collision/Models/WorldModel.h mode change 100755 => 100644 src/server/collision/VMapTools.h mode change 100755 => 100644 src/server/game/AI/CoreAI/CombatAI.cpp mode change 100755 => 100644 src/server/game/AI/CoreAI/CombatAI.h mode change 100755 => 100644 src/server/game/AI/CoreAI/GuardAI.cpp mode change 100755 => 100644 src/server/game/AI/CoreAI/GuardAI.h mode change 100755 => 100644 src/server/game/AI/CoreAI/PassiveAI.cpp mode change 100755 => 100644 src/server/game/AI/CoreAI/PassiveAI.h mode change 100755 => 100644 src/server/game/AI/CoreAI/PetAI.cpp mode change 100755 => 100644 src/server/game/AI/CoreAI/PetAI.h mode change 100755 => 100644 src/server/game/AI/CoreAI/ReactorAI.cpp mode change 100755 => 100644 src/server/game/AI/CoreAI/ReactorAI.h mode change 100755 => 100644 src/server/game/AI/CoreAI/TotemAI.cpp mode change 100755 => 100644 src/server/game/AI/CoreAI/TotemAI.h mode change 100755 => 100644 src/server/game/AI/CoreAI/UnitAI.cpp mode change 100755 => 100644 src/server/game/AI/CoreAI/UnitAI.h mode change 100755 => 100644 src/server/game/AI/CreatureAI.cpp mode change 100755 => 100644 src/server/game/AI/CreatureAI.h mode change 100755 => 100644 src/server/game/AI/CreatureAIFactory.h mode change 100755 => 100644 src/server/game/AI/CreatureAIImpl.h mode change 100755 => 100644 src/server/game/AI/CreatureAIRegistry.cpp mode change 100755 => 100644 src/server/game/AI/CreatureAIRegistry.h mode change 100755 => 100644 src/server/game/AI/CreatureAISelector.cpp mode change 100755 => 100644 src/server/game/AI/CreatureAISelector.h mode change 100755 => 100644 src/server/game/AI/EventAI/CreatureEventAI.cpp mode change 100755 => 100644 src/server/game/AI/EventAI/CreatureEventAI.h mode change 100755 => 100644 src/server/game/AI/EventAI/CreatureEventAIMgr.cpp mode change 100755 => 100644 src/server/game/AI/EventAI/CreatureEventAIMgr.h mode change 100755 => 100644 src/server/game/Accounts/AccountMgr.cpp mode change 100755 => 100644 src/server/game/Accounts/AccountMgr.h mode change 100755 => 100644 src/server/game/Achievements/AchievementMgr.cpp mode change 100755 => 100644 src/server/game/Achievements/AchievementMgr.h mode change 100755 => 100644 src/server/game/Addons/AddonMgr.cpp mode change 100755 => 100644 src/server/game/Addons/AddonMgr.h mode change 100755 => 100644 src/server/game/Battlegrounds/ArenaTeam.cpp mode change 100755 => 100644 src/server/game/Battlegrounds/ArenaTeam.h mode change 100755 => 100644 src/server/game/Battlegrounds/Battleground.cpp mode change 100755 => 100644 src/server/game/Battlegrounds/Battleground.h mode change 100755 => 100644 src/server/game/Battlegrounds/BattlegroundMgr.cpp mode change 100755 => 100644 src/server/game/Battlegrounds/BattlegroundMgr.h mode change 100755 => 100644 src/server/game/Battlegrounds/BattlegroundQueue.cpp mode change 100755 => 100644 src/server/game/Battlegrounds/BattlegroundQueue.h mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundAB.h mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundAV.h mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundBE.h mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundDS.h mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundEY.h mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundIC.h mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundNA.h mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundRL.h mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundRV.h mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundSA.h mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp mode change 100755 => 100644 src/server/game/Battlegrounds/Zones/BattlegroundWS.h mode change 100755 => 100644 src/server/game/Chat/Channels/Channel.cpp mode change 100755 => 100644 src/server/game/Chat/Channels/Channel.h mode change 100755 => 100644 src/server/game/Chat/Channels/ChannelMgr.cpp mode change 100755 => 100644 src/server/game/Chat/Channels/ChannelMgr.h mode change 100755 => 100644 src/server/game/Chat/Chat.cpp mode change 100755 => 100644 src/server/game/Chat/Chat.h mode change 100755 => 100644 src/server/game/Combat/HostileRefManager.cpp mode change 100755 => 100644 src/server/game/Combat/HostileRefManager.h mode change 100755 => 100644 src/server/game/Combat/ThreatManager.cpp mode change 100755 => 100644 src/server/game/Combat/ThreatManager.h mode change 100755 => 100644 src/server/game/Combat/UnitEvents.h mode change 100755 => 100644 src/server/game/Conditions/ConditionMgr.cpp mode change 100755 => 100644 src/server/game/Conditions/ConditionMgr.h mode change 100755 => 100644 src/server/game/Conditions/DisableMgr.cpp mode change 100755 => 100644 src/server/game/Conditions/DisableMgr.h mode change 100755 => 100644 src/server/game/DataStores/DBCEnums.h mode change 100755 => 100644 src/server/game/DataStores/DBCStores.cpp mode change 100755 => 100644 src/server/game/DataStores/DBCStores.h mode change 100755 => 100644 src/server/game/DataStores/DBCStructure.h mode change 100755 => 100644 src/server/game/DataStores/DBCfmt.h mode change 100755 => 100644 src/server/game/DungeonFinding/LFG.h mode change 100755 => 100644 src/server/game/DungeonFinding/LFGMgr.cpp mode change 100755 => 100644 src/server/game/DungeonFinding/LFGMgr.h mode change 100755 => 100644 src/server/game/Entities/Corpse/Corpse.cpp mode change 100755 => 100644 src/server/game/Entities/Corpse/Corpse.h mode change 100755 => 100644 src/server/game/Entities/Creature/Creature.cpp mode change 100755 => 100644 src/server/game/Entities/Creature/Creature.h mode change 100755 => 100644 src/server/game/Entities/Creature/CreatureGroups.cpp mode change 100755 => 100644 src/server/game/Entities/Creature/CreatureGroups.h mode change 100755 => 100644 src/server/game/Entities/Creature/GossipDef.cpp mode change 100755 => 100644 src/server/game/Entities/Creature/GossipDef.h mode change 100755 => 100644 src/server/game/Entities/Creature/TemporarySummon.cpp mode change 100755 => 100644 src/server/game/Entities/Creature/TemporarySummon.h mode change 100755 => 100644 src/server/game/Entities/DynamicObject/DynamicObject.cpp mode change 100755 => 100644 src/server/game/Entities/DynamicObject/DynamicObject.h mode change 100755 => 100644 src/server/game/Entities/GameObject/GameObject.cpp mode change 100755 => 100644 src/server/game/Entities/GameObject/GameObject.h mode change 100755 => 100644 src/server/game/Entities/Item/Container/Bag.cpp mode change 100755 => 100644 src/server/game/Entities/Item/Container/Bag.h mode change 100755 => 100644 src/server/game/Entities/Item/Item.cpp mode change 100755 => 100644 src/server/game/Entities/Item/Item.h mode change 100755 => 100644 src/server/game/Entities/Item/ItemEnchantmentMgr.cpp mode change 100755 => 100644 src/server/game/Entities/Item/ItemEnchantmentMgr.h mode change 100755 => 100644 src/server/game/Entities/Item/ItemPrototype.h mode change 100755 => 100644 src/server/game/Entities/Object/Object.cpp mode change 100755 => 100644 src/server/game/Entities/Object/Object.h mode change 100755 => 100644 src/server/game/Entities/Object/ObjectDefines.h mode change 100755 => 100644 src/server/game/Entities/Object/ObjectPosSelector.cpp mode change 100755 => 100644 src/server/game/Entities/Object/ObjectPosSelector.h mode change 100755 => 100644 src/server/game/Entities/Object/Updates/UpdateData.cpp mode change 100755 => 100644 src/server/game/Entities/Object/Updates/UpdateData.h mode change 100755 => 100644 src/server/game/Entities/Object/Updates/UpdateFields.h mode change 100755 => 100644 src/server/game/Entities/Object/Updates/UpdateMask.h mode change 100755 => 100644 src/server/game/Entities/Pet/Pet.cpp mode change 100755 => 100644 src/server/game/Entities/Pet/Pet.h mode change 100755 => 100644 src/server/game/Entities/Player/Player.cpp mode change 100755 => 100644 src/server/game/Entities/Player/Player.h mode change 100755 => 100644 src/server/game/Entities/Player/SocialMgr.cpp mode change 100755 => 100644 src/server/game/Entities/Player/SocialMgr.h mode change 100755 => 100644 src/server/game/Entities/Totem/Totem.cpp mode change 100755 => 100644 src/server/game/Entities/Totem/Totem.h mode change 100755 => 100644 src/server/game/Entities/Transport/Transport.cpp mode change 100755 => 100644 src/server/game/Entities/Transport/Transport.h mode change 100755 => 100644 src/server/game/Entities/Unit/StatSystem.cpp mode change 100755 => 100644 src/server/game/Entities/Unit/Unit.cpp mode change 100755 => 100644 src/server/game/Entities/Unit/Unit.h mode change 100755 => 100644 src/server/game/Entities/Vehicle/Vehicle.cpp mode change 100755 => 100644 src/server/game/Entities/Vehicle/Vehicle.h mode change 100755 => 100644 src/server/game/Events/GameEventMgr.cpp mode change 100755 => 100644 src/server/game/Events/GameEventMgr.h mode change 100755 => 100644 src/server/game/Globals/ObjectAccessor.cpp mode change 100755 => 100644 src/server/game/Globals/ObjectAccessor.h mode change 100755 => 100644 src/server/game/Globals/ObjectMgr.cpp mode change 100755 => 100644 src/server/game/Globals/ObjectMgr.h mode change 100755 => 100644 src/server/game/Grids/Cells/Cell.h mode change 100755 => 100644 src/server/game/Grids/Grid.h mode change 100755 => 100644 src/server/game/Grids/GridLoader.h mode change 100755 => 100644 src/server/game/Grids/GridRefManager.h mode change 100755 => 100644 src/server/game/Grids/GridReference.h mode change 100755 => 100644 src/server/game/Grids/GridStates.cpp mode change 100755 => 100644 src/server/game/Grids/GridStates.h mode change 100755 => 100644 src/server/game/Grids/NGrid.h mode change 100755 => 100644 src/server/game/Grids/Notifiers/GridNotifiers.cpp mode change 100755 => 100644 src/server/game/Grids/Notifiers/GridNotifiers.h mode change 100755 => 100644 src/server/game/Grids/Notifiers/GridNotifiersImpl.h mode change 100755 => 100644 src/server/game/Grids/ObjectGridLoader.cpp mode change 100755 => 100644 src/server/game/Grids/ObjectGridLoader.h mode change 100755 => 100644 src/server/game/Groups/Group.cpp mode change 100755 => 100644 src/server/game/Groups/Group.h mode change 100755 => 100644 src/server/game/Groups/GroupRefManager.h mode change 100755 => 100644 src/server/game/Groups/GroupReference.cpp mode change 100755 => 100644 src/server/game/Groups/GroupReference.h mode change 100755 => 100644 src/server/game/Guilds/Guild.cpp mode change 100755 => 100644 src/server/game/Guilds/Guild.h mode change 100755 => 100644 src/server/game/Handlers/AddonHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/AddonHandler.h mode change 100755 => 100644 src/server/game/Handlers/ArenaTeamHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/AuctionHouseHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/AuthHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/BattleGroundHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/CalendarHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/ChannelHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/ChatHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/CombatHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/DuelHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/GroupHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/GuildHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/ItemHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/LFGHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/LootHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/MailHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/MiscHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/MovementHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/NPCHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/NPCHandler.h mode change 100755 => 100644 src/server/game/Handlers/PetHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/PetitionsHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/QueryHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/QuestHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/SkillHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/SpellHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/TaxiHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/TicketHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/TradeHandler.cpp mode change 100755 => 100644 src/server/game/Handlers/VoiceChatHandler.cpp mode change 100755 => 100644 src/server/game/Instances/InstanceSaveMgr.cpp mode change 100755 => 100644 src/server/game/Instances/InstanceSaveMgr.h mode change 100755 => 100644 src/server/game/Instances/InstanceScript.cpp mode change 100755 => 100644 src/server/game/Instances/InstanceScript.h mode change 100755 => 100644 src/server/game/Loot/LootMgr.cpp mode change 100755 => 100644 src/server/game/Loot/LootMgr.h mode change 100755 => 100644 src/server/game/Mails/Mail.cpp mode change 100755 => 100644 src/server/game/Mails/Mail.h mode change 100755 => 100644 src/server/game/Maps/Map.cpp mode change 100755 => 100644 src/server/game/Maps/Map.h mode change 100755 => 100644 src/server/game/Maps/MapInstanced.cpp mode change 100755 => 100644 src/server/game/Maps/MapInstanced.h mode change 100755 => 100644 src/server/game/Maps/MapManager.cpp mode change 100755 => 100644 src/server/game/Maps/MapManager.h mode change 100755 => 100644 src/server/game/Maps/MapRefManager.h mode change 100755 => 100644 src/server/game/Maps/MapReference.h mode change 100755 => 100644 src/server/game/Maps/ZoneScript.h mode change 100755 => 100644 src/server/game/Miscellaneous/Formulas.h mode change 100755 => 100644 src/server/game/Miscellaneous/Language.h mode change 100755 => 100644 src/server/game/Miscellaneous/SharedDefines.h mode change 100755 => 100644 src/server/game/Movement/FollowerRefManager.h mode change 100755 => 100644 src/server/game/Movement/FollowerReference.cpp mode change 100755 => 100644 src/server/game/Movement/FollowerReference.h mode change 100755 => 100644 src/server/game/Movement/MotionMaster.cpp mode change 100755 => 100644 src/server/game/Movement/MotionMaster.h mode change 100755 => 100644 src/server/game/Movement/MovementGenerator.cpp mode change 100755 => 100644 src/server/game/Movement/MovementGenerator.h mode change 100755 => 100644 src/server/game/Movement/MovementGeneratorImpl.h mode change 100755 => 100644 src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp mode change 100755 => 100644 src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h mode change 100755 => 100644 src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp mode change 100755 => 100644 src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h mode change 100755 => 100644 src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp mode change 100755 => 100644 src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h mode change 100755 => 100644 src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp mode change 100755 => 100644 src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h mode change 100755 => 100644 src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp mode change 100755 => 100644 src/server/game/Movement/MovementGenerators/PointMovementGenerator.h mode change 100755 => 100644 src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp mode change 100755 => 100644 src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h mode change 100755 => 100644 src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp mode change 100755 => 100644 src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h mode change 100755 => 100644 src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp mode change 100755 => 100644 src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h mode change 100755 => 100644 src/server/game/Movement/Waypoints/Path.h mode change 100755 => 100644 src/server/game/Movement/Waypoints/WaypointManager.cpp mode change 100755 => 100644 src/server/game/Movement/Waypoints/WaypointManager.h mode change 100755 => 100644 src/server/game/OutdoorPvP/OutdoorPvP.cpp mode change 100755 => 100644 src/server/game/OutdoorPvP/OutdoorPvP.h mode change 100755 => 100644 src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp mode change 100755 => 100644 src/server/game/OutdoorPvP/OutdoorPvPMgr.h mode change 100755 => 100644 src/server/game/Pools/PoolMgr.cpp mode change 100755 => 100644 src/server/game/Pools/PoolMgr.h mode change 100755 => 100644 src/server/game/Quests/QuestDef.cpp mode change 100755 => 100644 src/server/game/Quests/QuestDef.h mode change 100755 => 100644 src/server/game/Reputation/ReputationMgr.cpp mode change 100755 => 100644 src/server/game/Reputation/ReputationMgr.h mode change 100755 => 100644 src/server/game/Scripting/MapScripts.cpp mode change 100755 => 100644 src/server/game/Scripting/ScriptLoader.cpp mode change 100755 => 100644 src/server/game/Scripting/ScriptMgr.cpp mode change 100755 => 100644 src/server/game/Scripting/ScriptMgr.h mode change 100755 => 100644 src/server/game/Scripting/ScriptSystem.cpp mode change 100755 => 100644 src/server/game/Server/Protocol/Opcodes.cpp mode change 100755 => 100644 src/server/game/Server/Protocol/Opcodes.h mode change 100755 => 100644 src/server/game/Server/WorldSession.cpp mode change 100755 => 100644 src/server/game/Server/WorldSession.h mode change 100755 => 100644 src/server/game/Server/WorldSocket.cpp mode change 100755 => 100644 src/server/game/Server/WorldSocket.h mode change 100755 => 100644 src/server/game/Server/WorldSocketMgr.cpp mode change 100755 => 100644 src/server/game/Server/WorldSocketMgr.h mode change 100755 => 100644 src/server/game/Skills/SkillDiscovery.cpp mode change 100755 => 100644 src/server/game/Skills/SkillDiscovery.h mode change 100755 => 100644 src/server/game/Skills/SkillExtraItems.cpp mode change 100755 => 100644 src/server/game/Skills/SkillExtraItems.h mode change 100755 => 100644 src/server/game/Spells/Auras/SpellAuraDefines.h mode change 100755 => 100644 src/server/game/Spells/Auras/SpellAuraEffects.cpp mode change 100755 => 100644 src/server/game/Spells/Auras/SpellAuras.cpp mode change 100755 => 100644 src/server/game/Spells/Auras/SpellAuras.h mode change 100755 => 100644 src/server/game/Spells/Spell.cpp mode change 100755 => 100644 src/server/game/Spells/Spell.h mode change 100755 => 100644 src/server/game/Spells/SpellEffects.cpp mode change 100755 => 100644 src/server/game/Spells/SpellMgr.cpp mode change 100755 => 100644 src/server/game/Spells/SpellMgr.h mode change 100755 => 100644 src/server/game/Spells/SpellScript.cpp mode change 100755 => 100644 src/server/game/Spells/SpellScript.h mode change 100755 => 100644 src/server/game/Texts/CreatureTextMgr.cpp mode change 100755 => 100644 src/server/game/Texts/CreatureTextMgr.h mode change 100755 => 100644 src/server/game/Tickets/TicketMgr.cpp mode change 100755 => 100644 src/server/game/Tickets/TicketMgr.h mode change 100755 => 100644 src/server/game/Tools/PlayerDump.h mode change 100755 => 100644 src/server/game/Weather/Weather.cpp mode change 100755 => 100644 src/server/game/Weather/Weather.h mode change 100755 => 100644 src/server/game/Weather/WeatherMgr.cpp mode change 100755 => 100644 src/server/game/Weather/WeatherMgr.h mode change 100755 => 100644 src/server/game/World/World.cpp mode change 100755 => 100644 src/server/game/World/World.h mode change 100755 => 100644 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp mode change 100755 => 100644 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp mode change 100755 => 100644 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp mode change 100755 => 100644 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp mode change 100755 => 100644 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp mode change 100755 => 100644 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp mode change 100755 => 100644 src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp mode change 100755 => 100644 src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp mode change 100755 => 100644 src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp mode change 100755 => 100644 src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp mode change 100755 => 100644 src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp mode change 100755 => 100644 src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp mode change 100755 => 100644 src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h mode change 100755 => 100644 src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp mode change 100755 => 100644 src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp mode change 100755 => 100644 src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp mode change 100755 => 100644 src/server/scripts/OutdoorPvP/OutdoorPvPEP.h mode change 100755 => 100644 src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp mode change 100755 => 100644 src/server/scripts/OutdoorPvP/OutdoorPvPHP.h mode change 100755 => 100644 src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp mode change 100755 => 100644 src/server/scripts/OutdoorPvP/OutdoorPvPNA.h mode change 100755 => 100644 src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp mode change 100755 => 100644 src/server/scripts/OutdoorPvP/OutdoorPvPSI.h mode change 100755 => 100644 src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp mode change 100755 => 100644 src/server/scripts/OutdoorPvP/OutdoorPvPTF.h mode change 100755 => 100644 src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp mode change 100755 => 100644 src/server/scripts/OutdoorPvP/OutdoorPvPZM.h mode change 100755 => 100644 src/server/scripts/World/achievement_scripts.cpp mode change 100755 => 100644 src/server/scripts/World/chat_log.cpp mode change 100755 => 100644 src/server/shared/Common.cpp mode change 100755 => 100644 src/server/shared/Common.h mode change 100755 => 100644 src/server/shared/CompilerDefs.h mode change 100755 => 100644 src/server/shared/Configuration/Config.cpp mode change 100755 => 100644 src/server/shared/Configuration/Config.h mode change 100755 => 100644 src/server/shared/Cryptography/ARC4.cpp mode change 100755 => 100644 src/server/shared/Cryptography/ARC4.h mode change 100755 => 100644 src/server/shared/Cryptography/Authentication/AuthCrypt.cpp mode change 100755 => 100644 src/server/shared/Cryptography/Authentication/AuthCrypt.h mode change 100755 => 100644 src/server/shared/Cryptography/BigNumber.cpp mode change 100755 => 100644 src/server/shared/Cryptography/BigNumber.h mode change 100755 => 100644 src/server/shared/Cryptography/HMACSHA1.cpp mode change 100755 => 100644 src/server/shared/Cryptography/HMACSHA1.h mode change 100755 => 100644 src/server/shared/Cryptography/SHA1.cpp mode change 100755 => 100644 src/server/shared/Cryptography/SHA1.h mode change 100755 => 100644 src/server/shared/DataStores/DBCFileLoader.cpp mode change 100755 => 100644 src/server/shared/DataStores/DBCFileLoader.h mode change 100755 => 100644 src/server/shared/DataStores/DBCStore.h mode change 100755 => 100644 src/server/shared/Database/AdhocStatement.cpp mode change 100755 => 100644 src/server/shared/Database/AdhocStatement.h mode change 100755 => 100644 src/server/shared/Database/DatabaseEnv.h mode change 100755 => 100644 src/server/shared/Database/DatabaseWorker.h mode change 100755 => 100644 src/server/shared/Database/DatabaseWorkerPool.h mode change 100755 => 100644 src/server/shared/Database/Field.cpp mode change 100755 => 100644 src/server/shared/Database/Field.h mode change 100755 => 100644 src/server/shared/Database/Implementation/LoginDatabase.cpp mode change 100755 => 100644 src/server/shared/Database/Implementation/LoginDatabase.h mode change 100755 => 100644 src/server/shared/Database/Implementation/WorldDatabase.cpp mode change 100755 => 100644 src/server/shared/Database/Implementation/WorldDatabase.h mode change 100755 => 100644 src/server/shared/Database/MySQLConnection.cpp mode change 100755 => 100644 src/server/shared/Database/MySQLConnection.h mode change 100755 => 100644 src/server/shared/Database/MySQLThreading.h mode change 100755 => 100644 src/server/shared/Database/PreparedStatement.cpp mode change 100755 => 100644 src/server/shared/Database/PreparedStatement.h mode change 100755 => 100644 src/server/shared/Database/QueryHolder.cpp mode change 100755 => 100644 src/server/shared/Database/QueryHolder.h mode change 100755 => 100644 src/server/shared/Database/QueryResult.cpp mode change 100755 => 100644 src/server/shared/Database/QueryResult.h mode change 100755 => 100644 src/server/shared/Database/SQLOperation.h mode change 100755 => 100644 src/server/shared/Database/Transaction.cpp mode change 100755 => 100644 src/server/shared/Database/Transaction.h mode change 100755 => 100644 src/server/shared/Debugging/Errors.h mode change 100755 => 100644 src/server/shared/Define.h mode change 100755 => 100644 src/server/shared/Dynamic/FactoryHolder.h mode change 100755 => 100644 src/server/shared/Dynamic/LinkedList.h mode change 100755 => 100644 src/server/shared/Dynamic/LinkedReference/RefManager.h mode change 100755 => 100644 src/server/shared/Dynamic/LinkedReference/Reference.h mode change 100755 => 100644 src/server/shared/Dynamic/ObjectRegistry.h mode change 100755 => 100644 src/server/shared/Dynamic/TypeContainer.h mode change 100755 => 100644 src/server/shared/Dynamic/TypeContainerFunctions.h mode change 100755 => 100644 src/server/shared/Dynamic/TypeContainerVisitor.h mode change 100755 => 100644 src/server/shared/Dynamic/TypeList.h mode change 100755 => 100644 src/server/shared/Dynamic/UnorderedMap.h mode change 100755 => 100644 src/server/shared/Logging/Log.cpp mode change 100755 => 100644 src/server/shared/Logging/Log.h mode change 100755 => 100644 src/server/shared/Packets/ByteBuffer.h mode change 100755 => 100644 src/server/shared/Packets/WorldPacket.h mode change 100755 => 100644 src/server/shared/SystemConfig.h mode change 100755 => 100644 src/server/shared/Threading/Callback.h mode change 100755 => 100644 src/server/shared/Threading/LockedQueue.h mode change 100755 => 100644 src/server/shared/Threading/Threading.cpp mode change 100755 => 100644 src/server/shared/Threading/Threading.h mode change 100755 => 100644 src/server/shared/Utilities/ByteConverter.h mode change 100755 => 100644 src/server/shared/Utilities/EventProcessor.cpp mode change 100755 => 100644 src/server/shared/Utilities/EventProcessor.h mode change 100755 => 100644 src/server/shared/Utilities/ServiceWin32.cpp mode change 100755 => 100644 src/server/shared/Utilities/ServiceWin32.h mode change 100755 => 100644 src/server/shared/Utilities/SignalHandler.h mode change 100755 => 100644 src/server/shared/Utilities/Timer.h mode change 100755 => 100644 src/server/shared/Utilities/Util.cpp mode change 100755 => 100644 src/server/shared/Utilities/Util.h mode change 100755 => 100644 src/server/worldserver/CommandLine/CliRunnable.cpp mode change 100755 => 100644 src/server/worldserver/CommandLine/CliRunnable.h mode change 100755 => 100644 src/server/worldserver/Main.cpp mode change 100755 => 100644 src/server/worldserver/Master.cpp mode change 100755 => 100644 src/server/worldserver/Master.h mode change 100755 => 100644 src/server/worldserver/RemoteAccess/RASocket.cpp mode change 100755 => 100644 src/server/worldserver/RemoteAccess/RASocket.h mode change 100755 => 100644 src/server/worldserver/TCSoap/TCSoap.cpp mode change 100755 => 100644 src/server/worldserver/TCSoap/TCSoap.h mode change 100755 => 100644 src/server/worldserver/WorldThread/WorldRunnable.cpp mode change 100755 => 100644 src/server/worldserver/WorldThread/WorldRunnable.h mode change 100755 => 100644 src/server/worldserver/worldserver.rc diff --git a/src/server/authserver/Authentication/AuthCodes.h b/src/server/authserver/Authentication/AuthCodes.h old mode 100755 new mode 100644 diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp old mode 100755 new mode 100644 diff --git a/src/server/authserver/Realms/RealmList.cpp b/src/server/authserver/Realms/RealmList.cpp old mode 100755 new mode 100644 diff --git a/src/server/authserver/Realms/RealmList.h b/src/server/authserver/Realms/RealmList.h old mode 100755 new mode 100644 diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp old mode 100755 new mode 100644 diff --git a/src/server/authserver/Server/AuthSocket.h b/src/server/authserver/Server/AuthSocket.h old mode 100755 new mode 100644 diff --git a/src/server/authserver/Server/RealmAcceptor.h b/src/server/authserver/Server/RealmAcceptor.h old mode 100755 new mode 100644 diff --git a/src/server/authserver/Server/RealmSocket.cpp b/src/server/authserver/Server/RealmSocket.cpp old mode 100755 new mode 100644 diff --git a/src/server/authserver/Server/RealmSocket.h b/src/server/authserver/Server/RealmSocket.h old mode 100755 new mode 100644 diff --git a/src/server/authserver/authserver.rc b/src/server/authserver/authserver.rc old mode 100755 new mode 100644 diff --git a/src/server/collision/BoundingIntervalHierarchy.cpp b/src/server/collision/BoundingIntervalHierarchy.cpp old mode 100755 new mode 100644 diff --git a/src/server/collision/BoundingIntervalHierarchy.h b/src/server/collision/BoundingIntervalHierarchy.h old mode 100755 new mode 100644 diff --git a/src/server/collision/Management/IVMapManager.h b/src/server/collision/Management/IVMapManager.h old mode 100755 new mode 100644 diff --git a/src/server/collision/Management/VMapFactory.cpp b/src/server/collision/Management/VMapFactory.cpp old mode 100755 new mode 100644 diff --git a/src/server/collision/Management/VMapFactory.h b/src/server/collision/Management/VMapFactory.h old mode 100755 new mode 100644 diff --git a/src/server/collision/Management/VMapManager2.h b/src/server/collision/Management/VMapManager2.h old mode 100755 new mode 100644 diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h old mode 100755 new mode 100644 diff --git a/src/server/collision/Maps/TileAssembler.h b/src/server/collision/Maps/TileAssembler.h old mode 100755 new mode 100644 diff --git a/src/server/collision/Models/ModelInstance.h b/src/server/collision/Models/ModelInstance.h old mode 100755 new mode 100644 diff --git a/src/server/collision/Models/WorldModel.h b/src/server/collision/Models/WorldModel.h old mode 100755 new mode 100644 diff --git a/src/server/collision/VMapTools.h b/src/server/collision/VMapTools.h old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CoreAI/CombatAI.h b/src/server/game/AI/CoreAI/CombatAI.h old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CoreAI/GuardAI.cpp b/src/server/game/AI/CoreAI/GuardAI.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CoreAI/GuardAI.h b/src/server/game/AI/CoreAI/GuardAI.h old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CoreAI/PassiveAI.cpp b/src/server/game/AI/CoreAI/PassiveAI.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CoreAI/PassiveAI.h b/src/server/game/AI/CoreAI/PassiveAI.h old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CoreAI/PetAI.h b/src/server/game/AI/CoreAI/PetAI.h old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CoreAI/ReactorAI.cpp b/src/server/game/AI/CoreAI/ReactorAI.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CoreAI/ReactorAI.h b/src/server/game/AI/CoreAI/ReactorAI.h old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CoreAI/TotemAI.h b/src/server/game/AI/CoreAI/TotemAI.h old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CreatureAIFactory.h b/src/server/game/AI/CreatureAIFactory.h old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CreatureAIRegistry.h b/src/server/game/AI/CreatureAIRegistry.h old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CreatureAISelector.cpp b/src/server/game/AI/CreatureAISelector.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/AI/CreatureAISelector.h b/src/server/game/AI/CreatureAISelector.h old mode 100755 new mode 100644 diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/AI/EventAI/CreatureEventAI.h b/src/server/game/AI/EventAI/CreatureEventAI.h old mode 100755 new mode 100644 diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.h b/src/server/game/AI/EventAI/CreatureEventAIMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Accounts/AccountMgr.h b/src/server/game/Accounts/AccountMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Addons/AddonMgr.cpp b/src/server/game/Addons/AddonMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Addons/AddonMgr.h b/src/server/game/Addons/AddonMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/ArenaTeam.h b/src/server/game/Battlegrounds/ArenaTeam.h old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.h b/src/server/game/Battlegrounds/BattlegroundMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.cpp b/src/server/game/Battlegrounds/BattlegroundQueue.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/BattlegroundQueue.h b/src/server/game/Battlegrounds/BattlegroundQueue.h old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundBE.h b/src/server/game/Battlegrounds/Zones/BattlegroundBE.h old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.h b/src/server/game/Battlegrounds/Zones/BattlegroundDS.h old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.h b/src/server/game/Battlegrounds/Zones/BattlegroundIC.h old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundNA.h b/src/server/game/Battlegrounds/Zones/BattlegroundNA.h old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRL.h b/src/server/game/Battlegrounds/Zones/BattlegroundRL.h old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundRV.h b/src/server/game/Battlegrounds/Zones/BattlegroundRV.h old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.h b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h old mode 100755 new mode 100644 diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h old mode 100755 new mode 100644 diff --git a/src/server/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h old mode 100755 new mode 100644 diff --git a/src/server/game/Combat/HostileRefManager.cpp b/src/server/game/Combat/HostileRefManager.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Combat/HostileRefManager.h b/src/server/game/Combat/HostileRefManager.h old mode 100755 new mode 100644 diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h old mode 100755 new mode 100644 diff --git a/src/server/game/Combat/UnitEvents.h b/src/server/game/Combat/UnitEvents.h old mode 100755 new mode 100644 diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Conditions/DisableMgr.h b/src/server/game/Conditions/DisableMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h old mode 100755 new mode 100644 diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h old mode 100755 new mode 100644 diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h old mode 100755 new mode 100644 diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h old mode 100755 new mode 100644 diff --git a/src/server/game/DungeonFinding/LFG.h b/src/server/game/DungeonFinding/LFG.h old mode 100755 new mode 100644 diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Corpse/Corpse.h b/src/server/game/Entities/Corpse/Corpse.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Creature/CreatureGroups.cpp b/src/server/game/Entities/Creature/CreatureGroups.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Creature/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Creature/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Creature/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.cpp b/src/server/game/Entities/DynamicObject/DynamicObject.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/DynamicObject/DynamicObject.h b/src/server/game/Entities/DynamicObject/DynamicObject.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Item/Container/Bag.h b/src/server/game/Entities/Item/Container/Bag.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Item/Item.h b/src/server/game/Entities/Item/Item.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.h b/src/server/game/Entities/Item/ItemEnchantmentMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Object/ObjectDefines.h b/src/server/game/Entities/Object/ObjectDefines.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Object/ObjectPosSelector.cpp b/src/server/game/Entities/Object/ObjectPosSelector.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Object/ObjectPosSelector.h b/src/server/game/Entities/Object/ObjectPosSelector.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Object/Updates/UpdateData.cpp b/src/server/game/Entities/Object/Updates/UpdateData.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Object/Updates/UpdateData.h b/src/server/game/Entities/Object/Updates/UpdateData.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Object/Updates/UpdateMask.h b/src/server/game/Entities/Object/Updates/UpdateMask.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Player/SocialMgr.cpp b/src/server/game/Entities/Player/SocialMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Player/SocialMgr.h b/src/server/game/Entities/Player/SocialMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Totem/Totem.cpp b/src/server/game/Entities/Totem/Totem.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Totem/Totem.h b/src/server/game/Entities/Totem/Totem.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Transport/Transport.h b/src/server/game/Entities/Transport/Transport.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h old mode 100755 new mode 100644 diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h old mode 100755 new mode 100644 diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Grids/Cells/Cell.h b/src/server/game/Grids/Cells/Cell.h old mode 100755 new mode 100644 diff --git a/src/server/game/Grids/Grid.h b/src/server/game/Grids/Grid.h old mode 100755 new mode 100644 diff --git a/src/server/game/Grids/GridLoader.h b/src/server/game/Grids/GridLoader.h old mode 100755 new mode 100644 diff --git a/src/server/game/Grids/GridRefManager.h b/src/server/game/Grids/GridRefManager.h old mode 100755 new mode 100644 diff --git a/src/server/game/Grids/GridReference.h b/src/server/game/Grids/GridReference.h old mode 100755 new mode 100644 diff --git a/src/server/game/Grids/GridStates.cpp b/src/server/game/Grids/GridStates.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Grids/GridStates.h b/src/server/game/Grids/GridStates.h old mode 100755 new mode 100644 diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h old mode 100755 new mode 100644 diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.cpp b/src/server/game/Grids/Notifiers/GridNotifiers.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h old mode 100755 new mode 100644 diff --git a/src/server/game/Grids/Notifiers/GridNotifiersImpl.h b/src/server/game/Grids/Notifiers/GridNotifiersImpl.h old mode 100755 new mode 100644 diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Grids/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h old mode 100755 new mode 100644 diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h old mode 100755 new mode 100644 diff --git a/src/server/game/Groups/GroupRefManager.h b/src/server/game/Groups/GroupRefManager.h old mode 100755 new mode 100644 diff --git a/src/server/game/Groups/GroupReference.cpp b/src/server/game/Groups/GroupReference.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Groups/GroupReference.h b/src/server/game/Groups/GroupReference.h old mode 100755 new mode 100644 diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/AddonHandler.cpp b/src/server/game/Handlers/AddonHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/AddonHandler.h b/src/server/game/Handlers/AddonHandler.h old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/AuthHandler.cpp b/src/server/game/Handlers/AuthHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/ChannelHandler.cpp b/src/server/game/Handlers/ChannelHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/CombatHandler.cpp b/src/server/game/Handlers/CombatHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/DuelHandler.cpp b/src/server/game/Handlers/DuelHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/NPCHandler.h b/src/server/game/Handlers/NPCHandler.h old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/SkillHandler.cpp b/src/server/game/Handlers/SkillHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/TaxiHandler.cpp b/src/server/game/Handlers/TaxiHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/TicketHandler.cpp b/src/server/game/Handlers/TicketHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Handlers/VoiceChatHandler.cpp b/src/server/game/Handlers/VoiceChatHandler.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h old mode 100755 new mode 100644 diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Mails/Mail.h b/src/server/game/Mails/Mail.h old mode 100755 new mode 100644 diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h old mode 100755 new mode 100644 diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Maps/MapInstanced.h b/src/server/game/Maps/MapInstanced.h old mode 100755 new mode 100644 diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h old mode 100755 new mode 100644 diff --git a/src/server/game/Maps/MapRefManager.h b/src/server/game/Maps/MapRefManager.h old mode 100755 new mode 100644 diff --git a/src/server/game/Maps/MapReference.h b/src/server/game/Maps/MapReference.h old mode 100755 new mode 100644 diff --git a/src/server/game/Maps/ZoneScript.h b/src/server/game/Maps/ZoneScript.h old mode 100755 new mode 100644 diff --git a/src/server/game/Miscellaneous/Formulas.h b/src/server/game/Miscellaneous/Formulas.h old mode 100755 new mode 100644 diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h old mode 100755 new mode 100644 diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/FollowerRefManager.h b/src/server/game/Movement/FollowerRefManager.h old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/FollowerReference.cpp b/src/server/game/Movement/FollowerReference.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/FollowerReference.h b/src/server/game/Movement/FollowerReference.h old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerator.cpp b/src/server/game/Movement/MovementGenerator.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGeneratorImpl.h b/src/server/game/Movement/MovementGeneratorImpl.h old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/Waypoints/Path.h b/src/server/game/Movement/Waypoints/Path.h old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/Waypoints/WaypointManager.cpp b/src/server/game/Movement/Waypoints/WaypointManager.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Movement/Waypoints/WaypointManager.h b/src/server/game/Movement/Waypoints/WaypointManager.h old mode 100755 new mode 100644 diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h old mode 100755 new mode 100644 diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Pools/PoolMgr.h b/src/server/game/Pools/PoolMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h old mode 100755 new mode 100644 diff --git a/src/server/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h old mode 100755 new mode 100644 diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h old mode 100755 new mode 100644 diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h old mode 100755 new mode 100644 diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Server/WorldSocketMgr.h b/src/server/game/Server/WorldSocketMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Skills/SkillDiscovery.cpp b/src/server/game/Skills/SkillDiscovery.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Skills/SkillDiscovery.h b/src/server/game/Skills/SkillDiscovery.h old mode 100755 new mode 100644 diff --git a/src/server/game/Skills/SkillExtraItems.cpp b/src/server/game/Skills/SkillExtraItems.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Skills/SkillExtraItems.h b/src/server/game/Skills/SkillExtraItems.h old mode 100755 new mode 100644 diff --git a/src/server/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h old mode 100755 new mode 100644 diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h old mode 100755 new mode 100644 diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h old mode 100755 new mode 100644 diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h old mode 100755 new mode 100644 diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Tickets/TicketMgr.h b/src/server/game/Tickets/TicketMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/Tools/PlayerDump.h b/src/server/game/Tools/PlayerDump.h old mode 100755 new mode 100644 diff --git a/src/server/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Weather/Weather.h b/src/server/game/Weather/Weather.h old mode 100755 new mode 100644 diff --git a/src/server/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/Weather/WeatherMgr.h b/src/server/game/Weather/WeatherMgr.h old mode 100755 new mode 100644 diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp old mode 100755 new mode 100644 diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h old mode 100755 new mode 100644 diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h old mode 100755 new mode 100644 diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.h old mode 100755 new mode 100644 diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.h old mode 100755 new mode 100644 diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h old mode 100755 new mode 100644 diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h b/src/server/scripts/OutdoorPvP/OutdoorPvPSI.h old mode 100755 new mode 100644 diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.h old mode 100755 new mode 100644 diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h old mode 100755 new mode 100644 diff --git a/src/server/scripts/World/achievement_scripts.cpp b/src/server/scripts/World/achievement_scripts.cpp old mode 100755 new mode 100644 diff --git a/src/server/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Common.cpp b/src/server/shared/Common.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h old mode 100755 new mode 100644 diff --git a/src/server/shared/CompilerDefs.h b/src/server/shared/CompilerDefs.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Configuration/Config.cpp b/src/server/shared/Configuration/Config.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Configuration/Config.h b/src/server/shared/Configuration/Config.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Cryptography/ARC4.cpp b/src/server/shared/Cryptography/ARC4.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Cryptography/ARC4.h b/src/server/shared/Cryptography/ARC4.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp b/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Cryptography/Authentication/AuthCrypt.h b/src/server/shared/Cryptography/Authentication/AuthCrypt.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Cryptography/BigNumber.cpp b/src/server/shared/Cryptography/BigNumber.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Cryptography/BigNumber.h b/src/server/shared/Cryptography/BigNumber.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Cryptography/HMACSHA1.cpp b/src/server/shared/Cryptography/HMACSHA1.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Cryptography/HMACSHA1.h b/src/server/shared/Cryptography/HMACSHA1.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Cryptography/SHA1.cpp b/src/server/shared/Cryptography/SHA1.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Cryptography/SHA1.h b/src/server/shared/Cryptography/SHA1.h old mode 100755 new mode 100644 diff --git a/src/server/shared/DataStores/DBCFileLoader.cpp b/src/server/shared/DataStores/DBCFileLoader.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/DataStores/DBCFileLoader.h b/src/server/shared/DataStores/DBCFileLoader.h old mode 100755 new mode 100644 diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h old mode 100755 new mode 100644 index 9965a5c1d71..e872ead35db --- a/src/server/shared/DataStores/DBCStore.h +++ b/src/server/shared/DataStores/DBCStore.h @@ -117,7 +117,7 @@ class DBCStorage // Check if sql index pos is valid if (int32(result->GetFieldCount()-1) < sql->sqlIndexPos) { - sLog->outError(LOG_FILTER_GENERAL, "Invalid index pos for dbc:'%s'", sql->sqlTableName.c_str()); + sLog->outError(LOG_FILTER_SERVER_LOADING, "Invalid index pos for dbc:'%s'", sql->sqlTableName.c_str()); return false; } } @@ -148,7 +148,7 @@ class DBCStorage uint32 id = fields[sql->sqlIndexPos].GetUInt32(); if (indexTable.asT[id]) { - sLog->outError(LOG_FILTER_GENERAL, "Index %d already exists in dbc:'%s'", id, sql->sqlTableName.c_str()); + sLog->outError(LOG_FILTER_SERVER_LOADING, "Index %d already exists in dbc:'%s'", id, sql->sqlTableName.c_str()); return false; } indexTable.asT[id]=(T*)&sqlDataTable[offset]; @@ -203,7 +203,7 @@ class DBCStorage offset+=1; break; case FT_STRING: - sLog->outError(LOG_FILTER_GENERAL, "Unsupported data type in table '%s' at char %d", sql->sqlTableName.c_str(), columnNumber); + sLog->outError(LOG_FILTER_SERVER_LOADING, "Unsupported data type in table '%s' at char %d", sql->sqlTableName.c_str(), columnNumber); return false; case FT_SORT: break; @@ -215,13 +215,13 @@ class DBCStorage } else { - sLog->outError(LOG_FILTER_GENERAL, "Incorrect sql format string '%s' at char %d", sql->sqlTableName.c_str(), columnNumber); + sLog->outError(LOG_FILTER_SERVER_LOADING, "Incorrect sql format string '%s' at char %d", sql->sqlTableName.c_str(), columnNumber); return false; } } if (sqlColumnNumber != (result->GetFieldCount()-1)) { - sLog->outError(LOG_FILTER_GENERAL, "SQL and DBC format strings are not matching for table: '%s'", sql->sqlTableName.c_str()); + sLog->outError(LOG_FILTER_SERVER_LOADING, "SQL and DBC format strings are not matching for table: '%s'", sql->sqlTableName.c_str()); return false; } diff --git a/src/server/shared/Database/AdhocStatement.cpp b/src/server/shared/Database/AdhocStatement.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/AdhocStatement.h b/src/server/shared/Database/AdhocStatement.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/DatabaseEnv.h b/src/server/shared/Database/DatabaseEnv.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/DatabaseWorker.h b/src/server/shared/Database/DatabaseWorker.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/Field.cpp b/src/server/shared/Database/Field.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/Field.h b/src/server/shared/Database/Field.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/Implementation/LoginDatabase.cpp b/src/server/shared/Database/Implementation/LoginDatabase.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/Implementation/LoginDatabase.h b/src/server/shared/Database/Implementation/LoginDatabase.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/Implementation/WorldDatabase.cpp b/src/server/shared/Database/Implementation/WorldDatabase.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/Implementation/WorldDatabase.h b/src/server/shared/Database/Implementation/WorldDatabase.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/MySQLConnection.h b/src/server/shared/Database/MySQLConnection.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/MySQLThreading.h b/src/server/shared/Database/MySQLThreading.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/PreparedStatement.h b/src/server/shared/Database/PreparedStatement.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/QueryHolder.cpp b/src/server/shared/Database/QueryHolder.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/QueryHolder.h b/src/server/shared/Database/QueryHolder.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/QueryResult.cpp b/src/server/shared/Database/QueryResult.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/QueryResult.h b/src/server/shared/Database/QueryResult.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/SQLOperation.h b/src/server/shared/Database/SQLOperation.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/Transaction.cpp b/src/server/shared/Database/Transaction.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Database/Transaction.h b/src/server/shared/Database/Transaction.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Debugging/Errors.h b/src/server/shared/Debugging/Errors.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Dynamic/FactoryHolder.h b/src/server/shared/Dynamic/FactoryHolder.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Dynamic/LinkedList.h b/src/server/shared/Dynamic/LinkedList.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Dynamic/LinkedReference/RefManager.h b/src/server/shared/Dynamic/LinkedReference/RefManager.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Dynamic/TypeContainer.h b/src/server/shared/Dynamic/TypeContainer.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Dynamic/TypeContainerFunctions.h b/src/server/shared/Dynamic/TypeContainerFunctions.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Dynamic/TypeContainerVisitor.h b/src/server/shared/Dynamic/TypeContainerVisitor.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Dynamic/TypeList.h b/src/server/shared/Dynamic/TypeList.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Dynamic/UnorderedMap.h b/src/server/shared/Dynamic/UnorderedMap.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h old mode 100755 new mode 100644 index e79544e7315..c03c1a4572a --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -52,7 +52,7 @@ class ByteBufferPositionException : public ByteBufferException { ACE_Stack_Trace trace; - sLog->outError(LOG_FILTER_GENERAL, "Attempted to %s value with size: "SIZEFMTD" in ByteBuffer (pos: " SIZEFMTD " size: "SIZEFMTD")\n[Stacktrace: %s]" , + sLog->outError(LOG_FILTER_NETWORKIO, "Attempted to %s value with size: "SIZEFMTD" in ByteBuffer (pos: " SIZEFMTD " size: "SIZEFMTD")\n[Stacktrace: %s]" , (_add ? "put" : "get"), ValueSize, Pos, Size, trace.c_str()); } @@ -74,7 +74,7 @@ class ByteBufferSourceException : public ByteBufferException { ACE_Stack_Trace trace; - sLog->outError(LOG_FILTER_GENERAL, "Attempted to put a %s in ByteBuffer (pos: "SIZEFMTD" size: "SIZEFMTD")\n[Stacktrace: %s]", + sLog->outError(LOG_FILTER_NETWORKIO, "Attempted to put a %s in ByteBuffer (pos: "SIZEFMTD" size: "SIZEFMTD")\n[Stacktrace: %s]", (ValueSize > 0 ? "NULL-pointer" : "zero-sized value"), Pos, Size, trace.c_str()); } }; diff --git a/src/server/shared/Packets/WorldPacket.h b/src/server/shared/Packets/WorldPacket.h old mode 100755 new mode 100644 diff --git a/src/server/shared/SystemConfig.h b/src/server/shared/SystemConfig.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Threading/Callback.h b/src/server/shared/Threading/Callback.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Threading/LockedQueue.h b/src/server/shared/Threading/LockedQueue.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Threading/Threading.cpp b/src/server/shared/Threading/Threading.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Threading/Threading.h b/src/server/shared/Threading/Threading.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Utilities/ByteConverter.h b/src/server/shared/Utilities/ByteConverter.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Utilities/EventProcessor.cpp b/src/server/shared/Utilities/EventProcessor.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Utilities/EventProcessor.h b/src/server/shared/Utilities/EventProcessor.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp old mode 100755 new mode 100644 index 91a78af1adc..390b1a35010 --- a/src/server/shared/Utilities/ServiceWin32.cpp +++ b/src/server/shared/Utilities/ServiceWin32.cpp @@ -255,7 +255,7 @@ bool WinServiceRun() if (!StartServiceCtrlDispatcher(serviceTable)) { - sLog->outError(LOG_FILTER_GENERAL, "StartService Failed. Error [%u]", ::GetLastError()); + sLog->outError(LOG_FILTER_WORLDSERVER, "StartService Failed. Error [%u]", ::GetLastError()); return false; } return true; diff --git a/src/server/shared/Utilities/ServiceWin32.h b/src/server/shared/Utilities/ServiceWin32.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Utilities/SignalHandler.h b/src/server/shared/Utilities/SignalHandler.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Utilities/Timer.h b/src/server/shared/Utilities/Timer.h old mode 100755 new mode 100644 diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp old mode 100755 new mode 100644 diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h old mode 100755 new mode 100644 diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp old mode 100755 new mode 100644 diff --git a/src/server/worldserver/CommandLine/CliRunnable.h b/src/server/worldserver/CommandLine/CliRunnable.h old mode 100755 new mode 100644 diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp old mode 100755 new mode 100644 diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp old mode 100755 new mode 100644 diff --git a/src/server/worldserver/Master.h b/src/server/worldserver/Master.h old mode 100755 new mode 100644 diff --git a/src/server/worldserver/RemoteAccess/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp old mode 100755 new mode 100644 diff --git a/src/server/worldserver/RemoteAccess/RASocket.h b/src/server/worldserver/RemoteAccess/RASocket.h old mode 100755 new mode 100644 diff --git a/src/server/worldserver/TCSoap/TCSoap.cpp b/src/server/worldserver/TCSoap/TCSoap.cpp old mode 100755 new mode 100644 diff --git a/src/server/worldserver/TCSoap/TCSoap.h b/src/server/worldserver/TCSoap/TCSoap.h old mode 100755 new mode 100644 diff --git a/src/server/worldserver/WorldThread/WorldRunnable.cpp b/src/server/worldserver/WorldThread/WorldRunnable.cpp old mode 100755 new mode 100644 diff --git a/src/server/worldserver/WorldThread/WorldRunnable.h b/src/server/worldserver/WorldThread/WorldRunnable.h old mode 100755 new mode 100644 diff --git a/src/server/worldserver/worldserver.rc b/src/server/worldserver/worldserver.rc old mode 100755 new mode 100644 From e9544985608e551d3765dea525d63b30d2c03b17 Mon Sep 17 00:00:00 2001 From: Spp Date: Tue, 27 Nov 2012 13:02:04 +0100 Subject: [PATCH 23/23] Core/Misc: Random changes here and there to minimize differences with 4.3.4 branch --- .../game/Achievements/AchievementMgr.cpp | 62 +- src/server/game/Achievements/AchievementMgr.h | 45 +- .../game/AuctionHouse/AuctionHouseMgr.cpp | 51 +- .../game/AuctionHouse/AuctionHouseMgr.h | 16 +- src/server/game/Battlefield/Battlefield.cpp | 20 +- src/server/game/Battlefield/Battlefield.h | 22 +- .../game/Battlefield/Zones/BattlefieldWG.cpp | 3 +- .../game/Battlefield/Zones/BattlefieldWG.h | 2 +- src/server/game/Battlegrounds/ArenaTeam.cpp | 4 +- src/server/game/Battlegrounds/Battleground.h | 2 +- .../game/Battlegrounds/BattlegroundMgr.h | 4 +- .../Battlegrounds/Zones/BattlegroundAB.cpp | 4 +- .../game/Battlegrounds/Zones/BattlegroundAB.h | 2 +- .../Battlegrounds/Zones/BattlegroundAV.cpp | 4 +- .../game/Battlegrounds/Zones/BattlegroundAV.h | 2 +- .../Battlegrounds/Zones/BattlegroundEY.cpp | 2 +- .../game/Battlegrounds/Zones/BattlegroundEY.h | 2 +- .../Battlegrounds/Zones/BattlegroundWS.cpp | 4 +- .../game/Battlegrounds/Zones/BattlegroundWS.h | 2 +- src/server/game/Chat/Channels/Channel.h | 2 + src/server/game/Chat/Chat.cpp | 3 +- src/server/game/Chat/ChatLink.cpp | 25 +- src/server/game/Conditions/ConditionMgr.cpp | 4 +- src/server/game/Conditions/DisableMgr.cpp | 3 +- src/server/game/DataStores/DBCEnums.h | 13 +- src/server/game/DataStores/DBCStores.cpp | 2 - src/server/game/DungeonFinding/LFGMgr.cpp | 4 +- src/server/game/Entities/Corpse/Corpse.cpp | 40 +- src/server/game/Entities/Creature/Creature.h | 6 +- .../game/Entities/Creature/TemporarySummon.h | 2 +- src/server/game/Entities/Player/Player.cpp | 15 +- src/server/game/Entities/Unit/StatSystem.cpp | 6 +- src/server/game/Entities/Vehicle/Vehicle.cpp | 8 +- src/server/game/Entities/Vehicle/Vehicle.h | 7 + src/server/game/Events/GameEventMgr.cpp | 10 +- src/server/game/Globals/ObjectMgr.cpp | 6 +- src/server/game/Groups/Group.cpp | 16 +- src/server/game/Groups/Group.h | 2 +- src/server/game/Handlers/ArenaTeamHandler.cpp | 16 +- .../game/Handlers/AuctionHouseHandler.cpp | 78 +-- .../game/Handlers/BattleGroundHandler.cpp | 8 +- .../BattlefieldHandler.cpp | 0 src/server/game/Handlers/CharacterHandler.cpp | 18 +- src/server/game/Handlers/GroupHandler.cpp | 24 +- src/server/game/Handlers/ItemHandler.cpp | 36 +- src/server/game/Handlers/LootHandler.cpp | 6 +- src/server/game/Handlers/MailHandler.cpp | 16 +- src/server/game/Handlers/MovementHandler.cpp | 4 +- src/server/game/Handlers/NPCHandler.cpp | 28 +- src/server/game/Handlers/PetHandler.cpp | 12 +- src/server/game/Handlers/PetitionsHandler.cpp | 16 +- src/server/game/Handlers/QueryHandler.cpp | 10 +- src/server/game/Handlers/QuestHandler.cpp | 14 +- src/server/game/Handlers/SkillHandler.cpp | 4 +- src/server/game/Handlers/SpellHandler.cpp | 6 +- src/server/game/Handlers/TaxiHandler.cpp | 8 +- src/server/game/Handlers/TicketHandler.cpp | 2 +- src/server/game/Miscellaneous/SharedDefines.h | 184 ++--- src/server/game/Movement/MotionMaster.h | 4 +- src/server/game/Movement/MovementGenerator.h | 4 +- .../ConfusedMovementGenerator.cpp | 6 +- .../ConfusedMovementGenerator.h | 2 +- .../FleeingMovementGenerator.cpp | 10 +- .../FleeingMovementGenerator.h | 4 +- .../IdleMovementGenerator.cpp | 4 +- .../IdleMovementGenerator.h | 6 +- .../PointMovementGenerator.cpp | 8 +- .../PointMovementGenerator.h | 4 +- .../TargetedMovementGenerator.cpp | 10 +- .../TargetedMovementGenerator.h | 3 +- .../WaypointMovementGenerator.cpp | 4 +- .../WaypointMovementGenerator.h | 4 +- .../game/Movement/Spline/MoveSpline.cpp | 6 +- src/server/game/Movement/Spline/MoveSpline.h | 29 +- .../game/Movement/Spline/MoveSplineFlag.h | 75 ++- .../game/Movement/Spline/MovementTypedefs.h | 6 +- .../game/Movement/Spline/MovementUtil.cpp | 79 +-- src/server/game/Reputation/ReputationMgr.cpp | 21 +- .../game/Spells/Auras/SpellAuraDefines.h | 632 +++++++++--------- .../game/Spells/Auras/SpellAuraEffects.cpp | 29 +- .../game/Tools/CharacterDatabaseCleaner.cpp | 3 +- .../scripts/Commands/cs_achievement.cpp | 3 +- src/server/scripts/Commands/cs_disable.cpp | 5 +- .../EasternKingdoms/Karazhan/karazhan.cpp | 1 - .../boss_felblood_kaelthas.cpp | 2 +- .../instance_magisters_terrace.cpp | 10 +- .../ScarletEnclave/chapter2.cpp | 2 +- .../boss_headless_horseman.cpp | 2 +- .../SunwellPlateau/boss_kalecgos.cpp | 2 +- .../SunwellPlateau/boss_kiljaeden.cpp | 2 +- .../WailingCaverns/wailing_caverns.cpp | 3 +- .../PitOfSaron/boss_forgemaster_garfrost.cpp | 19 +- .../Northrend/Naxxramas/boss_sapphiron.cpp | 3 +- .../Ulduar/HallsOfLightning/boss_volkhan.cpp | 3 +- 94 files changed, 976 insertions(+), 951 deletions(-) rename src/server/game/{Battlefield => Handlers}/BattlefieldHandler.cpp (100%) mode change 100644 => 100755 src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp mode change 100644 => 100755 src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h mode change 100644 => 100755 src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp mode change 100644 => 100755 src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h mode change 100644 => 100755 src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp mode change 100644 => 100755 src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp mode change 100644 => 100755 src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 91437ae3bb5..09e1de0a2bf 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -42,7 +42,6 @@ #include "World.h" #include "WorldPacket.h" - namespace Trinity { class AchievementChatBuilder @@ -472,7 +471,7 @@ void AchievementMgr::ResetAchievementCriteria(AchievementCriteriaTypes type, uin { AchievementCriteriaEntry const* achievementCriteria = (*i); - AchievementEntry const* achievement = sAchievementStore.LookupEntry(achievementCriteria->referredAchievement); + AchievementEntry const* achievement = sAchievementMgr->GetAchievement(achievementCriteria->referredAchievement); if (!achievement) continue; @@ -620,7 +619,7 @@ void AchievementMgr::LoadFromDB(PreparedQueryResult achievementResult, PreparedQ uint32 achievementid = fields[0].GetUInt16(); // must not happen: cleanup at server startup in sAchievementMgr->LoadCompletedAchievements() - AchievementEntry const* achievement = sAchievementStore.LookupEntry(achievementid); + AchievementEntry const* achievement = sAchievementMgr->GetAchievement(achievementid); if (!achievement) continue; @@ -646,7 +645,7 @@ void AchievementMgr::LoadFromDB(PreparedQueryResult achievementResult, PreparedQ uint32 counter = fields[1].GetUInt32(); time_t date = time_t(fields[2].GetUInt32()); - AchievementCriteriaEntry const* criteria = sAchievementCriteriaStore.LookupEntry(id); + AchievementCriteriaEntry const* criteria = sAchievementMgr->GetAchievementCriteria(id); if (!criteria) { // we will remove not existed criteria for all characters @@ -781,7 +780,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui for (AchievementCriteriaEntryList::const_iterator i = achievementCriteriaList.begin(); i != achievementCriteriaList.end(); ++i) { AchievementCriteriaEntry const* achievementCriteria = (*i); - AchievementEntry const* achievement = sAchievementStore.LookupEntry(achievementCriteria->referredAchievement); + AchievementEntry const* achievement = sAchievementMgr->GetAchievement(achievementCriteria->referredAchievement); if (!achievement) continue; @@ -1490,7 +1489,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui { uint32 points = 0; for (CompletedAchievementMap::iterator itr = m_completedAchievements.begin(); itr != m_completedAchievements.end(); ++itr) - if (AchievementEntry const* pAchievement = sAchievementStore.LookupEntry(itr->first)) + if (AchievementEntry const* pAchievement = sAchievementMgr->GetAchievement(itr->first)) points += pAchievement->points; SetCriteriaProgress(achievementCriteria, points, PROGRESS_SET); } @@ -1940,7 +1939,7 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry, if (entry->timeLimit) { // has to exist else we wouldn't be here - timedCompleted = IsCompletedCriteria(entry, sAchievementStore.LookupEntry(entry->referredAchievement)); + timedCompleted = IsCompletedCriteria(entry, sAchievementMgr->GetAchievement(entry->referredAchievement)); // Client expects this in packet timeElapsed = entry->timeLimit - (timedIter->second/IN_MILLISECONDS); @@ -1974,7 +1973,7 @@ void AchievementMgr::UpdateTimedAchievements(uint32 timeDiff) // Time is up, remove timer and reset progress if (itr->second <= timeDiff) { - AchievementCriteriaEntry const* entry = sAchievementCriteriaStore.LookupEntry(itr->first); + AchievementCriteriaEntry const* entry = sAchievementMgr->GetAchievementCriteria(itr->first); RemoveCriteriaProgress(entry); m_timedAchievements.erase(itr++); } @@ -1995,7 +1994,7 @@ void AchievementMgr::StartTimedAchievement(AchievementCriteriaTimedTypes type, u if ((*i)->timerStartEvent != entry) continue; - AchievementEntry const* achievement = sAchievementStore.LookupEntry((*i)->referredAchievement); + AchievementEntry const* achievement = sAchievementMgr->GetAchievement((*i)->referredAchievement); if (m_timedAchievements.find((*i)->ID) == m_timedAchievements.end() && !IsCompletedCriteria(*i, achievement)) { // Start the timer @@ -2131,7 +2130,7 @@ void AchievementMgr::BuildAllDataPacket(WorldPacket* data) const for (CompletedAchievementMap::const_iterator iter = m_completedAchievements.begin(); iter != m_completedAchievements.end(); ++iter) { // Skip hidden achievements - achievement = sAchievementStore.LookupEntry(iter->first); + achievement = sAchievementMgr->GetAchievement(iter->first); if (achievement->flags & ACHIEVEMENT_FLAG_HIDDEN) continue; @@ -2211,7 +2210,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaList() for (uint32 entryId = 0; entryId < sAchievementCriteriaStore.GetNumRows(); ++entryId) { - AchievementCriteriaEntry const* criteria = sAchievementCriteriaStore.LookupEntry(entryId); + AchievementCriteriaEntry const* criteria = sAchievementMgr->GetAchievementCriteria(entryId); if (!criteria) continue; @@ -2239,7 +2238,7 @@ void AchievementGlobalMgr::LoadAchievementReferenceList() for (uint32 entryId = 0; entryId < sAchievementStore.GetNumRows(); ++entryId) { - AchievementEntry const* achievement = sAchievementStore.LookupEntry(entryId); + AchievementEntry const* achievement = sAchievementMgr->GetAchievement(entryId); if (!achievement || !achievement->refAchievement) continue; @@ -2248,7 +2247,7 @@ void AchievementGlobalMgr::LoadAchievementReferenceList() } // Once Bitten, Twice Shy (10 player) - Icecrown Citadel - if (AchievementEntry const* achievement = sAchievementStore.LookupEntry(4539)) + if (AchievementEntry const* achievement = sAchievementMgr->GetAchievement(4539)) const_cast(achievement)->mapID = 631; // Correct map requirement (currently has Ulduar) sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %u achievement references in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); @@ -2275,7 +2274,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaData() Field* fields = result->Fetch(); uint32 criteria_id = fields[0].GetUInt32(); - AchievementCriteriaEntry const* criteria = sAchievementCriteriaStore.LookupEntry(criteria_id); + AchievementCriteriaEntry const* criteria = sAchievementMgr->GetAchievementCriteria(criteria_id); if (!criteria) { @@ -2315,7 +2314,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaData() // post loading checks for (uint32 entryId = 0; entryId < sAchievementCriteriaStore.GetNumRows(); ++entryId) { - AchievementCriteriaEntry const* criteria = sAchievementCriteriaStore.LookupEntry(entryId); + AchievementCriteriaEntry const* criteria = sAchievementMgr->GetAchievementCriteria(entryId); if (!criteria) continue; @@ -2327,7 +2326,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaData() break; // any cases case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST: { - AchievementEntry const* achievement = sAchievementStore.LookupEntry(criteria->referredAchievement); + AchievementEntry const* achievement = sAchievementMgr->GetAchievement(criteria->referredAchievement); if (!achievement) continue; @@ -2378,7 +2377,7 @@ void AchievementGlobalMgr::LoadAchievementCriteriaData() case ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST: case ACHIEVEMENT_CRITERIA_TYPE_USE_ITEM: // only Children's Week achievements { - AchievementEntry const* achievement = sAchievementStore.LookupEntry(criteria->referredAchievement); + AchievementEntry const* achievement = sAchievementMgr->GetAchievement(criteria->referredAchievement); if (!achievement) continue; if (achievement->categoryId != CATEGORY_CHILDRENS_WEEK) @@ -2415,23 +2414,22 @@ void AchievementGlobalMgr::LoadCompletedAchievements() Field* fields = result->Fetch(); uint16 achievementId = fields[0].GetUInt16(); - const AchievementEntry* achievement = sAchievementStore.LookupEntry(achievementId); + const AchievementEntry* achievement = sAchievementMgr->GetAchievement(achievementId); if (!achievement) { // Remove non existent achievements from all characters sLog->outError(LOG_FILTER_ACHIEVEMENTSYS, "Non-existing achievement %u data removed from table `character_achievement`.", achievementId); PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_INVALID_ACHIEVMENT); - stmt->setUInt16(0, uint16(achievementId)); - CharacterDatabase.Execute(stmt); continue; } else if (achievement->flags & (ACHIEVEMENT_FLAG_REALM_FIRST_REACH | ACHIEVEMENT_FLAG_REALM_FIRST_KILL)) m_allCompletedAchievements.insert(achievementId); - } while (result->NextRow()); + } + while (result->NextRow()); sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %lu realm first completed achievements in %u ms", (unsigned long)m_allCompletedAchievements.size(), GetMSTimeDiffToNow(oldMSTime)); } @@ -2442,7 +2440,7 @@ void AchievementGlobalMgr::LoadRewards() m_achievementRewards.clear(); // need for reload case - // 0 1 2 3 4 5 6 + // 0 1 2 3 4 5 6 QueryResult result = WorldDatabase.Query("SELECT entry, title_A, title_H, item, sender, subject, text FROM achievement_reward"); if (!result) @@ -2457,10 +2455,10 @@ void AchievementGlobalMgr::LoadRewards() { Field* fields = result->Fetch(); uint32 entry = fields[0].GetUInt32(); - const AchievementEntry* pAchievement = sAchievementStore.LookupEntry(entry); + const AchievementEntry* pAchievement = GetAchievement(entry); if (!pAchievement) { - sLog->outError(LOG_FILTER_SQL, "Table `achievement_reward` has wrong achievement (Entry: %u), ignore", entry); + sLog->outError(LOG_FILTER_SQL, "Table `achievement_reward` has wrong achievement (Entry: %u), ignored.", entry); continue; } @@ -2475,7 +2473,7 @@ void AchievementGlobalMgr::LoadRewards() // must be title or mail at least if (!reward.titleId[0] && !reward.titleId[1] && !reward.sender) { - sLog->outError(LOG_FILTER_SQL, "Table `achievement_reward` (Entry: %u) not have title or item reward data, ignore.", entry); + sLog->outError(LOG_FILTER_SQL, "Table `achievement_reward` (Entry: %u) does not have title or item reward data, ignored.", entry); continue; } @@ -2534,7 +2532,6 @@ void AchievementGlobalMgr::LoadRewards() m_achievementRewards[entry] = reward; ++count; - } while (result->NextRow()); @@ -2577,7 +2574,18 @@ void AchievementGlobalMgr::LoadRewardLocales() ObjectMgr::AddLocaleString(fields[1 + 2 * (i - 1)].GetString(), locale, data.subject); ObjectMgr::AddLocaleString(fields[1 + 2 * (i - 1) + 1].GetString(), locale, data.text); } - } while (result->NextRow()); + } + while (result->NextRow()); sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded %lu achievement reward locale strings in %u ms", (unsigned long)m_achievementRewardLocales.size(), GetMSTimeDiffToNow(oldMSTime)); } + +AchievementEntry const* AchievementGlobalMgr::GetAchievement(uint32 achievementId) const +{ + return sAchievementStore.LookupEntry(achievementId); +} + +AchievementCriteriaEntry const* AchievementGlobalMgr::GetAchievementCriteria(uint32 criteriaId) const +{ + return sAchievementCriteriaStore.LookupEntry(criteriaId); +} diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h index 3215b4196f7..0f3d63cd60f 100644 --- a/src/server/game/Achievements/AchievementMgr.h +++ b/src/server/game/Achievements/AchievementMgr.h @@ -15,6 +15,7 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . */ + #ifndef __TRINITY_ACHIEVEMENTMGR_H #define __TRINITY_ACHIEVEMENTMGR_H @@ -27,11 +28,15 @@ #include "DBCEnums.h" #include "DBCStores.h" -typedef std::list AchievementCriteriaEntryList; -typedef std::list AchievementEntryList; +class Unit; +class Player; +class WorldPacket; -typedef std::map AchievementCriteriaListByAchievement; -typedef std::map AchievementListByReferencedId; +typedef std::vector AchievementCriteriaEntryList; +typedef std::vector AchievementEntryList; + +typedef UNORDERED_MAP AchievementCriteriaListByAchievement; +typedef UNORDERED_MAP AchievementListByReferencedId; struct CriteriaProgress { @@ -68,9 +73,6 @@ enum AchievementCriteriaDataType #define MAX_ACHIEVEMENT_CRITERIA_DATA_TYPE 22 // maximum value in AchievementCriteriaDataType enum -class Player; -class Unit; - struct AchievementCriteriaData { AchievementCriteriaDataType dataType; @@ -194,7 +196,7 @@ struct AchievementCriteriaData } bool IsValid(AchievementCriteriaEntry const* criteria); - bool Meets(uint32 criteria_id, Player const* source, Unit const* target, uint32 miscvalue1 = 0) const; + bool Meets(uint32 criteria_id, Player const* source, Unit const* target, uint32 miscValue1 = 0) const; }; struct AchievementCriteriaDataSet @@ -202,7 +204,7 @@ struct AchievementCriteriaDataSet AchievementCriteriaDataSet() : criteria_id(0) {} typedef std::vector Storage; void Add(AchievementCriteriaData const& data) { storage.push_back(data); } - bool Meets(Player const* source, Unit const* target, uint32 miscvalue = 0) const; + bool Meets(Player const* source, Unit const* target, uint32 miscValue = 0) const; void SetCriteriaId(uint32 id) {criteria_id = id;} private: uint32 criteria_id; @@ -220,15 +222,15 @@ struct AchievementReward std::string text; }; -typedef std::map AchievementRewards; +typedef UNORDERED_MAP AchievementRewards; struct AchievementRewardLocale { - StringVector subject; - StringVector text; + std::vector subject; + std::vector text; }; -typedef std::map AchievementRewardLocales; +typedef UNORDERED_MAP AchievementRewardLocales; struct CompletedAchievementData { @@ -239,9 +241,12 @@ struct CompletedAchievementData typedef UNORDERED_MAP CriteriaProgressMap; typedef UNORDERED_MAP CompletedAchievementMap; -class Unit; -class Player; -class WorldPacket; +enum ProgressType +{ + PROGRESS_SET, + PROGRESS_ACCUMULATE, + PROGRESS_HIGHEST +}; class AchievementMgr { @@ -253,7 +258,7 @@ class AchievementMgr static void DeleteFromDB(uint32 lowguid); void LoadFromDB(PreparedQueryResult achievementResult, PreparedQueryResult criteriaResult); void SaveToDB(SQLTransaction& trans); - void ResetAchievementCriteria(AchievementCriteriaTypes type, uint32 miscvalue1 = 0, uint32 miscvalue2 = 0, bool evenIfCriteriaComplete = false); + void ResetAchievementCriteria(AchievementCriteriaTypes type, uint32 miscValue1 = 0, uint32 miscValue2 = 0, bool evenIfCriteriaComplete = false); void UpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscValue1 = 0, uint32 miscValue2 = 0, Unit* unit = NULL); void CompletedAchievement(AchievementEntry const* entry); void CheckAllAchievementCriteria(); @@ -266,7 +271,6 @@ class AchievementMgr void RemoveTimedAchievement(AchievementCriteriaTimedTypes type, uint32 entry); // used for quest and scripted timed achievements private: - enum ProgressType { PROGRESS_SET, PROGRESS_ACCUMULATE, PROGRESS_HIGHEST }; void SendAchievementEarned(AchievementEntry const* achievement) const; void SendCriteriaUpdate(AchievementCriteriaEntry const* entry, CriteriaProgress const* progress, uint32 timeElapsed, bool timedCompleted) const; CriteriaProgress* GetCriteriaProgress(AchievementCriteriaEntry const* entry); @@ -348,14 +352,19 @@ class AchievementGlobalMgr void LoadCompletedAchievements(); void LoadRewards(); void LoadRewardLocales(); + AchievementEntry const* GetAchievement(uint32 achievementId) const; + AchievementCriteriaEntry const* GetAchievementCriteria(uint32 achievementId) const; private: AchievementCriteriaDataMap m_criteriaDataMap; // store achievement criterias by type to speed up lookup AchievementCriteriaEntryList m_AchievementCriteriasByType[ACHIEVEMENT_CRITERIA_TYPE_TOTAL]; + AchievementCriteriaEntryList m_AchievementCriteriasByTimedType[ACHIEVEMENT_TIMED_TYPE_MAX]; + // store achievement criterias by achievement to speed up lookup AchievementCriteriaListByAchievement m_AchievementCriteriaListByAchievement; + // store achievements by referenced achievement id to speed up lookup AchievementListByReferencedId m_AchievementListByReferencedId; diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index d580df63700..4738d8f6f27 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -29,7 +29,7 @@ #include "AuctionHouseMgr.h" #include "Item.h" #include "Language.h" -#include "Logging/Log.h" +#include "Log.h" #include enum eAuctionHouse @@ -89,7 +89,7 @@ uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 //does not clear ram void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry* auction, SQLTransaction& trans) { - Item* pItem = GetAItem(auction->item_guidlow); + Item* pItem = GetAItem(auction->itemGUIDLow); if (!pItem) return; @@ -143,7 +143,7 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry* auction, SQLTransaction& if (bidder) { - bidder->GetSession()->SendAuctionBidderNotification(auction->GetHouseId(), auction->Id, bidder_guid, 0, 0, auction->item_template); + bidder->GetSession()->SendAuctionBidderNotification(auction->GetHouseId(), auction->Id, bidder_guid, 0, 0, auction->itemEntry); // FIXME: for offline player need also bidder->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WON_AUCTIONS, 1); } @@ -195,7 +195,7 @@ void AuctionHouseMgr::SendAuctionSuccessfulMail(AuctionEntry* auction, SQLTransa void AuctionHouseMgr::SendAuctionExpiredMail(AuctionEntry* auction, SQLTransaction& trans) { //return an item in auction to its owner by mail - Item* pItem = GetAItem(auction->item_guidlow); + Item* pItem = GetAItem(auction->itemGUIDLow); if (!pItem) return; @@ -228,7 +228,7 @@ void AuctionHouseMgr::SendAuctionOutbiddedMail(AuctionEntry* auction, uint32 new if (oldBidder || oldBidder_accId) { if (oldBidder && newBidder) - oldBidder->GetSession()->SendAuctionBidderNotification(auction->GetHouseId(), auction->Id, newBidder->GetGUID(), newPrice, auction->GetAuctionOutBid(), auction->item_template); + oldBidder->GetSession()->SendAuctionBidderNotification(auction->GetHouseId(), auction->Id, newBidder->GetGUID(), newPrice, auction->GetAuctionOutBid(), auction->itemEntry); MailDraft(auction->BuildAuctionMailSubject(AUCTION_OUTBIDDED), AuctionEntry::BuildAuctionMailBody(auction->owner, auction->bid, auction->buyout, auction->deposit, auction->GetAuctionCut())) .AddMoney(auction->bid) @@ -275,17 +275,17 @@ void AuctionHouseMgr::LoadAuctionItems() Field* fields = result->Fetch(); uint32 item_guid = fields[11].GetUInt32(); - uint32 item_template = fields[12].GetUInt32(); + uint32 itemEntry = fields[12].GetUInt32(); - ItemTemplate const* proto = sObjectMgr->GetItemTemplate(item_template); + ItemTemplate const* proto = sObjectMgr->GetItemTemplate(itemEntry); if (!proto) { - sLog->outError(LOG_FILTER_GENERAL, "AuctionHouseMgr::LoadAuctionItems: Unknown item (GUID: %u id: #%u) in auction, skipped.", item_guid, item_template); + sLog->outError(LOG_FILTER_GENERAL, "AuctionHouseMgr::LoadAuctionItems: Unknown item (GUID: %u id: #%u) in auction, skipped.", item_guid, itemEntry); continue; } Item* item = NewItemOrBag(proto); - if (!item->LoadFromDB(item_guid, 0, fields, item_template)) + if (!item->LoadFromDB(item_guid, 0, fields, itemEntry)) { delete item; continue; @@ -411,7 +411,7 @@ void AuctionHouseObject::AddAuction(AuctionEntry* auction) sScriptMgr->OnAuctionAdd(this, auction); } -bool AuctionHouseObject::RemoveAuction(AuctionEntry* auction, uint32 /*item_template*/) +bool AuctionHouseObject::RemoveAuction(AuctionEntry* auction, uint32 /*itemEntry*/) { bool wasInMap = AuctionsMap.erase(auction->Id) ? true : false; @@ -465,14 +465,14 @@ void AuctionHouseObject::Update() sScriptMgr->OnAuctionSuccessful(this, auction); } - uint32 item_template = auction->item_template; + uint32 itemEntry = auction->itemEntry; ///- In any case clear the auction auction->DeleteFromDB(trans); CharacterDatabase.CommitTransaction(trans); - RemoveAuction(auction, item_template); - sAuctionMgr->RemoveAItem(auction->item_guidlow); + RemoveAuction(auction, itemEntry); + sAuctionMgr->RemoveAItem(auction->itemGUIDLow); } while (result->NextRow()); } @@ -518,7 +518,7 @@ void AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player for (AuctionEntryMap::const_iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end(); ++itr) { AuctionEntry* Aentry = itr->second; - Item* item = sAuctionMgr->GetAItem(Aentry->item_guidlow); + Item* item = sAuctionMgr->GetAItem(Aentry->itemGUIDLow); if (!item) continue; @@ -570,7 +570,6 @@ void AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player if (itemRandProp) { char* const* temp = itemRandProp->nameSuffix; - //char* temp = itemRandProp->nameSuffix; // dbc local name if (temp) @@ -601,10 +600,10 @@ void AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player //this function inserts to WorldPacket auction's data bool AuctionEntry::BuildAuctionInfo(WorldPacket& data) const { - Item* item = sAuctionMgr->GetAItem(item_guidlow); + Item* item = sAuctionMgr->GetAItem(itemGUIDLow); if (!item) { - sLog->outError(LOG_FILTER_GENERAL, "AuctionEntry::BuildAuctionInfo: Auction %u has a non-existent item: %u", Id, item_guidlow); + sLog->outError(LOG_FILTER_GENERAL, "AuctionEntry::BuildAuctionInfo: Auction %u has a non-existent item: %u", Id, itemGUIDLow); return false; } data << uint32(Id); @@ -658,7 +657,7 @@ void AuctionEntry::SaveToDB(SQLTransaction& trans) const PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_AUCTION); stmt->setUInt32(0, Id); stmt->setUInt32(1, auctioneer); - stmt->setUInt32(2, item_guidlow); + stmt->setUInt32(2, itemGUIDLow); stmt->setUInt32(3, owner); stmt->setInt32 (4, int32(buyout)); stmt->setUInt64(5, uint64(expire_time)); @@ -673,8 +672,8 @@ bool AuctionEntry::LoadFromDB(Field* fields) { Id = fields[0].GetUInt32(); auctioneer = fields[1].GetUInt32(); - item_guidlow = fields[2].GetUInt32(); - item_template = fields[3].GetUInt32(); + itemGUIDLow = fields[2].GetUInt32(); + itemEntry = fields[3].GetUInt32(); itemCount = fields[4].GetUInt32(); owner = fields[5].GetUInt32(); buyout = fields[6].GetUInt32(); @@ -707,10 +706,10 @@ bool AuctionEntry::LoadFromDB(Field* fields) } // check if sold item exists for guid - // and item_template in fact (GetAItem will fail if problematic in result check in AuctionHouseMgr::LoadAuctionItems) - if (!sAuctionMgr->GetAItem(item_guidlow)) + // and itemEntry in fact (GetAItem will fail if problematic in result check in AuctionHouseMgr::LoadAuctionItems) + if (!sAuctionMgr->GetAItem(itemGUIDLow)) { - sLog->outError(LOG_FILTER_GENERAL, "Auction %u has not a existing item : %u", Id, item_guidlow); + sLog->outError(LOG_FILTER_GENERAL, "Auction %u has not a existing item : %u", Id, itemGUIDLow); return false; } return true; @@ -795,8 +794,8 @@ bool AuctionEntry::LoadFromFieldList(Field* fields) Id = fields[0].GetUInt32(); auctioneer = fields[1].GetUInt32(); - item_guidlow = fields[2].GetUInt32(); - item_template = fields[3].GetUInt32(); + itemGUIDLow = fields[2].GetUInt32(); + itemEntry = fields[3].GetUInt32(); itemCount = fields[4].GetUInt32(); owner = fields[5].GetUInt32(); buyout = fields[6].GetUInt32(); @@ -835,7 +834,7 @@ bool AuctionEntry::LoadFromFieldList(Field* fields) std::string AuctionEntry::BuildAuctionMailSubject(MailAuctionAnswers response) const { std::ostringstream strm; - strm << item_template << ":0:" << response << ':' << Id << ':' << itemCount; + strm << itemEntry << ":0:" << response << ':' << Id << ':' << itemCount; return strm.str(); } diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h index 049440f99d0..e13b4665b7b 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.h +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h @@ -34,11 +34,11 @@ class WorldPacket; enum AuctionError { - AUCTION_OK = 0, - AUCTION_INTERNAL_ERROR = 2, - AUCTION_NOT_ENOUGHT_MONEY = 3, - AUCTION_ITEM_NOT_FOUND = 4, - CANNOT_BID_YOUR_AUCTION_ERROR = 10 + ERR_AUCTION_OK = 0, + ERR_AUCTION_DATABASE_ERROR = 2, + ERR_AUCTION_NOT_ENOUGHT_MONEY = 3, + ERR_AUCTION_ITEM_NOT_FOUND = 4, + ERR_AUCTION_BID_OWN = 10 }; enum AuctionAction @@ -63,8 +63,8 @@ struct AuctionEntry { uint32 Id; uint32 auctioneer; // creature low guid - uint32 item_guidlow; - uint32 item_template; + uint32 itemGUIDLow; + uint32 itemEntry; uint32 itemCount; uint32 owner; uint32 startbid; //maybe useless @@ -118,7 +118,7 @@ class AuctionHouseObject void AddAuction(AuctionEntry* auction); - bool RemoveAuction(AuctionEntry* auction, uint32 item_template); + bool RemoveAuction(AuctionEntry* auction, uint32 itemEntry); void Update(); diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index 1960f65d10f..55f38f748f2 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -407,13 +407,17 @@ void Battlefield::PlayerAcceptInviteToWar(Player* player) void Battlefield::TeamCastSpell(TeamId team, int32 spellId) { if (spellId > 0) + { for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr) if (Player* player = sObjectAccessor->FindPlayer(*itr)) player->CastSpell(player, uint32(spellId), true); + } else + { for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr) if (Player* player = sObjectAccessor->FindPlayer(*itr)) player->RemoveAuraFromStack(uint32(-spellId)); + } } void Battlefield::BroadcastPacketToZone(WorldPacket& data) const @@ -656,7 +660,7 @@ void Battlefield::RemovePlayerFromResurrectQueue(uint64 playerGuid) } } -void Battlefield::SendAreaSpiritHealerQueryOpcode(Player* player, const uint64 &guid) +void Battlefield::SendAreaSpiritHealerQueryOpcode(Player* player, uint64 guid) { WorldPacket data(SMSG_AREA_SPIRIT_HEALER_TIME, 12); uint32 time = m_LastResurectTimer; // resurrect every 30 seconds @@ -913,7 +917,7 @@ bool BfCapturePoint::HandlePlayerEnter(Player* player) player->SendUpdateWorldState(capturePoint->GetGOInfo()->capturePoint.worldstate3, m_neutralValuePct); } } - + return m_activePlayers[player->GetTeamId()].insert(player->GetGUID()).second; } @@ -936,7 +940,7 @@ void BfCapturePoint::SendChangePhase() { if (!m_capturePointGUID) return; - + if (GameObject* capturePoint = m_Bf->GetGameObject(m_capturePointGUID)) { // send this too, sometimes the slider disappears, dunno why :( @@ -984,9 +988,9 @@ bool BfCapturePoint::SetCapturePointData(GameObject* capturePoint) return true; } -GameObject* BfCapturePoint::GetCapturePointGo() -{ - return m_Bf->GetGameObject(m_capturePointGUID); +GameObject* BfCapturePoint::GetCapturePointGo() +{ + return m_Bf->GetGameObject(m_capturePointGUID); } bool BfCapturePoint::DelCapturePoint() @@ -1034,13 +1038,13 @@ bool BfCapturePoint::Update(uint32 diff) Trinity::AnyPlayerInObjectRangeCheck checker(capturePoint, radius); Trinity::PlayerListSearcher searcher(capturePoint, players, checker); capturePoint->VisitNearbyWorldObject(radius, searcher); - + for (std::list::iterator itr = players.begin(); itr != players.end(); ++itr) if ((*itr)->IsOutdoorPvPActive()) if (m_activePlayers[(*itr)->GetTeamId()].insert((*itr)->GetGUID()).second) HandlePlayerEnter(*itr); } - + // get the difference of numbers float fact_diff = ((float) m_activePlayers[0].size() - (float) m_activePlayers[1].size()) * diff / BATTLEFIELD_OBJECTIVE_UPDATE_INTERVAL; if (G3D::fuzzyEq(fact_diff, 0.0f)) diff --git a/src/server/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h index 53522c8188d..28216a43758 100644 --- a/src/server/game/Battlefield/Battlefield.h +++ b/src/server/game/Battlefield/Battlefield.h @@ -105,7 +105,7 @@ class BfCapturePoint bool SetCapturePointData(GameObject* capturePoint); GameObject* GetCapturePointGo(); uint32 GetCapturePointEntry(){ return m_capturePointEntry; } - + TeamId GetTeamId() { return m_team; } protected: bool DelCapturePoint(); @@ -292,23 +292,23 @@ class Battlefield : public ZoneScript Creature* GetCreature(uint64 GUID); GameObject* GetGameObject(uint64 GUID); - + // Script-methods /// Called on start - virtual void OnBattleStart() {}; + virtual void OnBattleStart() { } /// Called at the end of battle - virtual void OnBattleEnd(bool /*endByTimer*/) {}; + virtual void OnBattleEnd(bool /*endByTimer*/) { } /// Called x minutes before battle start when player in zone are invite to join queue - virtual void OnStartGrouping() {}; + virtual void OnStartGrouping() { } /// Called when a player accept to join the battle - virtual void OnPlayerJoinWar(Player* /*player*/) {}; + virtual void OnPlayerJoinWar(Player* /*player*/) { } /// Called when a player leave the battle - virtual void OnPlayerLeaveWar(Player* /*player*/) {}; + virtual void OnPlayerLeaveWar(Player* /*player*/) { } /// Called when a player leave battlefield zone - virtual void OnPlayerLeaveZone(Player* /*player*/) {}; + virtual void OnPlayerLeaveZone(Player* /*player*/) { } /// Called when a player enter in battlefield zone - virtual void OnPlayerEnterZone(Player* /*player*/) {}; + virtual void OnPlayerEnterZone(Player* /*player*/) { } WorldPacket BuildWarningAnnPacket(std::string const& msg); void SendWarningToAllInZone(uint32 entry); @@ -320,7 +320,7 @@ class Battlefield : public ZoneScript uint32 GetBattleId() { return m_BattleId; } void AskToLeaveQueue(Player* player); - virtual void DoCompleteOrIncrementAchievement(uint32 /*achievement*/, Player* /*player*/, uint8 /*incrementNumber = 1*/) {}; + virtual void DoCompleteOrIncrementAchievement(uint32 /*achievement*/, Player* /*player*/, uint8 /*incrementNumber = 1*/) { } /// Send all worldstate data to all player in zone. virtual void SendInitWorldStatesToAll() = 0; @@ -329,7 +329,7 @@ class Battlefield : public ZoneScript /// Return if we can use mount in battlefield bool CanFlyIn() { return !m_isActive; } - void SendAreaSpiritHealerQueryOpcode(Player* player, const uint64 & guid); + void SendAreaSpiritHealerQueryOpcode(Player* player, uint64 guid); void StartBattle(); void EndBattle(bool endByTimer); diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp index 3cb1e5a8b9e..63f95e159af 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp @@ -21,6 +21,7 @@ // TODO: Add proper implement of achievement #include "BattlefieldWG.h" +#include "AchievementMgr.h" #include "MapManager.h" #include "ObjectMgr.h" #include "Opcodes.h" @@ -428,7 +429,7 @@ void BattlefieldWG::OnBattleEnd(bool endByTimer) // ******************************************************* void BattlefieldWG::DoCompleteOrIncrementAchievement(uint32 achievement, Player* player, uint8 /*incrementNumber*/) { - AchievementEntry const* achievementEntry = sAchievementStore.LookupEntry(achievement); + AchievementEntry const* achievementEntry = sAchievementMgr->GetAchievement(achievement); if (!achievementEntry) return; diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h index 73ec858e965..0ac87af94ba 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.h +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h @@ -1201,7 +1201,7 @@ struct BfWGGameObjectBuilding { if (!go) return; - + // GameObject associated to object m_BuildGUID = go->GetGUID(); diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp index fd58765b056..628eb5ff3c1 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.cpp +++ b/src/server/game/Battlegrounds/ArenaTeam.cpp @@ -48,7 +48,7 @@ bool ArenaTeam::Create(uint64 captainGuid, uint8 type, std::string const& teamNa return false; // Check if arena team name is already taken - if (sArenaTeamMgr->GetArenaTeamByName(TeamName)) + if (sArenaTeamMgr->GetArenaTeamByName(teamName)) return false; // Generate new arena team id @@ -179,7 +179,7 @@ bool ArenaTeam::AddMember(uint64 playerGuid) player->SetArenaTeamInfoField(GetSlot(), ARENA_TEAM_MEMBER, 1); } - sLog->outInfo(LOG_FILTER_ARENAS, "Player: %s [GUID: %u] joined arena team type: %u [Id: %u].", playerName.c_str(), GUID_LOPART(playerGuid), GetType(), GetId()); + sLog->outInfo(LOG_FILTER_ARENAS, "Player: %s [GUID: %u] joined arena team type: %u [Id: %u, Name: %s].", playerName.c_str(), GUID_LOPART(playerGuid), GetType(), GetId(), GetName().c_str()); return true; } diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h index 71dbd097b0a..0a837f9f3c3 100644 --- a/src/server/game/Battlegrounds/Battleground.h +++ b/src/server/game/Battlegrounds/Battleground.h @@ -528,7 +528,7 @@ class Battleground virtual uint64 GetFlagPickerGUID(int32 /*team*/ = -1) const { return 0; } virtual void SetDroppedFlagGUID(uint64 /*guid*/, int32 /*team*/ = -1) {} uint32 GetTeamScore(uint32 TeamID) const; - + virtual uint32 GetPrematureWinner(); protected: diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.h b/src/server/game/Battlegrounds/BattlegroundMgr.h index 67bed737588..22c42b0febc 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.h +++ b/src/server/game/Battlegrounds/BattlegroundMgr.h @@ -80,8 +80,8 @@ class BattlegroundMgr void BuildGroupJoinedBattlegroundPacket(WorldPacket* data, GroupJoinBattlegroundResult result); void BuildUpdateWorldStatePacket(WorldPacket* data, uint32 field, uint32 value); void BuildPvpLogDataPacket(WorldPacket* data, Battleground* bg); - void BuildBattlegroundStatusPacket(WorldPacket* data, Battleground* bg, uint8 QueueSlot, uint8 StatusID, uint32 Time1, uint32 Time2, uint8 arenatype, uint8 uiFrame = 1); - void BuildPlaySoundPacket(WorldPacket* data, uint32 soundid); + void BuildBattlegroundStatusPacket(WorldPacket* data, Battleground* bg, uint8 queueSlot, uint8 statusId, uint32 time1, uint32 time2, uint8 arenaType, uint8 uiFrame = 1); + void BuildPlaySoundPacket(WorldPacket* data, uint32 soundId); void SendAreaSpiritHealerQueryOpcode(Player* player, Battleground* bg, uint64 guid); /* Battlegrounds */ diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp index 47320db27cf..cb0d651ad47 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp @@ -558,12 +558,12 @@ uint32 BattlegroundAB::GetPrematureWinner() ++ally; else if (m_Nodes[i] == BG_AB_NODE_STATUS_HORDE_OCCUPIED) ++horde; - + if (ally > horde) return ALLIANCE; else if (horde > ally) return HORDE; - + // If the values are equal, fall back to the original result (based on number of players on each team) return Battleground::GetPrematureWinner(); } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h index b80e216a216..6e01437b895 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.h @@ -272,7 +272,7 @@ class BattlegroundAB : public Battleground /* achievement req. */ bool IsAllNodesConrolledByTeam(uint32 team) const; // overwrited bool IsTeamScores500Disadvantage(uint32 team) const { return m_TeamScores500Disadvantage[GetTeamIndexByTeamId(team)]; } - + uint32 GetPrematureWinner(); private: void PostUpdateImpl(uint32 diff); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index 918cef4d261..b12aec245cd 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -1701,11 +1701,11 @@ uint32 BattlegroundAV::GetPrematureWinner() { uint32 allianceScore = m_Team_Scores[GetTeamIndexByTeamId(ALLIANCE)]; uint32 hordeScore = m_Team_Scores[GetTeamIndexByTeamId(HORDE)]; - + if (allianceScore > hordeScore) return ALLIANCE; else if (hordeScore > allianceScore) return HORDE; - + return Battleground::GetPrematureWinner(); } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h index bedd946a78c..b7fa8d6ece8 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.h @@ -1572,7 +1572,7 @@ class BattlegroundAV : public Battleground /* achievement req. */ bool IsBothMinesControlledByTeam(uint32 team) const; bool IsAllTowersControlledAndCaptainAlive(uint32 team) const; - + uint32 GetPrematureWinner(); private: diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp index 458e86729e7..ab0f94b74f6 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp @@ -944,6 +944,6 @@ uint32 BattlegroundEY::GetPrematureWinner() return ALLIANCE; else if (GetTeamScore(TEAM_HORDE) > GetTeamScore(TEAM_ALLIANCE)) return HORDE; - + return Battleground::GetPrematureWinner(); } \ No newline at end of file diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h index 2cfd4ca7e0f..43e7fb4f933 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h @@ -369,7 +369,7 @@ class BattlegroundEY : public Battleground /* achievement req. */ bool IsAllNodesConrolledByTeam(uint32 team) const; - + uint32 GetPrematureWinner(); private: void PostUpdateImpl(uint32 diff); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp index 965045c5293..63204129f24 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp @@ -864,6 +864,6 @@ uint32 BattlegroundWS::GetPrematureWinner() return ALLIANCE; else if (GetTeamScore(TEAM_HORDE) > GetTeamScore(TEAM_ALLIANCE)) return HORDE; - + return Battleground::GetPrematureWinner(); -} \ No newline at end of file +} diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.h b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h index 5b72de43b32..b0d68177072 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.h @@ -211,7 +211,7 @@ class BattlegroundWS : public Battleground void AddPoint(uint32 TeamID, uint32 Points = 1) { m_TeamScores[GetTeamIndexByTeamId(TeamID)] += Points; } void SetTeamPoint(uint32 TeamID, uint32 Points = 0) { m_TeamScores[GetTeamIndexByTeamId(TeamID)] = Points; } void RemovePoint(uint32 TeamID, uint32 Points = 1) { m_TeamScores[GetTeamIndexByTeamId(TeamID)] -= Points; } - + uint32 GetPrematureWinner(); private: uint64 m_FlagKeepers[2]; // 0 - alliance, 1 - horde diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h index c816cd91257..b9883144cbc 100644 --- a/src/server/game/Chat/Channels/Channel.h +++ b/src/server/game/Chat/Channels/Channel.h @@ -28,6 +28,8 @@ #include "Opcodes.h" #include "WorldPacket.h" +class Player; + enum ChatNotify { CHAT_JOINED_NOTICE = 0x00, //+ "%s joined channel."; diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index c1ea96b0db1..6441bd1bcb6 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -63,7 +63,7 @@ ChatCommand* ChatHandler::getCommandTable() // cache for commands, needed because some commands are loaded dynamically through ScriptMgr // cache is never freed and will show as a memory leak in diagnostic tools // can't use vector as vector storage is implementation-dependent, eg, there can be alignment gaps between elements - static ChatCommand* commandTableCache = 0; + static ChatCommand* commandTableCache = NULL; if (LoadCommandTable()) { @@ -96,7 +96,6 @@ ChatCommand* ChatHandler::getCommandTable() std::string name = fields[0].GetString(); SetDataForCommandInTable(commandTableCache, name.c_str(), fields[1].GetUInt8(), fields[2].GetString(), name); - } while (result->NextRow()); } diff --git a/src/server/game/Chat/ChatLink.cpp b/src/server/game/Chat/ChatLink.cpp index a9c72e1112e..c02df6198f8 100644 --- a/src/server/game/Chat/ChatLink.cpp +++ b/src/server/game/Chat/ChatLink.cpp @@ -20,6 +20,7 @@ #include "ObjectMgr.h" #include "SpellInfo.h" #include "DBCStores.h" +#include "AchievementMgr.h" // Supported shift-links (client generated and server side) // |color|Hachievement:achievement_id:player_guid:0:0:0:0:0:0:0:0|h[name]|h|r @@ -318,17 +319,12 @@ bool SpellChatLink::ValidateName(char* buffer, const char* context) } } - bool res = false; for (uint8 i = 0; i < TOTAL_LOCALES; ++i) if (*_spell->SpellName[i] && strcmp(_spell->SpellName[i], buffer) == 0) - { - res = true; - break; - } + return true; - if (!res) - sLog->outTrace(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): linked spell (id: %u) name wasn't found in any localization", context, _spell->Id); - return res; + sLog->outTrace(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): linked spell (id: %u) name wasn't found in any localization", context, _spell->Id); + return false; } // |color|Hachievement:achievement_id:player_guid:0:0:0:0:0:0:0:0|h[name]|h|r @@ -345,7 +341,7 @@ bool AchievementChatLink::Initialize(std::istringstream& iss) return false; } // Validate achievement - _achievement = sAchievementStore.LookupEntry(achievementId); + _achievement = sAchievementMgr->GetAchievement(achievementId); if (!_achievement) { sLog->outTrace(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): got invalid achivement id %u in |achievement command", iss.str().c_str(), achievementId); @@ -380,17 +376,12 @@ bool AchievementChatLink::ValidateName(char* buffer, const char* context) { ChatLink::ValidateName(buffer, context); - bool res = false; for (uint8 i = 0; i < TOTAL_LOCALES; ++i) if (*_achievement->name[i] && strcmp(_achievement->name[i], buffer) == 0) - { - res = true; - break; - } + return true; - if (!res) - sLog->outTrace(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): linked achievement (id: %u) name wasn't found in any localization", context, _achievement->ID); - return res; + sLog->outTrace(LOG_FILTER_CHATSYS, "ChatHandler::isValidChatMessage('%s'): linked achievement (id: %u) name wasn't found in any localization", context, _achievement->ID); + return false; } // |color|Htrade:spell_id:cur_value:max_value:player_guid:base64_data|h[name]|h|r diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 85d0cb36ca4..b0a466148fb 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -17,6 +17,7 @@ */ #include "ConditionMgr.h" +#include "AchievementMgr.h" #include "GameEventMgr.h" #include "InstanceScript.h" #include "ObjectMgr.h" @@ -1421,6 +1422,7 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) return true; } + bool ConditionMgr::isConditionTypeValid(Condition* cond) { if (cond->ConditionType == CONDITION_NONE || cond->ConditionType >= CONDITION_MAX) @@ -1584,7 +1586,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) } case CONDITION_ACHIEVEMENT: { - AchievementEntry const* achievement = sAchievementStore.LookupEntry(cond->ConditionValue1); + AchievementEntry const* achievement = sAchievementMgr->GetAchievement(cond->ConditionValue1); if (!achievement) { sLog->outError(LOG_FILTER_SQL, "Achivement condition has non existing achivement id (%u), skipped", cond->ConditionValue1); diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index cc23036c534..b544e966084 100644 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -17,6 +17,7 @@ */ #include "DisableMgr.h" +#include "AchievementMgr.h" #include "ObjectMgr.h" #include "OutdoorPvP.h" #include "SpellMgr.h" @@ -173,7 +174,7 @@ void LoadDisables() sLog->outError(LOG_FILTER_SQL, "Disable flags specified for outdoor PvP %u, useless data.", entry); break; case DISABLE_TYPE_ACHIEVEMENT_CRITERIA: - if (!sAchievementCriteriaStore.LookupEntry(entry)) + if (!sAchievementMgr->GetAchievementCriteria(entry)) { sLog->outError(LOG_FILTER_SQL, "Achievement Criteria entry %u from `disables` doesn't exist in dbc, skipped.", entry); continue; diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h index 4fa2e3e748e..fa6b5f0695f 100644 --- a/src/server/game/DataStores/DBCEnums.h +++ b/src/server/game/DataStores/DBCEnums.h @@ -79,12 +79,12 @@ enum AchievementCriteriaCondition { ACHIEVEMENT_CRITERIA_CONDITION_NONE = 0, ACHIEVEMENT_CRITERIA_CONDITION_NO_DEATH = 1, // reset progress on death - ACHIEVEMENT_CRITERIA_CONDITION_UNK1 = 2, // only used in "Complete a daily quest every day for five consecutive days" + ACHIEVEMENT_CRITERIA_CONDITION_UNK2 = 2, // only used in "Complete a daily quest every day for five consecutive days" ACHIEVEMENT_CRITERIA_CONDITION_BG_MAP = 3, // requires you to be on specific map, reset at change ACHIEVEMENT_CRITERIA_CONDITION_NO_LOSE = 4, // only used in "Win 10 arenas without losing" ACHIEVEMENT_CRITERIA_CONDITION_NO_SPELL_HIT = 9, // requires the player not to be hit by specific spell ACHIEVEMENT_CRITERIA_CONDITION_NOT_IN_GROUP = 10, // requires the player not to be in group - ACHIEVEMENT_CRITERIA_CONDITION_UNK3 = 13 // unk + ACHIEVEMENT_CRITERIA_CONDITION_UNK13 = 13 // unk }; enum AchievementCriteriaFlags @@ -140,7 +140,7 @@ enum AchievementCriteriaTypes ACHIEVEMENT_CRITERIA_TYPE_LEARN_SPELL = 34, ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL = 35, ACHIEVEMENT_CRITERIA_TYPE_OWN_ITEM = 36, - ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA = 37, // TODO: the archievements 1162 and 1163 requires a special rating which can't be found in the dbc + ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA = 37, ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_TEAM_RATING = 38, ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_PERSONAL_RATING = 39, ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LEVEL = 40, @@ -213,14 +213,9 @@ enum AchievementCriteriaTypes ACHIEVEMENT_CRITERIA_TYPE_ACCEPTED_SUMMONINGS = 114, ACHIEVEMENT_CRITERIA_TYPE_EARN_ACHIEVEMENT_POINTS = 115, ACHIEVEMENT_CRITERIA_TYPE_USE_LFD_TO_GROUP_WITH_PLAYERS = 119, - // 120 - // 121 - // 122 - // 123 - // 0..123 => 124 criteria types total }; -#define ACHIEVEMENT_CRITERIA_TYPE_TOTAL 124 +#define ACHIEVEMENT_CRITERIA_TYPE_TOTAL 120 enum AchievementCategory { diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index 850c58bdf93..b74c8a4d1f5 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -17,11 +17,9 @@ */ #include "DBCStores.h" - #include "Log.h" #include "SharedDefines.h" #include "SpellMgr.h" - #include "DBCfmt.h" #include diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 0eec334c603..f8aea2d10f3 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -1261,7 +1261,7 @@ void LFGMgr::RemoveProposal(LfgProposalContainer::iterator itProposal, LfgUpdate RestoreState(guid, "Proposal Fail (didn't accepted or in group with someone that didn't accept"); if (gguid != guid) { - RestoreState(it->second.group, "Proposal Fail (someone in group didn't accepted)"); + RestoreState(it->second.group, "Proposal Fail (someone in group didn't accepted)"); SendLfgUpdateParty(guid, updateData); } else @@ -1375,7 +1375,7 @@ void LFGMgr::UpdateBoot(uint64 guid, LfgAnswer answer) return; boot.votes[guid] = answer; - + for (LfgAnswerContainer::const_iterator itVotes = boot.votes.begin(); itVotes != boot.votes.end(); ++itVotes) { if (itVotes->second != LFG_ANSWER_PENDING) diff --git a/src/server/game/Entities/Corpse/Corpse.cpp b/src/server/game/Entities/Corpse/Corpse.cpp index bbee663c955..9f3b416d0f6 100644 --- a/src/server/game/Entities/Corpse/Corpse.cpp +++ b/src/server/game/Entities/Corpse/Corpse.cpp @@ -103,25 +103,26 @@ void Corpse::SaveToDB() SQLTransaction trans = CharacterDatabase.BeginTransaction(); DeleteFromDB(trans); + uint16 index = 0; PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_CORPSE); - stmt->setUInt32(0, GetGUIDLow()); // corpseGuid - stmt->setUInt32(1, GUID_LOPART(GetOwnerGUID())); // guid - stmt->setFloat (2, GetPositionX()); // posX - stmt->setFloat (3, GetPositionY()); // posY - stmt->setFloat (4, GetPositionZ()); // posZ - stmt->setFloat (5, GetOrientation()); // orientation - stmt->setUInt16(6, GetMapId()); // mapId - stmt->setUInt32(7, GetUInt32Value(CORPSE_FIELD_DISPLAY_ID)); // displayId - stmt->setString(8, _ConcatFields(CORPSE_FIELD_ITEM, EQUIPMENT_SLOT_END)); // itemCache - stmt->setUInt32(9, GetUInt32Value(CORPSE_FIELD_BYTES_1)); // bytes1 - stmt->setUInt32(10, GetUInt32Value(CORPSE_FIELD_BYTES_2)); // bytes2 - stmt->setUInt32(11, GetUInt32Value(CORPSE_FIELD_GUILD)); // guildId - stmt->setUInt8 (12, GetUInt32Value(CORPSE_FIELD_FLAGS)); // flags - stmt->setUInt8 (13, GetUInt32Value(CORPSE_FIELD_DYNAMIC_FLAGS)); // dynFlags - stmt->setUInt32(14, uint32(m_time)); // time - stmt->setUInt8 (15, GetType()); // corpseType - stmt->setUInt32(16, GetInstanceId()); // instanceId - stmt->setUInt16(17, GetPhaseMask()); // phaseMask + stmt->setUInt32(index++, GetGUIDLow()); // corpseGuid + stmt->setUInt32(index++, GUID_LOPART(GetOwnerGUID())); // guid + stmt->setFloat (index++, GetPositionX()); // posX + stmt->setFloat (index++, GetPositionY()); // posY + stmt->setFloat (index++, GetPositionZ()); // posZ + stmt->setFloat (index++, GetOrientation()); // orientation + stmt->setUInt16(index++, GetMapId()); // mapId + stmt->setUInt32(index++, GetUInt32Value(CORPSE_FIELD_DISPLAY_ID)); // displayId + stmt->setString(index++, _ConcatFields(CORPSE_FIELD_ITEM, EQUIPMENT_SLOT_END)); // itemCache + stmt->setUInt32(index++, GetUInt32Value(CORPSE_FIELD_BYTES_1)); // bytes1 + stmt->setUInt32(index++, GetUInt32Value(CORPSE_FIELD_BYTES_2)); // bytes2 + stmt->setUInt32(index++, GetUInt32Value(CORPSE_FIELD_GUILD)); // guildId + stmt->setUInt8 (index++, GetUInt32Value(CORPSE_FIELD_FLAGS)); // flags + stmt->setUInt8 (index++, GetUInt32Value(CORPSE_FIELD_DYNAMIC_FLAGS)); // dynFlags + stmt->setUInt32(index++, uint32(m_time)); // time + stmt->setUInt8 (index++, GetType()); // corpseType + stmt->setUInt32(index++, GetInstanceId()); // instanceId + stmt->setUInt16(index++, GetPhaseMask()); // phaseMask trans->Append(stmt); CharacterDatabase.CommitTransaction(trans); @@ -161,9 +162,10 @@ void Corpse::DeleteFromDB(SQLTransaction& trans) bool Corpse::LoadCorpseFromDB(uint32 guid, Field* fields) { - uint32 ownerGuid = fields[17].GetUInt32(); // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 // SELECT posX, posY, posZ, orientation, mapId, displayId, itemCache, bytes1, bytes2, guildId, flags, dynFlags, time, corpseType, instanceId, phaseMask, corpseGuid, guid FROM corpse WHERE corpseType <> 0 + + uint32 ownerGuid = fields[17].GetUInt32(); float posX = fields[0].GetFloat(); float posY = fields[1].GetFloat(); float posZ = fields[2].GetFloat(); diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 228485d001e..f9b682383f1 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -323,7 +323,7 @@ struct VendorItem : item(_item), maxcount(_maxcount), incrtime(_incrtime), ExtendedCost(_ExtendedCost) {} uint32 item; - uint32 maxcount; // 0 for infinity item amount + uint32 maxcount; // 0 for infinity item amount uint32 incrtime; // time for restore items amount if maxcount != 0 uint32 ExtendedCost; @@ -682,8 +682,8 @@ class Creature : public Unit, public GridObject, public MapCreature void SetHomePosition(float x, float y, float z, float o) { m_homePosition.Relocate(x, y, z, o); } void SetHomePosition(const Position &pos) { m_homePosition.Relocate(pos); } - void GetHomePosition(float &x, float &y, float &z, float &ori) { m_homePosition.GetPosition(x, y, z, ori); } - Position GetHomePosition() { return m_homePosition; } + void GetHomePosition(float &x, float &y, float &z, float &ori) const { m_homePosition.GetPosition(x, y, z, ori); } + Position GetHomePosition() const { return m_homePosition; } void SetTransportHomePosition(float x, float y, float z, float o) { m_transportHomePosition.Relocate(x, y, z, o); } void SetTransportHomePosition(const Position &pos) { m_transportHomePosition.Relocate(pos); } diff --git a/src/server/game/Entities/Creature/TemporarySummon.h b/src/server/game/Entities/Creature/TemporarySummon.h index ba7faf60ddf..b60197ff613 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.h +++ b/src/server/game/Entities/Creature/TemporarySummon.h @@ -34,7 +34,7 @@ class TempSummon : public Creature void SetTempSummonType(TempSummonType type); void SaveToDB(uint32 /*mapid*/, uint8 /*spawnMask*/, uint32 /*phaseMask*/) {} Unit* GetSummoner() const; - uint64 GetSummonerGUID() { return m_summonerGUID; } + uint64 GetSummonerGUID() const { return m_summonerGUID; } TempSummonType const& GetSummonType() { return m_type; } uint32 GetTimer() { return m_timer; } diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 99795193b85..e6d264d46cf 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -207,12 +207,12 @@ void PlayerTaxi::AppendTaximaskTo(ByteBuffer& data, bool all) { if (all) { - for (uint8 i=0; iSkin | (createInfo->Face << 8) | (createInfo->HairStyle << 16) | (createInfo->HairColor << 24))); SetUInt32Value(PLAYER_BYTES_2, (createInfo->FacialHair | diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index 8c0bfb8af23..2a17367e7a8 100644 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -78,16 +78,16 @@ bool Player::UpdateStats(Stats stat) UpdateAllCritPercentages(); UpdateDodgePercentage(); break; - case STAT_STAMINA: UpdateMaxHealth(); break; + case STAT_STAMINA: + UpdateMaxHealth(); + break; case STAT_INTELLECT: UpdateMaxPower(POWER_MANA); UpdateAllSpellCritChances(); UpdateArmor(); //SPELL_AURA_MOD_RESISTANCE_OF_INTELLECT_PERCENT, only armor currently break; - case STAT_SPIRIT: break; - default: break; } diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp index 08d8349681b..c81f9af82ca 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.cpp +++ b/src/server/game/Entities/Vehicle/Vehicle.cpp @@ -348,7 +348,7 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId) unit->m_movementInfo.t_pos.m_positionX = veSeat->m_attachmentOffsetX; unit->m_movementInfo.t_pos.m_positionY = veSeat->m_attachmentOffsetY; unit->m_movementInfo.t_pos.m_positionZ = veSeat->m_attachmentOffsetZ; - unit->m_movementInfo.t_pos.m_orientation = 0; + unit->m_movementInfo.t_pos.SetOrientation(0); unit->m_movementInfo.t_time = 0; // 1 for player unit->m_movementInfo.t_seat = seat->first; unit->m_movementInfo.t_guid = _me->GetGUID(); @@ -363,9 +363,9 @@ bool Vehicle::AddPassenger(Unit* unit, int8 seatId) if (_me->IsInWorld()) { - unit->SendClearTarget(); // SMSG_BREAK_TARGET - unit->SetControlled(true, UNIT_STATE_ROOT); // SMSG_FORCE_ROOT - In some cases we send SMSG_SPLINE_MOVE_ROOT here (for creatures) - // also adds MOVEMENTFLAG_ROOT + unit->SendClearTarget(); // SMSG_BREAK_TARGET + unit->SetControlled(true, UNIT_STATE_ROOT); // SMSG_FORCE_ROOT - In some cases we send SMSG_SPLINE_MOVE_ROOT here (for creatures) + // also adds MOVEMENTFLAG_ROOT Movement::MoveSplineInit init(*unit); init.DisableTransportPathTransformations(); init.MoveTo(veSeat->m_attachmentOffsetX, veSeat->m_attachmentOffsetY, veSeat->m_attachmentOffsetZ); diff --git a/src/server/game/Entities/Vehicle/Vehicle.h b/src/server/game/Entities/Vehicle/Vehicle.h index 4ad8663a17a..3f1567c74ee 100644 --- a/src/server/game/Entities/Vehicle/Vehicle.h +++ b/src/server/game/Entities/Vehicle/Vehicle.h @@ -20,9 +20,11 @@ #define __TRINITY_VEHICLE_H #include "ObjectDefines.h" +#include "Object.h" #include "VehicleDefines.h" struct VehicleEntry; + class Unit; typedef std::set GuidSet; @@ -58,6 +60,9 @@ class Vehicle : public TransportBase void TeleportVehicle(float x, float y, float z, float ang); bool IsVehicleInUse() { return Seats.begin() != Seats.end(); } + void SetLastShootPos(Position const& pos) { m_lastShootPos.Relocate(pos); } + Position GetLastShootPos() { return m_lastShootPos; } + SeatMap Seats; VehicleSeatEntry const* GetSeatForPassenger(Unit* passenger); @@ -77,5 +82,7 @@ class Vehicle : public TransportBase GuidSet vehiclePlayers; uint32 _usableSeatNum; // Number of seats that match VehicleSeatEntry::UsableByPlayer, used for proper display flags uint32 _creatureEntry; // Can be different than me->GetBase()->GetEntry() in case of players + + Position m_lastShootPos; }; #endif diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 2116738fac3..256864d6a77 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -795,9 +795,7 @@ void GameEventMgr::LoadFromDB() QueryResult result = WorldDatabase.Query("SELECT eventEntry, guid, item, maxcount, incrtime, ExtendedCost FROM game_event_npc_vendor ORDER BY guid, slot ASC"); if (!result) - { sLog->outInfo(LOG_FILTER_SERVER_LOADING, ">> Loaded 0 vendor additions in game events. DB table `game_event_npc_vendor` is empty."); - } else { uint32 count = 0; @@ -1041,14 +1039,14 @@ uint32 GameEventMgr::Update() // return the next e // changed, save to DB the gameevent state, will be updated in next update cycle SaveWorldEventStateToDB(itr); - //sLog->outDebug("GameEvent %u is active", itr->first); + //sLog->outDebug(LOG_FILTER_GENERAL, "GameEvent %u is active", itr->first); // queue for activation if (!IsActiveEvent(itr)) activate.insert(itr); } else { - //sLog->outDebug("GameEvent %u is not active", itr->first); + //sLog->outDebug(LOG_FILTER_GENERAL, "GameEvent %u is not active", itr->first); if (IsActiveEvent(itr)) deactivate.insert(itr); else @@ -1206,7 +1204,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id) if (!map->Instanceable() && map->IsGridLoaded(data->posX, data->posY)) { Creature* creature = new Creature; - //sLog->outDebug("Spawning creature %u", *itr); + //sLog->outDebug(LOG_FILTER_GENERAL, "Spawning creature %u", *itr); if (!creature->LoadCreatureFromDB(*itr, map)) delete creature; } @@ -1233,7 +1231,7 @@ void GameEventMgr::GameEventSpawn(int16 event_id) if (!map->Instanceable() && map->IsGridLoaded(data->posX, data->posY)) { GameObject* pGameobject = new GameObject; - //sLog->outDebug("Spawning gameobject %u", *itr); + //sLog->outDebug(LOG_FILTER_GENERAL, "Spawning gameobject %u", *itr); //TODO: find out when it is add to map if (!pGameobject->LoadGameObjectFromDB(*itr, map, false)) delete pGameobject; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index ff734efe385..64ce078bfef 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -6016,7 +6016,7 @@ void ObjectMgr::LoadAccessRequirements() if (ar->achievement) { - if (!sAchievementStore.LookupEntry(ar->achievement)) + if (!sAchievementMgr->GetAchievement(ar->achievement)) { sLog->outError(LOG_FILTER_SQL, "Required Achievement %u not exist for map %u difficulty %u, remove quest done requirement.", ar->achievement, mapid, difficulty); ar->achievement = 0; @@ -8551,9 +8551,9 @@ void ObjectMgr::LoadFactionChangeAchievements() uint32 alliance = fields[0].GetUInt32(); uint32 horde = fields[1].GetUInt32(); - if (!sAchievementStore.LookupEntry(alliance)) + if (!sAchievementMgr->GetAchievement(alliance)) sLog->outError(LOG_FILTER_SQL, "Achievement %u referenced in `player_factionchange_achievement` does not exist, pair skipped!", alliance); - else if (!sAchievementStore.LookupEntry(horde)) + else if (!sAchievementMgr->GetAchievement(horde)) sLog->outError(LOG_FILTER_SQL, "Achievement %u referenced in `player_factionchange_achievement` does not exist, pair skipped!", horde); else FactionChange_Achievements[alliance] = horde; diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 1eeb2b3fe7b..13c656a4aa3 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -773,7 +773,7 @@ void Group::Disband(bool hideDestroy /* = false */) /*** LOOT SYSTEM ***/ /*********************************************************/ -void Group::SendLootStartRoll(uint32 CountDown, uint32 mapid, const Roll &r) +void Group::SendLootStartRoll(uint32 countDown, uint32 mapid, const Roll &r) { WorldPacket data(SMSG_LOOT_START_ROLL, (8+4+4+4+4+4+4+1)); data << uint64(r.itemGUID); // guid of rolled item @@ -783,7 +783,7 @@ void Group::SendLootStartRoll(uint32 CountDown, uint32 mapid, const Roll &r) data << uint32(r.itemRandomSuffix); // randomSuffix data << uint32(r.itemRandomPropId); // item random property ID data << uint32(r.itemCount); // items in stack - data << uint32(CountDown); // the countdown time to choose "need" or "greed" + data << uint32(countDown); // the countdown time to choose "need" or "greed" data << uint8(r.rollVoteMask); // roll type mask for (Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr != r.playerVote.end(); ++itr) @@ -917,7 +917,7 @@ void Group::GroupLoot(Loot* loot, WorldObject* pLootedObject) item = sObjectMgr->GetItemTemplate(i->itemid); if (!item) { - //sLog->outDebug("Group::GroupLoot: missing item prototype for item with id: %d", i->itemid); + //sLog->outDebug(LOG_FILTER_GENERAL, "Group::GroupLoot: missing item prototype for item with id: %d", i->itemid); continue; } @@ -1004,7 +1004,7 @@ void Group::GroupLoot(Loot* loot, WorldObject* pLootedObject) item = sObjectMgr->GetItemTemplate(i->itemid); if (!item) { - //sLog->outDebug("Group::GroupLoot: missing item prototype for item with id: %d", i->itemid); + //sLog->outDebug(LOG_FILTER_GENERAL, "Group::GroupLoot: missing item prototype for item with id: %d", i->itemid); continue; } @@ -1201,12 +1201,12 @@ void Group::NeedBeforeGreed(Loot* loot, WorldObject* lootedObject) void Group::MasterLoot(Loot* /*loot*/, WorldObject* pLootedObject) { - sLog->outDebug(LOG_FILTER_NETWORKIO, "Group::MasterLoot (SMSG_LOOT_MASTER_LIST, 330)"); + sLog->outDebug(LOG_FILTER_NETWORKIO, "Group::MasterLoot (SMSG_LOOT_MASTER_LIST)"); uint32 real_count = 0; - WorldPacket data(SMSG_LOOT_MASTER_LIST, 330); - data << (uint8)GetMembersCount(); + WorldPacket data(SMSG_LOOT_MASTER_LIST, 1 + GetMembersCount() * 8); + data << uint8(GetMembersCount()); for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { @@ -1510,7 +1510,7 @@ void Group::SendUpdateToPlayer(uint64 playerGUID, MemberSlot* slot) Player* member = ObjectAccessor::FindPlayer(citr->guid); - uint8 onlineState = (member) ? MEMBER_STATUS_ONLINE : MEMBER_STATUS_OFFLINE; + uint8 onlineState = member ? MEMBER_STATUS_ONLINE : MEMBER_STATUS_OFFLINE; onlineState = onlineState | ((isBGGroup() || isBFGroup()) ? MEMBER_STATUS_PVP : 0); data << citr->name; diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index b20a1bd9dd4..3421e12a9a4 100644 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -267,7 +267,7 @@ class Group void SendUpdateToPlayer(uint64 playerGUID, MemberSlot* slot = NULL); void UpdatePlayerOutOfRange(Player* player); // ignore: GUID of player that will be ignored - void BroadcastPacket(WorldPacket* packet, bool ignorePlayersInBGRaid, int group=-1, uint64 ignore=0); + void BroadcastPacket(WorldPacket* packet, bool ignorePlayersInBGRaid, int group = -1, uint64 ignore = 0); void BroadcastReadyCheck(WorldPacket* packet); void OfflineReadyCheck(); diff --git a/src/server/game/Handlers/ArenaTeamHandler.cpp b/src/server/game/Handlers/ArenaTeamHandler.cpp index b8592fd846e..e3ccee35b47 100644 --- a/src/server/game/Handlers/ArenaTeamHandler.cpp +++ b/src/server/game/Handlers/ArenaTeamHandler.cpp @@ -29,7 +29,7 @@ #include "ArenaTeamMgr.h" #include "Opcodes.h" -void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket & recvData) +void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "MSG_INSPECT_ARENA_TEAMS"); @@ -50,7 +50,7 @@ void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket & recvData) } } -void WorldSession::HandleArenaTeamQueryOpcode(WorldPacket & recvData) +void WorldSession::HandleArenaTeamQueryOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ARENA_TEAM_QUERY"); @@ -64,7 +64,7 @@ void WorldSession::HandleArenaTeamQueryOpcode(WorldPacket & recvData) } } -void WorldSession::HandleArenaTeamRosterOpcode(WorldPacket & recvData) +void WorldSession::HandleArenaTeamRosterOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ARENA_TEAM_ROSTER"); @@ -75,7 +75,7 @@ void WorldSession::HandleArenaTeamRosterOpcode(WorldPacket & recvData) arenaTeam->Roster(this); } -void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket & recvData) +void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_INVITE"); @@ -194,7 +194,7 @@ void WorldSession::HandleArenaTeamDeclineOpcode(WorldPacket & /*recvData*/) _player->SetArenaTeamIdInvited(0); } -void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket & recvData) +void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_LEAVE"); @@ -236,7 +236,7 @@ void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket & recvData) SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, arenaTeam->GetName(), "", 0); } -void WorldSession::HandleArenaTeamDisbandOpcode(WorldPacket & recvData) +void WorldSession::HandleArenaTeamDisbandOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_DISBAND"); @@ -258,7 +258,7 @@ void WorldSession::HandleArenaTeamDisbandOpcode(WorldPacket & recvData) } } -void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket & recvData) +void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_REMOVE"); @@ -304,7 +304,7 @@ void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket & recvData) arenaTeam->BroadcastEvent(ERR_ARENA_TEAM_REMOVE_SSS, 0, 3, name, arenaTeam->GetName(), _player->GetName()); } -void WorldSession::HandleArenaTeamLeaderOpcode(WorldPacket & recvData) +void WorldSession::HandleArenaTeamLeaderOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ARENA_TEAM_LEADER"); diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp index 7e23429be2f..3c38ff8460e 100644 --- a/src/server/game/Handlers/AuctionHouseHandler.cpp +++ b/src/server/game/Handlers/AuctionHouseHandler.cpp @@ -34,7 +34,7 @@ //post-incrementation is always slower than pre-incrementation ! //void called when player click on auctioneer npc -void WorldSession::HandleAuctionHelloOpcode(WorldPacket & recvData) +void WorldSession::HandleAuctionHelloOpcode(WorldPacket& recvData) { uint64 guid; //NPC guid recvData >> guid; @@ -86,7 +86,7 @@ void WorldSession::SendAuctionCommandResult(uint32 auctionId, uint32 Action, uin } //this function sends notification, if bidder is online -void WorldSession::SendAuctionBidderNotification(uint32 location, uint32 auctionId, uint64 bidder, uint32 bidSum, uint32 diff, uint32 item_template) +void WorldSession::SendAuctionBidderNotification(uint32 location, uint32 auctionId, uint64 bidder, uint32 bidSum, uint32 diff, uint32 itemEntry) { WorldPacket data(SMSG_AUCTION_BIDDER_NOTIFICATION, (8*4)); data << uint32(location); @@ -94,7 +94,7 @@ void WorldSession::SendAuctionBidderNotification(uint32 location, uint32 auction data << uint64(bidder); data << uint32(bidSum); data << uint32(diff); - data << uint32(item_template); + data << uint32(itemEntry); data << uint32(0); SendPacket(&data); } @@ -107,14 +107,14 @@ void WorldSession::SendAuctionOwnerNotification(AuctionEntry* auction) data << uint32(auction->bid); data << uint32(0); //unk data << uint64(0); //unk (bidder guid?) - data << uint32(auction->item_template); + data << uint32(auction->itemEntry); data << uint32(0); //unk data << float(0); //unk (time?) SendPacket(&data); } //this void creates new auction and adds auction to some auctionhouse -void WorldSession::HandleAuctionSellItem(WorldPacket & recvData) +void WorldSession::HandleAuctionSellItem(WorldPacket& recvData) { uint64 auctioneer; uint32 itemsCount, etime, bid, buyout; @@ -126,7 +126,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recvData) if (itemsCount > MAX_AUCTION_ITEMS) { - SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR); + SendAuctionCommandResult(0, AUCTION_SELL_ITEM, ERR_AUCTION_DATABASE_ERROR); return; } @@ -185,7 +185,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recvData) if (!item) { - SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_ITEM_NOT_FOUND); + SendAuctionCommandResult(0, AUCTION_SELL_ITEM, ERR_AUCTION_ITEM_NOT_FOUND); return; } @@ -193,7 +193,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recvData) item->GetTemplate()->Flags & ITEM_PROTO_FLAG_CONJURED || item->GetUInt32Value(ITEM_FIELD_DURATION) || item->GetCount() < count[i]) { - SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR); + SendAuctionCommandResult(0, AUCTION_SELL_ITEM, ERR_AUCTION_DATABASE_ERROR); return; } @@ -203,7 +203,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recvData) if (!finalCount) { - SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR); + SendAuctionCommandResult(0, AUCTION_SELL_ITEM, ERR_AUCTION_DATABASE_ERROR); return; } @@ -213,7 +213,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recvData) if (item->GetMaxStackCount() < finalCount) { - SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR); + SendAuctionCommandResult(0, AUCTION_SELL_ITEM, ERR_AUCTION_DATABASE_ERROR); return; } } @@ -228,7 +228,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recvData) uint32 deposit = sAuctionMgr->GetAuctionDeposit(auctionHouseEntry, etime, item, finalCount); if (!_player->HasEnoughMoney(deposit)) { - SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_NOT_ENOUGHT_MONEY); + SendAuctionCommandResult(0, AUCTION_SELL_ITEM, ERR_AUCTION_NOT_ENOUGHT_MONEY); return; } @@ -251,8 +251,8 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recvData) GetPlayerName().c_str(), GetAccountId(), item->GetTemplate()->Name1.c_str(), item->GetEntry(), item->GetCount()); } - AH->item_guidlow = item->GetGUIDLow(); - AH->item_template = item->GetEntry(); + AH->itemGUIDLow = item->GetGUIDLow(); + AH->itemEntry = item->GetEntry(); AH->itemCount = item->GetCount(); AH->owner = _player->GetGUIDLow(); AH->startbid = bid; @@ -276,7 +276,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recvData) _player->SaveInventoryAndGoldToDB(trans); CharacterDatabase.CommitTransaction(trans); - SendAuctionCommandResult(AH->Id, AUCTION_SELL_ITEM, AUCTION_OK); + SendAuctionCommandResult(AH->Id, AUCTION_SELL_ITEM, ERR_AUCTION_OK); GetPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CREATE_AUCTION, 1); return; @@ -287,7 +287,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recvData) if (!newItem) { sLog->outError(LOG_FILTER_NETWORKIO, "CMSG_AUCTION_SELL_ITEM: Could not create clone of item %u", item->GetEntry()); - SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR); + SendAuctionCommandResult(0, AUCTION_SELL_ITEM, ERR_AUCTION_DATABASE_ERROR); return; } @@ -297,8 +297,8 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recvData) GetPlayerName().c_str(), GetAccountId(), newItem->GetTemplate()->Name1.c_str(), newItem->GetEntry(), newItem->GetCount()); } - AH->item_guidlow = newItem->GetGUIDLow(); - AH->item_template = newItem->GetEntry(); + AH->itemGUIDLow = newItem->GetGUIDLow(); + AH->itemEntry = newItem->GetEntry(); AH->itemCount = newItem->GetCount(); AH->owner = _player->GetGUIDLow(); AH->startbid = bid; @@ -346,7 +346,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recvData) _player->SaveInventoryAndGoldToDB(trans); CharacterDatabase.CommitTransaction(trans); - SendAuctionCommandResult(AH->Id, AUCTION_SELL_ITEM, AUCTION_OK); + SendAuctionCommandResult(AH->Id, AUCTION_SELL_ITEM, ERR_AUCTION_OK); GetPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CREATE_AUCTION, 1); return; @@ -355,7 +355,7 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recvData) } //this function is called when client bids or buys out auction -void WorldSession::HandleAuctionPlaceBid(WorldPacket & recvData) +void WorldSession::HandleAuctionPlaceBid(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_PLACE_BID"); @@ -387,7 +387,7 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recvData) if (!auction || auction->owner == player->GetGUIDLow()) { //you cannot bid your own auction: - SendAuctionCommandResult(0, AUCTION_PLACE_BID, CANNOT_BID_YOUR_AUCTION_ERROR); + SendAuctionCommandResult(0, AUCTION_PLACE_BID, ERR_AUCTION_BID_OWN); return; } @@ -396,7 +396,7 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recvData) if (!auction_owner && sObjectMgr->GetPlayerAccountIdByGUID(MAKE_NEW_GUID(auction->owner, 0, HIGHGUID_PLAYER)) == player->GetSession()->GetAccountId()) { //you cannot bid your another character auction: - SendAuctionCommandResult(0, AUCTION_PLACE_BID, CANNOT_BID_YOUR_AUCTION_ERROR); + SendAuctionCommandResult(0, AUCTION_PLACE_BID, ERR_AUCTION_BID_OWN); return; } @@ -447,7 +447,7 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recvData) stmt->setUInt32(2, auction->Id); trans->Append(stmt); - SendAuctionCommandResult(auction->Id, AUCTION_PLACE_BID, AUCTION_OK, 0); + SendAuctionCommandResult(auction->Id, AUCTION_PLACE_BID, ERR_AUCTION_OK, 0); } else { @@ -469,20 +469,20 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recvData) sAuctionMgr->SendAuctionSuccessfulMail(auction, trans); sAuctionMgr->SendAuctionWonMail(auction, trans); - SendAuctionCommandResult(auction->Id, AUCTION_PLACE_BID, AUCTION_OK); + SendAuctionCommandResult(auction->Id, AUCTION_PLACE_BID, ERR_AUCTION_OK); auction->DeleteFromDB(trans); - uint32 item_template = auction->item_template; - sAuctionMgr->RemoveAItem(auction->item_guidlow); - auctionHouse->RemoveAuction(auction, item_template); + uint32 itemEntry = auction->itemEntry; + sAuctionMgr->RemoveAItem(auction->itemGUIDLow); + auctionHouse->RemoveAuction(auction, itemEntry); } player->SaveInventoryAndGoldToDB(trans); CharacterDatabase.CommitTransaction(trans); } //this void is called when auction_owner cancels his auction -void WorldSession::HandleAuctionRemoveItem(WorldPacket & recvData) +void WorldSession::HandleAuctionRemoveItem(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_REMOVE_ITEM"); @@ -511,7 +511,7 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recvData) SQLTransaction trans = CharacterDatabase.BeginTransaction(); if (auction && auction->owner == player->GetGUIDLow()) { - Item* pItem = sAuctionMgr->GetAItem(auction->item_guidlow); + Item* pItem = sAuctionMgr->GetAItem(auction->itemGUIDLow); if (pItem) { if (auction->bidder > 0) // If we have a bidder, we have to send him the money he paid @@ -531,21 +531,21 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recvData) } else { - sLog->outError(LOG_FILTER_NETWORKIO, "Auction id: %u has non-existed item (item guid : %u)!!!", auction->Id, auction->item_guidlow); - SendAuctionCommandResult(0, AUCTION_CANCEL, AUCTION_INTERNAL_ERROR); + sLog->outError(LOG_FILTER_NETWORKIO, "Auction id: %u has non-existed item (item guid : %u)!!!", auction->Id, auction->itemGUIDLow); + SendAuctionCommandResult(0, AUCTION_CANCEL, ERR_AUCTION_DATABASE_ERROR); return; } } else { - SendAuctionCommandResult(0, AUCTION_CANCEL, AUCTION_INTERNAL_ERROR); + SendAuctionCommandResult(0, AUCTION_CANCEL, ERR_AUCTION_DATABASE_ERROR); //this code isn't possible ... maybe there should be assert sLog->outError(LOG_FILTER_NETWORKIO, "CHEATER : %u, he tried to cancel auction (id: %u) of another player, or auction is NULL", player->GetGUIDLow(), auctionId); return; } //inform player, that auction is removed - SendAuctionCommandResult(auction->Id, AUCTION_CANCEL, AUCTION_OK); + SendAuctionCommandResult(auction->Id, AUCTION_CANCEL, ERR_AUCTION_OK); // Now remove the auction @@ -553,13 +553,13 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recvData) auction->DeleteFromDB(trans); CharacterDatabase.CommitTransaction(trans); - uint32 item_template = auction->item_template; - sAuctionMgr->RemoveAItem(auction->item_guidlow); - auctionHouse->RemoveAuction(auction, item_template); + uint32 itemEntry = auction->itemEntry; + sAuctionMgr->RemoveAItem(auction->itemGUIDLow); + auctionHouse->RemoveAuction(auction, itemEntry); } //called when player lists his bids -void WorldSession::HandleAuctionListBidderItems(WorldPacket & recvData) +void WorldSession::HandleAuctionListBidderItems(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_LIST_BIDDER_ITEMS"); @@ -616,7 +616,7 @@ void WorldSession::HandleAuctionListBidderItems(WorldPacket & recvData) } //this void sends player info about his auctions -void WorldSession::HandleAuctionListOwnerItems(WorldPacket & recvData) +void WorldSession::HandleAuctionListOwnerItems(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_LIST_OWNER_ITEMS"); @@ -653,7 +653,7 @@ void WorldSession::HandleAuctionListOwnerItems(WorldPacket & recvData) } //this void is called when player clicks on search button -void WorldSession::HandleAuctionListItems(WorldPacket & recvData) +void WorldSession::HandleAuctionListItems(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_LIST_ITEMS"); @@ -720,7 +720,7 @@ void WorldSession::HandleAuctionListItems(WorldPacket & recvData) SendPacket(&data); } -void WorldSession::HandleAuctionListPendingSales(WorldPacket & recvData) +void WorldSession::HandleAuctionListPendingSales(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_AUCTION_LIST_PENDING_SALES"); diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp index 0a076dfaa34..12f4e6ffa82 100644 --- a/src/server/game/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Handlers/BattleGroundHandler.cpp @@ -35,7 +35,7 @@ #include "DisableMgr.h" #include "Group.h" -void WorldSession::HandleBattlemasterHelloOpcode(WorldPacket & recvData) +void WorldSession::HandleBattlemasterHelloOpcode(WorldPacket& recvData) { uint64 guid; recvData >> guid; @@ -70,7 +70,7 @@ void WorldSession::SendBattleGroundList(uint64 guid, BattlegroundTypeId bgTypeId SendPacket(&data); } -void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket & recvData) +void WorldSession::HandleBattlemasterJoinOpcode(WorldPacket& recvData) { uint64 guid; uint32 bgTypeId_; @@ -581,7 +581,7 @@ void WorldSession::HandleBattlefieldStatusOpcode(WorldPacket & /*recvData*/) } } -void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recvData) +void WorldSession::HandleBattlemasterJoinArena(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_BATTLEMASTER_JOIN_ARENA"); @@ -749,7 +749,7 @@ void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recvData) sBattlegroundMgr->ScheduleQueueUpdate(matchmakerRating, arenatype, bgQueueTypeId, bgTypeId, bracketEntry->GetBracketId()); } -void WorldSession::HandleReportPvPAFK(WorldPacket & recvData) +void WorldSession::HandleReportPvPAFK(WorldPacket& recvData) { uint64 playerGuid; recvData >> playerGuid; diff --git a/src/server/game/Battlefield/BattlefieldHandler.cpp b/src/server/game/Handlers/BattlefieldHandler.cpp similarity index 100% rename from src/server/game/Battlefield/BattlefieldHandler.cpp rename to src/server/game/Handlers/BattlefieldHandler.cpp diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 0b01c796511..51cf1486213 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -252,7 +252,7 @@ void WorldSession::HandleCharEnumOpcode(WorldPacket & /*recvData*/) _charEnumCallback = CharacterDatabase.AsyncQuery(stmt); } -void WorldSession::HandleCharCreateOpcode(WorldPacket & recvData) +void WorldSession::HandleCharCreateOpcode(WorldPacket& recvData) { std::string name; uint8 race_, class_; @@ -673,7 +673,7 @@ void WorldSession::HandleCharCreateCallback(PreparedQueryResult result, Characte } } -void WorldSession::HandleCharDeleteOpcode(WorldPacket & recvData) +void WorldSession::HandleCharDeleteOpcode(WorldPacket& recvData) { uint64 guid; recvData >> guid; @@ -737,7 +737,7 @@ void WorldSession::HandleCharDeleteOpcode(WorldPacket & recvData) SendPacket(&data); } -void WorldSession::HandlePlayerLoginOpcode(WorldPacket & recvData) +void WorldSession::HandlePlayerLoginOpcode(WorldPacket& recvData) { if (PlayerLoading() || GetPlayer() != NULL) { @@ -1006,7 +1006,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder) delete holder; } -void WorldSession::HandleSetFactionAtWar(WorldPacket & recvData) +void WorldSession::HandleSetFactionAtWar(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_SET_FACTION_ATWAR"); @@ -1026,7 +1026,7 @@ void WorldSession::HandleSetFactionCheat(WorldPacket & /*recvData*/) GetPlayer()->GetReputationMgr().SendStates(); } -void WorldSession::HandleTutorialFlag(WorldPacket & recvData) +void WorldSession::HandleTutorialFlag(WorldPacket& recvData) { uint32 data; recvData >> data; @@ -1054,7 +1054,7 @@ void WorldSession::HandleTutorialReset(WorldPacket & /*recvData*/) SetTutorialInt(i, 0x00000000); } -void WorldSession::HandleSetWatchedFactionOpcode(WorldPacket & recvData) +void WorldSession::HandleSetWatchedFactionOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_SET_WATCHED_FACTION"); uint32 fact; @@ -1062,7 +1062,7 @@ void WorldSession::HandleSetWatchedFactionOpcode(WorldPacket & recvData) GetPlayer()->SetUInt32Value(PLAYER_FIELD_WATCHED_FACTION_INDEX, fact); } -void WorldSession::HandleSetFactionInactiveOpcode(WorldPacket & recvData) +void WorldSession::HandleSetFactionInactiveOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_SET_FACTION_INACTIVE"); uint32 replistid; @@ -1279,7 +1279,7 @@ void WorldSession::HandleSetPlayerDeclinedNames(WorldPacket& recvData) SendPacket(&data); } -void WorldSession::HandleAlterAppearance(WorldPacket & recvData) +void WorldSession::HandleAlterAppearance(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_ALTER_APPEARANCE"); @@ -1351,7 +1351,7 @@ void WorldSession::HandleAlterAppearance(WorldPacket & recvData) _player->SetStandState(0); // stand up } -void WorldSession::HandleRemoveGlyph(WorldPacket & recvData) +void WorldSession::HandleRemoveGlyph(WorldPacket& recvData) { uint32 slot; recvData >> slot; diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index 8555b4a6a1f..5b517e1d726 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -57,7 +57,7 @@ void WorldSession::SendPartyResult(PartyOperation operation, const std::string& SendPacket(&data); } -void WorldSession::HandleGroupInviteOpcode(WorldPacket & recvData) +void WorldSession::HandleGroupInviteOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_INVITE"); @@ -271,7 +271,7 @@ void WorldSession::HandleGroupDeclineOpcode(WorldPacket & /*recvData*/) leader->GetSession()->SendPacket(&data); } -void WorldSession::HandleGroupUninviteGuidOpcode(WorldPacket & recvData) +void WorldSession::HandleGroupUninviteGuidOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_UNINVITE_GUID"); @@ -320,7 +320,7 @@ void WorldSession::HandleGroupUninviteGuidOpcode(WorldPacket & recvData) SendPartyResult(PARTY_OP_UNINVITE, "", ERR_TARGET_NOT_IN_GROUP_S); } -void WorldSession::HandleGroupUninviteOpcode(WorldPacket & recvData) +void WorldSession::HandleGroupUninviteOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_UNINVITE"); @@ -365,7 +365,7 @@ void WorldSession::HandleGroupUninviteOpcode(WorldPacket & recvData) SendPartyResult(PARTY_OP_UNINVITE, membername, ERR_TARGET_NOT_IN_GROUP_S); } -void WorldSession::HandleGroupSetLeaderOpcode(WorldPacket & recvData) +void WorldSession::HandleGroupSetLeaderOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_SET_LEADER"); @@ -409,7 +409,7 @@ void WorldSession::HandleGroupDisbandOpcode(WorldPacket & /*recvData*/) GetPlayer()->RemoveFromGroup(GROUP_REMOVEMETHOD_LEAVE); } -void WorldSession::HandleLootMethodOpcode(WorldPacket & recvData) +void WorldSession::HandleLootMethodOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_LOOT_METHOD"); @@ -513,7 +513,7 @@ void WorldSession::HandleRandomRollOpcode(WorldPacket& recvData) SendPacket(&data); } -void WorldSession::HandleRaidTargetUpdateOpcode(WorldPacket & recvData) +void WorldSession::HandleRaidTargetUpdateOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_RAID_TARGET_UPDATE"); @@ -564,7 +564,7 @@ void WorldSession::HandleGroupRaidConvertOpcode(WorldPacket & /*recvData*/) group->ConvertToRaid(); } -void WorldSession::HandleGroupChangeSubGroupOpcode(WorldPacket & recvData) +void WorldSession::HandleGroupChangeSubGroupOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_CHANGE_SUB_GROUP"); @@ -603,7 +603,7 @@ void WorldSession::HandleGroupChangeSubGroupOpcode(WorldPacket & recvData) group->ChangeMembersGroup(guid, groupNr); } -void WorldSession::HandleGroupAssistantLeaderOpcode(WorldPacket & recvData) +void WorldSession::HandleGroupAssistantLeaderOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GROUP_ASSISTANT_LEADER"); @@ -624,7 +624,7 @@ void WorldSession::HandleGroupAssistantLeaderOpcode(WorldPacket & recvData) group->SendUpdate(); } -void WorldSession::HandlePartyAssignmentOpcode(WorldPacket & recvData) +void WorldSession::HandlePartyAssignmentOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_PARTY_ASSIGNMENT"); @@ -658,7 +658,7 @@ void WorldSession::HandlePartyAssignmentOpcode(WorldPacket & recvData) group->SendUpdate(); } -void WorldSession::HandleRaidReadyCheckOpcode(WorldPacket & recvData) +void WorldSession::HandleRaidReadyCheckOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received MSG_RAID_READY_CHECK"); @@ -969,12 +969,12 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket &recvData) _player->SendRaidInfo(); } -/*void WorldSession::HandleGroupCancelOpcode(WorldPacket & recvData) +/*void WorldSession::HandleGroupCancelOpcode(WorldPacket& recvData) { sLog->outDebug("WORLD: got CMSG_GROUP_CANCEL."); }*/ -void WorldSession::HandleOptOutOfLootOpcode(WorldPacket & recvData) +void WorldSession::HandleOptOutOfLootOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_OPT_OUT_OF_LOOT"); diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index 6dc7dc427d3..17d1e31c399 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -28,7 +28,7 @@ #include "ObjectAccessor.h" #include "SpellInfo.h" -void WorldSession::HandleSplitItemOpcode(WorldPacket & recvData) +void WorldSession::HandleSplitItemOpcode(WorldPacket& recvData) { //sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_SPLIT_ITEM"); uint8 srcbag, srcslot, dstbag, dstslot; @@ -61,7 +61,7 @@ void WorldSession::HandleSplitItemOpcode(WorldPacket & recvData) _player->SplitItem(src, dst, count); } -void WorldSession::HandleSwapInvItemOpcode(WorldPacket & recvData) +void WorldSession::HandleSwapInvItemOpcode(WorldPacket& recvData) { //sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_SWAP_INV_ITEM"); uint8 srcslot, dstslot; @@ -91,7 +91,7 @@ void WorldSession::HandleSwapInvItemOpcode(WorldPacket & recvData) _player->SwapItem(src, dst); } -void WorldSession::HandleAutoEquipItemSlotOpcode(WorldPacket & recvData) +void WorldSession::HandleAutoEquipItemSlotOpcode(WorldPacket& recvData) { uint64 itemguid; uint8 dstslot; @@ -110,7 +110,7 @@ void WorldSession::HandleAutoEquipItemSlotOpcode(WorldPacket & recvData) _player->SwapItem(item->GetPos(), dstpos); } -void WorldSession::HandleSwapItem(WorldPacket & recvData) +void WorldSession::HandleSwapItem(WorldPacket& recvData) { //sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_SWAP_ITEM"); uint8 dstbag, dstslot, srcbag, srcslot; @@ -140,7 +140,7 @@ void WorldSession::HandleSwapItem(WorldPacket & recvData) _player->SwapItem(src, dst); } -void WorldSession::HandleAutoEquipItemOpcode(WorldPacket & recvData) +void WorldSession::HandleAutoEquipItemOpcode(WorldPacket& recvData) { //sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_AUTOEQUIP_ITEM"); uint8 srcbag, srcslot; @@ -234,7 +234,7 @@ void WorldSession::HandleAutoEquipItemOpcode(WorldPacket & recvData) } } -void WorldSession::HandleDestroyItemOpcode(WorldPacket & recvData) +void WorldSession::HandleDestroyItemOpcode(WorldPacket& recvData) { //sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_DESTROYITEM"); uint8 bag, slot, count, data1, data2, data3; @@ -278,7 +278,7 @@ void WorldSession::HandleDestroyItemOpcode(WorldPacket & recvData) } // Only _static_ data send in this packet !!! -void WorldSession::HandleItemQuerySingleOpcode(WorldPacket & recvData) +void WorldSession::HandleItemQuerySingleOpcode(WorldPacket& recvData) { //sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_ITEM_QUERY_SINGLE"); uint32 item; @@ -437,7 +437,7 @@ void WorldSession::HandleItemQuerySingleOpcode(WorldPacket & recvData) } } -void WorldSession::HandleReadItem(WorldPacket & recvData) +void WorldSession::HandleReadItem(WorldPacket& recvData) { //sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_READ_ITEM"); @@ -470,7 +470,7 @@ void WorldSession::HandleReadItem(WorldPacket & recvData) _player->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL); } -void WorldSession::HandlePageQuerySkippedOpcode(WorldPacket & recvData) +void WorldSession::HandlePageQuerySkippedOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_PAGE_TEXT_QUERY"); @@ -483,7 +483,7 @@ void WorldSession::HandlePageQuerySkippedOpcode(WorldPacket & recvData) itemid, GUID_LOPART(guid), GUID_ENPART(guid), GUID_HIPART(guid)); } -void WorldSession::HandleSellItemOpcode(WorldPacket & recvData) +void WorldSession::HandleSellItemOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_SELL_ITEM"); uint64 vendorguid, itemguid; @@ -597,7 +597,7 @@ void WorldSession::HandleSellItemOpcode(WorldPacket & recvData) return; } -void WorldSession::HandleBuybackItem(WorldPacket & recvData) +void WorldSession::HandleBuybackItem(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BUYBACK_ITEM"); uint64 vendorguid; @@ -645,7 +645,7 @@ void WorldSession::HandleBuybackItem(WorldPacket & recvData) _player->SendBuyError(BUY_ERR_CANT_FIND_ITEM, creature, 0, 0); } -void WorldSession::HandleBuyItemInSlotOpcode(WorldPacket & recvData) +void WorldSession::HandleBuyItemInSlotOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BUY_ITEM_IN_SLOT"); uint64 vendorguid, bagguid; @@ -687,7 +687,7 @@ void WorldSession::HandleBuyItemInSlotOpcode(WorldPacket & recvData) GetPlayer()->BuyItemFromVendorSlot(vendorguid, slot, item, count, bag, bagslot); } -void WorldSession::HandleBuyItemOpcode(WorldPacket & recvData) +void WorldSession::HandleBuyItemOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_BUY_ITEM"); uint64 vendorguid; @@ -705,7 +705,7 @@ void WorldSession::HandleBuyItemOpcode(WorldPacket & recvData) GetPlayer()->BuyItemFromVendorSlot(vendorguid, slot, item, count, NULL_BAG, NULL_SLOT); } -void WorldSession::HandleListInventoryOpcode(WorldPacket & recvData) +void WorldSession::HandleListInventoryOpcode(WorldPacket& recvData) { uint64 guid; @@ -807,7 +807,7 @@ void WorldSession::SendListInventory(uint64 vendorGuid) SendPacket(&data); } -void WorldSession::HandleAutoStoreBagItemOpcode(WorldPacket & recvData) +void WorldSession::HandleAutoStoreBagItemOpcode(WorldPacket& recvData) { //sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_AUTOSTORE_BAG_ITEM"); uint8 srcbag, srcslot, dstbag; @@ -983,7 +983,7 @@ void WorldSession::HandleAutoStoreBankItemOpcode(WorldPacket& recvPacket) } } -void WorldSession::HandleSetAmmoOpcode(WorldPacket & recvData) +void WorldSession::HandleSetAmmoOpcode(WorldPacket& recvData) { if (!GetPlayer()->isAlive()) { @@ -1024,7 +1024,7 @@ void WorldSession::SendItemEnchantTimeUpdate(uint64 Playerguid, uint64 Itemguid, SendPacket(&data); } -void WorldSession::HandleItemNameQueryOpcode(WorldPacket & recvData) +void WorldSession::HandleItemNameQueryOpcode(WorldPacket& recvData) { uint32 itemid; recvData >> itemid; @@ -1415,7 +1415,7 @@ void WorldSession::HandleItemRefund(WorldPacket &recvData) * * This function is called when player clicks on item which has some flag set */ -void WorldSession::HandleItemTextQuery(WorldPacket & recvData ) +void WorldSession::HandleItemTextQuery(WorldPacket& recvData ) { uint64 itemGuid; recvData >> itemGuid; diff --git a/src/server/game/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp index 1c9719a210f..752eace536b 100644 --- a/src/server/game/Handlers/LootHandler.cpp +++ b/src/server/game/Handlers/LootHandler.cpp @@ -31,7 +31,7 @@ #include "WorldPacket.h" #include "WorldSession.h" -void WorldSession::HandleAutostoreLootItemOpcode(WorldPacket & recvData) +void WorldSession::HandleAutostoreLootItemOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_AUTOSTORE_LOOT_ITEM"); Player* player = GetPlayer(); @@ -203,7 +203,7 @@ void WorldSession::HandleLootMoneyOpcode(WorldPacket & /*recvData*/) } } -void WorldSession::HandleLootOpcode(WorldPacket & recvData) +void WorldSession::HandleLootOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_LOOT"); @@ -429,7 +429,7 @@ void WorldSession::DoLootRelease(uint64 lguid) loot->RemoveLooter(player->GetGUID()); } -void WorldSession::HandleLootMasterGiveOpcode(WorldPacket & recvData) +void WorldSession::HandleLootMasterGiveOpcode(WorldPacket& recvData) { uint8 slotid; uint64 lootguid, target_playerguid; diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp index cb3a6d920b8..3fd3eb05032 100644 --- a/src/server/game/Handlers/MailHandler.cpp +++ b/src/server/game/Handlers/MailHandler.cpp @@ -29,7 +29,7 @@ #include "Item.h" #include "AccountMgr.h" -void WorldSession::HandleSendMail(WorldPacket & recvData) +void WorldSession::HandleSendMail(WorldPacket& recvData) { uint64 mailbox, unk3; std::string receiver, subject, body; @@ -302,7 +302,7 @@ void WorldSession::HandleSendMail(WorldPacket & recvData) } //called when mail is read -void WorldSession::HandleMailMarkAsRead(WorldPacket & recvData) +void WorldSession::HandleMailMarkAsRead(WorldPacket& recvData) { uint64 mailbox; uint32 mailId; @@ -325,7 +325,7 @@ void WorldSession::HandleMailMarkAsRead(WorldPacket & recvData) } //called when client deletes mail -void WorldSession::HandleMailDelete(WorldPacket & recvData) +void WorldSession::HandleMailDelete(WorldPacket& recvData) { uint64 mailbox; uint32 mailId; @@ -353,7 +353,7 @@ void WorldSession::HandleMailDelete(WorldPacket & recvData) player->SendMailResult(mailId, MAIL_DELETED, MAIL_OK); } -void WorldSession::HandleMailReturnToSender(WorldPacket & recvData) +void WorldSession::HandleMailReturnToSender(WorldPacket& recvData) { uint64 mailbox; uint32 mailId; @@ -417,7 +417,7 @@ void WorldSession::HandleMailReturnToSender(WorldPacket & recvData) } //called when player takes item attached in mail -void WorldSession::HandleMailTakeItem(WorldPacket & recvData) +void WorldSession::HandleMailTakeItem(WorldPacket& recvData) { uint64 mailbox; uint32 mailId; @@ -513,7 +513,7 @@ void WorldSession::HandleMailTakeItem(WorldPacket & recvData) player->SendMailResult(mailId, MAIL_ITEM_TAKEN, MAIL_ERR_EQUIP_ERROR, msg); } -void WorldSession::HandleMailTakeMoney(WorldPacket & recvData) +void WorldSession::HandleMailTakeMoney(WorldPacket& recvData) { uint64 mailbox; uint32 mailId; @@ -547,7 +547,7 @@ void WorldSession::HandleMailTakeMoney(WorldPacket & recvData) } //called when player lists his received mails -void WorldSession::HandleGetMailList(WorldPacket & recvData) +void WorldSession::HandleGetMailList(WorldPacket& recvData) { uint64 mailbox; recvData >> mailbox; @@ -667,7 +667,7 @@ void WorldSession::HandleGetMailList(WorldPacket & recvData) } //used when player copies mail body to his inventory -void WorldSession::HandleMailCreateTextItem(WorldPacket & recvData) +void WorldSession::HandleMailCreateTextItem(WorldPacket& recvData) { uint64 mailbox; uint32 mailId; diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index be31603a0ff..8c5594abab0 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -239,7 +239,7 @@ void WorldSession::HandleMoveTeleportAck(WorldPacket& recvData) GetPlayer()->ProcessDelayedOperations(); } -void WorldSession::HandleMovementOpcodes(WorldPacket & recvData) +void WorldSession::HandleMovementOpcodes(WorldPacket& recvData) { uint16 opcode = recvData.GetOpcode(); @@ -523,7 +523,7 @@ void WorldSession::HandleMountSpecialAnimOpcode(WorldPacket& /*recvData*/) GetPlayer()->SendMessageToSet(&data, false); } -void WorldSession::HandleMoveKnockBackAck(WorldPacket & recvData) +void WorldSession::HandleMoveKnockBackAck(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_MOVE_KNOCK_BACK_ACK"); diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp index ef0f8e130b6..f3b26452435 100644 --- a/src/server/game/Handlers/NPCHandler.cpp +++ b/src/server/game/Handlers/NPCHandler.cpp @@ -48,7 +48,7 @@ enum StableResultCode STABLE_ERR_EXOTIC = 0x0C // "you are unable to control exotic creatures" }; -void WorldSession::HandleTabardVendorActivateOpcode(WorldPacket & recvData) +void WorldSession::HandleTabardVendorActivateOpcode(WorldPacket& recvData) { uint64 guid; recvData >> guid; @@ -74,7 +74,7 @@ void WorldSession::SendTabardVendorActivate(uint64 guid) SendPacket(&data); } -void WorldSession::HandleBankerActivateOpcode(WorldPacket & recvData) +void WorldSession::HandleBankerActivateOpcode(WorldPacket& recvData) { uint64 guid; @@ -103,7 +103,7 @@ void WorldSession::SendShowBank(uint64 guid) SendPacket(&data); } -void WorldSession::HandleTrainerListOpcode(WorldPacket & recvData) +void WorldSession::HandleTrainerListOpcode(WorldPacket& recvData) { uint64 guid; @@ -235,7 +235,7 @@ void WorldSession::SendTrainerList(uint64 guid, const std::string& strTitle) SendPacket(&data); } -void WorldSession::HandleTrainerBuySpellOpcode(WorldPacket & recvData) +void WorldSession::HandleTrainerBuySpellOpcode(WorldPacket& recvData) { uint64 guid; uint32 spellId = 0; @@ -295,7 +295,7 @@ void WorldSession::HandleTrainerBuySpellOpcode(WorldPacket & recvData) SendPacket(&data); } -void WorldSession::HandleGossipHelloOpcode(WorldPacket & recvData) +void WorldSession::HandleGossipHelloOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GOSSIP_HELLO"); @@ -344,7 +344,7 @@ void WorldSession::HandleGossipHelloOpcode(WorldPacket & recvData) unit->AI()->sGossipHello(_player); } -/*void WorldSession::HandleGossipSelectOptionOpcode(WorldPacket & recvData) +/*void WorldSession::HandleGossipSelectOptionOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_PACKETIO, "WORLD: CMSG_GOSSIP_SELECT_OPTION"); @@ -385,7 +385,7 @@ void WorldSession::HandleGossipHelloOpcode(WorldPacket & recvData) } }*/ -void WorldSession::HandleSpiritHealerActivateOpcode(WorldPacket & recvData) +void WorldSession::HandleSpiritHealerActivateOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_SPIRIT_HEALER_ACTIVATE"); @@ -440,7 +440,7 @@ void WorldSession::SendSpiritResurrect() _player->UpdateObjectVisibility(); } -void WorldSession::HandleBinderActivateOpcode(WorldPacket & recvData) +void WorldSession::HandleBinderActivateOpcode(WorldPacket& recvData) { uint64 npcGUID; recvData >> npcGUID; @@ -497,7 +497,7 @@ void WorldSession::SendBindPoint(Creature* npc) _player->PlayerTalkClass->SendCloseGossip(); } -void WorldSession::HandleListStabledPetsOpcode(WorldPacket & recvData) +void WorldSession::HandleListStabledPetsOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv MSG_LIST_STABLED_PETS"); uint64 npcGUID; @@ -590,7 +590,7 @@ void WorldSession::SendStableResult(uint8 res) SendPacket(&data); } -void WorldSession::HandleStablePet(WorldPacket & recvData) +void WorldSession::HandleStablePet(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv CMSG_STABLE_PET"); uint64 npcGUID; @@ -665,7 +665,7 @@ void WorldSession::HandleStablePetCallback(PreparedQueryResult result) SendStableResult(STABLE_ERR_STABLE); } -void WorldSession::HandleUnstablePet(WorldPacket & recvData) +void WorldSession::HandleUnstablePet(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv CMSG_UNSTABLE_PET."); uint64 npcGUID; @@ -746,7 +746,7 @@ void WorldSession::HandleUnstablePetCallback(PreparedQueryResult result, uint32 SendStableResult(STABLE_SUCCESS_UNSTABLE); } -void WorldSession::HandleBuyStableSlot(WorldPacket & recvData) +void WorldSession::HandleBuyStableSlot(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv CMSG_BUY_STABLE_SLOT."); uint64 npcGUID; @@ -784,7 +784,7 @@ void WorldSession::HandleStableRevivePet(WorldPacket &/* recvData */) sLog->outDebug(LOG_FILTER_NETWORKIO, "HandleStableRevivePet: Not implemented"); } -void WorldSession::HandleStableSwapPet(WorldPacket & recvData) +void WorldSession::HandleStableSwapPet(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv CMSG_STABLE_SWAP_PET."); uint64 npcGUID; @@ -876,7 +876,7 @@ void WorldSession::HandleStableSwapPetCallback(PreparedQueryResult result, uint3 SendStableResult(STABLE_SUCCESS_UNSTABLE); } -void WorldSession::HandleRepairItemOpcode(WorldPacket & recvData) +void WorldSession::HandleRepairItemOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_REPAIR_ITEM"); diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index daba55e5aa8..36dacaead69 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -56,7 +56,7 @@ void WorldSession::HandleDismissCritter(WorldPacket& recvData) } } -void WorldSession::HandlePetAction(WorldPacket & recvData) +void WorldSession::HandlePetAction(WorldPacket& recvData) { uint64 guid1; uint32 data; @@ -403,7 +403,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint32 spellid } } -void WorldSession::HandlePetNameQuery(WorldPacket & recvData) +void WorldSession::HandlePetNameQuery(WorldPacket& recvData) { sLog->outInfo(LOG_FILTER_NETWORKIO, "HandlePetNameQuery. CMSG_PET_NAME_QUERY"); @@ -470,7 +470,7 @@ bool WorldSession::CheckStableMaster(uint64 guid) return true; } -void WorldSession::HandlePetSetAction(WorldPacket & recvData) +void WorldSession::HandlePetSetAction(WorldPacket& recvData) { sLog->outInfo(LOG_FILTER_NETWORKIO, "HandlePetSetAction. CMSG_PET_SET_ACTION"); @@ -587,7 +587,7 @@ void WorldSession::HandlePetSetAction(WorldPacket & recvData) } } -void WorldSession::HandlePetRename(WorldPacket & recvData) +void WorldSession::HandlePetRename(WorldPacket& recvData) { sLog->outInfo(LOG_FILTER_NETWORKIO, "HandlePetRename. CMSG_PET_RENAME"); @@ -672,7 +672,7 @@ void WorldSession::HandlePetRename(WorldPacket & recvData) pet->SetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP, uint32(time(NULL))); // cast can't be helped } -void WorldSession::HandlePetAbandon(WorldPacket & recvData) +void WorldSession::HandlePetAbandon(WorldPacket& recvData) { uint64 guid; recvData >> guid; //pet guid @@ -868,7 +868,7 @@ void WorldSession::HandlePetLearnTalent(WorldPacket& recvData) _player->SendTalentsInfoData(true); } -void WorldSession::HandleLearnPreviewTalentsPet(WorldPacket & recvData) +void WorldSession::HandleLearnPreviewTalentsPet(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_LEARN_PREVIEW_TALENTS_PET"); diff --git a/src/server/game/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp index 0da9c762ca9..1704229674e 100644 --- a/src/server/game/Handlers/PetitionsHandler.cpp +++ b/src/server/game/Handlers/PetitionsHandler.cpp @@ -50,7 +50,7 @@ enum CharterCosts ARENA_TEAM_CHARTER_5v5_COST = 2000000 }; -void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recvData) +void WorldSession::HandlePetitionBuyOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_PETITION_BUY"); @@ -305,7 +305,7 @@ void WorldSession::HandlePetitionShowSignOpcode(WorldPacket& recvData) SendPacket(&data); } -void WorldSession::HandlePetitionQueryOpcode(WorldPacket & recvData) +void WorldSession::HandlePetitionQueryOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_PETITION_QUERY"); // ok @@ -380,7 +380,7 @@ void WorldSession::SendPetitionQueryOpcode(uint64 petitionguid) SendPacket(&data); } -void WorldSession::HandlePetitionRenameOpcode(WorldPacket & recvData) +void WorldSession::HandlePetitionRenameOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode MSG_PETITION_RENAME"); // ok @@ -453,7 +453,7 @@ void WorldSession::HandlePetitionRenameOpcode(WorldPacket & recvData) SendPacket(&data); } -void WorldSession::HandlePetitionSignOpcode(WorldPacket & recvData) +void WorldSession::HandlePetitionSignOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_PETITION_SIGN"); // ok @@ -590,7 +590,7 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket & recvData) owner->GetSession()->SendPacket(&data); } -void WorldSession::HandlePetitionDeclineOpcode(WorldPacket & recvData) +void WorldSession::HandlePetitionDeclineOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode MSG_PETITION_DECLINE"); // ok @@ -620,7 +620,7 @@ void WorldSession::HandlePetitionDeclineOpcode(WorldPacket & recvData) } } -void WorldSession::HandleOfferPetitionOpcode(WorldPacket & recvData) +void WorldSession::HandleOfferPetitionOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_OFFER_PETITION"); // ok @@ -729,7 +729,7 @@ void WorldSession::HandleOfferPetitionOpcode(WorldPacket & recvData) player->GetSession()->SendPacket(&data); } -void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recvData) +void WorldSession::HandleTurnInPetitionOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_TURN_IN_PETITION"); @@ -919,7 +919,7 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recvData) SendPacket(&data); } -void WorldSession::HandlePetitionShowListOpcode(WorldPacket & recvData) +void WorldSession::HandlePetitionShowListOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Received CMSG_PETITION_SHOWLIST"); diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp index 534f992b594..e44fbd0d899 100644 --- a/src/server/game/Handlers/QueryHandler.cpp +++ b/src/server/game/Handlers/QueryHandler.cpp @@ -89,7 +89,7 @@ void WorldSession::SendQueryTimeResponse() } /// Only _static_ data is sent in this packet !!! -void WorldSession::HandleCreatureQueryOpcode(WorldPacket & recvData) +void WorldSession::HandleCreatureQueryOpcode(WorldPacket& recvData) { uint32 entry; recvData >> entry; @@ -152,7 +152,7 @@ void WorldSession::HandleCreatureQueryOpcode(WorldPacket & recvData) } /// Only _static_ data is sent in this packet !!! -void WorldSession::HandleGameObjectQueryOpcode(WorldPacket & recvData) +void WorldSession::HandleGameObjectQueryOpcode(WorldPacket& recvData) { uint32 entry; recvData >> entry; @@ -258,7 +258,7 @@ void WorldSession::HandleCorpseQueryOpcode(WorldPacket & /*recvData*/) SendPacket(&data); } -void WorldSession::HandleNpcTextQueryOpcode(WorldPacket & recvData) +void WorldSession::HandleNpcTextQueryOpcode(WorldPacket& recvData) { uint32 textID; uint64 guid; @@ -342,7 +342,7 @@ void WorldSession::HandleNpcTextQueryOpcode(WorldPacket & recvData) } /// Only _static_ data is sent in this packet !!! -void WorldSession::HandlePageTextQueryOpcode(WorldPacket & recvData) +void WorldSession::HandlePageTextQueryOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_PAGE_TEXT_QUERY"); @@ -382,7 +382,7 @@ void WorldSession::HandlePageTextQueryOpcode(WorldPacket & recvData) } } -void WorldSession::HandleCorpseMapPositionQuery(WorldPacket & recvData) +void WorldSession::HandleCorpseMapPositionQuery(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Recv CMSG_CORPSE_MAP_POSITION_QUERY"); diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index 4196bc26b91..8defb3b8761 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -33,7 +33,7 @@ #include "ScriptMgr.h" #include "GameObjectAI.h" -void WorldSession::HandleQuestgiverStatusQueryOpcode(WorldPacket & recvData) +void WorldSession::HandleQuestgiverStatusQueryOpcode(WorldPacket& recvData) { uint64 guid; recvData >> guid; @@ -79,7 +79,7 @@ void WorldSession::HandleQuestgiverStatusQueryOpcode(WorldPacket & recvData) _player->PlayerTalkClass->SendQuestGiverStatus(questStatus, guid); } -void WorldSession::HandleQuestgiverHelloOpcode(WorldPacket & recvData) +void WorldSession::HandleQuestgiverHelloOpcode(WorldPacket& recvData) { uint64 guid; recvData >> guid; @@ -109,7 +109,7 @@ void WorldSession::HandleQuestgiverHelloOpcode(WorldPacket & recvData) creature->AI()->sGossipHello(_player); } -void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket & recvData) +void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket& recvData) { uint64 guid; uint32 questId; @@ -230,7 +230,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket & recvData) _player->PlayerTalkClass->SendCloseGossip(); } -void WorldSession::HandleQuestgiverQueryQuestOpcode(WorldPacket & recvData) +void WorldSession::HandleQuestgiverQueryQuestOpcode(WorldPacket& recvData) { uint64 guid; uint32 questId; @@ -268,7 +268,7 @@ void WorldSession::HandleQuestgiverQueryQuestOpcode(WorldPacket & recvData) } } -void WorldSession::HandleQuestQueryOpcode(WorldPacket & recvData) +void WorldSession::HandleQuestQueryOpcode(WorldPacket& recvData) { if (!_player) return; @@ -281,7 +281,7 @@ void WorldSession::HandleQuestQueryOpcode(WorldPacket & recvData) _player->PlayerTalkClass->SendQuestQueryResponse(quest); } -void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket & recvData) +void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket& recvData) { uint32 questId, reward; uint64 guid; @@ -365,7 +365,7 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket & recvData) } } -void WorldSession::HandleQuestgiverRequestRewardOpcode(WorldPacket & recvData) +void WorldSession::HandleQuestgiverRequestRewardOpcode(WorldPacket& recvData) { uint32 questId; uint64 guid; diff --git a/src/server/game/Handlers/SkillHandler.cpp b/src/server/game/Handlers/SkillHandler.cpp index ec389142182..f5f48b2a45b 100644 --- a/src/server/game/Handlers/SkillHandler.cpp +++ b/src/server/game/Handlers/SkillHandler.cpp @@ -27,7 +27,7 @@ #include "WorldPacket.h" #include "WorldSession.h" -void WorldSession::HandleLearnTalentOpcode(WorldPacket & recvData) +void WorldSession::HandleLearnTalentOpcode(WorldPacket& recvData) { uint32 talent_id, requested_rank; recvData >> talent_id >> requested_rank; @@ -55,7 +55,7 @@ void WorldSession::HandleLearnPreviewTalents(WorldPacket& recvPacket) _player->SendTalentsInfoData(false); } -void WorldSession::HandleTalentWipeConfirmOpcode(WorldPacket & recvData) +void WorldSession::HandleTalentWipeConfirmOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "MSG_TALENT_WIPE_CONFIRM"); uint64 guid; diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp index a32f4eea370..7002a55e2d1 100644 --- a/src/server/game/Handlers/SpellHandler.cpp +++ b/src/server/game/Handlers/SpellHandler.cpp @@ -263,7 +263,7 @@ void WorldSession::HandleOpenItemOpcode(WorldPacket& recvPacket) pUser->SendLoot(item->GetGUID(), LOOT_CORPSE); } -void WorldSession::HandleGameObjectUseOpcode(WorldPacket & recvData) +void WorldSession::HandleGameObjectUseOpcode(WorldPacket& recvData) { uint64 guid; @@ -479,7 +479,7 @@ void WorldSession::HandleCancelAutoRepeatSpellOpcode(WorldPacket& /*recvPacket*/ _player->InterruptSpell(CURRENT_AUTOREPEAT_SPELL); } -void WorldSession::HandleCancelChanneling(WorldPacket & recvData) +void WorldSession::HandleCancelChanneling(WorldPacket& recvData) { recvData.read_skip(); // spellid, not used @@ -549,7 +549,7 @@ void WorldSession::HandleSpellClick(WorldPacket& recvData) unit->HandleSpellClick(_player); } -void WorldSession::HandleMirrorImageDataRequest(WorldPacket & recvData) +void WorldSession::HandleMirrorImageDataRequest(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_GET_MIRRORIMAGE_DATA"); uint64 guid; diff --git a/src/server/game/Handlers/TaxiHandler.cpp b/src/server/game/Handlers/TaxiHandler.cpp index 16ffdfbc440..1df98af315d 100644 --- a/src/server/game/Handlers/TaxiHandler.cpp +++ b/src/server/game/Handlers/TaxiHandler.cpp @@ -28,7 +28,7 @@ #include "Path.h" #include "WaypointMovementGenerator.h" -void WorldSession::HandleTaxiNodeStatusQueryOpcode(WorldPacket & recvData) +void WorldSession::HandleTaxiNodeStatusQueryOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_TAXINODE_STATUS_QUERY"); @@ -63,7 +63,7 @@ void WorldSession::SendTaxiStatus(uint64 guid) sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent SMSG_TAXINODE_STATUS"); } -void WorldSession::HandleTaxiQueryAvailableNodes(WorldPacket & recvData) +void WorldSession::HandleTaxiQueryAvailableNodes(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_TAXIQUERYAVAILABLENODES"); @@ -163,7 +163,7 @@ void WorldSession::SendDiscoverNewTaxiNode(uint32 nodeid) } } -void WorldSession::HandleActivateTaxiExpressOpcode (WorldPacket & recvData) +void WorldSession::HandleActivateTaxiExpressOpcode (WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXIEXPRESS"); @@ -273,7 +273,7 @@ void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& recvData) GetPlayer()->CastSpell(GetPlayer(), 2479, true); } -void WorldSession::HandleActivateTaxiOpcode(WorldPacket & recvData) +void WorldSession::HandleActivateTaxiOpcode(WorldPacket& recvData) { sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_ACTIVATETAXI"); diff --git a/src/server/game/Handlers/TicketHandler.cpp b/src/server/game/Handlers/TicketHandler.cpp index 1571d857f41..a632f956470 100644 --- a/src/server/game/Handlers/TicketHandler.cpp +++ b/src/server/game/Handlers/TicketHandler.cpp @@ -97,7 +97,7 @@ void WorldSession::HandleGMTicketCreateOpcode(WorldPacket& recvData) SendPacket(&data); } -void WorldSession::HandleGMTicketUpdateOpcode(WorldPacket & recvData) +void WorldSession::HandleGMTicketUpdateOpcode(WorldPacket& recvData) { std::string message; recvData >> message; diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 8fa6adaf525..e3cf975e92f 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -36,11 +36,11 @@ enum SpellEffIndex // loot modes for creatures and gameobjects, bitmask! enum LootModes { - LOOT_MODE_DEFAULT = 1, - LOOT_MODE_HARD_MODE_1 = 2, - LOOT_MODE_HARD_MODE_2 = 4, - LOOT_MODE_HARD_MODE_3 = 8, - LOOT_MODE_HARD_MODE_4 = 16 + LOOT_MODE_DEFAULT = 0x1, + LOOT_MODE_HARD_MODE_1 = 0x2, + LOOT_MODE_HARD_MODE_2 = 0x4, + LOOT_MODE_HARD_MODE_3 = 0x8, + LOOT_MODE_HARD_MODE_4 = 0x10 }; enum Gender @@ -53,28 +53,28 @@ enum Gender // Race value is index in ChrRaces.dbc enum Races { - RACE_NONE = 0, - RACE_HUMAN = 1, - RACE_ORC = 2, - RACE_DWARF = 3, - RACE_NIGHTELF = 4, - RACE_UNDEAD_PLAYER = 5, - RACE_TAUREN = 6, - RACE_GNOME = 7, - RACE_TROLL = 8, - //RACE_GOBLIN = 9, - RACE_BLOODELF = 10, - RACE_DRAENEI = 11 - //RACE_FEL_ORC = 12, - //RACE_NAGA = 13, - //RACE_BROKEN = 14, - //RACE_SKELETON = 15, - //RACE_VRYKUL = 16, - //RACE_TUSKARR = 17, - //RACE_FOREST_TROLL = 18, - //RACE_TAUNKA = 19, + RACE_NONE = 0, + RACE_HUMAN = 1, + RACE_ORC = 2, + RACE_DWARF = 3, + RACE_NIGHTELF = 4, + RACE_UNDEAD_PLAYER = 5, + RACE_TAUREN = 6, + RACE_GNOME = 7, + RACE_TROLL = 8, + //RACE_GOBLIN = 9, + RACE_BLOODELF = 10, + RACE_DRAENEI = 11 + //RACE_FEL_ORC = 12, + //RACE_NAGA = 13, + //RACE_BROKEN = 14, + //RACE_SKELETON = 15, + //RACE_VRYKUL = 16, + //RACE_TUSKARR = 17, + //RACE_FOREST_TROLL = 18, + //RACE_TAUNKA = 19, //RACE_NORTHREND_SKELETON = 20, - //RACE_ICE_TROLL = 21 + //RACE_ICE_TROLL = 21 }; // max+1 for player race @@ -82,13 +82,13 @@ enum Races #define RACEMASK_ALL_PLAYABLE \ ((1<<(RACE_HUMAN-1)) |(1<<(RACE_ORC-1)) |(1<<(RACE_DWARF-1)) | \ - (1<<(RACE_NIGHTELF-1))|(1<<(RACE_UNDEAD_PLAYER-1))|(1<<(RACE_TAUREN-1)) | \ - (1<<(RACE_GNOME-1)) |(1<<(RACE_TROLL-1)) |(1<<(RACE_BLOODELF-1))| \ - (1<<(RACE_DRAENEI-1))) + (1<<(RACE_NIGHTELF-1))|(1<<(RACE_UNDEAD_PLAYER-1))|(1<<(RACE_TAUREN-1)) | \ + (1<<(RACE_GNOME-1)) |(1<<(RACE_TROLL-1)) |(1<<(RACE_BLOODELF-1))| \ + (1<<(RACE_DRAENEI-1))) #define RACEMASK_ALLIANCE \ ((1<<(RACE_HUMAN-1)) | (1<<(RACE_DWARF-1)) | (1<<(RACE_NIGHTELF-1)) | \ - (1<<(RACE_GNOME-1)) | (1<<(RACE_DRAENEI-1))) + (1<<(RACE_GNOME-1)) | (1<<(RACE_DRAENEI-1))) #define RACEMASK_HORDE RACEMASK_ALL_PLAYABLE & ~RACEMASK_ALLIANCE @@ -2519,47 +2519,47 @@ uint32 const CREATURE_TYPEMASK_MECHANICAL_OR_ELEMENTAL = (1 << (CREATURE_TYPE_ME // CreatureFamily.dbc enum CreatureFamily { - CREATURE_FAMILY_WOLF = 1, - CREATURE_FAMILY_CAT = 2, - CREATURE_FAMILY_SPIDER = 3, - CREATURE_FAMILY_BEAR = 4, - CREATURE_FAMILY_BOAR = 5, - CREATURE_FAMILY_CROCOLISK = 6, - CREATURE_FAMILY_CARRION_BIRD = 7, - CREATURE_FAMILY_CRAB = 8, - CREATURE_FAMILY_GORILLA = 9, - CREATURE_FAMILY_HORSE_CUSTOM = 10, // not exist in DBC but used for horse like beasts in DB - CREATURE_FAMILY_RAPTOR = 11, - CREATURE_FAMILY_TALLSTRIDER = 12, - CREATURE_FAMILY_FELHUNTER = 15, - CREATURE_FAMILY_VOIDWALKER = 16, - CREATURE_FAMILY_SUCCUBUS = 17, - CREATURE_FAMILY_DOOMGUARD = 19, - CREATURE_FAMILY_SCORPID = 20, - CREATURE_FAMILY_TURTLE = 21, - CREATURE_FAMILY_IMP = 23, - CREATURE_FAMILY_BAT = 24, - CREATURE_FAMILY_HYENA = 25, - CREATURE_FAMILY_BIRD_OF_PREY = 26, - CREATURE_FAMILY_WIND_SERPENT = 27, - CREATURE_FAMILY_REMOTE_CONTROL = 28, - CREATURE_FAMILY_FELGUARD = 29, - CREATURE_FAMILY_DRAGONHAWK = 30, - CREATURE_FAMILY_RAVAGER = 31, - CREATURE_FAMILY_WARP_STALKER = 32, - CREATURE_FAMILY_SPOREBAT = 33, - CREATURE_FAMILY_NETHER_RAY = 34, - CREATURE_FAMILY_SERPENT = 35, - CREATURE_FAMILY_MOTH = 37, - CREATURE_FAMILY_CHIMAERA = 38, - CREATURE_FAMILY_DEVILSAUR = 39, - CREATURE_FAMILY_GHOUL = 40, - CREATURE_FAMILY_SILITHID = 41, - CREATURE_FAMILY_WORM = 42, - CREATURE_FAMILY_RHINO = 43, - CREATURE_FAMILY_WASP = 44, - CREATURE_FAMILY_CORE_HOUND = 45, - CREATURE_FAMILY_SPIRIT_BEAST = 46 + CREATURE_FAMILY_WOLF = 1, + CREATURE_FAMILY_CAT = 2, + CREATURE_FAMILY_SPIDER = 3, + CREATURE_FAMILY_BEAR = 4, + CREATURE_FAMILY_BOAR = 5, + CREATURE_FAMILY_CROCOLISK = 6, + CREATURE_FAMILY_CARRION_BIRD = 7, + CREATURE_FAMILY_CRAB = 8, + CREATURE_FAMILY_GORILLA = 9, + CREATURE_FAMILY_HORSE_CUSTOM = 10, // Does not exist in DBC but used for horse like beasts in DB + CREATURE_FAMILY_RAPTOR = 11, + CREATURE_FAMILY_TALLSTRIDER = 12, + CREATURE_FAMILY_FELHUNTER = 15, + CREATURE_FAMILY_VOIDWALKER = 16, + CREATURE_FAMILY_SUCCUBUS = 17, + CREATURE_FAMILY_DOOMGUARD = 19, + CREATURE_FAMILY_SCORPID = 20, + CREATURE_FAMILY_TURTLE = 21, + CREATURE_FAMILY_IMP = 23, + CREATURE_FAMILY_BAT = 24, + CREATURE_FAMILY_HYENA = 25, + CREATURE_FAMILY_BIRD_OF_PREY = 26, + CREATURE_FAMILY_WIND_SERPENT = 27, + CREATURE_FAMILY_REMOTE_CONTROL = 28, + CREATURE_FAMILY_FELGUARD = 29, + CREATURE_FAMILY_DRAGONHAWK = 30, + CREATURE_FAMILY_RAVAGER = 31, + CREATURE_FAMILY_WARP_STALKER = 32, + CREATURE_FAMILY_SPOREBAT = 33, + CREATURE_FAMILY_NETHER_RAY = 34, + CREATURE_FAMILY_SERPENT = 35, + CREATURE_FAMILY_MOTH = 37, + CREATURE_FAMILY_CHIMAERA = 38, + CREATURE_FAMILY_DEVILSAUR = 39, + CREATURE_FAMILY_GHOUL = 40, + CREATURE_FAMILY_SILITHID = 41, + CREATURE_FAMILY_WORM = 42, + CREATURE_FAMILY_RHINO = 43, + CREATURE_FAMILY_WASP = 44, + CREATURE_FAMILY_CORE_HOUND = 45, + CREATURE_FAMILY_SPIRIT_BEAST = 46 }; enum CreatureTypeFlags @@ -2992,7 +2992,7 @@ enum WeatherType enum ChatMsg { - CHAT_MSG_ADDON = 0xFFFFFFFF, + CHAT_MSG_ADDON = 0xFFFFFFFF, // -1 CHAT_MSG_SYSTEM = 0x00, CHAT_MSG_SAY = 0x01, CHAT_MSG_PARTY = 0x02, @@ -3076,8 +3076,11 @@ enum PetDiet #define CHAIN_SPELL_JUMP_RADIUS 8 -#define GUILD_BANKLOG_MAX_RECORDS 25 -#define GUILD_EVENTLOG_MAX_RECORDS 100 +enum GuildLogs +{ + GUILD_BANKLOG_MAX_RECORDS = 25, + GUILD_EVENTLOG_MAX_RECORDS = 100, +}; enum AiReaction { @@ -3151,7 +3154,8 @@ enum SummonType enum EventId { - EVENT_CHARGE = 1003 + EVENT_CHARGE = 1003, + EVENT_JUMP = 1004 }; enum ResponseCodes @@ -3230,9 +3234,7 @@ enum ResponseCodes CHAR_CREATE_CHARACTER_DELETE_MAIL = 0x41, CHAR_CREATE_CHARACTER_SWAP_FACTION = 0x42, CHAR_CREATE_CHARACTER_RACE_ONLY = 0x43, - CHAR_CREATE_CHARACTER_GOLD_LIMIT = 0x44, - CHAR_CREATE_FORCE_LOGIN = 0x45, CHAR_DELETE_IN_PROGRESS = 0x46, @@ -3292,20 +3294,20 @@ enum BanReturn // indexes of BattlemasterList.dbc enum BattlegroundTypeId { - BATTLEGROUND_TYPE_NONE = 0, // None - BATTLEGROUND_AV = 1, // Alterac Valley - BATTLEGROUND_WS = 2, // Warsong Gulch - BATTLEGROUND_AB = 3, // Arathi Basin - BATTLEGROUND_NA = 4, // Nagrand Arena - BATTLEGROUND_BE = 5, // Blade's Edge Arena - BATTLEGROUND_AA = 6, // All Arenas - BATTLEGROUND_EY = 7, // Eye of the Storm - BATTLEGROUND_RL = 8, // Ruins of Lordaernon - BATTLEGROUND_SA = 9, // Strand of the Ancients - BATTLEGROUND_DS = 10, // Dalaran Sewers - BATTLEGROUND_RV = 11, // Ring of Valor - BATTLEGROUND_IC = 30, // Isle of Conquest - BATTLEGROUND_RB = 32 // Random Battleground + BATTLEGROUND_TYPE_NONE = 0, // None + BATTLEGROUND_AV = 1, // Alterac Valley + BATTLEGROUND_WS = 2, // Warsong Gulch + BATTLEGROUND_AB = 3, // Arathi Basin + BATTLEGROUND_NA = 4, // Nagrand Arena + BATTLEGROUND_BE = 5, // Blade's Edge Arena + BATTLEGROUND_AA = 6, // All Arenas + BATTLEGROUND_EY = 7, // Eye of the Storm + BATTLEGROUND_RL = 8, // Ruins of Lordaernon + BATTLEGROUND_SA = 9, // Strand of the Ancients + BATTLEGROUND_DS = 10, // Dalaran Sewers + BATTLEGROUND_RV = 11, // Ring of Valor + BATTLEGROUND_IC = 30, // Isle of Conquest + BATTLEGROUND_RB = 32 // Random Battleground }; #define MAX_BATTLEGROUND_TYPE_ID 33 diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index 8d7fdee7ad2..7037d1316f1 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -163,7 +163,9 @@ class MotionMaster //: private std::stack void MoveCharge(float x, float y, float z, float speed = SPEED_CHARGE, uint32 id = EVENT_CHARGE); void MoveKnockbackFrom(float srcX, float srcY, float speedXY, float speedZ); void MoveJumpTo(float angle, float speedXY, float speedZ); - void MoveJump(float x, float y, float z, float speedXY, float speedZ, uint32 id = 0); + void MoveJump(Position const& pos, float speedXY, float speedZ, uint32 id = EVENT_JUMP) + { MoveJump(pos.m_positionX, pos.m_positionY, pos.m_positionZ, speedXY, speedZ, id); }; + void MoveJump(float x, float y, float z, float speedXY, float speedZ, uint32 id = EVENT_JUMP); void MoveFall(uint32 id = 0); void MoveSeekAssistance(float x, float y, float z); diff --git a/src/server/game/Movement/MovementGenerator.h b/src/server/game/Movement/MovementGenerator.h index 0c1fc8114ca..e586d7e6ae6 100644 --- a/src/server/game/Movement/MovementGenerator.h +++ b/src/server/game/Movement/MovementGenerator.h @@ -38,7 +38,7 @@ class MovementGenerator virtual void Reset(Unit &) = 0; - virtual bool Update(Unit &, const uint32& time_diff) = 0; + virtual bool Update(Unit &, uint32 time_diff) = 0; virtual MovementGeneratorType GetMovementGeneratorType() = 0; @@ -64,7 +64,7 @@ class MovementGeneratorMedium : public MovementGenerator //u->AssertIsType(); (static_cast(this))->DoReset(*((T*)&u)); } - bool Update(Unit &u, const uint32& time_diff) + bool Update(Unit &u, uint32 time_diff) { //u->AssertIsType(); return (static_cast(this))->DoUpdate(*((T*)&u), time_diff); diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp old mode 100644 new mode 100755 index b8925c8b512..f93e94fa35b --- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp @@ -109,7 +109,7 @@ void ConfusedMovementGenerator::DoReset(T &unit) } template -bool ConfusedMovementGenerator::DoUpdate(T &unit, const uint32 &diff) +bool ConfusedMovementGenerator::DoUpdate(T &unit, uint32 diff) { if (unit.HasUnitState(UNIT_STATE_ROOT | UNIT_STATE_STUNNED | UNIT_STATE_DISTRACTED)) return true; @@ -168,6 +168,6 @@ template void ConfusedMovementGenerator::DoInitialize(Player &player); template void ConfusedMovementGenerator::DoInitialize(Creature &creature); template void ConfusedMovementGenerator::DoReset(Player &player); template void ConfusedMovementGenerator::DoReset(Creature &creature); -template bool ConfusedMovementGenerator::DoUpdate(Player &player, const uint32 &diff); -template bool ConfusedMovementGenerator::DoUpdate(Creature &creature, const uint32 &diff); +template bool ConfusedMovementGenerator::DoUpdate(Player &player, uint32 diff); +template bool ConfusedMovementGenerator::DoUpdate(Creature &creature, uint32 diff); diff --git a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h old mode 100644 new mode 100755 index 1943b113888..34ce1e04dd2 --- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h @@ -33,7 +33,7 @@ class ConfusedMovementGenerator : public MovementGeneratorMedium< T, ConfusedMov void DoInitialize(T &); void DoFinalize(T &); void DoReset(T &); - bool DoUpdate(T &, const uint32 &); + bool DoUpdate(T &, uint32); MovementGeneratorType GetMovementGeneratorType() { return CONFUSED_MOTION_TYPE; } private: diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp old mode 100644 new mode 100755 index ceeb8c18201..b070e21ed5b --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp @@ -355,7 +355,7 @@ void FleeingMovementGenerator::DoReset(T &owner) } template -bool FleeingMovementGenerator::DoUpdate(T &owner, const uint32 &time_diff) +bool FleeingMovementGenerator::DoUpdate(T &owner, uint32 time_diff) { if (!&owner || !owner.isAlive()) return false; @@ -382,8 +382,8 @@ template void FleeingMovementGenerator::_setTargetLocation(Player &); template void FleeingMovementGenerator::_setTargetLocation(Creature &); template void FleeingMovementGenerator::DoReset(Player &); template void FleeingMovementGenerator::DoReset(Creature &); -template bool FleeingMovementGenerator::DoUpdate(Player &, const uint32 &); -template bool FleeingMovementGenerator::DoUpdate(Creature &, const uint32 &); +template bool FleeingMovementGenerator::DoUpdate(Player &, uint32); +template bool FleeingMovementGenerator::DoUpdate(Creature &, uint32); void TimedFleeingMovementGenerator::Finalize(Unit &owner) { @@ -399,7 +399,7 @@ void TimedFleeingMovementGenerator::Finalize(Unit &owner) } } -bool TimedFleeingMovementGenerator::Update(Unit & owner, const uint32& time_diff) +bool TimedFleeingMovementGenerator::Update(Unit & owner, uint32 time_diff) { if (!owner.isAlive()) return false; @@ -414,7 +414,7 @@ bool TimedFleeingMovementGenerator::Update(Unit & owner, const uint32& time_diff if (i_totalFleeTime.Passed()) return false; - // This calls grant-parent Update method hiden by FleeingMovementGenerator::Update(Creature &, const uint32 &) version + // This calls grant-parent Update method hiden by FleeingMovementGenerator::Update(Creature &, uint32) version // This is done instead of casting Unit& to Creature& and call parent method, then we can use Unit directly return MovementGeneratorMedium< Creature, FleeingMovementGenerator >::Update(owner, time_diff); } diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h old mode 100644 new mode 100755 index 288abbb5753..5acebb54c99 --- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h @@ -30,7 +30,7 @@ class FleeingMovementGenerator : public MovementGeneratorMedium< T, FleeingMovem void DoInitialize(T &); void DoFinalize(T &); void DoReset(T &); - bool DoUpdate(T &, const uint32 &); + bool DoUpdate(T &, uint32); MovementGeneratorType GetMovementGeneratorType() { return FLEEING_MOTION_TYPE; } @@ -62,7 +62,7 @@ class TimedFleeingMovementGenerator : public FleeingMovementGenerator i_totalFleeTime(time) {} MovementGeneratorType GetMovementGeneratorType() { return TIMED_FLEEING_MOTION_TYPE; } - bool Update(Unit &, const uint32&); + bool Update(Unit &, uint32); void Finalize(Unit &); private: diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp old mode 100644 new mode 100755 index 5a2090cfe28..e237f22e8b1 --- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp @@ -48,7 +48,7 @@ void RotateMovementGenerator::Initialize(Unit& owner) owner.AttackStop(); } -bool RotateMovementGenerator::Update(Unit& owner, const uint32& diff) +bool RotateMovementGenerator::Update(Unit& owner, uint32 diff) { float angle = owner.GetOrientation(); if (m_direction == ROTATE_DIRECTION_LEFT) @@ -89,7 +89,7 @@ void DistractMovementGenerator::Finalize(Unit& owner) owner.ClearUnitState(UNIT_STATE_DISTRACTED); } -bool DistractMovementGenerator::Update(Unit& /*owner*/, const uint32& time_diff) +bool DistractMovementGenerator::Update(Unit& /*owner*/, uint32 time_diff) { if (time_diff > m_timer) return false; diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h index 7acec82af98..ad28cc185e6 100644 --- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h @@ -28,7 +28,7 @@ class IdleMovementGenerator : public MovementGenerator void Initialize(Unit &); void Finalize(Unit &) { } void Reset(Unit &); - bool Update(Unit &, const uint32&) { return true; } + bool Update(Unit &, uint32) { return true; } MovementGeneratorType GetMovementGeneratorType() { return IDLE_MOTION_TYPE; } }; @@ -42,7 +42,7 @@ class RotateMovementGenerator : public MovementGenerator void Initialize(Unit& owner); void Finalize(Unit& owner); void Reset(Unit& owner) { Initialize(owner); } - bool Update(Unit& owner, const uint32& time_diff); + bool Update(Unit& owner, uint32 time_diff); MovementGeneratorType GetMovementGeneratorType() { return ROTATE_MOTION_TYPE; } private: @@ -58,7 +58,7 @@ class DistractMovementGenerator : public MovementGenerator void Initialize(Unit& owner); void Finalize(Unit& owner); void Reset(Unit& owner) { Initialize(owner); } - bool Update(Unit& owner, const uint32& time_diff); + bool Update(Unit& owner, uint32 time_diff); MovementGeneratorType GetMovementGeneratorType() { return DISTRACT_MOTION_TYPE; } private: diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp index 91f77e8ebfe..9bc3e09640f 100644 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp @@ -42,7 +42,7 @@ void PointMovementGenerator::DoInitialize(T &unit) } template -bool PointMovementGenerator::DoUpdate(T &unit, const uint32 & /*diff*/) +bool PointMovementGenerator::DoUpdate(T &unit, uint32 /*diff*/) { if (!&unit) return false; @@ -103,8 +103,8 @@ template void PointMovementGenerator::DoFinalize(Player&); template void PointMovementGenerator::DoFinalize(Creature&); template void PointMovementGenerator::DoReset(Player&); template void PointMovementGenerator::DoReset(Creature&); -template bool PointMovementGenerator::DoUpdate(Player &, const uint32 &); -template bool PointMovementGenerator::DoUpdate(Creature&, const uint32 &); +template bool PointMovementGenerator::DoUpdate(Player &, uint32); +template bool PointMovementGenerator::DoUpdate(Creature&, uint32); void AssistanceMovementGenerator::Finalize(Unit &unit) { @@ -114,7 +114,7 @@ void AssistanceMovementGenerator::Finalize(Unit &unit) unit.GetMotionMaster()->MoveSeekAssistanceDistract(sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_ASSISTANCE_DELAY)); } -bool EffectMovementGenerator::Update(Unit &unit, const uint32&) +bool EffectMovementGenerator::Update(Unit &unit, uint32) { return !unit.movespline->Finalized(); } diff --git a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h index 62ffb931e6d..93516e5d354 100644 --- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h @@ -32,7 +32,7 @@ class PointMovementGenerator : public MovementGeneratorMedium< T, PointMovementG void DoInitialize(T &); void DoFinalize(T &); void DoReset(T &); - bool DoUpdate(T &, const uint32 &); + bool DoUpdate(T &, uint32); void MovementInform(T &); @@ -66,7 +66,7 @@ class EffectMovementGenerator : public MovementGenerator void Initialize(Unit &) {} void Finalize(Unit &unit); void Reset(Unit &) {} - bool Update(Unit &u, const uint32&); + bool Update(Unit &u, uint32); MovementGeneratorType GetMovementGeneratorType() { return EFFECT_MOTION_TYPE; } private: uint32 m_Id; diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp old mode 100644 new mode 100755 index 9a4d33a5665..7a669642e7e --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -139,7 +139,7 @@ void TargetedMovementGeneratorMedium } template -bool TargetedMovementGeneratorMedium::DoUpdate(T &owner, const uint32 & time_diff) +bool TargetedMovementGeneratorMedium::DoUpdate(T &owner, uint32 time_diff) { if (!i_target.isValid() || !i_target->IsInWorld()) return false; @@ -325,10 +325,10 @@ template void TargetedMovementGeneratorMedium >::_setTargetLocation(Player &); template void TargetedMovementGeneratorMedium >::_setTargetLocation(Creature &); template void TargetedMovementGeneratorMedium >::_setTargetLocation(Creature &); -template bool TargetedMovementGeneratorMedium >::DoUpdate(Player &, const uint32 &); -template bool TargetedMovementGeneratorMedium >::DoUpdate(Player &, const uint32 &); -template bool TargetedMovementGeneratorMedium >::DoUpdate(Creature &, const uint32 &); -template bool TargetedMovementGeneratorMedium >::DoUpdate(Creature &, const uint32 &); +template bool TargetedMovementGeneratorMedium >::DoUpdate(Player &, uint32); +template bool TargetedMovementGeneratorMedium >::DoUpdate(Player &, uint32); +template bool TargetedMovementGeneratorMedium >::DoUpdate(Creature &, uint32); +template bool TargetedMovementGeneratorMedium >::DoUpdate(Creature &, uint32); template void ChaseMovementGenerator::_reachTarget(Player &); template void ChaseMovementGenerator::_reachTarget(Creature &); diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h old mode 100644 new mode 100755 index 94b4078efbd..67cd8771aa7 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h @@ -46,7 +46,7 @@ class TargetedMovementGeneratorMedium : public MovementGeneratorMedium< T, D >, ~TargetedMovementGeneratorMedium() {} public: - bool DoUpdate(T &, const uint32 &); + bool DoUpdate(T &, uint32); Unit* GetTarget() const { return i_target.getTarget(); } void unitSpeedChanged() { i_recalculateTravel=true; } @@ -113,4 +113,3 @@ class FollowMovementGenerator : public TargetedMovementGeneratorMedium::StartMove(Creature &creature) return true; } -bool WaypointMovementGenerator::DoUpdate(Creature &creature, const uint32 &diff) +bool WaypointMovementGenerator::DoUpdate(Creature &creature, uint32 diff) { // Waypoint movement can be switched on/off // This is quite handy for escort quests and other stuff @@ -241,7 +241,7 @@ void FlightPathMovementGenerator::DoReset(Player & player) init.Launch(); } -bool FlightPathMovementGenerator::DoUpdate(Player &player, const uint32& /*diff*/) +bool FlightPathMovementGenerator::DoUpdate(Player &player, uint32 /*diff*/) { uint32 pointId = (uint32)player.movespline->currentPathIdx(); if (pointId > i_currentNode) diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h index bb6381da2f0..0bd75076a33 100644 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h @@ -68,7 +68,7 @@ class WaypointMovementGenerator : public MovementGeneratorMedium< Crea void DoInitialize(Creature &); void DoFinalize(Creature &); void DoReset(Creature &); - bool DoUpdate(Creature &, const uint32 &diff); + bool DoUpdate(Creature &, uint32 diff); void MovementInform(Creature &); @@ -121,7 +121,7 @@ class FlightPathMovementGenerator : public MovementGeneratorMedium< Player, Flig void DoInitialize(Player &); void DoReset(Player &); void DoFinalize(Player &); - bool DoUpdate(Player &, const uint32&); + bool DoUpdate(Player &, uint32); MovementGeneratorType GetMovementGeneratorType() { return FLIGHT_MOTION_TYPE; } TaxiPathNodeList const& GetPath() { return *i_path; } diff --git a/src/server/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp index 1821a78d993..1e96cd00fd3 100644 --- a/src/server/game/Movement/Spline/MoveSpline.cpp +++ b/src/server/game/Movement/Spline/MoveSpline.cpp @@ -51,15 +51,15 @@ Location MoveSpline::ComputePosition() const if (splineflags.final_angle) c.orientation = facing.angle; else if (splineflags.final_point) - c.orientation = atan2(facing.f.y-c.y, facing.f.x-c.x); + c.orientation = atan2(facing.f.y - c.y, facing.f.x - c.x); //nothing to do for MoveSplineFlag::Final_Target flag } else { - if (!splineflags.hasFlag(MoveSplineFlag::OrientationFixed|MoveSplineFlag::Falling)) + if (!splineflags.hasFlag(MoveSplineFlag::OrientationFixed | MoveSplineFlag::Falling)) { Vector3 hermite; - spline.evaluate_derivative(point_Idx,u,hermite); + spline.evaluate_derivative(point_Idx, u, hermite); c.orientation = atan2(hermite.y, hermite.x); } diff --git a/src/server/game/Movement/Spline/MoveSpline.h b/src/server/game/Movement/Spline/MoveSpline.h index 945adf6d9f8..46611e58447 100644 --- a/src/server/game/Movement/Spline/MoveSpline.h +++ b/src/server/game/Movement/Spline/MoveSpline.h @@ -41,7 +41,8 @@ namespace Movement { public: typedef Spline MySpline; - enum UpdateResult{ + enum UpdateResult + { Result_None = 0x01, Result_Arrived = 0x02, Result_NextCycle = 0x04, @@ -70,27 +71,27 @@ namespace Movement void init_spline(const MoveSplineInitArgs& args); protected: - const MySpline::ControlArray& getPath() const { return spline.getPoints();} + const MySpline::ControlArray& getPath() const { return spline.getPoints(); } void computeParabolicElevation(float& el) const; void computeFallElevation(float& el) const; UpdateResult _updateState(int32& ms_time_diff); - int32 next_timestamp() const { return spline.length(point_Idx+1);} - int32 segment_time_elapsed() const { return next_timestamp()-time_passed;} - int32 Duration() const { return spline.length();} - int32 timeElapsed() const { return Duration() - time_passed;} - int32 timePassed() const { return time_passed;} + int32 next_timestamp() const { return spline.length(point_Idx+1); } + int32 segment_time_elapsed() const { return next_timestamp()-time_passed; } + int32 Duration() const { return spline.length(); } + int32 timeElapsed() const { return Duration() - time_passed; } + int32 timePassed() const { return time_passed; } public: - const MySpline& _Spline() const { return spline;} - int32 _currentSplineIdx() const { return point_Idx;} + const MySpline& _Spline() const { return spline; } + int32 _currentSplineIdx() const { return point_Idx; } void _Finalize(); void _Interrupt() { splineflags.done = true;} public: void Initialize(const MoveSplineInitArgs&); - bool Initialized() const { return !spline.empty();} + bool Initialized() const { return !spline.empty(); } explicit MoveSpline(); @@ -112,11 +113,11 @@ namespace Movement Location ComputePosition() const; - uint32 GetId() const { return m_Id;} + uint32 GetId() const { return m_Id; } bool Finalized() const { return splineflags.done; } - bool isCyclic() const { return splineflags.cyclic;} - const Vector3 FinalDestination() const { return Initialized() ? spline.getPoint(spline.last()) : Vector3();} - const Vector3 CurrentDestination() const { return Initialized() ? spline.getPoint(point_Idx+1) : Vector3();} + bool isCyclic() const { return splineflags.cyclic; } + const Vector3 FinalDestination() const { return Initialized() ? spline.getPoint(spline.last()) : Vector3(); } + const Vector3 CurrentDestination() const { return Initialized() ? spline.getPoint(point_Idx+1) : Vector3(); } int32 currentPathIdx() const; bool onTransport; diff --git a/src/server/game/Movement/Spline/MoveSplineFlag.h b/src/server/game/Movement/Spline/MoveSplineFlag.h index a7262182391..f3f436c9d00 100644 --- a/src/server/game/Movement/Spline/MoveSplineFlag.h +++ b/src/server/game/Movement/Spline/MoveSplineFlag.h @@ -33,7 +33,8 @@ namespace Movement class MoveSplineFlag { public: - enum eFlags{ + enum eFlags + { None = 0x00000000, // x00-xFF(first byte) used as animation Ids storage in pair with Animation flag Done = 0x00000100, @@ -73,8 +74,8 @@ namespace Movement Mask_Unused = No_Spline|Enter_Cycle|Frozen|Unknown7|Unknown8|Unknown10|Unknown11|Unknown12|Unknown13 }; - inline uint32& raw() { return (uint32&)*this;} - inline const uint32& raw() const { return (const uint32&)*this;} + inline uint32& raw() { return (uint32&)*this; } + inline const uint32& raw() const { return (const uint32&)*this; } MoveSplineFlag() { raw() = 0; } MoveSplineFlag(uint32 f) { raw() = f; } @@ -82,21 +83,21 @@ namespace Movement // Constant interface - bool isSmooth() const { return raw() & Mask_CatmullRom;} - bool isLinear() const { return !isSmooth();} - bool isFacing() const { return raw() & Mask_Final_Facing;} + bool isSmooth() const { return raw() & Mask_CatmullRom; } + bool isLinear() const { return !isSmooth(); } + bool isFacing() const { return raw() & Mask_Final_Facing; } - uint8 getAnimationId() const { return animId;} - bool hasAllFlags(uint32 f) const { return (raw() & f) == f;} - bool hasFlag(uint32 f) const { return (raw() & f) != 0;} - uint32 operator & (uint32 f) const { return (raw() & f);} - uint32 operator | (uint32 f) const { return (raw() | f);} + uint8 getAnimationId() const { return animId; } + bool hasAllFlags(uint32 f) const { return (raw() & f) == f; } + bool hasFlag(uint32 f) const { return (raw() & f) != 0; } + uint32 operator & (uint32 f) const { return (raw() & f); } + uint32 operator | (uint32 f) const { return (raw() | f); } std::string ToString() const; // Not constant interface - void operator &= (uint32 f) { raw() &= f;} - void operator |= (uint32 f) { raw() |= f;} + void operator &= (uint32 f) { raw() &= f; } + void operator |= (uint32 f) { raw() |= f; } void EnableAnimation(uint8 anim) { raw() = (raw() & ~(Mask_Animations | Falling | Parabolic)) | Animation | anim; } void EnableParabolic() { raw() = (raw() & ~(Mask_Animations | Falling | Animation)) | Parabolic; } @@ -109,31 +110,31 @@ namespace Movement void EnableTransportEnter() { raw() = (raw() & ~TransportExit) | TransportEnter; } void EnableTransportExit() { raw() = (raw() & ~TransportEnter) | TransportExit; } - uint8 animId : 8; - bool done : 1; - bool falling : 1; - bool no_spline : 1; - bool parabolic : 1; - bool walkmode : 1; - bool flying : 1; - bool orientationFixed : 1; - bool final_point : 1; - bool final_target : 1; - bool final_angle : 1; - bool catmullrom : 1; - bool cyclic : 1; - bool enter_cycle : 1; - bool animation : 1; - bool frozen : 1; - bool transportEnter: 1; - bool transportExit : 1; - bool unknown7 : 1; - bool unknown8 : 1; + uint8 animId : 8; + bool done : 1; + bool falling : 1; + bool no_spline : 1; + bool parabolic : 1; + bool walkmode : 1; + bool flying : 1; + bool orientationFixed : 1; + bool final_point : 1; + bool final_target : 1; + bool final_angle : 1; + bool catmullrom : 1; + bool cyclic : 1; + bool enter_cycle : 1; + bool animation : 1; + bool frozen : 1; + bool transportEnter : 1; + bool transportExit : 1; + bool unknown7 : 1; + bool unknown8 : 1; bool orientationInversed : 1; - bool unknown10 : 1; - bool unknown11 : 1; - bool unknown12 : 1; - bool unknown13 : 1; + bool unknown10 : 1; + bool unknown11 : 1; + bool unknown12 : 1; + bool unknown13 : 1; }; #if defined( __GNUC__ ) #pragma pack() diff --git a/src/server/game/Movement/Spline/MovementTypedefs.h b/src/server/game/Movement/Spline/MovementTypedefs.h index 01c8a5b7e7b..d8fe21ad4e6 100644 --- a/src/server/game/Movement/Spline/MovementTypedefs.h +++ b/src/server/game/Movement/Spline/MovementTypedefs.h @@ -54,7 +54,7 @@ namespace Movement class counter { public: - counter() { init();} + counter() { init(); } void Increase() { @@ -64,8 +64,8 @@ namespace Movement ++m_counter; } - T NewId() { Increase(); return m_counter;} - T getCurrent() const { return m_counter;} + T NewId() { Increase(); return m_counter; } + T getCurrent() const { return m_counter; } private: void init() { m_counter = 0; } diff --git a/src/server/game/Movement/Spline/MovementUtil.cpp b/src/server/game/Movement/Spline/MovementUtil.cpp index f0ed01c4676..b69d4b39e19 100644 --- a/src/server/game/Movement/Spline/MovementUtil.cpp +++ b/src/server/game/Movement/Spline/MovementUtil.cpp @@ -26,31 +26,31 @@ namespace Movement /// Velocity bounds that makes fall speed limited float terminalVelocity = 60.148003f; - float terminalSavefallVelocity = 7.f; + float terminalSafefallVelocity = 7.0f; - const float terminal_length = float(terminalVelocity * terminalVelocity) / (2.f * gravity); - const float terminal_savefall_length = (terminalSavefallVelocity * terminalSavefallVelocity) / (2.f * gravity); - const float terminalFallTime = float(terminalVelocity/gravity); // the time that needed to reach terminalVelocity + const float terminal_length = float(terminalVelocity * terminalVelocity) / (2.0f * gravity); + const float terminal_safefall_length = (terminalSafefallVelocity * terminalSafefallVelocity) / (2.0f * gravity); + const float terminalFallTime = float(terminalVelocity / gravity); // the time that needed to reach terminalVelocity float computeFallTime(float path_length, bool isSafeFall) { - if (path_length < 0.f) - return 0.f; + if (path_length < 0.0f) + return 0.0f; float time; - if ( isSafeFall ) + if (isSafeFall) { - if (path_length >= terminal_savefall_length) - time = (path_length - terminal_savefall_length)/terminalSavefallVelocity + terminalSavefallVelocity/gravity; + if (path_length >= terminal_safefall_length) + time = (path_length - terminal_safefall_length) / terminalSafefallVelocity + terminalSafefallVelocity / gravity; else - time = sqrtf(2.f * path_length/gravity); + time = sqrtf(2.0f * path_length / gravity); } else { if (path_length >= terminal_length) - time = (path_length - terminal_length)/terminalVelocity + terminalFallTime; + time = (path_length - terminal_length) / terminalVelocity + terminalFallTime; else - time = sqrtf(2.f * path_length/gravity); + time = sqrtf(2.0f * path_length / gravity); } return time; @@ -61,20 +61,21 @@ namespace Movement float termVel; float result; - if ( isSafeFall ) - termVel = terminalSavefallVelocity; + if (isSafeFall) + termVel = terminalSafefallVelocity; else termVel = terminalVelocity; - if ( start_velocity > termVel ) + if (start_velocity > termVel) start_velocity = termVel; float terminal_time = terminalFallTime - start_velocity / gravity; // the time that needed to reach terminalVelocity - if ( t_passed > terminal_time ) + if (t_passed > terminal_time) { - result = terminalVelocity*(t_passed - terminal_time) + - start_velocity*terminal_time + gravity*terminal_time*terminal_time*0.5f; + result = terminalVelocity * (t_passed - terminal_time) + + start_velocity * terminal_time + + gravity * terminal_time * terminal_time*0.5f; } else result = t_passed * (start_velocity + t_passed * gravity * 0.5f); @@ -100,7 +101,7 @@ namespace Movement #define STR(x) #x - const char * g_MovementFlag_names[]= + char const* g_MovementFlag_names[] = { STR(Forward ),// 0x00000001, STR(Backward ),// 0x00000002, @@ -135,25 +136,25 @@ namespace Movement STR(Safe_Fall ),// 0x20000000, // Active Rogue Safe Fall Spell (Passive) STR(Hover ),// 0x40000000 STR(Unknown13 ),// 0x80000000 - STR(Unk1 ), - STR(Unk2 ), - STR(Unk3 ), - STR(Fullspeedturning ), - STR(Fullspeedpitching ), - STR(Allow_Pitching ), - STR(Unk4 ), - STR(Unk5 ), - STR(Unk6 ), - STR(Unk7 ), - STR(Interp_Move ), - STR(Interp_Turning ), - STR(Interp_Pitching ), - STR(Unk8 ), - STR(Unk9 ), - STR(Unk10 ), + STR(Unk1 ), + STR(Unk2 ), + STR(Unk3 ), + STR(Fullspeedturning ), + STR(Fullspeedpitching ), + STR(Allow_Pitching ), + STR(Unk4 ), + STR(Unk5 ), + STR(Unk6 ), + STR(Unk7 ), + STR(Interp_Move ), + STR(Interp_Turning ), + STR(Interp_Pitching ), + STR(Unk8 ), + STR(Unk9 ), + STR(Unk10 ), }; - const char * g_SplineFlag_names[32]= + char const* g_SplineFlag_names[32] = { STR(AnimBit1 ),// 0x00000001, STR(AnimBit2 ),// 0x00000002, @@ -190,11 +191,11 @@ namespace Movement }; template - void print_flags(Flags t, const char* (&names)[N], std::string& str) + void print_flags(Flags t, char const* (&names)[N], std::string& str) { for (int i = 0; i < N; ++i) { - if ((t & (Flags)(1 << i)) && names[i] != NULL) + if ((t & Flags(1 << i)) && names[i] != NULL) str.append(" ").append(names[i]); } } @@ -202,7 +203,7 @@ namespace Movement std::string MoveSplineFlag::ToString() const { std::string str; - print_flags(raw(),g_SplineFlag_names,str); + print_flags(raw(), g_SplineFlag_names, str); return str; } } diff --git a/src/server/game/Reputation/ReputationMgr.cpp b/src/server/game/Reputation/ReputationMgr.cpp index 3a8dc7c5e63..2294ec0d6a4 100644 --- a/src/server/game/Reputation/ReputationMgr.cpp +++ b/src/server/game/Reputation/ReputationMgr.cpp @@ -198,23 +198,24 @@ void ReputationMgr::SendState(FactionState const* faction) void ReputationMgr::SendInitialReputations() { - WorldPacket data(SMSG_INITIALIZE_FACTIONS, (4+128*5)); - data << uint32 (0x00000080); + uint8 count = 128; + WorldPacket data(SMSG_INITIALIZE_FACTIONS, 4 + count * 5); + data << uint32(count); RepListID a = 0; for (FactionStateList::iterator itr = _factions.begin(); itr != _factions.end(); ++itr) { // fill in absent fields - for (; a != itr->first; a++) + for (; a != itr->first; ++a) { - data << uint8 (0x00); - data << uint32 (0x00000000); + data << uint8(0); + data << uint32(0); } // fill in encountered data - data << uint8 (itr->second.Flags); - data << uint32 (itr->second.Standing); + data << uint8(itr->second.Flags); + data << uint32(itr->second.Standing); itr->second.needSend = false; @@ -222,10 +223,10 @@ void ReputationMgr::SendInitialReputations() } // fill in absent fields - for (; a != 128; a++) + for (; a != count; ++a) { - data << uint8 (0x00); - data << uint32 (0x00000000); + data << uint8(0); + data << uint32(0); } _player->SendDirectMessage(&data); diff --git a/src/server/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h index 6902dd60c80..11e4a28e084 100644 --- a/src/server/game/Spells/Auras/SpellAuraDefines.h +++ b/src/server/game/Spells/Auras/SpellAuraDefines.h @@ -59,324 +59,324 @@ enum DAMAGE_ABSORB_TYPE enum AuraType { - SPELL_AURA_NONE = 0, - SPELL_AURA_BIND_SIGHT = 1, - SPELL_AURA_MOD_POSSESS = 2, - SPELL_AURA_PERIODIC_DAMAGE = 3, - SPELL_AURA_DUMMY = 4, - SPELL_AURA_MOD_CONFUSE = 5, - SPELL_AURA_MOD_CHARM = 6, - SPELL_AURA_MOD_FEAR = 7, - SPELL_AURA_PERIODIC_HEAL = 8, - SPELL_AURA_MOD_ATTACKSPEED = 9, - SPELL_AURA_MOD_THREAT = 10, - SPELL_AURA_MOD_TAUNT = 11, - SPELL_AURA_MOD_STUN = 12, - SPELL_AURA_MOD_DAMAGE_DONE = 13, - SPELL_AURA_MOD_DAMAGE_TAKEN = 14, - SPELL_AURA_DAMAGE_SHIELD = 15, - SPELL_AURA_MOD_STEALTH = 16, - SPELL_AURA_MOD_STEALTH_DETECT = 17, - SPELL_AURA_MOD_INVISIBILITY = 18, - SPELL_AURA_MOD_INVISIBILITY_DETECT = 19, - SPELL_AURA_OBS_MOD_HEALTH = 20, //20, 21 unofficial - SPELL_AURA_OBS_MOD_POWER = 21, - SPELL_AURA_MOD_RESISTANCE = 22, - SPELL_AURA_PERIODIC_TRIGGER_SPELL = 23, - SPELL_AURA_PERIODIC_ENERGIZE = 24, - SPELL_AURA_MOD_PACIFY = 25, - SPELL_AURA_MOD_ROOT = 26, - SPELL_AURA_MOD_SILENCE = 27, - SPELL_AURA_REFLECT_SPELLS = 28, - SPELL_AURA_MOD_STAT = 29, - SPELL_AURA_MOD_SKILL = 30, - SPELL_AURA_MOD_INCREASE_SPEED = 31, - SPELL_AURA_MOD_INCREASE_MOUNTED_SPEED = 32, - SPELL_AURA_MOD_DECREASE_SPEED = 33, - SPELL_AURA_MOD_INCREASE_HEALTH = 34, - SPELL_AURA_MOD_INCREASE_ENERGY = 35, - SPELL_AURA_MOD_SHAPESHIFT = 36, - SPELL_AURA_EFFECT_IMMUNITY = 37, - SPELL_AURA_STATE_IMMUNITY = 38, - SPELL_AURA_SCHOOL_IMMUNITY = 39, - SPELL_AURA_DAMAGE_IMMUNITY = 40, - SPELL_AURA_DISPEL_IMMUNITY = 41, - SPELL_AURA_PROC_TRIGGER_SPELL = 42, - SPELL_AURA_PROC_TRIGGER_DAMAGE = 43, - SPELL_AURA_TRACK_CREATURES = 44, - SPELL_AURA_TRACK_RESOURCES = 45, - SPELL_AURA_46 = 46, // Ignore all Gear test spells - SPELL_AURA_MOD_PARRY_PERCENT = 47, - SPELL_AURA_48 = 48, // One periodic spell - SPELL_AURA_MOD_DODGE_PERCENT = 49, - SPELL_AURA_MOD_CRITICAL_HEALING_AMOUNT = 50, - SPELL_AURA_MOD_BLOCK_PERCENT = 51, - SPELL_AURA_MOD_WEAPON_CRIT_PERCENT = 52, - SPELL_AURA_PERIODIC_LEECH = 53, - SPELL_AURA_MOD_HIT_CHANCE = 54, - SPELL_AURA_MOD_SPELL_HIT_CHANCE = 55, - SPELL_AURA_TRANSFORM = 56, - SPELL_AURA_MOD_SPELL_CRIT_CHANCE = 57, - SPELL_AURA_MOD_INCREASE_SWIM_SPEED = 58, - SPELL_AURA_MOD_DAMAGE_DONE_CREATURE = 59, - SPELL_AURA_MOD_PACIFY_SILENCE = 60, - SPELL_AURA_MOD_SCALE = 61, - SPELL_AURA_PERIODIC_HEALTH_FUNNEL = 62, - SPELL_AURA_63 = 63, // old SPELL_AURA_PERIODIC_MANA_FUNNEL - SPELL_AURA_PERIODIC_MANA_LEECH = 64, - SPELL_AURA_MOD_CASTING_SPEED_NOT_STACK = 65, - SPELL_AURA_FEIGN_DEATH = 66, - SPELL_AURA_MOD_DISARM = 67, - SPELL_AURA_MOD_STALKED = 68, - SPELL_AURA_SCHOOL_ABSORB = 69, - SPELL_AURA_EXTRA_ATTACKS = 70, - SPELL_AURA_MOD_SPELL_CRIT_CHANCE_SCHOOL = 71, - SPELL_AURA_MOD_POWER_COST_SCHOOL_PCT = 72, - SPELL_AURA_MOD_POWER_COST_SCHOOL = 73, - SPELL_AURA_REFLECT_SPELLS_SCHOOL = 74, - SPELL_AURA_MOD_LANGUAGE = 75, - SPELL_AURA_FAR_SIGHT = 76, - SPELL_AURA_MECHANIC_IMMUNITY = 77, - SPELL_AURA_MOUNTED = 78, - SPELL_AURA_MOD_DAMAGE_PERCENT_DONE = 79, - SPELL_AURA_MOD_PERCENT_STAT = 80, - SPELL_AURA_SPLIT_DAMAGE_PCT = 81, - SPELL_AURA_WATER_BREATHING = 82, - SPELL_AURA_MOD_BASE_RESISTANCE = 83, - SPELL_AURA_MOD_REGEN = 84, - SPELL_AURA_MOD_POWER_REGEN = 85, - SPELL_AURA_CHANNEL_DEATH_ITEM = 86, - SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN = 87, - SPELL_AURA_MOD_HEALTH_REGEN_PERCENT = 88, - SPELL_AURA_PERIODIC_DAMAGE_PERCENT = 89, - SPELL_AURA_90 = 90, // old SPELL_AURA_MOD_RESIST_CHANCE - SPELL_AURA_MOD_DETECT_RANGE = 91, - SPELL_AURA_PREVENTS_FLEEING = 92, - SPELL_AURA_MOD_UNATTACKABLE = 93, - SPELL_AURA_INTERRUPT_REGEN = 94, - SPELL_AURA_GHOST = 95, - SPELL_AURA_SPELL_MAGNET = 96, - SPELL_AURA_MANA_SHIELD = 97, - SPELL_AURA_MOD_SKILL_TALENT = 98, - SPELL_AURA_MOD_ATTACK_POWER = 99, - SPELL_AURA_AURAS_VISIBLE = 100, - SPELL_AURA_MOD_RESISTANCE_PCT = 101, - SPELL_AURA_MOD_MELEE_ATTACK_POWER_VERSUS = 102, - SPELL_AURA_MOD_TOTAL_THREAT = 103, - SPELL_AURA_WATER_WALK = 104, - SPELL_AURA_FEATHER_FALL = 105, - SPELL_AURA_HOVER = 106, - SPELL_AURA_ADD_FLAT_MODIFIER = 107, - SPELL_AURA_ADD_PCT_MODIFIER = 108, - SPELL_AURA_ADD_TARGET_TRIGGER = 109, - SPELL_AURA_MOD_POWER_REGEN_PERCENT = 110, - SPELL_AURA_ADD_CASTER_HIT_TRIGGER = 111, - SPELL_AURA_OVERRIDE_CLASS_SCRIPTS = 112, - SPELL_AURA_MOD_RANGED_DAMAGE_TAKEN = 113, - SPELL_AURA_MOD_RANGED_DAMAGE_TAKEN_PCT = 114, - SPELL_AURA_MOD_HEALING = 115, - SPELL_AURA_MOD_REGEN_DURING_COMBAT = 116, - SPELL_AURA_MOD_MECHANIC_RESISTANCE = 117, - SPELL_AURA_MOD_HEALING_PCT = 118, - SPELL_AURA_119 = 119, // old SPELL_AURA_SHARE_PET_TRACKING - SPELL_AURA_UNTRACKABLE = 120, - SPELL_AURA_EMPATHY = 121, - SPELL_AURA_MOD_OFFHAND_DAMAGE_PCT = 122, - SPELL_AURA_MOD_TARGET_RESISTANCE = 123, - SPELL_AURA_MOD_RANGED_ATTACK_POWER = 124, - SPELL_AURA_MOD_MELEE_DAMAGE_TAKEN = 125, - SPELL_AURA_MOD_MELEE_DAMAGE_TAKEN_PCT = 126, - SPELL_AURA_RANGED_ATTACK_POWER_ATTACKER_BONUS = 127, - SPELL_AURA_MOD_POSSESS_PET = 128, - SPELL_AURA_MOD_SPEED_ALWAYS = 129, - SPELL_AURA_MOD_MOUNTED_SPEED_ALWAYS = 130, - SPELL_AURA_MOD_RANGED_ATTACK_POWER_VERSUS = 131, - SPELL_AURA_MOD_INCREASE_ENERGY_PERCENT = 132, - SPELL_AURA_MOD_INCREASE_HEALTH_PERCENT = 133, - SPELL_AURA_MOD_MANA_REGEN_INTERRUPT = 134, - SPELL_AURA_MOD_HEALING_DONE = 135, - SPELL_AURA_MOD_HEALING_DONE_PERCENT = 136, - SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE = 137, - SPELL_AURA_MOD_MELEE_HASTE = 138, - SPELL_AURA_FORCE_REACTION = 139, - SPELL_AURA_MOD_RANGED_HASTE = 140, - SPELL_AURA_MOD_RANGED_AMMO_HASTE = 141, - SPELL_AURA_MOD_BASE_RESISTANCE_PCT = 142, - SPELL_AURA_MOD_RESISTANCE_EXCLUSIVE = 143, - SPELL_AURA_SAFE_FALL = 144, - SPELL_AURA_MOD_PET_TALENT_POINTS = 145, - SPELL_AURA_ALLOW_TAME_PET_TYPE = 146, - SPELL_AURA_MECHANIC_IMMUNITY_MASK = 147, - SPELL_AURA_RETAIN_COMBO_POINTS = 148, - SPELL_AURA_REDUCE_PUSHBACK = 149, // Reduce Pushback - SPELL_AURA_MOD_SHIELD_BLOCKVALUE_PCT = 150, - SPELL_AURA_TRACK_STEALTHED = 151, // Track Stealthed - SPELL_AURA_MOD_DETECTED_RANGE = 152, // Mod Detected Range - SPELL_AURA_SPLIT_DAMAGE_FLAT = 153, // Split Damage Flat - SPELL_AURA_MOD_STEALTH_LEVEL = 154, // Stealth Level Modifier - SPELL_AURA_MOD_WATER_BREATHING = 155, // Mod Water Breathing - SPELL_AURA_MOD_REPUTATION_GAIN = 156, // Mod Reputation Gain - SPELL_AURA_PET_DAMAGE_MULTI = 157, // Mod Pet Damage - SPELL_AURA_MOD_SHIELD_BLOCKVALUE = 158, - SPELL_AURA_NO_PVP_CREDIT = 159, - SPELL_AURA_MOD_AOE_AVOIDANCE = 160, - SPELL_AURA_MOD_HEALTH_REGEN_IN_COMBAT = 161, - SPELL_AURA_POWER_BURN = 162, - SPELL_AURA_MOD_CRIT_DAMAGE_BONUS = 163, - SPELL_AURA_164 = 164, - SPELL_AURA_MELEE_ATTACK_POWER_ATTACKER_BONUS = 165, - SPELL_AURA_MOD_ATTACK_POWER_PCT = 166, - SPELL_AURA_MOD_RANGED_ATTACK_POWER_PCT = 167, - SPELL_AURA_MOD_DAMAGE_DONE_VERSUS = 168, - SPELL_AURA_MOD_CRIT_PERCENT_VERSUS = 169, - SPELL_AURA_DETECT_AMORE = 170, - SPELL_AURA_MOD_SPEED_NOT_STACK = 171, - SPELL_AURA_MOD_MOUNTED_SPEED_NOT_STACK = 172, - SPELL_AURA_173 = 173, // old SPELL_AURA_ALLOW_CHAMPION_SPELLS - SPELL_AURA_MOD_SPELL_DAMAGE_OF_STAT_PERCENT = 174, // by defeult intelect, dependent from SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT - SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT = 175, - SPELL_AURA_SPIRIT_OF_REDEMPTION = 176, - SPELL_AURA_AOE_CHARM = 177, - SPELL_AURA_MOD_DEBUFF_RESISTANCE = 178, - SPELL_AURA_MOD_ATTACKER_SPELL_CRIT_CHANCE = 179, - SPELL_AURA_MOD_FLAT_SPELL_DAMAGE_VERSUS = 180, - SPELL_AURA_181 = 181, // old SPELL_AURA_MOD_FLAT_SPELL_CRIT_DAMAGE_VERSUS - possible flat spell crit damage versus - SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT = 182, - SPELL_AURA_MOD_CRITICAL_THREAT = 183, - SPELL_AURA_MOD_ATTACKER_MELEE_HIT_CHANCE = 184, - SPELL_AURA_MOD_ATTACKER_RANGED_HIT_CHANCE= 185, - SPELL_AURA_MOD_ATTACKER_SPELL_HIT_CHANCE = 186, - SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_CHANCE = 187, - SPELL_AURA_MOD_ATTACKER_RANGED_CRIT_CHANCE = 188, - SPELL_AURA_MOD_RATING = 189, - SPELL_AURA_MOD_FACTION_REPUTATION_GAIN = 190, - SPELL_AURA_USE_NORMAL_MOVEMENT_SPEED = 191, - SPELL_AURA_MOD_MELEE_RANGED_HASTE = 192, - SPELL_AURA_MELEE_SLOW = 193, - SPELL_AURA_MOD_TARGET_ABSORB_SCHOOL = 194, - SPELL_AURA_MOD_TARGET_ABILITY_ABSORB_SCHOOL = 195, - SPELL_AURA_MOD_COOLDOWN = 196, // only 24818 Noxious Breath - SPELL_AURA_MOD_ATTACKER_SPELL_AND_WEAPON_CRIT_CHANCE = 197, - SPELL_AURA_198 = 198, // old SPELL_AURA_MOD_ALL_WEAPON_SKILLS - SPELL_AURA_MOD_INCREASES_SPELL_PCT_TO_HIT = 199, - SPELL_AURA_MOD_XP_PCT = 200, - SPELL_AURA_FLY = 201, - SPELL_AURA_IGNORE_COMBAT_RESULT = 202, - SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_DAMAGE = 203, - SPELL_AURA_MOD_ATTACKER_RANGED_CRIT_DAMAGE = 204, - SPELL_AURA_MOD_SCHOOL_CRIT_DMG_TAKEN = 205, - SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED = 206, - SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED = 207, - SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED = 208, - SPELL_AURA_MOD_MOUNTED_FLIGHT_SPEED_ALWAYS = 209, - SPELL_AURA_MOD_VEHICLE_SPEED_ALWAYS = 210, - SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK = 211, - SPELL_AURA_MOD_RANGED_ATTACK_POWER_OF_STAT_PERCENT = 212, - SPELL_AURA_MOD_RAGE_FROM_DAMAGE_DEALT = 213, - SPELL_AURA_214 = 214, - SPELL_AURA_ARENA_PREPARATION = 215, - SPELL_AURA_HASTE_SPELLS = 216, - SPELL_AURA_MOD_MELEE_HASTE_2 = 217, // NYI - SPELL_AURA_HASTE_RANGED = 218, - SPELL_AURA_MOD_MANA_REGEN_FROM_STAT = 219, - SPELL_AURA_MOD_RATING_FROM_STAT = 220, - SPELL_AURA_MOD_DETAUNT = 221, - SPELL_AURA_222 = 222, - SPELL_AURA_RAID_PROC_FROM_CHARGE = 223, - SPELL_AURA_224 = 224, - SPELL_AURA_RAID_PROC_FROM_CHARGE_WITH_VALUE = 225, - SPELL_AURA_PERIODIC_DUMMY = 226, - SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE = 227, - SPELL_AURA_DETECT_STEALTH = 228, - SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE = 229, - SPELL_AURA_230 = 230, - SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE = 231, - SPELL_AURA_MECHANIC_DURATION_MOD = 232, - SPELL_AURA_CHANGE_MODEL_FOR_ALL_HUMANOIDS = 233, // client-side only - SPELL_AURA_MECHANIC_DURATION_MOD_NOT_STACK = 234, - SPELL_AURA_MOD_DISPEL_RESIST = 235, - SPELL_AURA_CONTROL_VEHICLE = 236, - SPELL_AURA_MOD_SPELL_DAMAGE_OF_ATTACK_POWER = 237, - SPELL_AURA_MOD_SPELL_HEALING_OF_ATTACK_POWER = 238, - SPELL_AURA_MOD_SCALE_2 = 239, - SPELL_AURA_MOD_EXPERTISE = 240, - SPELL_AURA_FORCE_MOVE_FORWARD = 241, - SPELL_AURA_MOD_SPELL_DAMAGE_FROM_HEALING = 242, - SPELL_AURA_MOD_FACTION = 243, - SPELL_AURA_COMPREHEND_LANGUAGE = 244, - SPELL_AURA_MOD_AURA_DURATION_BY_DISPEL = 245, - SPELL_AURA_MOD_AURA_DURATION_BY_DISPEL_NOT_STACK = 246, - SPELL_AURA_CLONE_CASTER = 247, - SPELL_AURA_MOD_COMBAT_RESULT_CHANCE = 248, - SPELL_AURA_CONVERT_RUNE = 249, - SPELL_AURA_MOD_INCREASE_HEALTH_2 = 250, - SPELL_AURA_MOD_ENEMY_DODGE = 251, - SPELL_AURA_MOD_SPEED_SLOW_ALL = 252, - SPELL_AURA_MOD_BLOCK_CRIT_CHANCE = 253, - SPELL_AURA_MOD_DISARM_OFFHAND = 254, - SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT = 255, - SPELL_AURA_NO_REAGENT_USE = 256, - SPELL_AURA_MOD_TARGET_RESIST_BY_SPELL_CLASS = 257, - SPELL_AURA_258 = 258, - SPELL_AURA_MOD_HOT_PCT = 259, - SPELL_AURA_SCREEN_EFFECT = 260, - SPELL_AURA_PHASE = 261, - SPELL_AURA_ABILITY_IGNORE_AURASTATE = 262, - SPELL_AURA_ALLOW_ONLY_ABILITY = 263, - SPELL_AURA_264 = 264, - SPELL_AURA_265 = 265, - SPELL_AURA_266 = 266, - SPELL_AURA_MOD_IMMUNE_AURA_APPLY_SCHOOL = 267, + SPELL_AURA_NONE = 0, + SPELL_AURA_BIND_SIGHT = 1, + SPELL_AURA_MOD_POSSESS = 2, + SPELL_AURA_PERIODIC_DAMAGE = 3, + SPELL_AURA_DUMMY = 4, + SPELL_AURA_MOD_CONFUSE = 5, + SPELL_AURA_MOD_CHARM = 6, + SPELL_AURA_MOD_FEAR = 7, + SPELL_AURA_PERIODIC_HEAL = 8, + SPELL_AURA_MOD_ATTACKSPEED = 9, + SPELL_AURA_MOD_THREAT = 10, + SPELL_AURA_MOD_TAUNT = 11, + SPELL_AURA_MOD_STUN = 12, + SPELL_AURA_MOD_DAMAGE_DONE = 13, + SPELL_AURA_MOD_DAMAGE_TAKEN = 14, + SPELL_AURA_DAMAGE_SHIELD = 15, + SPELL_AURA_MOD_STEALTH = 16, + SPELL_AURA_MOD_STEALTH_DETECT = 17, + SPELL_AURA_MOD_INVISIBILITY = 18, + SPELL_AURA_MOD_INVISIBILITY_DETECT = 19, + SPELL_AURA_OBS_MOD_HEALTH = 20, // 20, 21 unofficial + SPELL_AURA_OBS_MOD_POWER = 21, + SPELL_AURA_MOD_RESISTANCE = 22, + SPELL_AURA_PERIODIC_TRIGGER_SPELL = 23, + SPELL_AURA_PERIODIC_ENERGIZE = 24, + SPELL_AURA_MOD_PACIFY = 25, + SPELL_AURA_MOD_ROOT = 26, + SPELL_AURA_MOD_SILENCE = 27, + SPELL_AURA_REFLECT_SPELLS = 28, + SPELL_AURA_MOD_STAT = 29, + SPELL_AURA_MOD_SKILL = 30, + SPELL_AURA_MOD_INCREASE_SPEED = 31, + SPELL_AURA_MOD_INCREASE_MOUNTED_SPEED = 32, + SPELL_AURA_MOD_DECREASE_SPEED = 33, + SPELL_AURA_MOD_INCREASE_HEALTH = 34, + SPELL_AURA_MOD_INCREASE_ENERGY = 35, + SPELL_AURA_MOD_SHAPESHIFT = 36, + SPELL_AURA_EFFECT_IMMUNITY = 37, + SPELL_AURA_STATE_IMMUNITY = 38, + SPELL_AURA_SCHOOL_IMMUNITY = 39, + SPELL_AURA_DAMAGE_IMMUNITY = 40, + SPELL_AURA_DISPEL_IMMUNITY = 41, + SPELL_AURA_PROC_TRIGGER_SPELL = 42, + SPELL_AURA_PROC_TRIGGER_DAMAGE = 43, + SPELL_AURA_TRACK_CREATURES = 44, + SPELL_AURA_TRACK_RESOURCES = 45, + SPELL_AURA_46 = 46, // Ignore all Gear test spells + SPELL_AURA_MOD_PARRY_PERCENT = 47, + SPELL_AURA_48 = 48, // One periodic spell + SPELL_AURA_MOD_DODGE_PERCENT = 49, + SPELL_AURA_MOD_CRITICAL_HEALING_AMOUNT = 50, + SPELL_AURA_MOD_BLOCK_PERCENT = 51, + SPELL_AURA_MOD_WEAPON_CRIT_PERCENT = 52, + SPELL_AURA_PERIODIC_LEECH = 53, + SPELL_AURA_MOD_HIT_CHANCE = 54, + SPELL_AURA_MOD_SPELL_HIT_CHANCE = 55, + SPELL_AURA_TRANSFORM = 56, + SPELL_AURA_MOD_SPELL_CRIT_CHANCE = 57, + SPELL_AURA_MOD_INCREASE_SWIM_SPEED = 58, + SPELL_AURA_MOD_DAMAGE_DONE_CREATURE = 59, + SPELL_AURA_MOD_PACIFY_SILENCE = 60, + SPELL_AURA_MOD_SCALE = 61, + SPELL_AURA_PERIODIC_HEALTH_FUNNEL = 62, + SPELL_AURA_63 = 63, // old SPELL_AURA_PERIODIC_MANA_FUNNEL + SPELL_AURA_PERIODIC_MANA_LEECH = 64, + SPELL_AURA_MOD_CASTING_SPEED_NOT_STACK = 65, + SPELL_AURA_FEIGN_DEATH = 66, + SPELL_AURA_MOD_DISARM = 67, + SPELL_AURA_MOD_STALKED = 68, + SPELL_AURA_SCHOOL_ABSORB = 69, + SPELL_AURA_EXTRA_ATTACKS = 70, + SPELL_AURA_MOD_SPELL_CRIT_CHANCE_SCHOOL = 71, + SPELL_AURA_MOD_POWER_COST_SCHOOL_PCT = 72, + SPELL_AURA_MOD_POWER_COST_SCHOOL = 73, + SPELL_AURA_REFLECT_SPELLS_SCHOOL = 74, + SPELL_AURA_MOD_LANGUAGE = 75, + SPELL_AURA_FAR_SIGHT = 76, + SPELL_AURA_MECHANIC_IMMUNITY = 77, + SPELL_AURA_MOUNTED = 78, + SPELL_AURA_MOD_DAMAGE_PERCENT_DONE = 79, + SPELL_AURA_MOD_PERCENT_STAT = 80, + SPELL_AURA_SPLIT_DAMAGE_PCT = 81, + SPELL_AURA_WATER_BREATHING = 82, + SPELL_AURA_MOD_BASE_RESISTANCE = 83, + SPELL_AURA_MOD_REGEN = 84, + SPELL_AURA_MOD_POWER_REGEN = 85, + SPELL_AURA_CHANNEL_DEATH_ITEM = 86, + SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN = 87, + SPELL_AURA_MOD_HEALTH_REGEN_PERCENT = 88, + SPELL_AURA_PERIODIC_DAMAGE_PERCENT = 89, + SPELL_AURA_90 = 90, // old SPELL_AURA_MOD_RESIST_CHANCE + SPELL_AURA_MOD_DETECT_RANGE = 91, + SPELL_AURA_PREVENTS_FLEEING = 92, + SPELL_AURA_MOD_UNATTACKABLE = 93, + SPELL_AURA_INTERRUPT_REGEN = 94, + SPELL_AURA_GHOST = 95, + SPELL_AURA_SPELL_MAGNET = 96, + SPELL_AURA_MANA_SHIELD = 97, + SPELL_AURA_MOD_SKILL_TALENT = 98, + SPELL_AURA_MOD_ATTACK_POWER = 99, + SPELL_AURA_AURAS_VISIBLE = 100, + SPELL_AURA_MOD_RESISTANCE_PCT = 101, + SPELL_AURA_MOD_MELEE_ATTACK_POWER_VERSUS = 102, + SPELL_AURA_MOD_TOTAL_THREAT = 103, + SPELL_AURA_WATER_WALK = 104, + SPELL_AURA_FEATHER_FALL = 105, + SPELL_AURA_HOVER = 106, + SPELL_AURA_ADD_FLAT_MODIFIER = 107, + SPELL_AURA_ADD_PCT_MODIFIER = 108, + SPELL_AURA_ADD_TARGET_TRIGGER = 109, + SPELL_AURA_MOD_POWER_REGEN_PERCENT = 110, + SPELL_AURA_ADD_CASTER_HIT_TRIGGER = 111, + SPELL_AURA_OVERRIDE_CLASS_SCRIPTS = 112, + SPELL_AURA_MOD_RANGED_DAMAGE_TAKEN = 113, + SPELL_AURA_MOD_RANGED_DAMAGE_TAKEN_PCT = 114, + SPELL_AURA_MOD_HEALING = 115, + SPELL_AURA_MOD_REGEN_DURING_COMBAT = 116, + SPELL_AURA_MOD_MECHANIC_RESISTANCE = 117, + SPELL_AURA_MOD_HEALING_PCT = 118, + SPELL_AURA_119 = 119, // old SPELL_AURA_SHARE_PET_TRACKING + SPELL_AURA_UNTRACKABLE = 120, + SPELL_AURA_EMPATHY = 121, + SPELL_AURA_MOD_OFFHAND_DAMAGE_PCT = 122, + SPELL_AURA_MOD_TARGET_RESISTANCE = 123, + SPELL_AURA_MOD_RANGED_ATTACK_POWER = 124, + SPELL_AURA_MOD_MELEE_DAMAGE_TAKEN = 125, + SPELL_AURA_MOD_MELEE_DAMAGE_TAKEN_PCT = 126, + SPELL_AURA_RANGED_ATTACK_POWER_ATTACKER_BONUS = 127, + SPELL_AURA_MOD_POSSESS_PET = 128, + SPELL_AURA_MOD_SPEED_ALWAYS = 129, + SPELL_AURA_MOD_MOUNTED_SPEED_ALWAYS = 130, + SPELL_AURA_MOD_RANGED_ATTACK_POWER_VERSUS = 131, + SPELL_AURA_MOD_INCREASE_ENERGY_PERCENT = 132, + SPELL_AURA_MOD_INCREASE_HEALTH_PERCENT = 133, + SPELL_AURA_MOD_MANA_REGEN_INTERRUPT = 134, + SPELL_AURA_MOD_HEALING_DONE = 135, + SPELL_AURA_MOD_HEALING_DONE_PERCENT = 136, + SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE = 137, + SPELL_AURA_MOD_MELEE_HASTE = 138, + SPELL_AURA_FORCE_REACTION = 139, + SPELL_AURA_MOD_RANGED_HASTE = 140, + SPELL_AURA_MOD_RANGED_AMMO_HASTE = 141, + SPELL_AURA_MOD_BASE_RESISTANCE_PCT = 142, + SPELL_AURA_MOD_RESISTANCE_EXCLUSIVE = 143, + SPELL_AURA_SAFE_FALL = 144, + SPELL_AURA_MOD_PET_TALENT_POINTS = 145, + SPELL_AURA_ALLOW_TAME_PET_TYPE = 146, + SPELL_AURA_MECHANIC_IMMUNITY_MASK = 147, + SPELL_AURA_RETAIN_COMBO_POINTS = 148, + SPELL_AURA_REDUCE_PUSHBACK = 149, // Reduce Pushback + SPELL_AURA_MOD_SHIELD_BLOCKVALUE_PCT = 150, + SPELL_AURA_TRACK_STEALTHED = 151, // Track Stealthed + SPELL_AURA_MOD_DETECTED_RANGE = 152, // Mod Detected Range + SPELL_AURA_SPLIT_DAMAGE_FLAT = 153, // Split Damage Flat + SPELL_AURA_MOD_STEALTH_LEVEL = 154, // Stealth Level Modifier + SPELL_AURA_MOD_WATER_BREATHING = 155, // Mod Water Breathing + SPELL_AURA_MOD_REPUTATION_GAIN = 156, // Mod Reputation Gain + SPELL_AURA_PET_DAMAGE_MULTI = 157, // Mod Pet Damage + SPELL_AURA_MOD_SHIELD_BLOCKVALUE = 158, + SPELL_AURA_NO_PVP_CREDIT = 159, + SPELL_AURA_MOD_AOE_AVOIDANCE = 160, + SPELL_AURA_MOD_HEALTH_REGEN_IN_COMBAT = 161, + SPELL_AURA_POWER_BURN = 162, + SPELL_AURA_MOD_CRIT_DAMAGE_BONUS = 163, + SPELL_AURA_164 = 164, + SPELL_AURA_MELEE_ATTACK_POWER_ATTACKER_BONUS = 165, + SPELL_AURA_MOD_ATTACK_POWER_PCT = 166, + SPELL_AURA_MOD_RANGED_ATTACK_POWER_PCT = 167, + SPELL_AURA_MOD_DAMAGE_DONE_VERSUS = 168, + SPELL_AURA_MOD_CRIT_PERCENT_VERSUS = 169, + SPELL_AURA_DETECT_AMORE = 170, + SPELL_AURA_MOD_SPEED_NOT_STACK = 171, + SPELL_AURA_MOD_MOUNTED_SPEED_NOT_STACK = 172, + SPELL_AURA_173 = 173, // old SPELL_AURA_ALLOW_CHAMPION_SPELLS + SPELL_AURA_MOD_SPELL_DAMAGE_OF_STAT_PERCENT = 174, // by defeult intelect, dependent from SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT + SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT = 175, + SPELL_AURA_SPIRIT_OF_REDEMPTION = 176, + SPELL_AURA_AOE_CHARM = 177, + SPELL_AURA_MOD_DEBUFF_RESISTANCE = 178, + SPELL_AURA_MOD_ATTACKER_SPELL_CRIT_CHANCE = 179, + SPELL_AURA_MOD_FLAT_SPELL_DAMAGE_VERSUS = 180, + SPELL_AURA_181 = 181, // old SPELL_AURA_MOD_FLAT_SPELL_CRIT_DAMAGE_VERSUS - possible flat spell crit damage versus + SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT = 182, + SPELL_AURA_MOD_CRITICAL_THREAT = 183, + SPELL_AURA_MOD_ATTACKER_MELEE_HIT_CHANCE = 184, + SPELL_AURA_MOD_ATTACKER_RANGED_HIT_CHANCE = 185, + SPELL_AURA_MOD_ATTACKER_SPELL_HIT_CHANCE = 186, + SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_CHANCE = 187, + SPELL_AURA_MOD_ATTACKER_RANGED_CRIT_CHANCE = 188, + SPELL_AURA_MOD_RATING = 189, + SPELL_AURA_MOD_FACTION_REPUTATION_GAIN = 190, + SPELL_AURA_USE_NORMAL_MOVEMENT_SPEED = 191, + SPELL_AURA_MOD_MELEE_RANGED_HASTE = 192, + SPELL_AURA_MELEE_SLOW = 193, + SPELL_AURA_MOD_TARGET_ABSORB_SCHOOL = 194, + SPELL_AURA_MOD_TARGET_ABILITY_ABSORB_SCHOOL = 195, + SPELL_AURA_MOD_COOLDOWN = 196, // only 24818 Noxious Breath + SPELL_AURA_MOD_ATTACKER_SPELL_AND_WEAPON_CRIT_CHANCE = 197, + SPELL_AURA_198 = 198, // old SPELL_AURA_MOD_ALL_WEAPON_SKILLS + SPELL_AURA_MOD_INCREASES_SPELL_PCT_TO_HIT = 199, + SPELL_AURA_MOD_XP_PCT = 200, + SPELL_AURA_FLY = 201, + SPELL_AURA_IGNORE_COMBAT_RESULT = 202, + SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_DAMAGE = 203, + SPELL_AURA_MOD_ATTACKER_RANGED_CRIT_DAMAGE = 204, + SPELL_AURA_MOD_SCHOOL_CRIT_DMG_TAKEN = 205, + SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED = 206, + SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED = 207, + SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED = 208, + SPELL_AURA_MOD_MOUNTED_FLIGHT_SPEED_ALWAYS = 209, + SPELL_AURA_MOD_VEHICLE_SPEED_ALWAYS = 210, + SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK = 211, + SPELL_AURA_MOD_RANGED_ATTACK_POWER_OF_STAT_PERCENT = 212, + SPELL_AURA_MOD_RAGE_FROM_DAMAGE_DEALT = 213, + SPELL_AURA_214 = 214, + SPELL_AURA_ARENA_PREPARATION = 215, + SPELL_AURA_HASTE_SPELLS = 216, + SPELL_AURA_MOD_MELEE_HASTE_2 = 217, // NYI + SPELL_AURA_HASTE_RANGED = 218, + SPELL_AURA_MOD_MANA_REGEN_FROM_STAT = 219, + SPELL_AURA_MOD_RATING_FROM_STAT = 220, + SPELL_AURA_MOD_DETAUNT = 221, + SPELL_AURA_222 = 222, + SPELL_AURA_RAID_PROC_FROM_CHARGE = 223, + SPELL_AURA_224 = 224, + SPELL_AURA_RAID_PROC_FROM_CHARGE_WITH_VALUE = 225, + SPELL_AURA_PERIODIC_DUMMY = 226, + SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE = 227, + SPELL_AURA_DETECT_STEALTH = 228, + SPELL_AURA_MOD_AOE_DAMAGE_AVOIDANCE = 229, + SPELL_AURA_230 = 230, + SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE = 231, + SPELL_AURA_MECHANIC_DURATION_MOD = 232, + SPELL_AURA_CHANGE_MODEL_FOR_ALL_HUMANOIDS = 233, // client-side only + SPELL_AURA_MECHANIC_DURATION_MOD_NOT_STACK = 234, + SPELL_AURA_MOD_DISPEL_RESIST = 235, + SPELL_AURA_CONTROL_VEHICLE = 236, + SPELL_AURA_MOD_SPELL_DAMAGE_OF_ATTACK_POWER = 237, + SPELL_AURA_MOD_SPELL_HEALING_OF_ATTACK_POWER = 238, + SPELL_AURA_MOD_SCALE_2 = 239, + SPELL_AURA_MOD_EXPERTISE = 240, + SPELL_AURA_FORCE_MOVE_FORWARD = 241, + SPELL_AURA_MOD_SPELL_DAMAGE_FROM_HEALING = 242, + SPELL_AURA_MOD_FACTION = 243, + SPELL_AURA_COMPREHEND_LANGUAGE = 244, + SPELL_AURA_MOD_AURA_DURATION_BY_DISPEL = 245, + SPELL_AURA_MOD_AURA_DURATION_BY_DISPEL_NOT_STACK = 246, + SPELL_AURA_CLONE_CASTER = 247, + SPELL_AURA_MOD_COMBAT_RESULT_CHANCE = 248, + SPELL_AURA_CONVERT_RUNE = 249, + SPELL_AURA_MOD_INCREASE_HEALTH_2 = 250, + SPELL_AURA_MOD_ENEMY_DODGE = 251, + SPELL_AURA_MOD_SPEED_SLOW_ALL = 252, + SPELL_AURA_MOD_BLOCK_CRIT_CHANCE = 253, + SPELL_AURA_MOD_DISARM_OFFHAND = 254, + SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT = 255, + SPELL_AURA_NO_REAGENT_USE = 256, + SPELL_AURA_MOD_TARGET_RESIST_BY_SPELL_CLASS = 257, + SPELL_AURA_258 = 258, + SPELL_AURA_MOD_HOT_PCT = 259, + SPELL_AURA_SCREEN_EFFECT = 260, + SPELL_AURA_PHASE = 261, + SPELL_AURA_ABILITY_IGNORE_AURASTATE = 262, + SPELL_AURA_ALLOW_ONLY_ABILITY = 263, + SPELL_AURA_264 = 264, + SPELL_AURA_265 = 265, + SPELL_AURA_266 = 266, + SPELL_AURA_MOD_IMMUNE_AURA_APPLY_SCHOOL = 267, SPELL_AURA_MOD_ATTACK_POWER_OF_STAT_PERCENT = 268, - SPELL_AURA_MOD_IGNORE_TARGET_RESIST = 269, - SPELL_AURA_MOD_ABILITY_IGNORE_TARGET_RESIST = 270, // Possibly need swap vs 195 aura used only in 1 spell Chaos Bolt Passive - SPELL_AURA_MOD_DAMAGE_FROM_CASTER = 271, - SPELL_AURA_IGNORE_MELEE_RESET = 272, - SPELL_AURA_X_RAY = 273, - SPELL_AURA_ABILITY_CONSUME_NO_AMMO = 274, - SPELL_AURA_MOD_IGNORE_SHAPESHIFT = 275, - SPELL_AURA_MOD_DAMAGE_DONE_FOR_MECHANIC = 276, // NYI - SPELL_AURA_MOD_MAX_AFFECTED_TARGETS = 277, - SPELL_AURA_MOD_DISARM_RANGED = 278, - SPELL_AURA_INITIALIZE_IMAGES = 279, + SPELL_AURA_MOD_IGNORE_TARGET_RESIST = 269, + SPELL_AURA_MOD_ABILITY_IGNORE_TARGET_RESIST = 270, // Possibly need swap vs 195 aura used only in 1 spell Chaos Bolt Passive + SPELL_AURA_MOD_DAMAGE_FROM_CASTER = 271, + SPELL_AURA_IGNORE_MELEE_RESET = 272, + SPELL_AURA_X_RAY = 273, + SPELL_AURA_ABILITY_CONSUME_NO_AMMO = 274, + SPELL_AURA_MOD_IGNORE_SHAPESHIFT = 275, + SPELL_AURA_MOD_DAMAGE_DONE_FOR_MECHANIC = 276, // NYI + SPELL_AURA_MOD_MAX_AFFECTED_TARGETS = 277, + SPELL_AURA_MOD_DISARM_RANGED = 278, + SPELL_AURA_INITIALIZE_IMAGES = 279, SPELL_AURA_MOD_ARMOR_PENETRATION_PCT = 280, - SPELL_AURA_MOD_HONOR_GAIN_PCT = 281, - SPELL_AURA_MOD_BASE_HEALTH_PCT = 282, - SPELL_AURA_MOD_HEALING_RECEIVED = 283, // Possibly only for some spell family class spells - SPELL_AURA_LINKED = 284, - SPELL_AURA_MOD_ATTACK_POWER_OF_ARMOR = 285, - SPELL_AURA_ABILITY_PERIODIC_CRIT = 286, - SPELL_AURA_DEFLECT_SPELLS = 287, - SPELL_AURA_IGNORE_HIT_DIRECTION = 288, - SPELL_AURA_289 = 289, - SPELL_AURA_MOD_CRIT_PCT = 290, - SPELL_AURA_MOD_XP_QUEST_PCT = 291, - SPELL_AURA_OPEN_STABLE = 292, - SPELL_AURA_OVERRIDE_SPELLS = 293, - SPELL_AURA_PREVENT_REGENERATE_POWER = 294, - SPELL_AURA_295 = 295, - SPELL_AURA_SET_VEHICLE_ID = 296, - SPELL_AURA_BLOCK_SPELL_FAMILY = 297, - SPELL_AURA_STRANGULATE = 298, - SPELL_AURA_299 = 299, - SPELL_AURA_SHARE_DAMAGE_PCT = 300, - SPELL_AURA_SCHOOL_HEAL_ABSORB = 301, - SPELL_AURA_302 = 302, - SPELL_AURA_MOD_DAMAGE_DONE_VERSUS_AURASTATE = 303, - SPELL_AURA_MOD_FAKE_INEBRIATE = 304, - SPELL_AURA_MOD_MINIMUM_SPEED = 305, - SPELL_AURA_306 = 306, - SPELL_AURA_HEAL_ABSORB_TEST = 307, - SPELL_AURA_MOD_CRIT_CHANCE_FOR_CASTER = 308, // NYI - SPELL_AURA_309 = 309, - SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE = 310, - SPELL_AURA_311 = 311, - SPELL_AURA_312 = 312, - SPELL_AURA_313 = 313, - SPELL_AURA_PREVENT_RESURRECTION = 314, - SPELL_AURA_UNDERWATER_WALKING = 315, - SPELL_AURA_PERIODIC_HASTE = 316, - TOTAL_AURAS = 317 + SPELL_AURA_MOD_HONOR_GAIN_PCT = 281, + SPELL_AURA_MOD_BASE_HEALTH_PCT = 282, + SPELL_AURA_MOD_HEALING_RECEIVED = 283, // Possibly only for some spell family class spells + SPELL_AURA_LINKED = 284, + SPELL_AURA_MOD_ATTACK_POWER_OF_ARMOR = 285, + SPELL_AURA_ABILITY_PERIODIC_CRIT = 286, + SPELL_AURA_DEFLECT_SPELLS = 287, + SPELL_AURA_IGNORE_HIT_DIRECTION = 288, + SPELL_AURA_289 = 289, + SPELL_AURA_MOD_CRIT_PCT = 290, + SPELL_AURA_MOD_XP_QUEST_PCT = 291, + SPELL_AURA_OPEN_STABLE = 292, + SPELL_AURA_OVERRIDE_SPELLS = 293, + SPELL_AURA_PREVENT_REGENERATE_POWER = 294, + SPELL_AURA_295 = 295, + SPELL_AURA_SET_VEHICLE_ID = 296, + SPELL_AURA_BLOCK_SPELL_FAMILY = 297, + SPELL_AURA_STRANGULATE = 298, + SPELL_AURA_299 = 299, + SPELL_AURA_SHARE_DAMAGE_PCT = 300, + SPELL_AURA_SCHOOL_HEAL_ABSORB = 301, + SPELL_AURA_302 = 302, + SPELL_AURA_MOD_DAMAGE_DONE_VERSUS_AURASTATE = 303, + SPELL_AURA_MOD_FAKE_INEBRIATE = 304, + SPELL_AURA_MOD_MINIMUM_SPEED = 305, + SPELL_AURA_306 = 306, + SPELL_AURA_HEAL_ABSORB_TEST = 307, + SPELL_AURA_MOD_CRIT_CHANCE_FOR_CASTER = 308, // NYI + SPELL_AURA_309 = 309, + SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE = 310, + SPELL_AURA_311 = 311, + SPELL_AURA_312 = 312, + SPELL_AURA_313 = 313, + SPELL_AURA_PREVENT_RESURRECTION = 314, + SPELL_AURA_UNDERWATER_WALKING = 315, + SPELL_AURA_PERIODIC_HASTE = 316, + TOTAL_AURAS = 317 }; enum AuraObjectType diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 24bc9540ab7..816f9399221 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -120,7 +120,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleAuraModPacifyAndSilence, // 60 SPELL_AURA_MOD_PACIFY_SILENCE &AuraEffect::HandleAuraModScale, // 61 SPELL_AURA_MOD_SCALE &AuraEffect::HandleNoImmediateEffect, // 62 SPELL_AURA_PERIODIC_HEALTH_FUNNEL implemented in AuraEffect::PeriodicTick - &AuraEffect::HandleNULL, // 63 unused (3.2.0) old SPELL_AURA_PERIODIC_MANA_FUNNEL + &AuraEffect::HandleUnused, // 63 unused (3.2.0) old SPELL_AURA_PERIODIC_MANA_FUNNEL &AuraEffect::HandleNoImmediateEffect, // 64 SPELL_AURA_PERIODIC_MANA_LEECH implemented in AuraEffect::PeriodicTick &AuraEffect::HandleModCastingSpeed, // 65 SPELL_AURA_MOD_CASTING_SPEED_NOT_STACK &AuraEffect::HandleFeignDeath, // 66 SPELL_AURA_FEIGN_DEATH @@ -147,7 +147,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleNoImmediateEffect, // 87 SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN implemented in Unit::MeleeDamageBonus and Unit::SpellDamageBonus &AuraEffect::HandleNoImmediateEffect, // 88 SPELL_AURA_MOD_HEALTH_REGEN_PERCENT implemented in Player::RegenerateHealth &AuraEffect::HandleNoImmediateEffect, // 89 SPELL_AURA_PERIODIC_DAMAGE_PERCENT - &AuraEffect::HandleNULL, // 90 unused (3.0.8a) old SPELL_AURA_MOD_RESIST_CHANCE + &AuraEffect::HandleUnused, // 90 unused (3.0.8a) old SPELL_AURA_MOD_RESIST_CHANCE &AuraEffect::HandleNoImmediateEffect, // 91 SPELL_AURA_MOD_DETECT_RANGE implemented in Creature::GetAttackDistance &AuraEffect::HandlePreventFleeing, // 92 SPELL_AURA_PREVENTS_FLEEING &AuraEffect::HandleModUnattackable, // 93 SPELL_AURA_MOD_UNATTACKABLE @@ -176,7 +176,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleNoImmediateEffect, //116 SPELL_AURA_MOD_REGEN_DURING_COMBAT &AuraEffect::HandleNoImmediateEffect, //117 SPELL_AURA_MOD_MECHANIC_RESISTANCE implemented in Unit::MagicSpellHitResult &AuraEffect::HandleNoImmediateEffect, //118 SPELL_AURA_MOD_HEALING_PCT implemented in Unit::SpellHealingBonus - &AuraEffect::HandleNULL, //119 unused (3.2.0) old SPELL_AURA_SHARE_PET_TRACKING + &AuraEffect::HandleUnused, //119 unused (3.2.0) old SPELL_AURA_SHARE_PET_TRACKING &AuraEffect::HandleAuraUntrackable, //120 SPELL_AURA_UNTRACKABLE &AuraEffect::HandleAuraEmpathy, //121 SPELL_AURA_EMPATHY &AuraEffect::HandleModOffhandDamagePercent, //122 SPELL_AURA_MOD_OFFHAND_DAMAGE_PCT @@ -230,7 +230,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleNULL, //170 SPELL_AURA_DETECT_AMORE various spells that change visual of units for aura target (clientside?) &AuraEffect::HandleAuraModIncreaseSpeed, //171 SPELL_AURA_MOD_SPEED_NOT_STACK &AuraEffect::HandleAuraModIncreaseMountedSpeed, //172 SPELL_AURA_MOD_MOUNTED_SPEED_NOT_STACK - &AuraEffect::HandleNULL, //173 unused (3.2.0) no spells, old SPELL_AURA_ALLOW_CHAMPION_SPELLS only for Proclaim Champion spell + &AuraEffect::HandleUnused, //173 unused (3.2.0) no spells, old SPELL_AURA_ALLOW_CHAMPION_SPELLS only for Proclaim Champion spell &AuraEffect::HandleModSpellDamagePercentFromStat, //174 SPELL_AURA_MOD_SPELL_DAMAGE_OF_STAT_PERCENT implemented in Unit::SpellBaseDamageBonus &AuraEffect::HandleModSpellHealingPercentFromStat, //175 SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT implemented in Unit::SpellBaseHealingBonus &AuraEffect::HandleSpiritOfRedemption, //176 SPELL_AURA_SPIRIT_OF_REDEMPTION only for Spirit of Redemption spell, die at aura end @@ -238,7 +238,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleNoImmediateEffect, //178 SPELL_AURA_MOD_DEBUFF_RESISTANCE implemented in Unit::MagicSpellHitResult &AuraEffect::HandleNoImmediateEffect, //179 SPELL_AURA_MOD_ATTACKER_SPELL_CRIT_CHANCE implemented in Unit::SpellCriticalBonus &AuraEffect::HandleNoImmediateEffect, //180 SPELL_AURA_MOD_FLAT_SPELL_DAMAGE_VERSUS implemented in Unit::SpellDamageBonus - &AuraEffect::HandleNULL, //181 unused (3.2.0) old SPELL_AURA_MOD_FLAT_SPELL_CRIT_DAMAGE_VERSUS + &AuraEffect::HandleUnused, //181 unused (3.2.0) old SPELL_AURA_MOD_FLAT_SPELL_CRIT_DAMAGE_VERSUS &AuraEffect::HandleAuraModResistenceOfStatPercent, //182 SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT &AuraEffect::HandleNULL, //183 SPELL_AURA_MOD_CRITICAL_THREAT only used in 28746 - miscvalue - spell school &AuraEffect::HandleNoImmediateEffect, //184 SPELL_AURA_MOD_ATTACKER_MELEE_HIT_CHANCE implemented in Unit::RollMeleeOutcomeAgainst @@ -255,7 +255,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleNoImmediateEffect, //195 SPELL_AURA_MOD_TARGET_ABILITY_ABSORB_SCHOOL implemented in Unit::CalcAbsorbResist &AuraEffect::HandleNULL, //196 SPELL_AURA_MOD_COOLDOWN - flat mod of spell cooldowns &AuraEffect::HandleNoImmediateEffect, //197 SPELL_AURA_MOD_ATTACKER_SPELL_AND_WEAPON_CRIT_CHANCE implemented in Unit::SpellCriticalBonus Unit::GetUnitCriticalChance - &AuraEffect::HandleNULL, //198 unused (3.2.0) old SPELL_AURA_MOD_ALL_WEAPON_SKILLS + &AuraEffect::HandleUnused, //198 unused (3.2.0) old SPELL_AURA_MOD_ALL_WEAPON_SKILLS &AuraEffect::HandleNoImmediateEffect, //199 SPELL_AURA_MOD_INCREASES_SPELL_PCT_TO_HIT implemented in Unit::MagicSpellHitResult &AuraEffect::HandleNoImmediateEffect, //200 SPELL_AURA_MOD_XP_PCT implemented in Player::RewardPlayerAndGroupAtKill &AuraEffect::HandleAuraAllowFlight, //201 SPELL_AURA_FLY this aura enable flight mode... @@ -352,25 +352,25 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleAuraOpenStable, //292 SPELL_AURA_OPEN_STABLE &AuraEffect::HandleAuraOverrideSpells, //293 auras which probably add set of abilities to their target based on it's miscvalue &AuraEffect::HandleNoImmediateEffect, //294 SPELL_AURA_PREVENT_REGENERATE_POWER implemented in Player::Regenerate(Powers power) - &AuraEffect::HandleNULL, //295 0 spells in 3.3.5 + &AuraEffect::HandleUnused, //295 0 spells in 3.3.5 &AuraEffect::HandleAuraSetVehicle, //296 SPELL_AURA_SET_VEHICLE_ID sets vehicle on target &AuraEffect::HandleNULL, //297 Spirit Burst spells &AuraEffect::HandleNULL, //298 70569 - Strangulating, maybe prevents talk or cast - &AuraEffect::HandleNULL, //299 unused + &AuraEffect::HandleUnused, //299 unused &AuraEffect::HandleNoImmediateEffect, //300 SPELL_AURA_SHARE_DAMAGE_PCT implemented in Unit::DealDamage &AuraEffect::HandleNoImmediateEffect, //301 SPELL_AURA_SCHOOL_HEAL_ABSORB implemented in Unit::CalcHealAbsorb - &AuraEffect::HandleNULL, //302 0 spells in 3.3.5 + &AuraEffect::HandleUnused, //302 0 spells in 3.3.5 &AuraEffect::HandleNoImmediateEffect, //303 SPELL_AURA_MOD_DAMAGE_DONE_VERSUS_AURASTATE implemented in Unit::SpellDamageBonus, Unit::MeleeDamageBonus &AuraEffect::HandleAuraModFakeInebriation, //304 SPELL_AURA_MOD_DRUNK &AuraEffect::HandleAuraModIncreaseSpeed, //305 SPELL_AURA_MOD_MINIMUM_SPEED - &AuraEffect::HandleNULL, //306 0 spells in 3.3.5 - &AuraEffect::HandleNULL, //307 0 spells in 3.3.5 + &AuraEffect::HandleUnused, //306 0 spells in 3.3.5 + &AuraEffect::HandleUnused, //307 0 spells in 3.3.5 &AuraEffect::HandleNULL, //308 new aura for hunter traps - &AuraEffect::HandleNULL, //309 0 spells in 3.3.5 + &AuraEffect::HandleUnused, //309 0 spells in 3.3.5 &AuraEffect::HandleNoImmediateEffect, //310 SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE implemented in Spell::CalculateDamageDone &AuraEffect::HandleNULL, //311 0 spells in 3.3.5 &AuraEffect::HandleNULL, //312 0 spells in 3.3.5 - &AuraEffect::HandleNULL, //313 0 spells in 3.3.5 + &AuraEffect::HandleUnused, //313 0 spells in 3.3.5 &AuraEffect::HandlePreventResurrection, //314 SPELL_AURA_PREVENT_RESURRECTION todo &AuraEffect::HandleNoImmediateEffect, //315 SPELL_AURA_UNDERWATER_WALKING todo &AuraEffect::HandleNoImmediateEffect, //316 SPELL_AURA_PERIODIC_HASTE implemented in AuraEffect::CalculatePeriodic @@ -417,9 +417,8 @@ void AuraEffect::GetApplicationList(std::list & applicationLis int32 AuraEffect::CalculateAmount(Unit* caster) { - int32 amount; // default amount calculation - amount = m_spellInfo->Effects[m_effIndex].CalcValue(caster, &m_baseAmount, NULL); + int32 amount = m_spellInfo->Effects[m_effIndex].CalcValue(caster, &m_baseAmount, NULL); // check item enchant aura cast if (!amount && caster) diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.cpp b/src/server/game/Tools/CharacterDatabaseCleaner.cpp index f87b81c8be8..a342388f583 100644 --- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp +++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp @@ -17,6 +17,7 @@ */ #include "Common.h" +#include "AchievementMgr.h" #include "CharacterDatabaseCleaner.h" #include "World.h" #include "Database/DatabaseEnv.h" @@ -108,7 +109,7 @@ void CharacterDatabaseCleaner::CheckUnique(const char* column, const char* table bool CharacterDatabaseCleaner::AchievementProgressCheck(uint32 criteria) { - return sAchievementCriteriaStore.LookupEntry(criteria); + return sAchievementMgr->GetAchievementCriteria(criteria); } void CharacterDatabaseCleaner::CleanCharacterAchievementProgress() diff --git a/src/server/scripts/Commands/cs_achievement.cpp b/src/server/scripts/Commands/cs_achievement.cpp index 9f5c861c52f..9a84a4c4cbc 100644 --- a/src/server/scripts/Commands/cs_achievement.cpp +++ b/src/server/scripts/Commands/cs_achievement.cpp @@ -22,6 +22,7 @@ Comment: All achievement related commands Category: commandscripts EndScriptData */ +#include "AchievementMgr.h" #include "Chat.h" #include "Language.h" #include "Player.h" @@ -69,7 +70,7 @@ public: return false; } - if (AchievementEntry const* achievementEntry = sAchievementStore.LookupEntry(achievementId)) + if (AchievementEntry const* achievementEntry = sAchievementMgr->GetAchievement(achievementId)) target->CompletedAchievement(achievementEntry); return true; diff --git a/src/server/scripts/Commands/cs_disable.cpp b/src/server/scripts/Commands/cs_disable.cpp index 73ed341a21c..cf0b1f08e53 100644 --- a/src/server/scripts/Commands/cs_disable.cpp +++ b/src/server/scripts/Commands/cs_disable.cpp @@ -22,8 +22,9 @@ Comment: All disable related commands Category: commandscripts EndScriptData */ -#include "Chat.h" #include "DisableMgr.h" +#include "AchievementMgr.h" +#include "Chat.h" #include "Language.h" #include "ObjectMgr.h" #include "OutdoorPvP.h" @@ -140,7 +141,7 @@ public: } case DISABLE_TYPE_ACHIEVEMENT_CRITERIA: { - if (!sAchievementCriteriaStore.LookupEntry(entry)) + if (!sAchievementMgr->GetAchievementCriteria(entry)) { handler->PSendSysMessage(LANG_COMMAND_NO_ACHIEVEMENT_CRITERIA_FOUND); handler->SetSentErrorMessage(true); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 660b8f6c460..1fa5cc9c5af 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -226,7 +226,6 @@ public: if (text) CreatureAI::Talk(text); - } void PrepareEncounter() diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 22a26fd4389..84d0cd6b4c4 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -178,7 +178,7 @@ public: { if (!instance) return; - + instance->SetData(DATA_KAELTHAS_EVENT, IN_PROGRESS); } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index c8bf50c0bcc..c142a0c30d7 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -150,7 +150,7 @@ public: HandleGameObject(SelinEncounterDoorGUID, false); else if (data == NOT_STARTED) HandleGameObject(SelinEncounterDoorGUID, true); - + Encounter[0] = data; break; case DATA_VEXALLUS_EVENT: @@ -184,7 +184,7 @@ public: StatuesState = data; break; } - + SaveToDB(); } @@ -245,7 +245,7 @@ public: OUT_SAVE_INST_DATA_COMPLETE; return saveStream.str(); } - + void Load(const char* str) { if (!str) @@ -257,7 +257,7 @@ public: OUT_LOAD_INST_DATA(str); std::istringstream loadStream(str); - + for (uint32 i = 0; i < MAX_ENCOUNTER; ++i) { uint32 tmpState; @@ -272,7 +272,7 @@ public: OUT_LOAD_INST_DATA_COMPLETE; } - + uint64 GetData64(uint32 identifier) const { switch (identifier) diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 2b21bb26804..7ceb86dd980 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -141,7 +141,7 @@ public: ++speechCounter; DoCastAOE(SPELL_THREAT_PULSE, true); - } else + } else speechTimer -= diff; return; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 78a5f3797d8..2ff3dcd5e32 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -34,7 +34,7 @@ EndScriptData */ //this texts are already used by 3975 and 3976 enum Says { - SAY_LOST_HEAD = 0, + SAY_LOST_HEAD = 0, SAY_PLAYER_DEATH = 1, SAY_ENTRANCE = 0, diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index c7db80c7f22..c2dc7123f6d 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -54,7 +54,7 @@ enum Spells AURA_SPECTRAL_REALM = 46021, AURA_SPECTRAL_INVISIBILITY = 44801, AURA_DEMONIC_VISUAL = 44800, - + SPELL_SPECTRAL_BLAST = 44869, SPELL_TELEPORT_SPECTRAL = 46019, SPELL_ARCANE_BUFFET = 45018, diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index c2552963b0e..b32f9244034 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -34,7 +34,7 @@ EndScriptData */ enum Yells { SAY_KJ_OFFCOMBAT = 0, - + SAY_KALECGOS_ENCOURAGE = 0, SAY_KALECGOS_READY1 = 1, SAY_KALECGOS_READY2 = 2, diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp index e1a3c3aeb45..a4d28498816 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp @@ -26,6 +26,7 @@ EndScriptData */ /* ContentData EndContentData */ +#include "AchievementMgr.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" @@ -318,7 +319,7 @@ public: eventTimer = 3000; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) { - AchievementEntry const* AchievWC = sAchievementStore.LookupEntry(ACHIEVEMENT_WAILING_CAVERNS); + AchievementEntry const* AchievWC = sAchievementMgr->GetAchievement(ACHIEVEMENT_WAILING_CAVERNS); if (AchievWC) { Map* map = me->GetMap(); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index cdc21eb25ec..8d9269aa70f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -48,16 +48,6 @@ enum Spells #define SPELL_PERMAFROST_HELPER RAID_MODE(68786, 70336) #define SPELL_FORGE_BLADE_HELPER RAID_MODE(68774, 70334) -enum Events -{ - EVENT_THROW_SARONITE = 1, - EVENT_CHILLING_WAVE = 2, - EVENT_DEEP_FREEZE = 3, - EVENT_JUMP = 4, - EVENT_FORGING = 5, - EVENT_RESUME_ATTACK = 6, -}; - enum Phases { PHASE_ONE = 1, @@ -82,6 +72,15 @@ Position const southForgePos = {639.257f, -210.1198f, 529.015f, 0.523599f}; class boss_garfrost : public CreatureScript { +enum Events +{ + EVENT_THROW_SARONITE = 1, + EVENT_CHILLING_WAVE = 2, + EVENT_DEEP_FREEZE = 3, + EVENT_JUMP = 4, + EVENT_FORGING = 5, + EVENT_RESUME_ATTACK = 6, +}; public: boss_garfrost() : CreatureScript("boss_garfrost") { } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 5a8f004788d..c027dd3a97d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -15,6 +15,7 @@ * with this program. If not, see . */ +#include "AchievementMgr.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "naxxramas.h" @@ -156,7 +157,7 @@ public: CheckPlayersFrostResist(); if (CanTheHundredClub) { - AchievementEntry const* AchievTheHundredClub = sAchievementStore.LookupEntry(ACHIEVEMENT_THE_HUNDRED_CLUB); + AchievementEntry const* AchievTheHundredClub = sAchievementMgr->GetAchievement(ACHIEVEMENT_THE_HUNDRED_CLUB); if (AchievTheHundredClub) { if (map && map->IsDungeon()) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 33e6e2846e4..fc6de6b2faf 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -23,6 +23,7 @@ SDComment: Event should be pretty close minus a few visual flaws SDCategory: Halls of Lightning EndScriptData */ +#include "AchievementMgr.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" #include "halls_of_lightning.h" @@ -155,7 +156,7 @@ public: if (IsHeroic() && GolemsShattered < 5) { - AchievementEntry const* AchievShatterResistant = sAchievementStore.LookupEntry(ACHIEVEMENT_SHATTER_RESISTANT); + AchievementEntry const* AchievShatterResistant = sAchievementMgr->GetAchievement(ACHIEVEMENT_SHATTER_RESISTANT); if (AchievShatterResistant) { Map* map = me->GetMap();