diff options
Diffstat (limited to 'src/server/scripts')
378 files changed, 1557 insertions, 1986 deletions
diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp index 94ab26f7a99..64a781364b2 100644 --- a/src/server/scripts/Commands/cs_account.cpp +++ b/src/server/scripts/Commands/cs_account.cpp @@ -686,7 +686,7 @@ public: return false; } - // handler->getSession() == NULL only for console + // handler->getSession() == nullptr only for console accountId = (isAccountNameGiven) ? AccountMgr::GetId(accountName) : handler->getSelectedPlayer()->GetSession()->GetAccountId(); int32 realmID = (isAccountNameGiven) ? atoi(arg3) : atoi(arg2); uint32 playerSecurity; diff --git a/src/server/scripts/Commands/cs_ahbot.cpp b/src/server/scripts/Commands/cs_ahbot.cpp index b28508335b3..dcdfb27e013 100644 --- a/src/server/scripts/Commands/cs_ahbot.cpp +++ b/src/server/scripts/Commands/cs_ahbot.cpp @@ -21,7 +21,7 @@ #include "Language.h" #include "RBAC.h" -static const uint32 ahbotQualityIds[MAX_AUCTION_QUALITY] = +uint32 const ahbotQualityIds[MAX_AUCTION_QUALITY] = { LANG_AHBOT_QUALITY_GRAY, LANG_AHBOT_QUALITY_WHITE, LANG_AHBOT_QUALITY_GREEN, LANG_AHBOT_QUALITY_BLUE, @@ -73,7 +73,7 @@ public: return commandTable; } - static bool HandleAHBotItemsAmountCommand(ChatHandler* handler, const char* args) + static bool HandleAHBotItemsAmountCommand(ChatHandler* handler, char const* args) { uint32 qVals[MAX_AUCTION_QUALITY]; char* arg = strtok((char*)args, " "); @@ -94,7 +94,7 @@ public: } template <AuctionQuality Q> - static bool HandleAHBotItemsAmountQualityCommand(ChatHandler* handler, const char* args) + static bool HandleAHBotItemsAmountQualityCommand(ChatHandler* handler, char const* args) { char* arg = strtok((char*)args, " "); if (!arg) @@ -108,7 +108,7 @@ public: return true; } - static bool HandleAHBotItemsRatioCommand(ChatHandler* handler, const char* args) + static bool HandleAHBotItemsRatioCommand(ChatHandler* handler, char const* args) { uint32 rVal[MAX_AUCTION_QUALITY]; char* arg = strtok((char*)args, " "); @@ -128,7 +128,7 @@ public: } template<AuctionHouseType H> - static bool HandleAHBotItemsRatioHouseCommand(ChatHandler* handler, const char* args) + static bool HandleAHBotItemsRatioHouseCommand(ChatHandler* handler, char const* args) { char* arg = strtok((char*)args, " "); if (!arg) @@ -140,7 +140,7 @@ public: return true; } - static bool HandleAHBotRebuildCommand(ChatHandler* /*handler*/, const char* args) + static bool HandleAHBotRebuildCommand(ChatHandler* /*handler*/, char const* args) { char* arg = strtok((char*)args, " "); @@ -152,14 +152,14 @@ public: return true; } - static bool HandleAHBotReloadCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleAHBotReloadCommand(ChatHandler* handler, char const* /*args*/) { sAuctionBot->ReloadAllConfig(); handler->SendSysMessage(LANG_AHBOT_RELOAD_OK); return true; } - static bool HandleAHBotStatusCommand(ChatHandler* handler, const char* args) + static bool HandleAHBotStatusCommand(ChatHandler* handler, char const* args) { char* arg = strtok((char*)args, " "); if (!arg) @@ -228,17 +228,17 @@ public: }; -template bool ahbot_commandscript::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_GRAY>(ChatHandler* handler, const char*); -template bool ahbot_commandscript::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_WHITE>(ChatHandler* handler, const char*); -template bool ahbot_commandscript::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_GREEN>(ChatHandler* handler, const char*); -template bool ahbot_commandscript::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_BLUE>(ChatHandler* handler, const char*); -template bool ahbot_commandscript::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_PURPLE>(ChatHandler* handler, const char*); -template bool ahbot_commandscript::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_ORANGE>(ChatHandler* handler, const char*); -template bool ahbot_commandscript::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_YELLOW>(ChatHandler* handler, const char*); - -template bool ahbot_commandscript::HandleAHBotItemsRatioHouseCommand<AUCTION_HOUSE_ALLIANCE>(ChatHandler* handler, const char*); -template bool ahbot_commandscript::HandleAHBotItemsRatioHouseCommand<AUCTION_HOUSE_HORDE>(ChatHandler* handler, const char*); -template bool ahbot_commandscript::HandleAHBotItemsRatioHouseCommand<AUCTION_HOUSE_NEUTRAL>(ChatHandler* handler, const char*); +template bool ahbot_commandscript::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_GRAY>(ChatHandler* handler, char const*); +template bool ahbot_commandscript::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_WHITE>(ChatHandler* handler, char const*); +template bool ahbot_commandscript::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_GREEN>(ChatHandler* handler, char const*); +template bool ahbot_commandscript::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_BLUE>(ChatHandler* handler, char const*); +template bool ahbot_commandscript::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_PURPLE>(ChatHandler* handler, char const*); +template bool ahbot_commandscript::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_ORANGE>(ChatHandler* handler, char const*); +template bool ahbot_commandscript::HandleAHBotItemsAmountQualityCommand<AUCTION_QUALITY_YELLOW>(ChatHandler* handler, char const*); + +template bool ahbot_commandscript::HandleAHBotItemsRatioHouseCommand<AUCTION_HOUSE_ALLIANCE>(ChatHandler* handler, char const*); +template bool ahbot_commandscript::HandleAHBotItemsRatioHouseCommand<AUCTION_HOUSE_HORDE>(ChatHandler* handler, char const*); +template bool ahbot_commandscript::HandleAHBotItemsRatioHouseCommand<AUCTION_HOUSE_NEUTRAL>(ChatHandler* handler, char const*); void AddSC_ahbot_commandscript() { diff --git a/src/server/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp index 0954aa9ab7a..cfe151bcde1 100644 --- a/src/server/scripts/Commands/cs_ban.cpp +++ b/src/server/scripts/Commands/cs_ban.cpp @@ -22,6 +22,7 @@ Comment: All ban related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "AccountMgr.h" #include "CharacterCache.h" #include "Chat.h" @@ -30,7 +31,6 @@ EndScriptData */ #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Player.h" -#include "ScriptMgr.h" #include "World.h" #include "WorldSession.h" @@ -429,7 +429,7 @@ public: Field* fields = result->Fetch(); uint32 accountid = fields[0].GetUInt32(); - QueryResult banResult = LoginDatabase.PQuery("SELECT account.username FROM account, account_banned WHERE account_banned.id='%u' AND account_banned.id=account.id", accountid); + QueryResult banResult = LoginDatabase.PQuery("SELECT account.username FROM account, account_banned WHERE account_banned.id='%u' AND account_banned.id = account.id", accountid); if (banResult) { Field* fields2 = banResult->Fetch(); diff --git a/src/server/scripts/Commands/cs_bf.cpp b/src/server/scripts/Commands/cs_bf.cpp index 93459a006ac..9c4dd466114 100644 --- a/src/server/scripts/Commands/cs_bf.cpp +++ b/src/server/scripts/Commands/cs_bf.cpp @@ -49,7 +49,7 @@ public: return commandTable; } - static bool HandleBattlefieldStart(ChatHandler* handler, const char* args) + static bool HandleBattlefieldStart(ChatHandler* handler, char const* args) { uint32 battleid = 0; char* battleid_str = strtok((char*)args, " "); @@ -71,7 +71,7 @@ public: return true; } - static bool HandleBattlefieldEnd(ChatHandler* handler, const char* args) + static bool HandleBattlefieldEnd(ChatHandler* handler, char const* args) { uint32 battleid = 0; char* battleid_str = strtok((char*)args, " "); @@ -93,7 +93,7 @@ public: return true; } - static bool HandleBattlefieldEnable(ChatHandler* handler, const char* args) + static bool HandleBattlefieldEnable(ChatHandler* handler, char const* args) { uint32 battleid = 0; char* battleid_str = strtok((char*)args, " "); @@ -123,7 +123,7 @@ public: return true; } - static bool HandleBattlefieldSwitch(ChatHandler* handler, const char* args) + static bool HandleBattlefieldSwitch(ChatHandler* handler, char const* args) { uint32 battleid = 0; char* battleid_str = strtok((char*)args, " "); @@ -144,7 +144,7 @@ public: return true; } - static bool HandleBattlefieldTimer(ChatHandler* handler, const char* args) + static bool HandleBattlefieldTimer(ChatHandler* handler, char const* args) { uint32 battleid = 0; uint32 time = 0; diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp index 33446f5d83c..f440f0bbff2 100644 --- a/src/server/scripts/Commands/cs_character.cpp +++ b/src/server/scripts/Commands/cs_character.cpp @@ -22,6 +22,7 @@ Comment: All character related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "AccountMgr.h" #include "CharacterCache.h" #include "Chat.h" @@ -30,10 +31,9 @@ EndScriptData */ #include "Log.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" -#include "PlayerDump.h" #include "Player.h" +#include "PlayerDump.h" #include "ReputationMgr.h" -#include "ScriptMgr.h" #include "World.h" #include "WorldSession.h" #include <sstream> diff --git a/src/server/scripts/Commands/cs_cheat.cpp b/src/server/scripts/Commands/cs_cheat.cpp index d861cd29184..04850f949c7 100644 --- a/src/server/scripts/Commands/cs_cheat.cpp +++ b/src/server/scripts/Commands/cs_cheat.cpp @@ -56,7 +56,7 @@ public: return commandTable; } - static bool HandleGodModeCheatCommand(ChatHandler* handler, const char* args) + static bool HandleGodModeCheatCommand(ChatHandler* handler, char const* args) { if (!handler->GetSession() && !handler->GetSession()->GetPlayer()) return false; @@ -82,7 +82,7 @@ public: return false; } - static bool HandleCasttimeCheatCommand(ChatHandler* handler, const char* args) + static bool HandleCasttimeCheatCommand(ChatHandler* handler, char const* args) { if (!handler->GetSession() && !handler->GetSession()->GetPlayer()) return false; @@ -108,7 +108,7 @@ public: return false; } - static bool HandleCoolDownCheatCommand(ChatHandler* handler, const char* args) + static bool HandleCoolDownCheatCommand(ChatHandler* handler, char const* args) { if (!handler->GetSession() && !handler->GetSession()->GetPlayer()) return false; @@ -134,7 +134,7 @@ public: return false; } - static bool HandlePowerCheatCommand(ChatHandler* handler, const char* args) + static bool HandlePowerCheatCommand(ChatHandler* handler, char const* args) { if (!handler->GetSession() && !handler->GetSession()->GetPlayer()) return false; @@ -160,12 +160,12 @@ public: return false; } - static bool HandleCheatStatusCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleCheatStatusCommand(ChatHandler* handler, char const* /*args*/) { Player* player = handler->GetSession()->GetPlayer(); - const char* enabled = "ON"; - const char* disabled = "OFF"; + char const* enabled = "ON"; + char const* disabled = "OFF"; handler->SendSysMessage(LANG_COMMAND_CHEAT_STATUS); handler->PSendSysMessage(LANG_COMMAND_CHEAT_GOD, player->GetCommandStatus(CHEAT_GOD) ? enabled : disabled); @@ -177,7 +177,7 @@ public: return true; } - static bool HandleWaterWalkCheatCommand(ChatHandler* handler, const char* args) + static bool HandleWaterWalkCheatCommand(ChatHandler* handler, char const* args) { if (!handler->GetSession() && !handler->GetSession()->GetPlayer()) return false; @@ -206,7 +206,7 @@ public: return false; } - static bool HandleTaxiCheatCommand(ChatHandler* handler, const char* args) + static bool HandleTaxiCheatCommand(ChatHandler* handler, char const* args) { std::string argstr = (char*)args; diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index cdb52b6fa3a..63efe4fb08e 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -137,6 +137,7 @@ public: return false; } + // Dump camera locations if (std::vector<FlyByCamera> const* flyByCameras = GetFlyByCameras(cineSeq->Camera[0])) { @@ -145,7 +146,7 @@ public: for (FlyByCamera const& cam : *flyByCameras) { handler->PSendSysMessage("%02u - %7ums [%s (%f degrees)]", count, cam.timeStamp, cam.locations.ToString().c_str(), cam.locations.GetOrientation() * (180 / M_PI)); - count++; + ++count; } handler->PSendSysMessage(SZFMTD " waypoints dumped", flyByCameras->size()); } @@ -274,7 +275,6 @@ public: return true; } - static bool HandleDebugSendPlayerChoiceCommand(ChatHandler* handler, char const* args) { if (!*args) @@ -981,7 +981,7 @@ public: static bool HandleDebugSendLargePacketCommand(ChatHandler* handler, char const* /*args*/) { - const char* stuffingString = "This is a dummy string to push the packet's size beyond 128000 bytes. "; + char const* stuffingString = "This is a dummy string to push the packet's size beyond 128000 bytes. "; std::ostringstream ss; while (ss.str().size() < 128000) ss << stuffingString; @@ -1312,13 +1312,13 @@ public: if (stricmp(args, "linked")) { if (Battleground* bg = player->GetBattleground()) - nearestLoc = bg->GetClosestGraveYard(player); + nearestLoc = bg->GetClosestGraveyard(player); else { if (Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(player->GetZoneId())) - nearestLoc = bf->GetClosestGraveYard(player); + nearestLoc = bf->GetClosestGraveyard(player); else - nearestLoc = sObjectMgr->GetClosestGraveYard(*player, player->GetTeam(), player); + nearestLoc = sObjectMgr->GetClosestGraveyard(*player, player->GetTeam(), player); } } else diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index f4c8005fa45..9c076691a18 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -22,6 +22,7 @@ Comment: All gm related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "AccountMgr.h" #include "Chat.h" #include "DatabaseEnv.h" @@ -30,11 +31,10 @@ EndScriptData */ #include "Opcodes.h" #include "Player.h" #include "Realm.h" -#include "ScriptMgr.h" #include "World.h" #include "WorldSession.h" -#include <boost/thread/shared_mutex.hpp> #include <boost/thread/locks.hpp> +#include <boost/thread/shared_mutex.hpp> class gm_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index 4f15fb08a9e..0c5643d4a34 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -71,8 +71,8 @@ public: { "near", rbac::RBAC_PERM_COMMAND_GOBJECT_NEAR, false, &HandleGameObjectNearCommand, "" }, { "target", rbac::RBAC_PERM_COMMAND_GOBJECT_TARGET, false, &HandleGameObjectTargetCommand, "" }, { "turn", rbac::RBAC_PERM_COMMAND_GOBJECT_TURN, false, &HandleGameObjectTurnCommand, "" }, - { "spawngroup", rbac::RBAC_PERM_COMMAND_GOBJECT_SPAWNGROUP, false, &HandleNpcSpawnGroup, "" }, - { "despawngroup", rbac::RBAC_PERM_COMMAND_GOBJECT_DESPAWNGROUP, false, &HandleNpcDespawnGroup,""}, + { "spawngroup", rbac::RBAC_PERM_COMMAND_GOBJECT_SPAWNGROUP, false, &HandleNpcSpawnGroup, "" }, + { "despawngroup", rbac::RBAC_PERM_COMMAND_GOBJECT_DESPAWNGROUP, false, &HandleNpcDespawnGroup, "" }, { "add", rbac::RBAC_PERM_COMMAND_GOBJECT_ADD, false, nullptr, "", gobjectAddCommandTable }, { "set", rbac::RBAC_PERM_COMMAND_GOBJECT_SET, false, nullptr, "", gobjectSetCommandTable }, }; diff --git a/src/server/scripts/Commands/cs_group.cpp b/src/server/scripts/Commands/cs_group.cpp index d8634040b73..2664b3d7246 100644 --- a/src/server/scripts/Commands/cs_group.cpp +++ b/src/server/scripts/Commands/cs_group.cpp @@ -342,7 +342,7 @@ public: ObjectGuid guidTarget; std::string nameTarget; std::string zoneName; - const char* onlineState = ""; + char const* onlineState = ""; // Parse the guid to uint32... ObjectGuid parseGUID = ObjectGuid::Create<HighGuid::Player>(strtoull(args, nullptr, 10)); diff --git a/src/server/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp index e050f71a0b5..870089f5da7 100644 --- a/src/server/scripts/Commands/cs_guild.cpp +++ b/src/server/scripts/Commands/cs_guild.cpp @@ -26,9 +26,9 @@ EndScriptData */ #include "AchievementMgr.h" #include "CharacterCache.h" #include "Chat.h" -#include "Language.h" #include "Guild.h" #include "GuildMgr.h" +#include "Language.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Player.h" diff --git a/src/server/scripts/Commands/cs_honor.cpp b/src/server/scripts/Commands/cs_honor.cpp index 37db2bf87d2..25873b2963b 100644 --- a/src/server/scripts/Commands/cs_honor.cpp +++ b/src/server/scripts/Commands/cs_honor.cpp @@ -25,7 +25,6 @@ EndScriptData */ #include "ScriptMgr.h" #include "Chat.h" #include "Language.h" -#include "ObjectMgr.h" #include "Player.h" #include "RBAC.h" #include "WorldSession.h" diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp index ec1e46f1ffb..90ed94a4d3b 100644 --- a/src/server/scripts/Commands/cs_instance.cpp +++ b/src/server/scripts/Commands/cs_instance.cpp @@ -35,6 +35,7 @@ EndScriptData */ #include "Player.h" #include "RBAC.h" #include "WorldSession.h" +#include <sstream> class instance_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp index 7533ac38937..c9f78eb61e2 100644 --- a/src/server/scripts/Commands/cs_learn.cpp +++ b/src/server/scripts/Commands/cs_learn.cpp @@ -288,9 +288,9 @@ public: static bool HandleLearnAllLangCommand(ChatHandler* handler, char const* /*args*/) { - // skipping UNIVERSAL language (0) - for (uint8 i = 1; i < LANGUAGES_COUNT; ++i) - handler->GetSession()->GetPlayer()->LearnSpell(lang_description[i].spell_id, false); + for (LanguageDesc const& langDesc : lang_description) + if (uint32 langSpellId = langDesc.spell_id) + handler->GetSession()->GetPlayer()->LearnSpell(langSpellId, false); handler->SendSysMessage(LANG_COMMAND_LEARN_ALL_LANG); return true; diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 801d1da66e9..3db136674be 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -15,6 +15,7 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "ScriptMgr.h" #include "AccountMgr.h" #include "ArenaTeamMgr.h" #include "CellImpl.h" @@ -44,7 +45,6 @@ #include "PhasingHandler.h" #include "Player.h" #include "Realm.h" -#include "ScriptMgr.h" #include "SpellAuras.h" #include "SpellHistory.h" #include "SpellMgr.h" @@ -55,7 +55,7 @@ #include "World.h" #include "WorldSession.h" - // temporary hack until database includes are sorted out (don't want to pull in Windows.h everywhere from mysql.h) +// temporary hack until includes are sorted out (don't want to pull in Windows.h) #ifdef GetClassName #undef GetClassName #endif @@ -1103,7 +1103,7 @@ public: return false; } - if (sObjectMgr->AddGraveYardLink(graveyardId, zoneId, team)) + if (sObjectMgr->AddGraveyardLink(graveyardId, zoneId, team)) handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDLINKED, graveyardId, zoneId); else handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDALRLINKED, graveyardId, zoneId); @@ -1129,12 +1129,12 @@ public: Player* player = handler->GetSession()->GetPlayer(); uint32 zone_id = player->GetZoneId(); - WorldSafeLocsEntry const* graveyard = sObjectMgr->GetClosestGraveYard(*player, team, nullptr); + WorldSafeLocsEntry const* graveyard = sObjectMgr->GetClosestGraveyard(*player, team, nullptr); if (graveyard) { uint32 graveyardId = graveyard->ID; - GraveYardData const* data = sObjectMgr->FindGraveYardData(graveyardId, zone_id); + GraveyardData const* data = sObjectMgr->FindGraveyardData(graveyardId, zone_id); if (!data) { handler->PSendSysMessage(LANG_COMMAND_GRAVEYARDERROR, graveyardId); diff --git a/src/server/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp index 27598e92309..125bd880ce0 100644 --- a/src/server/scripts/Commands/cs_mmaps.cpp +++ b/src/server/scripts/Commands/cs_mmaps.cpp @@ -104,9 +104,9 @@ public: handler->PSendSysMessage("Building: %s", useStraightPath ? "StraightPath" : useStraightLine ? "Raycast" : "SmoothPath"); handler->PSendSysMessage("Result: %s - Length: %zu - Type: %u", (result ? "true" : "false"), pointPath.size(), path.GetPathType()); - G3D::Vector3 const &start = path.GetStartPosition(); - G3D::Vector3 const &end = path.GetEndPosition(); - G3D::Vector3 const &actualEnd = path.GetActualEndPosition(); + G3D::Vector3 const& start = path.GetStartPosition(); + G3D::Vector3 const& end = path.GetEndPosition(); + G3D::Vector3 const& actualEnd = path.GetActualEndPosition(); handler->PSendSysMessage("StartPosition (%.3f, %.3f, %.3f)", start.x, start.y, start.z); handler->PSendSysMessage("EndPosition (%.3f, %.3f, %.3f)", end.x, end.y, end.z); diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 920569dd5be..2e04bbbae40 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -96,7 +96,7 @@ public: } } - static bool CheckModifyResources(ChatHandler* handler, const char* args, Player* target, int32& res, int32& resmax, int8 const multiplier = 1) + static bool CheckModifyResources(ChatHandler* handler, char const* args, Player* target, int32& res, int32& resmax, int8 const multiplier = 1) { if (!*args) return false; @@ -125,7 +125,7 @@ public: } //Edit Player HP - static bool HandleModifyHPCommand(ChatHandler* handler, const char* args) + static bool HandleModifyHPCommand(ChatHandler* handler, char const* args) { int32 hp, hpmax; Player* target = handler->getSelectedPlayerOrSelf(); @@ -140,7 +140,7 @@ public: } //Edit Player Mana - static bool HandleModifyManaCommand(ChatHandler* handler, const char* args) + static bool HandleModifyManaCommand(ChatHandler* handler, char const* args) { int32 mana, manamax; Player* target = handler->getSelectedPlayerOrSelf(); @@ -156,7 +156,7 @@ public: } //Edit Player Energy - static bool HandleModifyEnergyCommand(ChatHandler* handler, const char* args) + static bool HandleModifyEnergyCommand(ChatHandler* handler, char const* args) { int32 energy, energymax; Player* target = handler->getSelectedPlayerOrSelf(); @@ -172,7 +172,7 @@ public: } //Edit Player Rage - static bool HandleModifyRageCommand(ChatHandler* handler, const char* args) + static bool HandleModifyRageCommand(ChatHandler* handler, char const* args) { int32 rage, ragemax; Player* target = handler->getSelectedPlayerOrSelf(); @@ -188,7 +188,7 @@ public: } // Edit Player Runic Power - static bool HandleModifyRunicPowerCommand(ChatHandler* handler, const char* args) + static bool HandleModifyRunicPowerCommand(ChatHandler* handler, char const* args) { int32 rune, runemax; Player* target = handler->getSelectedPlayerOrSelf(); @@ -204,7 +204,7 @@ public: } //Edit Player Faction - static bool HandleModifyFactionCommand(ChatHandler* handler, const char* args) + static bool HandleModifyFactionCommand(ChatHandler* handler, char const* args) { char* pfactionid = handler->extractKeyFromLink((char*)args, "Hfaction"); @@ -271,7 +271,7 @@ public: } //Edit Player Spell - static bool HandleModifySpellCommand(ChatHandler* handler, const char* args) + static bool HandleModifySpellCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -330,7 +330,7 @@ public: } //Edit Player TP - static bool HandleModifyTalentCommand(ChatHandler* /*handler*/, const char* /*args*/) + static bool HandleModifyTalentCommand(ChatHandler* /*handler*/, char const* /*args*/) { /* TODO: 6.x remove this if (!*args) @@ -376,7 +376,7 @@ public: return false; } - static bool CheckModifySpeed(ChatHandler* handler, const char* args, Unit* target, float& speed, float minimumBound, float maximumBound, bool checkInFlight = true) + static bool CheckModifySpeed(ChatHandler* handler, char const* args, Unit* target, float& speed, float minimumBound, float maximumBound, bool checkInFlight = true) { if (!*args) return false; @@ -414,7 +414,7 @@ public: } //Edit Player Aspeed - static bool HandleModifyASpeedCommand(ChatHandler* handler, const char* args) + static bool HandleModifyASpeedCommand(ChatHandler* handler, char const* args) { float allSpeed; Player* target = handler->getSelectedPlayerOrSelf(); @@ -431,7 +431,7 @@ public: } //Edit Player Speed - static bool HandleModifySpeedCommand(ChatHandler* handler, const char* args) + static bool HandleModifySpeedCommand(ChatHandler* handler, char const* args) { float Speed; Player* target = handler->getSelectedPlayerOrSelf(); @@ -445,7 +445,7 @@ public: } //Edit Player Swim Speed - static bool HandleModifySwimCommand(ChatHandler* handler, const char* args) + static bool HandleModifySwimCommand(ChatHandler* handler, char const* args) { float swimSpeed; Player* target = handler->getSelectedPlayerOrSelf(); @@ -459,7 +459,7 @@ public: } //Edit Player Backwards Walk Speed - static bool HandleModifyBWalkCommand(ChatHandler* handler, const char* args) + static bool HandleModifyBWalkCommand(ChatHandler* handler, char const* args) { float backSpeed; Player* target = handler->getSelectedPlayerOrSelf(); @@ -473,7 +473,7 @@ public: } //Edit Player Fly - static bool HandleModifyFlyCommand(ChatHandler* handler, const char* args) + static bool HandleModifyFlyCommand(ChatHandler* handler, char const* args) { float flySpeed; Player* target = handler->getSelectedPlayerOrSelf(); @@ -487,7 +487,7 @@ public: } //Edit Player or Creature Scale - static bool HandleModifyScaleCommand(ChatHandler* handler, const char* args) + static bool HandleModifyScaleCommand(ChatHandler* handler, char const* args) { float Scale; Unit* target = handler->getSelectedUnit(); @@ -504,7 +504,7 @@ public: } //Enable Player mount - static bool HandleModifyMountCommand(ChatHandler* handler, const char* args) + static bool HandleModifyMountCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -547,7 +547,7 @@ public: } //Edit Player money - static bool HandleModifyMoneyCommand(ChatHandler* handler, const char* args) + static bool HandleModifyMoneyCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -613,7 +613,7 @@ public: return true; } - static bool HandleModifyHonorCommand(ChatHandler* handler, const char* args) + static bool HandleModifyHonorCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -639,7 +639,7 @@ public: return true; } - static bool HandleModifyDrunkCommand(ChatHandler* handler, const char* args) + static bool HandleModifyDrunkCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -654,7 +654,7 @@ public: return true; } - static bool HandleModifyRepCommand(ChatHandler* handler, const char* args) + static bool HandleModifyRepCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -755,7 +755,7 @@ public: } //morph creature or player - static bool HandleModifyMorphCommand(ChatHandler* handler, const char* args) + static bool HandleModifyMorphCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -776,7 +776,7 @@ public: } // Toggles a phaseid on a player - static bool HandleModifyPhaseCommand(ChatHandler* handler, const char* args) + static bool HandleModifyPhaseCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -829,7 +829,7 @@ public: } //change standstate - static bool HandleModifyStandStateCommand(ChatHandler* handler, const char* args) + static bool HandleModifyStandStateCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -840,7 +840,7 @@ public: return true; } - static bool HandleModifyGenderCommand(ChatHandler* handler, const char* args) + static bool HandleModifyGenderCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -901,7 +901,7 @@ public: return true; } //demorph player or unit - static bool HandleDeMorphCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleDeMorphCommand(ChatHandler* handler, char const* /*args*/) { Unit* target = handler->getSelectedUnit(); if (!target) @@ -944,7 +944,7 @@ public: } // mod xp command - static bool HandleModifyXPCommand(ChatHandler *handler, const char* args) + static bool HandleModifyXPCommand(ChatHandler *handler, char const* args) { if (!*args) return false; diff --git a/src/server/scripts/Commands/cs_pet.cpp b/src/server/scripts/Commands/cs_pet.cpp index fff051a2872..b282a1a5497 100644 --- a/src/server/scripts/Commands/cs_pet.cpp +++ b/src/server/scripts/Commands/cs_pet.cpp @@ -27,7 +27,7 @@ #include "SpellMgr.h" #include "WorldSession.h" -static inline Pet* GetSelectedPlayerPetOrOwn(ChatHandler* handler) +inline Pet* GetSelectedPlayerPetOrOwn(ChatHandler* handler) { if (Unit* target = handler->getSelectedUnit()) { @@ -40,6 +40,7 @@ static inline Pet* GetSelectedPlayerPetOrOwn(ChatHandler* handler) Player* player = handler->GetSession()->GetPlayer(); return player ? player->GetPet() : nullptr; } + class pet_commandscript : public CommandScript { public: diff --git a/src/server/scripts/Commands/cs_quest.cpp b/src/server/scripts/Commands/cs_quest.cpp index 5b00235f334..18840234b31 100644 --- a/src/server/scripts/Commands/cs_quest.cpp +++ b/src/server/scripts/Commands/cs_quest.cpp @@ -53,7 +53,7 @@ public: return commandTable; } - static bool HandleQuestAdd(ChatHandler* handler, const char* args) + static bool HandleQuestAdd(ChatHandler* handler, char const* args) { Player* player = handler->getSelectedPlayerOrSelf(); if (!player) @@ -101,7 +101,7 @@ public: return true; } - static bool HandleQuestRemove(ChatHandler* handler, const char* args) + static bool HandleQuestRemove(ChatHandler* handler, char const* args) { Player* player = handler->getSelectedPlayer(); if (!player) @@ -159,7 +159,7 @@ public: return true; } - static bool HandleQuestComplete(ChatHandler* handler, const char* args) + static bool HandleQuestComplete(ChatHandler* handler, char const* args) { Player* player = handler->getSelectedPlayerOrSelf(); if (!player) diff --git a/src/server/scripts/Commands/cs_rbac.cpp b/src/server/scripts/Commands/cs_rbac.cpp index f17ce428b06..93bf814600b 100644 --- a/src/server/scripts/Commands/cs_rbac.cpp +++ b/src/server/scripts/Commands/cs_rbac.cpp @@ -22,13 +22,13 @@ Comment: All role based access control related commands (including account relat Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "AccountMgr.h" #include "Chat.h" #include "Config.h" #include "Language.h" #include "Player.h" #include "Realm.h" -#include "ScriptMgr.h" #include "World.h" #include "WorldSession.h" diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index bb65c2da77e..eb1dd09134d 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -22,6 +22,7 @@ Comment: All reload related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "AccountMgr.h" #include "AchievementMgr.h" #include "AreaTriggerDataStore.h" @@ -40,7 +41,6 @@ EndScriptData */ #include "LootMgr.h" #include "MapManager.h" #include "ObjectMgr.h" -#include "ScriptMgr.h" #include "SkillDiscovery.h" #include "SkillExtraItems.h" #include "SmartAI.h" @@ -171,7 +171,7 @@ public: } //reload commands - static bool HandleReloadSupportSystemCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadSupportSystemCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Support System Tables..."); sSupportMgr->LoadBugTickets(); @@ -181,7 +181,7 @@ public: return true; } - static bool HandleReloadAllCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadAllCommand(ChatHandler* handler, char const* /*args*/) { HandleReloadSkillFishingBaseLevelCommand(handler, ""); @@ -213,14 +213,14 @@ public: return true; } - static bool HandleReloadAllAchievementCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadAllAchievementCommand(ChatHandler* handler, char const* /*args*/) { HandleReloadCriteriaDataCommand(handler, ""); HandleReloadAchievementRewardCommand(handler, ""); return true; } - static bool HandleReloadAllAreaCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadAllAreaCommand(ChatHandler* handler, char const* /*args*/) { //HandleReloadQuestAreaTriggersCommand(handler, ""); -- reloaded in HandleReloadAllQuestCommand HandleReloadAreaTriggerTeleportCommand(handler, ""); @@ -229,7 +229,7 @@ public: return true; } - static bool HandleReloadAllLootCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadAllLootCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Loot Tables..."); LoadLootTables(); @@ -238,7 +238,7 @@ public: return true; } - static bool HandleReloadAllNpcCommand(ChatHandler* handler, const char* args) + static bool HandleReloadAllNpcCommand(ChatHandler* handler, char const* args) { if (*args != 'a') // will be reloaded from all_gossips HandleReloadTrainerCommand(handler, "a"); @@ -248,7 +248,7 @@ public: return true; } - static bool HandleReloadAllQuestCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadAllQuestCommand(ChatHandler* handler, char const* /*args*/) { HandleReloadQuestAreaTriggersCommand(handler, "a"); HandleReloadQuestGreetingCommand(handler, "a"); @@ -261,7 +261,7 @@ public: return true; } - static bool HandleReloadAllScriptsCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadAllScriptsCommand(ChatHandler* handler, char const* /*args*/) { if (sMapMgr->IsScriptScheduled()) { @@ -279,7 +279,7 @@ public: return true; } - static bool HandleReloadAllSpellCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadAllSpellCommand(ChatHandler* handler, char const* /*args*/) { HandleReloadSkillDiscoveryTemplateCommand(handler, "a"); HandleReloadSkillExtraItemTemplateCommand(handler, "a"); @@ -296,7 +296,7 @@ public: return true; } - static bool HandleReloadAllGossipsCommand(ChatHandler* handler, const char* args) + static bool HandleReloadAllGossipsCommand(ChatHandler* handler, char const* args) { HandleReloadGossipMenuCommand(handler, "a"); HandleReloadGossipMenuOptionCommand(handler, "a"); @@ -305,14 +305,14 @@ public: return true; } - static bool HandleReloadAllItemCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadAllItemCommand(ChatHandler* handler, char const* /*args*/) { HandleReloadPageTextsCommand(handler, "a"); HandleReloadItemRandomBonusListTemplatesCommand(handler, "a"); return true; } - static bool HandleReloadAllLocalesCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadAllLocalesCommand(ChatHandler* handler, char const* /*args*/) { HandleReloadLocalesAchievementRewardCommand(handler, "a"); HandleReloadLocalesCreatureCommand(handler, "a"); @@ -325,7 +325,7 @@ public: return true; } - static bool HandleReloadConfigCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadConfigCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading config settings..."); sWorld->LoadConfigSettings(true); @@ -334,7 +334,7 @@ public: return true; } - static bool HandleReloadAccessRequirementCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadAccessRequirementCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Access Requirement definitions..."); sObjectMgr->LoadAccessRequirements(); @@ -342,7 +342,7 @@ public: return true; } - static bool HandleReloadCriteriaDataCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadCriteriaDataCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Additional Criteria Data..."); sCriteriaMgr->LoadCriteriaData(); @@ -350,7 +350,7 @@ public: return true; } - static bool HandleReloadAchievementRewardCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadAchievementRewardCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Achievement Reward Data..."); sAchievementMgr->LoadRewards(); @@ -358,7 +358,7 @@ public: return true; } - static bool HandleReloadAreaTriggerTavernCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadAreaTriggerTavernCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Tavern Area Triggers..."); sObjectMgr->LoadTavernAreaTriggers(); @@ -366,7 +366,7 @@ public: return true; } - static bool HandleReloadAreaTriggerTeleportCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadAreaTriggerTeleportCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading AreaTrigger teleport definitions..."); sObjectMgr->LoadAreaTriggerTeleports(); @@ -374,7 +374,7 @@ public: return true; } - static bool HandleReloadAutobroadcastCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadAutobroadcastCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Autobroadcasts..."); sWorld->LoadAutobroadcasts(); @@ -398,14 +398,14 @@ public: return true; } - static bool HandleReloadCommandCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadCommandCommand(ChatHandler* handler, char const* /*args*/) { ChatHandler::invalidateCommandTable(); handler->SendGlobalGMSysMessage("DB table `command` will be reloaded at next chat command use."); return true; } - static bool HandleReloadOnKillReputationCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadOnKillReputationCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading creature award reputation definitions..."); sObjectMgr->LoadReputationOnKill(); @@ -413,7 +413,7 @@ public: return true; } - static bool HandleReloadCreatureSummonGroupsCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadCreatureSummonGroupsCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Reloading creature summon groups..."); sObjectMgr->LoadTempSummons(); @@ -421,7 +421,7 @@ public: return true; } - static bool HandleReloadCreatureTemplateCommand(ChatHandler* handler, const char* args) + static bool HandleReloadCreatureTemplateCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -462,7 +462,7 @@ public: return true; } - static bool HandleReloadCreatureQuestStarterCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadCreatureQuestStarterCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Loading Quests Relations... (`creature_queststarter`)"); sObjectMgr->LoadCreatureQuestStarters(); @@ -470,7 +470,7 @@ public: return true; } - static bool HandleReloadLinkedRespawnCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLinkedRespawnCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Loading Linked Respawns... (`creature_linked_respawn`)"); sObjectMgr->LoadLinkedRespawn(); @@ -478,7 +478,7 @@ public: return true; } - static bool HandleReloadCreatureQuestEnderCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadCreatureQuestEnderCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Loading Quests Relations... (`creature_questender`)"); sObjectMgr->LoadCreatureQuestEnders(); @@ -486,7 +486,7 @@ public: return true; } - static bool HandleReloadGossipMenuCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadGossipMenuCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading `gossip_menu` Table!"); sObjectMgr->LoadGossipMenu(); @@ -495,7 +495,7 @@ public: return true; } - static bool HandleReloadGossipMenuOptionCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadGossipMenuOptionCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading `gossip_menu_option` Table!"); sObjectMgr->LoadGossipMenuItems(); @@ -504,7 +504,7 @@ public: return true; } - static bool HandleReloadGOQuestStarterCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadGOQuestStarterCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Loading Quests Relations... (`gameobject_queststarter`)"); sObjectMgr->LoadGameobjectQuestStarters(); @@ -512,7 +512,7 @@ public: return true; } - static bool HandleReloadGOQuestEnderCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadGOQuestEnderCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Loading Quests Relations... (`gameobject_questender`)"); sObjectMgr->LoadGameobjectQuestEnders(); @@ -520,7 +520,7 @@ public: return true; } - static bool HandleReloadQuestAreaTriggersCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadQuestAreaTriggersCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Quest Area Triggers..."); sObjectMgr->LoadQuestAreaTriggers(); @@ -528,7 +528,7 @@ public: return true; } - static bool HandleReloadQuestGreetingCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadQuestGreetingCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Quest Greeting ... "); sObjectMgr->LoadQuestGreetings(); @@ -536,7 +536,7 @@ public: return true; } - static bool HandleReloadQuestTemplateCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadQuestTemplateCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Quest Templates..."); sObjectMgr->LoadQuests(); @@ -550,7 +550,7 @@ public: return true; } - static bool HandleReloadLootTemplatesCreatureCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLootTemplatesCreatureCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Loot Tables... (`creature_loot_template`)"); LoadLootTemplates_Creature(); @@ -560,7 +560,7 @@ public: return true; } - static bool HandleReloadLootTemplatesDisenchantCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLootTemplatesDisenchantCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Loot Tables... (`disenchant_loot_template`)"); LoadLootTemplates_Disenchant(); @@ -570,7 +570,7 @@ public: return true; } - static bool HandleReloadLootTemplatesFishingCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLootTemplatesFishingCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Loot Tables... (`fishing_loot_template`)"); LoadLootTemplates_Fishing(); @@ -580,7 +580,7 @@ public: return true; } - static bool HandleReloadLootTemplatesGameobjectCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLootTemplatesGameobjectCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Loot Tables... (`gameobject_loot_template`)"); LoadLootTemplates_Gameobject(); @@ -590,7 +590,7 @@ public: return true; } - static bool HandleReloadLootTemplatesItemCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLootTemplatesItemCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Loot Tables... (`item_loot_template`)"); LoadLootTemplates_Item(); @@ -600,7 +600,7 @@ public: return true; } - static bool HandleReloadLootTemplatesMillingCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLootTemplatesMillingCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Loot Tables... (`milling_loot_template`)"); LoadLootTemplates_Milling(); @@ -610,7 +610,7 @@ public: return true; } - static bool HandleReloadLootTemplatesPickpocketingCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLootTemplatesPickpocketingCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Loot Tables... (`pickpocketing_loot_template`)"); LoadLootTemplates_Pickpocketing(); @@ -620,7 +620,7 @@ public: return true; } - static bool HandleReloadLootTemplatesProspectingCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLootTemplatesProspectingCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Loot Tables... (`prospecting_loot_template`)"); LoadLootTemplates_Prospecting(); @@ -630,7 +630,7 @@ public: return true; } - static bool HandleReloadLootTemplatesMailCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLootTemplatesMailCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Loot Tables... (`mail_loot_template`)"); LoadLootTemplates_Mail(); @@ -640,7 +640,7 @@ public: return true; } - static bool HandleReloadLootTemplatesReferenceCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLootTemplatesReferenceCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Loot Tables... (`reference_loot_template`)"); LoadLootTemplates_Reference(); @@ -649,7 +649,7 @@ public: return true; } - static bool HandleReloadLootTemplatesSkinningCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLootTemplatesSkinningCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Loot Tables... (`skinning_loot_template`)"); LoadLootTemplates_Skinning(); @@ -659,7 +659,7 @@ public: return true; } - static bool HandleReloadLootTemplatesSpellCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLootTemplatesSpellCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Loot Tables... (`spell_loot_template`)"); LoadLootTemplates_Spell(); @@ -669,7 +669,7 @@ public: return true; } - static bool HandleReloadTrinityStringCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadTrinityStringCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading trinity_string Table!"); sObjectMgr->LoadTrinityStrings(); @@ -677,7 +677,7 @@ public: return true; } - static bool HandleReloadWardenactionCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadWardenactionCommand(ChatHandler* handler, char const* /*args*/) { if (!sWorld->getBoolConfig(CONFIG_WARDEN_ENABLED)) { @@ -692,7 +692,7 @@ public: return true; } - static bool HandleReloadTrainerCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadTrainerCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading `trainer` Table!"); sObjectMgr->LoadTrainers(); @@ -704,7 +704,7 @@ public: return true; } - static bool HandleReloadNpcVendorCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadNpcVendorCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading `npc_vendor` Table!"); sObjectMgr->LoadVendors(); @@ -712,7 +712,7 @@ public: return true; } - static bool HandleReloadPointsOfInterestCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadPointsOfInterestCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading `points_of_interest` Table!"); sObjectMgr->LoadPointsOfInterest(); @@ -720,7 +720,7 @@ public: return true; } - static bool HandleReloadQuestPOICommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadQuestPOICommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Quest POI ..." ); sObjectMgr->LoadQuestPOI(); @@ -729,7 +729,7 @@ public: return true; } - static bool HandleReloadSpellClickSpellsCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadSpellClickSpellsCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading `npc_spellclick_spells` Table!"); sObjectMgr->LoadNPCSpellClickSpells(); @@ -737,7 +737,7 @@ public: return true; } - static bool HandleReloadReservedNameCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadReservedNameCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Loading ReservedNames... (`reserved_name`)"); sObjectMgr->LoadReservedPlayersNames(); @@ -745,7 +745,7 @@ public: return true; } - static bool HandleReloadReputationRewardRateCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadReputationRewardRateCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading `reputation_reward_rate` Table!" ); sObjectMgr->LoadReputationRewardRate(); @@ -753,7 +753,7 @@ public: return true; } - static bool HandleReloadReputationSpilloverTemplateCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadReputationSpilloverTemplateCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading `reputation_spillover_template` Table!" ); sObjectMgr->LoadReputationSpilloverTemplate(); @@ -761,7 +761,7 @@ public: return true; } - static bool HandleReloadSkillDiscoveryTemplateCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadSkillDiscoveryTemplateCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Skill Discovery Table..."); LoadSkillDiscoveryTable(); @@ -769,7 +769,7 @@ public: return true; } - static bool HandleReloadSkillPerfectItemTemplateCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadSkillPerfectItemTemplateCommand(ChatHandler* handler, char const* /*args*/) { // latched onto HandleReloadSkillExtraItemTemplateCommand as it's part of that table group (and i don't want to chance all the command IDs) TC_LOG_INFO("misc", "Re-Loading Skill Perfection Data Table..."); LoadSkillPerfectItemTable(); @@ -777,7 +777,7 @@ public: return true; } - static bool HandleReloadSkillExtraItemTemplateCommand(ChatHandler* handler, const char* args) + static bool HandleReloadSkillExtraItemTemplateCommand(ChatHandler* handler, char const* args) { TC_LOG_INFO("misc", "Re-Loading Skill Extra Item Table..."); LoadSkillExtraItemTable(); @@ -786,7 +786,7 @@ public: return HandleReloadSkillPerfectItemTemplateCommand(handler, args); } - static bool HandleReloadSkillFishingBaseLevelCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadSkillFishingBaseLevelCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Skill Fishing base level requirements..."); sObjectMgr->LoadFishingBaseSkillLevel(); @@ -794,7 +794,7 @@ public: return true; } - static bool HandleReloadSpellAreaCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadSpellAreaCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading SpellArea Data..."); sSpellMgr->LoadSpellAreas(); @@ -802,7 +802,7 @@ public: return true; } - static bool HandleReloadSpellRequiredCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadSpellRequiredCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Spell Required Data... "); sSpellMgr->LoadSpellRequired(); @@ -810,7 +810,7 @@ public: return true; } - static bool HandleReloadSpellGroupsCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadSpellGroupsCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Spell Groups..."); sSpellMgr->LoadSpellGroups(); @@ -818,7 +818,7 @@ public: return true; } - static bool HandleReloadSpellLearnSpellCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadSpellLearnSpellCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Spell Learn Spells..."); sSpellMgr->LoadSpellLearnSpells(); @@ -826,7 +826,7 @@ public: return true; } - static bool HandleReloadSpellLinkedSpellCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadSpellLinkedSpellCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Spell Linked Spells..."); sSpellMgr->LoadSpellLinked(); @@ -834,7 +834,7 @@ public: return true; } - static bool HandleReloadSpellProcsCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadSpellProcsCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Spell Proc conditions and data..."); sSpellMgr->LoadSpellProcs(); @@ -842,7 +842,7 @@ public: return true; } - static bool HandleReloadSpellTargetPositionCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadSpellTargetPositionCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Spell target coordinates..."); sSpellMgr->LoadSpellTargetPositions(); @@ -850,7 +850,7 @@ public: return true; } - static bool HandleReloadSpellThreatsCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadSpellThreatsCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Aggro Spells Definitions..."); sSpellMgr->LoadSpellThreats(); @@ -858,7 +858,7 @@ public: return true; } - static bool HandleReloadSpellGroupStackRulesCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadSpellGroupStackRulesCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Spell Group Stack Rules..."); sSpellMgr->LoadSpellGroupStackRules(); @@ -866,7 +866,7 @@ public: return true; } - static bool HandleReloadSpellPetAurasCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadSpellPetAurasCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Spell pet auras..."); sSpellMgr->LoadSpellPetAuras(); @@ -874,7 +874,7 @@ public: return true; } - static bool HandleReloadPageTextsCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadPageTextsCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Page Text..."); sObjectMgr->LoadPageTexts(); @@ -882,7 +882,7 @@ public: return true; } - static bool HandleReloadItemRandomBonusListTemplatesCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadItemRandomBonusListTemplatesCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Random item bonus list definitions..."); LoadItemRandomBonusListTemplates(); @@ -890,7 +890,7 @@ public: return true; } - static bool HandleReloadEventScriptsCommand(ChatHandler* handler, const char* args) + static bool HandleReloadEventScriptsCommand(ChatHandler* handler, char const* args) { if (sMapMgr->IsScriptScheduled()) { @@ -910,7 +910,7 @@ public: return true; } - static bool HandleReloadWpScriptsCommand(ChatHandler* handler, const char* args) + static bool HandleReloadWpScriptsCommand(ChatHandler* handler, char const* args) { if (sMapMgr->IsScriptScheduled()) { @@ -930,7 +930,7 @@ public: return true; } - static bool HandleReloadWpCommand(ChatHandler* handler, const char* args) + static bool HandleReloadWpCommand(ChatHandler* handler, char const* args) { if (*args != 'a') TC_LOG_INFO("misc", "Re-Loading Waypoints data from 'waypoints_data'"); @@ -943,7 +943,7 @@ public: return true; } - static bool HandleReloadSpellScriptsCommand(ChatHandler* handler, const char* args) + static bool HandleReloadSpellScriptsCommand(ChatHandler* handler, char const* args) { if (sMapMgr->IsScriptScheduled()) { @@ -963,7 +963,7 @@ public: return true; } - static bool HandleReloadGameGraveyardZoneCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadGameGraveyardZoneCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Graveyard-zone links..."); @@ -974,7 +974,7 @@ public: return true; } - static bool HandleReloadGameTeleCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadGameTeleCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Game Tele coordinates..."); @@ -985,7 +985,7 @@ public: return true; } - static bool HandleReloadDisablesCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadDisablesCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading disables table..."); DisableMgr::LoadDisables(); @@ -995,7 +995,7 @@ public: return true; } - static bool HandleReloadLocalesAchievementRewardCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLocalesAchievementRewardCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Achievement Reward Data Locale..."); sAchievementMgr->LoadRewardLocales(); @@ -1003,7 +1003,7 @@ public: return true; } - static bool HandleReloadLfgRewardsCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLfgRewardsCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading lfg dungeon rewards..."); sLFGMgr->LoadRewards(); @@ -1011,7 +1011,7 @@ public: return true; } - static bool HandleReloadLocalesCreatureCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLocalesCreatureCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Creature Template Locale..."); sObjectMgr->LoadCreatureLocales(); @@ -1019,7 +1019,7 @@ public: return true; } - static bool HandleReloadLocalesCreatureTextCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLocalesCreatureTextCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Creature Texts Locale..."); sCreatureTextMgr->LoadCreatureTextLocales(); @@ -1027,7 +1027,7 @@ public: return true; } - static bool HandleReloadLocalesGameobjectCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLocalesGameobjectCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Gameobject Template Locale... "); sObjectMgr->LoadGameObjectLocales(); @@ -1035,7 +1035,7 @@ public: return true; } - static bool HandleReloadLocalesGossipMenuOptionCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLocalesGossipMenuOptionCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Gossip Menu Option Locale... "); sObjectMgr->LoadGossipMenuItemsLocales(); @@ -1043,7 +1043,7 @@ public: return true; } - static bool HandleReloadLocalesPageTextCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLocalesPageTextCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Page Text Locale... "); sObjectMgr->LoadPageTextLocales(); @@ -1051,7 +1051,7 @@ public: return true; } - static bool HandleReloadLocalesPointsOfInterestCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadLocalesPointsOfInterestCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Points Of Interest Locale... "); sObjectMgr->LoadPointOfInterestLocales(); @@ -1059,7 +1059,7 @@ public: return true; } - static bool HandleReloadQuestLocaleCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadQuestLocaleCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Quest Locale ... "); sObjectMgr->LoadQuestTemplateLocale(); @@ -1075,7 +1075,7 @@ public: return true; } - static bool HandleReloadMailLevelRewardCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadMailLevelRewardCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Player level dependent mail rewards..."); sObjectMgr->LoadMailLevelRewards(); @@ -1083,7 +1083,7 @@ public: return true; } - static bool HandleReloadAuctionsCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadAuctionsCommand(ChatHandler* handler, char const* /*args*/) { ///- Reload dynamic data tables from the database TC_LOG_INFO("misc", "Re-Loading Auctions..."); @@ -1092,7 +1092,7 @@ public: return true; } - static bool HandleReloadConditions(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadConditions(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Conditions..."); sConditionMgr->LoadConditions(true); @@ -1100,7 +1100,7 @@ public: return true; } - static bool HandleReloadCreatureText(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadCreatureText(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Creature Texts..."); sCreatureTextMgr->LoadCreatureTexts(); @@ -1108,7 +1108,7 @@ public: return true; } - static bool HandleReloadSmartScripts(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadSmartScripts(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Re-Loading Smart Scripts..."); sSmartScriptMgr->LoadSmartAIFromDB(); @@ -1116,7 +1116,7 @@ public: return true; } - static bool HandleReloadVehicleAccessoryCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadVehicleAccessoryCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Reloading vehicle_accessory table..."); sObjectMgr->LoadVehicleAccessories(); @@ -1124,7 +1124,7 @@ public: return true; } - static bool HandleReloadVehicleTemplateAccessoryCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadVehicleTemplateAccessoryCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Reloading vehicle_template_accessory table..."); sObjectMgr->LoadVehicleTemplateAccessories(); @@ -1132,7 +1132,7 @@ public: return true; } - static bool HandleReloadAreaTriggerTemplateCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadAreaTriggerTemplateCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Reloading areatrigger_template table..."); sAreaTriggerDataStore->LoadAreaTriggerTemplates(); @@ -1140,7 +1140,7 @@ public: return true; } - static bool HandleReloadSceneTemplateCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadSceneTemplateCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Reloading scene_template table..."); sObjectMgr->LoadSceneTemplates(); @@ -1148,7 +1148,7 @@ public: return true; } - static bool HandleReloadConversationTemplateCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadConversationTemplateCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Reloading conversation_* tables..."); sConversationDataStore->LoadConversationTemplates(); @@ -1156,7 +1156,7 @@ public: return true; } - static bool HandleReloadRBACCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleReloadRBACCommand(ChatHandler* handler, char const* /*args*/) { TC_LOG_INFO("misc", "Reloading RBAC tables..."); sAccountMgr->LoadRBAC(); diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp index bddc6701ef7..283c4e598f2 100644 --- a/src/server/scripts/Commands/cs_reset.cpp +++ b/src/server/scripts/Commands/cs_reset.cpp @@ -35,8 +35,8 @@ EndScriptData */ #include "RBAC.h" #include "World.h" #include "WorldSession.h" -#include <boost/thread/shared_mutex.hpp> #include <boost/thread/locks.hpp> +#include <boost/thread/shared_mutex.hpp> class reset_commandscript : public CommandScript { diff --git a/src/server/scripts/Commands/cs_tele.cpp b/src/server/scripts/Commands/cs_tele.cpp index a21e868052f..41fcd95647b 100644 --- a/src/server/scripts/Commands/cs_tele.cpp +++ b/src/server/scripts/Commands/cs_tele.cpp @@ -58,7 +58,7 @@ public: return commandTable; } - static bool HandleTeleAddCommand(ChatHandler* handler, const char* args) + static bool HandleTeleAddCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -98,7 +98,7 @@ public: return true; } - static bool HandleTeleDelCommand(ChatHandler* handler, const char* args) + static bool HandleTeleDelCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -118,7 +118,7 @@ public: } // teleport player to given game_tele.entry - static bool HandleTeleNameCommand(ChatHandler* handler, const char* args) + static bool HandleTeleNameCommand(ChatHandler* handler, char const* args) { char* nameStr; char* teleStr; @@ -215,7 +215,7 @@ public: } //Teleport group to given game_tele.entry - static bool HandleTeleGroupCommand(ChatHandler* handler, const char* args) + static bool HandleTeleGroupCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -298,7 +298,7 @@ public: return true; } - static bool HandleTeleCommand(ChatHandler* handler, const char* args) + static bool HandleTeleCommand(ChatHandler* handler, char const* args) { if (!*args) return false; diff --git a/src/server/scripts/Commands/cs_ticket.cpp b/src/server/scripts/Commands/cs_ticket.cpp index d116046bdb1..58f3a346b9e 100644 --- a/src/server/scripts/Commands/cs_ticket.cpp +++ b/src/server/scripts/Commands/cs_ticket.cpp @@ -22,16 +22,14 @@ Comment: All ticket related commands Category: commandscripts EndScriptData */ +#include "ScriptMgr.h" #include "AccountMgr.h" #include "CharacterCache.h" #include "Chat.h" -#include "Config.h" #include "Language.h" #include "ObjectMgr.h" -#include "Opcodes.h" #include "Player.h" #include "Realm.h" -#include "ScriptMgr.h" #include "SupportMgr.h" #include "World.h" #include "WorldSession.h" diff --git a/src/server/scripts/Commands/cs_titles.cpp b/src/server/scripts/Commands/cs_titles.cpp index 2220beb3412..392ed03f37f 100644 --- a/src/server/scripts/Commands/cs_titles.cpp +++ b/src/server/scripts/Commands/cs_titles.cpp @@ -26,7 +26,6 @@ EndScriptData */ #include "Chat.h" #include "DB2Stores.h" #include "Language.h" -#include "ObjectMgr.h" #include "Player.h" #include "RBAC.h" diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp index 9d793f3082b..69dc1f8c51a 100644 --- a/src/server/scripts/Commands/cs_wp.cpp +++ b/src/server/scripts/Commands/cs_wp.cpp @@ -81,7 +81,7 @@ public: * * @return true - command did succeed, false - something went wrong */ - static bool HandleWpAddCommand(ChatHandler* handler, const char* args) + static bool HandleWpAddCommand(ChatHandler* handler, char const* args) { // optional char* path_number = nullptr; @@ -144,7 +144,7 @@ public: return true; } // HandleWpAddCommand - static bool HandleWpLoadCommand(ChatHandler* handler, const char* args) + static bool HandleWpLoadCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -225,7 +225,7 @@ public: return true; } - static bool HandleWpReloadCommand(ChatHandler* handler, const char* args) + static bool HandleWpReloadCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -240,7 +240,7 @@ public: return true; } - static bool HandleWpUnLoadCommand(ChatHandler* handler, const char* /*args*/) + static bool HandleWpUnLoadCommand(ChatHandler* handler, char const* /*args*/) { Creature* target = handler->getSelectedCreature(); @@ -285,7 +285,7 @@ public: return true; } - static bool HandleWpEventCommand(ChatHandler* handler, const char* args) + static bool HandleWpEventCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -542,7 +542,7 @@ public: return true; } - static bool HandleWpModifyCommand(ChatHandler* handler, const char* args) + static bool HandleWpModifyCommand(ChatHandler* handler, char const* args) { if (!*args) return false; @@ -722,7 +722,7 @@ public: return true; } - static bool HandleWpShowCommand(ChatHandler* handler, const char* args) + static bool HandleWpShowCommand(ChatHandler* handler, char const* args) { if (!*args) return false; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp index c9998ea1547..57e3d8da81c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp @@ -16,10 +16,9 @@ */ #include "ScriptMgr.h" -#include "GameObjectAI.h" #include "blackrock_depths.h" -#include "CreatureAIImpl.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "InstanceScript.h" #include "Log.h" #include "ObjectAccessor.h" @@ -98,7 +97,7 @@ class at_ring_of_law : public AreaTriggerScript public: at_ring_of_law() : AreaTriggerScript("at_ring_of_law") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override { if (InstanceScript* instance = player->GetInstanceScript()) { @@ -370,7 +369,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { - return new npc_phalanxAI(creature); + return GetBlackrockDepthsAI<npc_phalanxAI>(creature); } struct npc_phalanxAI : public ScriptedAI @@ -494,7 +493,7 @@ class npc_lokhtos_darkbargainer : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { - return new npc_lokhtos_darkbargainerAI(creature); + return GetBlackrockDepthsAI<npc_lokhtos_darkbargainerAI>(creature); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h index fc571947ca6..2f5821ec6c2 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h @@ -20,8 +20,8 @@ #include "CreatureAIImpl.h" -#define DataHeader "BRD" #define BRDScriptName "instance_blackrock_depths" +#define DataHeader "BRD" enum BRDFactionIds { @@ -66,7 +66,7 @@ enum BRDDataTypes DATA_COREN = 28 }; -template<typename AI, typename T> +template <class AI, class T> inline AI* GetBlackrockDepthsAI(T* obj) { return GetInstanceAI<AI>(obj, BRDScriptName); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp index 966eb9a625c..de92d16041a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp @@ -16,6 +16,7 @@ */ #include "ScriptMgr.h" +#include "blackrock_depths.h" #include "ScriptedCreature.h" enum Spells @@ -89,7 +90,7 @@ class boss_ambassador_flamelash : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { - return new boss_ambassador_flamelashAI(creature); + return GetBlackrockDepthsAI<boss_ambassador_flamelashAI>(creature); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp index 2bb126dbd39..1ac96c8c4a4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp @@ -15,6 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "ScriptMgr.h" +#include "blackrock_depths.h" #include "GameObjectAI.h" #include "GridNotifiers.h" #include "Group.h" @@ -25,11 +27,9 @@ #include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "SpellAuras.h" #include "SpellScript.h" #include "TemporarySummon.h" -#include "blackrock_depths.h" enum DirebrewSays { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp index 9726c2508c1..f9a30d7210c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp @@ -16,6 +16,7 @@ */ #include "ScriptMgr.h" +#include "blackrock_depths.h" #include "ScriptedCreature.h" enum Spells @@ -130,7 +131,7 @@ class boss_general_angerforge : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { - return new boss_general_angerforgeAI(creature); + return GetBlackrockDepthsAI<boss_general_angerforgeAI>(creature); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp index d2fb95a39e3..c14d56ba7bf 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp @@ -16,6 +16,7 @@ */ #include "ScriptMgr.h" +#include "blackrock_depths.h" #include "ScriptedCreature.h" enum Spells @@ -99,7 +100,7 @@ class boss_high_interrogator_gerstahn : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { - return new boss_high_interrogator_gerstahnAI(creature); + return GetBlackrockDepthsAI<boss_high_interrogator_gerstahnAI>(creature); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp index bc9401e7e16..295f94e71fd 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp @@ -106,7 +106,7 @@ class boss_magmus : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { - return new boss_magmusAI(creature); + return GetBlackrockDepthsAI<boss_magmusAI>(creature); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp index 097b4a67b82..4b2bee3fc16 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp @@ -16,6 +16,7 @@ */ #include "ScriptMgr.h" +#include "blackrock_depths.h" #include "ScriptedCreature.h" enum Spells @@ -93,7 +94,7 @@ class boss_moira_bronzebeard : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { - return new boss_moira_bronzebeardAI(creature); + return GetBlackrockDepthsAI<boss_moira_bronzebeardAI>(creature); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp index be16a653cfa..f6bbc3bd5ea 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp @@ -23,6 +23,7 @@ #include "Map.h" #include "MotionMaster.h" #include "ScriptedCreature.h" +#include <sstream> #define TIMER_TOMBOFTHESEVEN 15000 #define MAX_ENCOUNTER 6 @@ -133,22 +134,22 @@ public: { switch (creature->GetEntry()) { - case NPC_EMPEROR: EmperorGUID = creature->GetGUID(); break; - case NPC_PHALANX: PhalanxGUID = creature->GetGUID(); break; - case NPC_MOIRA: MoiraGUID = creature->GetGUID(); break; - case NPC_COREN: CorenGUID = creature->GetGUID(); break; - case NPC_DOOMREL: TombBossGUIDs[0] = creature->GetGUID(); break; - case NPC_DOPEREL: TombBossGUIDs[1] = creature->GetGUID(); break; - case NPC_HATEREL: TombBossGUIDs[2] = creature->GetGUID(); break; - case NPC_VILEREL: TombBossGUIDs[3] = creature->GetGUID(); break; - case NPC_SEETHREL: TombBossGUIDs[4] = creature->GetGUID(); break; - case NPC_GLOOMREL: TombBossGUIDs[5] = creature->GetGUID(); break; - case NPC_ANGERREL: TombBossGUIDs[6] = creature->GetGUID(); break; - case NPC_MAGMUS: - MagmusGUID = creature->GetGUID(); - if (!creature->IsAlive()) - HandleGameObject(GetGuidData(DATA_THRONE_DOOR), true); // if Magmus is dead open door to last boss - break; + case NPC_EMPEROR: EmperorGUID = creature->GetGUID(); break; + case NPC_PHALANX: PhalanxGUID = creature->GetGUID(); break; + case NPC_MOIRA: MoiraGUID = creature->GetGUID(); break; + case NPC_COREN: CorenGUID = creature->GetGUID(); break; + case NPC_DOOMREL: TombBossGUIDs[0] = creature->GetGUID(); break; + case NPC_DOPEREL: TombBossGUIDs[1] = creature->GetGUID(); break; + case NPC_HATEREL: TombBossGUIDs[2] = creature->GetGUID(); break; + case NPC_VILEREL: TombBossGUIDs[3] = creature->GetGUID(); break; + case NPC_SEETHREL: TombBossGUIDs[4] = creature->GetGUID(); break; + case NPC_GLOOMREL: TombBossGUIDs[5] = creature->GetGUID(); break; + case NPC_ANGERREL: TombBossGUIDs[6] = creature->GetGUID(); break; + case NPC_MAGMUS: + MagmusGUID = creature->GetGUID(); + if (!creature->IsAlive()) + HandleGameObject(GetGuidData(DATA_THRONE_DOOR), true); // if Magmus is dead open door to last boss + break; } } @@ -156,33 +157,33 @@ public: { switch (go->GetEntry()) { - case GO_ARENA1: GoArena1GUID = go->GetGUID(); break; - case GO_ARENA2: GoArena2GUID = go->GetGUID(); break; - case GO_ARENA3: GoArena3GUID = go->GetGUID(); break; - case GO_ARENA4: GoArena4GUID = go->GetGUID(); break; - case GO_SHADOW_LOCK: GoShadowLockGUID = go->GetGUID(); break; - case GO_SHADOW_MECHANISM: GoShadowMechGUID = go->GetGUID(); break; - case GO_SHADOW_GIANT_DOOR: GoShadowGiantGUID = go->GetGUID(); break; - case GO_SHADOW_DUMMY: GoShadowDummyGUID = go->GetGUID(); break; - case GO_BAR_KEG_SHOT: GoBarKegGUID = go->GetGUID(); break; - case GO_BAR_KEG_TRAP: GoBarKegTrapGUID = go->GetGUID(); break; - case GO_BAR_DOOR: GoBarDoorGUID = go->GetGUID(); break; - case GO_TOMB_ENTER: GoTombEnterGUID = go->GetGUID(); break; - case GO_TOMB_EXIT: - GoTombExitGUID = go->GetGUID(); - if (GhostKillCount >= 7) - HandleGameObject(ObjectGuid::Empty, true, go); - else - HandleGameObject(ObjectGuid::Empty, false, go); - break; - case GO_LYCEUM: GoLyceumGUID = go->GetGUID(); break; - case GO_SF_S: GoSFSGUID = go->GetGUID(); break; - case GO_SF_N: GoSFNGUID = go->GetGUID(); break; - case GO_GOLEM_ROOM_N: GoGolemNGUID = go->GetGUID(); break; - case GO_GOLEM_ROOM_S: GoGolemSGUID = go->GetGUID(); break; - case GO_THRONE_ROOM: GoThroneGUID = go->GetGUID(); break; - case GO_CHEST_SEVEN: GoChestGUID = go->GetGUID(); break; - case GO_SPECTRAL_CHALICE: GoSpectralChaliceGUID = go->GetGUID(); break; + case GO_ARENA1: GoArena1GUID = go->GetGUID(); break; + case GO_ARENA2: GoArena2GUID = go->GetGUID(); break; + case GO_ARENA3: GoArena3GUID = go->GetGUID(); break; + case GO_ARENA4: GoArena4GUID = go->GetGUID(); break; + case GO_SHADOW_LOCK: GoShadowLockGUID = go->GetGUID(); break; + case GO_SHADOW_MECHANISM: GoShadowMechGUID = go->GetGUID(); break; + case GO_SHADOW_GIANT_DOOR: GoShadowGiantGUID = go->GetGUID(); break; + case GO_SHADOW_DUMMY: GoShadowDummyGUID = go->GetGUID(); break; + case GO_BAR_KEG_SHOT: GoBarKegGUID = go->GetGUID(); break; + case GO_BAR_KEG_TRAP: GoBarKegTrapGUID = go->GetGUID(); break; + case GO_BAR_DOOR: GoBarDoorGUID = go->GetGUID(); break; + case GO_TOMB_ENTER: GoTombEnterGUID = go->GetGUID(); break; + case GO_TOMB_EXIT: + GoTombExitGUID = go->GetGUID(); + if (GhostKillCount >= 7) + HandleGameObject(ObjectGuid::Empty, true, go); + else + HandleGameObject(ObjectGuid::Empty, false, go); + break; + case GO_LYCEUM: GoLyceumGUID = go->GetGUID(); break; + case GO_SF_S: GoSFSGUID = go->GetGUID(); break; + case GO_SF_N: GoSFNGUID = go->GetGUID(); break; + case GO_GOLEM_ROOM_N: GoGolemNGUID = go->GetGUID(); break; + case GO_GOLEM_ROOM_S: GoGolemSGUID = go->GetGUID(); break; + case GO_THRONE_ROOM: GoThroneGUID = go->GetGUID(); break; + case GO_CHEST_SEVEN: GoChestGUID = go->GetGUID(); break; + case GO_SPECTRAL_CHALICE: GoSpectralChaliceGUID = go->GetGUID(); break; } } @@ -208,30 +209,30 @@ public: switch (type) { - case TYPE_RING_OF_LAW: - encounter[0] = data; - break; - case TYPE_VAULT: - encounter[1] = data; - break; - case TYPE_BAR: - if (data == SPECIAL) - ++BarAleCount; - else - encounter[2] = data; - break; - case TYPE_TOMB_OF_SEVEN: - encounter[3] = data; - break; - case TYPE_LYCEUM: - encounter[4] = data; - break; - case TYPE_IRON_HALL: - encounter[5] = data; - break; - case DATA_GHOSTKILL: - GhostKillCount += data; - break; + case TYPE_RING_OF_LAW: + encounter[0] = data; + break; + case TYPE_VAULT: + encounter[1] = data; + break; + case TYPE_BAR: + if (data == SPECIAL) + ++BarAleCount; + else + encounter[2] = data; + break; + case TYPE_TOMB_OF_SEVEN: + encounter[3] = data; + break; + case TYPE_LYCEUM: + encounter[4] = data; + break; + case TYPE_IRON_HALL: + encounter[5] = data; + break; + case DATA_GHOSTKILL: + GhostKillCount += data; + break; } if (data == DONE || GhostKillCount >= 7) @@ -253,23 +254,23 @@ public: { switch (type) { - case TYPE_RING_OF_LAW: - return encounter[0]; - case TYPE_VAULT: - return encounter[1]; - case TYPE_BAR: - if (encounter[2] == IN_PROGRESS && BarAleCount == 3) - return SPECIAL; - else - return encounter[2]; - case TYPE_TOMB_OF_SEVEN: - return encounter[3]; - case TYPE_LYCEUM: - return encounter[4]; - case TYPE_IRON_HALL: - return encounter[5]; - case DATA_GHOSTKILL: - return GhostKillCount; + case TYPE_RING_OF_LAW: + return encounter[0]; + case TYPE_VAULT: + return encounter[1]; + case TYPE_BAR: + if (encounter[2] == IN_PROGRESS && BarAleCount == 3) + return SPECIAL; + else + return encounter[2]; + case TYPE_TOMB_OF_SEVEN: + return encounter[3]; + case TYPE_LYCEUM: + return encounter[4]; + case TYPE_IRON_HALL: + return encounter[5]; + case DATA_GHOSTKILL: + return GhostKillCount; } return 0; } @@ -278,42 +279,42 @@ public: { switch (data) { - case DATA_EMPEROR: - return EmperorGUID; - case DATA_PHALANX: - return PhalanxGUID; - case DATA_MOIRA: - return MoiraGUID; - case DATA_COREN: - return CorenGUID; - case DATA_ARENA1: - return GoArena1GUID; - case DATA_ARENA2: - return GoArena2GUID; - case DATA_ARENA3: - return GoArena3GUID; - case DATA_ARENA4: - return GoArena4GUID; - case DATA_GO_BAR_KEG: - return GoBarKegGUID; - case DATA_GO_BAR_KEG_TRAP: - return GoBarKegTrapGUID; - case DATA_GO_BAR_DOOR: - return GoBarDoorGUID; - case DATA_EVENSTARTER: - return TombEventStarterGUID; - case DATA_SF_BRAZIER_N: - return GoSFNGUID; - case DATA_SF_BRAZIER_S: - return GoSFSGUID; - case DATA_THRONE_DOOR: - return GoThroneGUID; - case DATA_GOLEM_DOOR_N: - return GoGolemNGUID; - case DATA_GOLEM_DOOR_S: - return GoGolemSGUID; - case DATA_GO_CHALICE: - return GoSpectralChaliceGUID; + case DATA_EMPEROR: + return EmperorGUID; + case DATA_PHALANX: + return PhalanxGUID; + case DATA_MOIRA: + return MoiraGUID; + case DATA_COREN: + return CorenGUID; + case DATA_ARENA1: + return GoArena1GUID; + case DATA_ARENA2: + return GoArena2GUID; + case DATA_ARENA3: + return GoArena3GUID; + case DATA_ARENA4: + return GoArena4GUID; + case DATA_GO_BAR_KEG: + return GoBarKegGUID; + case DATA_GO_BAR_KEG_TRAP: + return GoBarKegTrapGUID; + case DATA_GO_BAR_DOOR: + return GoBarDoorGUID; + case DATA_EVENSTARTER: + return TombEventStarterGUID; + case DATA_SF_BRAZIER_N: + return GoSFNGUID; + case DATA_SF_BRAZIER_S: + return GoSFSGUID; + case DATA_THRONE_DOOR: + return GoThroneGUID; + case DATA_GOLEM_DOOR_N: + return GoGolemNGUID; + case DATA_GOLEM_DOOR_S: + return GoGolemSGUID; + case DATA_GO_CHALICE: + return GoSpectralChaliceGUID; } return ObjectGuid::Empty; } @@ -323,7 +324,7 @@ public: return str_data; } - void Load(const char* in) override + void Load(char const* in) override { if (!in) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h index ef1ee422476..bca9f01839a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h @@ -122,10 +122,10 @@ enum BRSGameObjectsIds GO_PORTCULLIS_TOBOSSROOMS = 175186 }; -template<typename AI> -inline AI* GetBlackrockSpireAI(Creature* creature) +template <class AI, class T> +inline AI* GetBlackrockSpireAI(T* obj) { - return GetInstanceAI<AI>(creature, BRSScriptName); + return GetInstanceAI<AI>(obj, BRSScriptName); } #endif diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp index 71beb27a282..8b5e4ad3d29 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp @@ -104,7 +104,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { - return new boss_drakkisathAI(creature); + return GetBlackrockSpireAI<boss_drakkisathAI>(creature); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp index da61c7d00b9..9b82c3292b0 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp @@ -255,7 +255,7 @@ public: { // Check to see if all players in instance have aura SPELL_EMBERSEER_START before starting event bool _hasAura = true; - Map::PlayerList const &players = me->GetMap()->GetPlayers(); + Map::PlayerList const& players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) if (Player* player = itr->GetSource()->ToPlayer()) if (!player->HasAura(SPELL_EMBERSEER_OBJECT_VISUAL)) @@ -441,7 +441,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { - return new npc_blackhand_incarceratorAI(creature); + return GetBlackrockSpireAI<npc_blackhand_incarceratorAI>(creature); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp index c5403ee37ad..0a756cced04 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp @@ -527,7 +527,7 @@ class at_dragonspire_hall : public AreaTriggerScript public: at_dragonspire_hall() : AreaTriggerScript("at_dragonspire_hall") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override { if (player && player->IsAlive()) { @@ -551,7 +551,7 @@ class at_blackrock_stadium : public AreaTriggerScript public: at_blackrock_stadium() : AreaTriggerScript("at_blackrock_stadium") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override { if (player && player->IsAlive()) { @@ -575,10 +575,12 @@ class at_nearby_scarshield_infiltrator : public AreaTriggerScript public: at_nearby_scarshield_infiltrator() : AreaTriggerScript("at_nearby_scarshield_infiltrator") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*at*/, bool /*entered*/) override { if (player->IsAlive()) + { if (InstanceScript* instance = player->GetInstanceScript()) + { if (Creature* infiltrator = ObjectAccessor::GetCreature(*player, instance->GetGuidData(DATA_SCARSHIELD_INFILTRATOR))) { if (player->getLevel() >= 57) @@ -588,6 +590,8 @@ public: return true; } + } + } return false; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp index 9fb0e77caac..9acbe8e6797 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp @@ -16,8 +16,8 @@ */ #include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackwing_lair.h" +#include "ScriptedCreature.h" enum Say { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp index 5953adb8105..97a91c81fe3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp @@ -240,7 +240,7 @@ public: break; case EVENT_AFFLICTION: { - Map::PlayerList const &players = me->GetMap()->GetPlayers(); + Map::PlayerList const& players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { if (Player* player = itr->GetSource()->ToPlayer()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp index 447ca2fe1ab..c147fd85548 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp @@ -16,8 +16,8 @@ */ #include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackwing_lair.h" +#include "ScriptedCreature.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp index 97c73b89973..e082f114c10 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp @@ -16,8 +16,8 @@ */ #include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackwing_lair.h" +#include "ScriptedCreature.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp index a54285164d9..ab465de3805 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp @@ -16,8 +16,8 @@ */ #include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "blackwing_lair.h" +#include "ScriptedCreature.h" enum Emotes { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp index 876f32cb89a..52fe779f4c1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp @@ -22,10 +22,9 @@ SDComment: SDCategory: Molten Core EndScriptData */ -#include "ObjectMgr.h" #include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "molten_core.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp index e4b43d27b48..c54b27489bd 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp @@ -22,10 +22,10 @@ SDComment: Adds NYI SDCategory: Molten Core EndScriptData */ -#include "ObjectMgr.h" #include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "molten_core.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp index f4652666abe..00aa6d38079 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp @@ -22,10 +22,10 @@ SDComment: Adds MC NYI SDCategory: Molten Core EndScriptData */ -#include "ObjectMgr.h" #include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "molten_core.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp index 4980fbcdcfc..aeaa706c174 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp @@ -27,7 +27,6 @@ EndScriptData */ #include "molten_core.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" -#include "TemporarySummon.h" enum Texts { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp index a0b70cc8396..fe297f576e6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp @@ -22,10 +22,10 @@ SDComment: SDCategory: Molten Core EndScriptData */ -#include "ObjectMgr.h" #include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "molten_core.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp index 386de5e94eb..aacf257226c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp @@ -22,10 +22,10 @@ SDComment: Adds NYI SDCategory: Molten Core EndScriptData */ -#include "ObjectMgr.h" #include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "molten_core.h" +#include "ObjectMgr.h" +#include "ScriptedCreature.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp index d237c7fe3a6..c82abaa4035 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp @@ -16,10 +16,10 @@ */ #include "ScriptMgr.h" +#include "molten_core.h" #include "GameObject.h" #include "InstanceScript.h" #include "Map.h" -#include "molten_core.h" #include "ScriptedCreature.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h index cc3494fe5b6..e8f88b50405 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h @@ -75,10 +75,10 @@ enum MCData DATA_RAGNAROS_ADDS = 0, }; -template<typename AI> -inline AI* GetMoltenCoreAI(Creature* creature) +template <class AI, class T> +inline AI* GetMoltenCoreAI(T* obj) { - return GetInstanceAI<AI>(creature, MCScriptName); + return GetInstanceAI<AI>(obj, MCScriptName); } #endif diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp index 079f14155c1..9b575fd34a9 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp @@ -16,11 +16,7 @@ */ #include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "deadmines.h" -#include "Spell.h" -#include "Player.h" -#include "WorldSession.h" void AddSC_deadmines() { diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h index 74edaa2b7aa..dfebf706d18 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h +++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h @@ -52,10 +52,10 @@ enum DMGameObjects GO_MR_SMITE_CHEST = 144111 }; -template<typename AI> -inline AI* GetDeadminesAI(Creature* creature) +template <class AI, class T> +inline AI* GetDeadminesAI(T* obj) { - return GetInstanceAI<AI>(creature, DMScriptName); + return GetInstanceAI<AI>(obj, DMScriptName); } #endif diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index 1804cf17a52..0587987ece8 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -196,15 +196,15 @@ class instance_deadmines : public InstanceMapScript { switch (type) { - case EVENT_STATE: - if (!DefiasCannonGUID.IsEmpty() && !IronCladDoorGUID.IsEmpty()) - State = data; - break; - case EVENT_RHAHKZOR: - if (data == DONE) - if (GameObject* go = instance->GetGameObject(FactoryDoorGUID)) - go->SetGoState(GO_STATE_ACTIVE); - break; + case EVENT_STATE: + if (!DefiasCannonGUID.IsEmpty() && !IronCladDoorGUID.IsEmpty()) + State = data; + break; + case EVENT_RHAHKZOR: + if (data == DONE) + if (GameObject* go = instance->GetGameObject(FactoryDoorGUID)) + go->SetGoState(GO_STATE_ACTIVE); + break; } } diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index aaa280fdbe1..98f3558d84e 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -204,7 +204,7 @@ public: void AggroAllPlayers(Creature* temp) { - Map::PlayerList const &PlList = me->GetMap()->GetPlayers(); + Map::PlayerList const& PlList = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i) { if (Player* player = i->GetSource()) diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h index e2ac26d6675..2b349789d97 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h @@ -50,10 +50,10 @@ enum GNOData64 DATA_NPC_BASTMASTER_EMI_SHORTFUSE }; -template<typename AI> -inline AI* GetGnomereganAI(Creature* creature) +template <class AI, class T> +inline AI* GetGnomereganAI(T* obj) { - return GetInstanceAI<AI>(creature, GNOScriptName); + return GetInstanceAI<AI>(obj, GNOScriptName); } #endif diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp index 5a583390728..965558131ee 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp @@ -22,13 +22,14 @@ #include "InstanceScript.h" #include "Log.h" #include "Map.h" +#include <sstream> #define MAX_ENCOUNTER 1 class instance_gnomeregan : public InstanceMapScript { public: - instance_gnomeregan() : InstanceMapScript("instance_gnomeregan", 90) { } + instance_gnomeregan() : InstanceMapScript(GNOScriptName, 90) { } InstanceScript* GetInstanceScript(InstanceMap* map) const override { @@ -50,7 +51,7 @@ public: ObjectGuid uiBastmasterEmiShortfuseGUID; - void Load(const char* in) override + void Load(char const* in) override { if (!in) { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index 1b7ded81966..0edd267c695 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "karazhan.h" #include "ScriptedCreature.h" -#include "karazhan.h" enum CuratorSays { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index b89078fb228..282e1a56ecd 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -222,7 +222,7 @@ public: std::bind(&BossAI::DoMeleeAttackIfReady, this)); } - void SpellHit(Unit* /*source*/, const SpellInfo* spell) override + void SpellHit(Unit* /*source*/, SpellInfo const* spell) override { if (spell->Mechanic == MECHANIC_DISARM) Talk(SAY_DISARMED); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index f612dc03094..539266ffa18 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -23,8 +23,8 @@ SDCategory: Karazhan EndScriptData */ #include "ScriptMgr.h" -#include "InstanceScript.h" #include "karazhan.h" +#include "InstanceScript.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index a4463fe4a7f..2ba6ba50317 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -15,16 +15,16 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "GameObject.h" #include "ScriptMgr.h" +#include "GameObject.h" +#include "GameObjectAI.h" #include "InstanceScript.h" #include "karazhan.h" #include "MotionMaster.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" -#include "GameObjectAI.h" -#include "SpellScript.h" #include "SpellAuraEffects.h" +#include "SpellScript.h" enum NightbaneSpells { @@ -119,11 +119,6 @@ class boss_nightbane : public CreatureScript public: boss_nightbane() : CreatureScript("boss_nightbane") { } - CreatureAI* GetAI(Creature* creature) const override - { - return GetKarazhanAI<boss_nightbaneAI>(creature); - } - struct boss_nightbaneAI : public BossAI { boss_nightbaneAI(Creature* creature) : BossAI(creature, DATA_NIGHTBANE), _flyCount(0) { } @@ -381,6 +376,11 @@ public: private: uint8 _flyCount; }; + + CreatureAI* GetAI(Creature* creature) const override + { + return GetKarazhanAI<boss_nightbaneAI>(creature); + } }; // 37098 - Rain of Bones diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index a70793dd572..e004ebeb87d 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -23,8 +23,8 @@ SDCategory: Karazhan EndScriptData */ #include "ScriptMgr.h" -#include "InstanceScript.h" #include "karazhan.h" +#include "InstanceScript.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "SpellInfo.h" @@ -154,7 +154,7 @@ public: creature->AI()->KilledUnit(who); } - void SpellHit(Unit* /*who*/, const SpellInfo* spell) override + void SpellHit(Unit* /*who*/, SpellInfo const* spell) override { if (spell->Id == SPELL_INFERNAL_RELAY) { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index 86c733d2e3c..a9eaa863f46 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -23,11 +23,10 @@ SDCategory: Karazhan EndScriptData */ #include "ScriptMgr.h" -#include "GameObject.h" +#include "karazhan.h" #include "InstanceScript.h" +#include "GameObject.h" #include "Item.h" -#include "karazhan.h" -#include "Map.h" #include "MotionMaster.h" #include "ObjectAccessor.h" #include "Player.h" diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index c639a384374..3150111e30b 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -16,12 +16,10 @@ */ #include "ScriptMgr.h" -#include "InstanceScript.h" #include "karazhan.h" #include "ObjectAccessor.h" #include "PassiveAI.h" #include "ScriptedCreature.h" -#include "TemporarySummon.h" #include "SpellInfo.h" enum TerestianSays diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 32cc678e901..1f5d49a3c6d 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -372,7 +372,7 @@ public: me->DespawnOrUnsummon(); } - void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* Spell) override { if ((Spell->SchoolMask == SPELL_SCHOOL_MASK_FIRE) && (!(rand32() % 10))) { @@ -1136,7 +1136,7 @@ public: me->DespawnOrUnsummon(); } - void SpellHit(Unit* /*caster*/, const SpellInfo* Spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* Spell) override { if (Spell->Id == SPELL_DRINK_POISON) { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index b0300ec3b4b..3c7e07505db 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -309,7 +309,7 @@ public: { if (WipeTimer <= diff) { - Map::PlayerList const &PlayerList = me->GetMap()->GetPlayers(); + Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers(); if (PlayerList.isEmpty()) return; @@ -566,7 +566,7 @@ public: me->SetVisible(false); me->ClearInCombat(); - InstanceMap::PlayerList const &PlayerList = me->GetMap()->GetPlayers(); + InstanceMap::PlayerList const& PlayerList = me->GetMap()->GetPlayers(); for (InstanceMap::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { if (i->GetSource()->IsAlive()) diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 292dc10e7f8..7483991ca6f 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -71,8 +71,6 @@ enum Spells SPELL_POWER_FEEDBACK = 44233 // Stuns him, making him take 50% more damage for 10 seconds. Cast after Gravity Lapse }; - - enum Creatures { CREATURE_PHOENIX = 24674, diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 0a9062e03f2..e6cac2e0132 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -23,8 +23,8 @@ SDCategory: Magister's Terrace EndScriptData */ #include "ScriptMgr.h" -#include "InstanceScript.h" #include "magisters_terrace.h" +#include "InstanceScript.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "TemporarySummon.h" @@ -1328,7 +1328,7 @@ public: //CreatureAI* GetAI(Creature* creature) const override //{ - // return new npc_high_explosive_sheepAI(creature); + // return GetMagistersTerraceAI<npc_high_explosive_sheepAI>(creature); //}; }; */ diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index 40e3195326a..b9bdcced9e6 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -16,9 +16,9 @@ */ #include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "magisters_terrace.h" #include "MotionMaster.h" +#include "ScriptedCreature.h" enum Yells { diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index 076520907d4..61507222774 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -163,11 +163,13 @@ class instance_magisters_terrace : public InstanceMapScript Events.Update(diff); if (Events.ExecuteEvent() == EVENT_SPAWN_KALECGOS) + { if (Creature* kalecgos = instance->SummonCreature(NPC_KALECGOS, KalecgosSpawnPos)) { kalecgos->GetMotionMaster()->MovePath(PATH_KALECGOS_FLIGHT, false); kalecgos->AI()->Talk(SAY_KALECGOS_SPAWN); } + } } bool SetBossState(uint32 type, EncounterState state) override diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp index 98494d2703c..01879a1f029 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp @@ -154,7 +154,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { - return new npc_kalecgosAI(creature); + return GetMagistersTerraceAI<npc_kalecgosAI>(creature); } }; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h index 664ffd740a0..2a0b8217635 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h @@ -76,10 +76,10 @@ enum MTMovementData PATH_KALECGOS_FLIGHT = 248440 }; -template<typename AI> -inline AI* GetMagistersTerraceAI(Creature* creature) +template <class AI, class T> +inline AI* GetMagistersTerraceAI(T* obj) { - return GetInstanceAI<AI>(creature, MGTScriptName); + return GetInstanceAI<AI>(obj, MGTScriptName); } #endif diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index f26876e8f3f..d4869fb0d10 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -19,12 +19,12 @@ #include "CombatAI.h" #include "CreatureTextMgr.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "Log.h" #include "MotionMaster.h" #include "MoveSplineInit.h" #include "ObjectAccessor.h" #include "PassiveAI.h" -#include "GameObjectAI.h" #include "Player.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" @@ -521,7 +521,7 @@ public: me->AddUnitFlag(UNIT_FLAG_UNK_15); } - void SpellHit(Unit* pCaster, const SpellInfo* pSpell) override + void SpellHit(Unit* pCaster, SpellInfo const* pSpell) override { if (!m_bIsDuelInProgress && pSpell->Id == SPELL_DUEL) { @@ -776,7 +776,7 @@ public: return false; } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id == SPELL_DELIVER_STOLEN_HORSE) { diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 934de238055..86fc1dc0c90 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -76,7 +76,7 @@ public: me->RestoreFaction(); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id == SPELL_PERSUASIVE_STRIKE && caster->GetTypeId() == TYPEID_PLAYER && me->IsAlive() && !speechCounter) { diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index 35ddd4ab784..f9164589cc2 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -1266,7 +1266,7 @@ public: // go->SetPhaseMask(0, true); { // search players with in 50 yards for quest credit - Map::PlayerList const &PlayerList = me->GetMap()->GetPlayers(); + Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers(); if (!PlayerList.isEmpty()) { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp index 84abf8b6062..eb9e2e4e871 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp @@ -131,10 +131,11 @@ public: break; } ++phase; - } else FlyBackTimer-=diff; + } + else + FlyBackTimer -= diff; } }; - }; void AddSC_the_scarlet_enclave() diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 3b294a6811c..6daedfb4a29 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -23,8 +23,8 @@ SDCategory: Scarlet Monastery EndScriptData */ #include "ScriptMgr.h" -#include "GameObjectAI.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "Group.h" #include "InstanceScript.h" #include "LFGMgr.h" @@ -187,7 +187,7 @@ public: DoCast(me, _spell); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_WISP_FLIGHT_PORT && Creaturetype == 4) me->SetDisplayId(2027); @@ -302,7 +302,7 @@ public: } } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (!withbody) return; @@ -540,7 +540,7 @@ public: Player* SelectRandomPlayer(float range = 0.0f, bool checkLoS = true) { - Map::PlayerList const &PlayerList = me->GetMap()->GetPlayers(); + Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers(); if (PlayerList.isEmpty()) return nullptr; @@ -559,7 +559,7 @@ public: return nullptr; } - void SpellHitTarget(Unit* unit, const SpellInfo* spell) override + void SpellHitTarget(Unit* unit, SpellInfo const* spell) override { if (spell->Id == SPELL_CONFLAGRATION && unit->HasAura(SPELL_CONFLAGRATION)) SaySound(SAY_CONFLAGRATION, unit); @@ -585,7 +585,7 @@ public: } } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (withhead) return; @@ -816,7 +816,7 @@ public: void EnterCombat(Unit* /*who*/) override { } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_SPROUTING) { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp index 4e3a71bbe71..75c6ad43263 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp @@ -23,9 +23,9 @@ SDCategory: Scarlet Monastery EndScriptData */ #include "ScriptMgr.h" +#include "scarlet_monastery.h" #include "ScriptedCreature.h" #include "ScriptedEscortAI.h" -#include "scarlet_monastery.h" enum Says { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index fd0a8ec795f..7c5855b4b10 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -23,8 +23,8 @@ SDCategory: Scarlet Monastery EndScriptData */ #include "ScriptMgr.h" -#include "InstanceScript.h" #include "scarlet_monastery.h" +#include "InstanceScript.h" #include "ScriptedCreature.h" enum Spells diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp index 7e4b210f599..224bc488b03 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp @@ -16,8 +16,8 @@ */ #include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "scarlet_monastery.h" +#include "ScriptedCreature.h" enum Yells { diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp index fbdad6dc712..4714bcb999e 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp @@ -16,9 +16,9 @@ */ #include "ScriptMgr.h" +#include "scarlet_monastery.h" #include "InstanceScript.h" #include "ObjectAccessor.h" -#include "scarlet_monastery.h" #include "ScriptedCreature.h" enum Says diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp index 5ae31c00d81..6d976481eca 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp @@ -161,7 +161,7 @@ public: } } - void SpellHit(Unit* /*who*/, const SpellInfo* spell) override + void SpellHit(Unit* /*who*/, SpellInfo const* spell) override { //When hit with resurrection say text if (spell->Id == SPELL_SCARLETRESURRECTION) diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index 6d70f5b762c..8be2b9a6269 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -46,26 +46,13 @@ class instance_scarlet_monastery : public InstanceMapScript void OnGameObjectCreate(GameObject* go) override { + InstanceScript::OnGameObjectCreate(go); + switch (go->GetEntry()) { case GO_PUMPKIN_SHRINE: PumpkinShrineGUID = go->GetGUID(); break; - case GO_HIGH_INQUISITORS_DOOR: - AddDoor(go, true); - break; - default: - break; - } - } - - void OnGameObjectRemove(GameObject* go) override - { - switch (go->GetEntry()) - { - case GO_HIGH_INQUISITORS_DOOR: - AddDoor(go, false); - break; default: break; } diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h index c1ba06d446b..36d2569dbf3 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h @@ -62,7 +62,7 @@ enum SMGameObjectIds GO_PUMPKIN_SHRINE = 186267 }; -template<class AI, class T> +template <class AI, class T> inline AI* GetScarletMonasteryAI(T* obj) { return GetInstanceAI<AI>(obj, SMScriptName); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index d0e711ae642..77539afa7be 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -27,8 +27,8 @@ Category: Scholomance #include "InstanceScript.h" #include "MotionMaster.h" #include "ObjectAccessor.h" -#include "ScriptedCreature.h" #include "scholomance.h" +#include "ScriptedCreature.h" #include "SpellInfo.h" #include "SpellScript.h" #include "TemporarySummon.h" @@ -171,17 +171,10 @@ class spell_shadow_portal : public SpellScriptLoader { PrepareSpellScript(spell_shadow_portal_SpellScript); - public: - spell_shadow_portal_SpellScript() - { - _instance = nullptr; - } - - private: bool Load() override { _instance = GetCaster()->GetInstanceScript(); - return _instance != nullptr; + return InstanceHasScript(GetCaster(), ScholomanceScriptName); } void HandleCast(SpellEffIndex /*effIndex*/) @@ -238,7 +231,7 @@ class spell_shadow_portal : public SpellScriptLoader OnEffectHitTarget += SpellEffectFn(spell_shadow_portal_SpellScript::HandleCast, EFFECT_0, SPELL_EFFECT_DUMMY); } - InstanceScript* _instance; + InstanceScript* _instance = nullptr; }; SpellScript* GetSpellScript() const override @@ -300,13 +293,6 @@ class spell_shadow_portal_rooms : public SpellScriptLoader { PrepareSpellScript(spell_shadow_portal_rooms_SpellScript); - public: - spell_shadow_portal_rooms_SpellScript() - { - _instance = nullptr; - } - - private: bool Load() override { _instance = GetCaster()->GetInstanceScript(); @@ -380,7 +366,7 @@ class spell_shadow_portal_rooms : public SpellScriptLoader OnEffectHit += SpellEffectFn(spell_shadow_portal_rooms_SpellScript::HandleSendEvent, EFFECT_1, SPELL_EFFECT_SEND_EVENT); } - InstanceScript* _instance; + InstanceScript* _instance = nullptr; }; SpellScript* GetSpellScript() const override diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp index 3f3ec24913a..2f053417900 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp @@ -23,8 +23,8 @@ Category: Scholomance */ #include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "scholomance.h" +#include "ScriptedCreature.h" enum Say { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index 23ba5b24237..99c81366ef5 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp @@ -23,8 +23,8 @@ Category: Scholomance */ #include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "scholomance.h" +#include "ScriptedCreature.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index f7108dc14cd..55c5c442a71 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp @@ -23,8 +23,8 @@ SDCategory: Scholomance EndScriptData */ #include "ScriptMgr.h" -#include "ScriptedCreature.h" #include "scholomance.h" +#include "ScriptedCreature.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp index 2888a9b4135..f8678b1e6ae 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -16,8 +16,8 @@ */ #include "ScriptMgr.h" -#include "GameObjectAI.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "InstanceScript.h" #include "MotionMaster.h" #include "MoveSplineInit.h" @@ -141,9 +141,7 @@ class boss_kirtonos_the_herald : public CreatureScript void MovementInform(uint32 type, uint32 id) override { if (type == WAYPOINT_MOTION_TYPE && id == POINT_KIRTONOS_LAND) - { events.ScheduleEvent(INTRO_2, 1500); - } } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp index 5343104dce7..b54c8b40ad6 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp @@ -22,9 +22,9 @@ SDComment: aura applied/defined in database SDCategory: Scholomance EndScriptData */ +#include "scholomance.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "scholomance.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp index e001036ca65..67df81f9928 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp @@ -22,9 +22,9 @@ Comment: Category: Scholomance */ +#include "scholomance.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "scholomance.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp index 37189ec6169..d4be3a1c44e 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ScriptMgr.h" #include "scholomance.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" enum Spells diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp index 1ab11ee1903..2ef20dfa915 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_the_ravenian.cpp @@ -22,9 +22,9 @@ Comment: Category: Scholomance */ +#include "scholomance.h" #include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "scholomance.h" enum Spells { diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp index 89ba79a8c25..9853500e5ee 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ScriptMgr.h" #include "scholomance.h" +#include "ScriptMgr.h" #include "ScriptedCreature.h" enum Emotes diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp index 3172c4e71fa..00e9b44d0da 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp @@ -15,7 +15,7 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "shadowfang_keep.h" +#include "ScriptMgr.h" #include "GridNotifiersImpl.h" #include "Group.h" #include "InstanceScript.h" @@ -25,8 +25,7 @@ #include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" -#include "SpellAuraEffects.h" +#include "shadowfang_keep.h" #include "SpellScript.h" enum ApothecarySpells diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp index 0872c8cfe0e..2837b3d1b75 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp @@ -23,14 +23,14 @@ SDCategory: Shadowfang Keep EndScriptData */ #include "ScriptMgr.h" -#include "Creature.h" -#include "CreatureAI.h" +#include "shadowfang_keep.h" #include "GameObject.h" #include "InstanceScript.h" #include "Log.h" #include "Map.h" -#include "shadowfang_keep.h" +#include "ScriptedCreature.h" #include "TemporarySummon.h" +#include <sstream> #define MAX_ENCOUNTER 4 @@ -217,7 +217,7 @@ public: return str_data; } - void Load(const char* in) override + void Load(char const* in) override { if (!in) { diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index db50a0c8f34..a69238119d4 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -27,11 +27,11 @@ npc_shadowfang_prisoner EndContentData */ #include "ScriptMgr.h" +#include "shadowfang_keep.h" #include "InstanceScript.h" #include "Player.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "shadowfang_keep.h" #include "SpellAuraEffects.h" #include "SpellScript.h" diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h index e7163fd64e0..486c9750acc 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h @@ -33,7 +33,7 @@ enum SKDataTypes DATA_APOTHECARY_HUMMEL = 6 }; -template<typename AI, typename T> +template <class AI, class T> inline AI* GetShadowfangKeepAI(T* obj) { return GetInstanceAI<AI>(obj, SFKScriptName); diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp index 64ecf812e66..04268b037b3 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp @@ -31,6 +31,7 @@ EndScriptData */ #include "Map.h" #include "Player.h" #include "stratholme.h" +#include <sstream> enum Misc { @@ -352,7 +353,7 @@ class instance_stratholme : public InstanceMapScript return saveStream.str(); } - void Load(const char* in) override + void Load(char const* in) override { if (!in) { diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 624047a5ab5..ab619c8abba 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -30,8 +30,8 @@ npc_spectral_ghostly_citizen EndContentData */ #include "ScriptMgr.h" -#include "GameObjectAI.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "Group.h" #include "InstanceScript.h" #include "MotionMaster.h" @@ -116,7 +116,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { - return new npc_restless_soulAI(creature); + return GetStratholmeAI<npc_restless_soulAI>(creature); } struct npc_restless_soulAI : public ScriptedAI @@ -144,7 +144,7 @@ public: void EnterCombat(Unit* /*who*/) override { } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (Tagged || spell->Id != SPELL_EGAN_BLASTER) return; @@ -209,7 +209,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { - return new npc_spectral_ghostly_citizenAI(creature); + return GetStratholmeAI<npc_spectral_ghostly_citizenAI>(creature); } struct npc_spectral_ghostly_citizenAI : public ScriptedAI @@ -235,7 +235,7 @@ public: void EnterCombat(Unit* /*who*/) override { } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (!Tagged && spell->Id == SPELL_EGAN_BLASTER) Tagged = true; diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp index acf914ebba3..448150295a1 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -50,7 +50,7 @@ enum CreatureIds class instance_sunken_temple : public InstanceMapScript { public: - instance_sunken_temple() : InstanceMapScript("instance_sunken_temple", 109) { } + instance_sunken_temple() : InstanceMapScript(STScriptName, 109) { } InstanceScript* GetInstanceScript(InstanceMap* map) const override { @@ -174,7 +174,7 @@ public: void UseLastStatue(GameObject* go) { for (uint8 i = 0; i < nStatues; ++i) - go->SummonGameObject(GO_ATALAI_LIGHT2, statuePositions[i], G3D::Quat(), 0); + go->SummonGameObject(GO_ATALAI_LIGHT2, statuePositions[i], QuaternionData(), 0); go->SummonCreature(NPC_ATALALARION, atalalarianPos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 7200); } diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp index 4998861939e..5e0a2fc0a29 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp @@ -28,10 +28,10 @@ EndContentData */ #include "ScriptMgr.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "InstanceScript.h" #include "Player.h" #include "ScriptedCreature.h" -#include "GameObjectAI.h" #include "sunken_temple.h" /*##### @@ -43,7 +43,7 @@ class at_malfurion_stormrage : public AreaTriggerScript public: at_malfurion_stormrage() : AreaTriggerScript("at_malfurion_stormrage") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override { if (player->GetInstanceScript() && !player->FindNearestCreature(15362, 15)) player->SummonCreature(15362, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), -1.52f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 100000); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 751ff1d16c1..9821ed2edae 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -24,7 +24,6 @@ EndScriptData */ #include "ScriptMgr.h" #include "InstanceScript.h" #include "Log.h" -#include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "sunwell_plateau.h" diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index a6bf0dec111..e733c6810c2 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -17,7 +17,6 @@ #include "ScriptMgr.h" #include "InstanceScript.h" -#include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "SpellInfo.h" #include "sunwell_plateau.h" @@ -162,7 +161,7 @@ public: me->RemoveDynamicFlag(UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { switch (spell->Id) { @@ -438,7 +437,7 @@ public: me->RemoveDynamicFlag(UNIT_DYNFLAG_LOOTABLE); } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { switch (spell->Id) { @@ -675,7 +674,7 @@ public: void EnterCombat(Unit* /*who*/) override { } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { switch (spell->Id) { diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 229e942103e..fb11d19b833 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -198,7 +198,7 @@ public: instance->SetBossState(DATA_FELMYST, DONE); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { // workaround for linked aura /*if (spell->Id == SPELL_VAPOR_FORCE) diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 9ed81e6f526..684b094e06b 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -26,13 +26,13 @@ EndScriptData */ #include "ScriptMgr.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "InstanceScript.h" #include "Log.h" #include "MotionMaster.h" #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" -#include "GameObjectAI.h" #include "sunwell_plateau.h" #include "TemporarySummon.h" #include <cmath> @@ -707,7 +707,7 @@ public: case TIMER_SPEECH: if (SpeechBegins) { - SpeechBegins=false; + SpeechBegins = false; switch (Phase) { case PHASE_NORMAL: diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h index 1ea9a56f7ec..2ddb4233a18 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h @@ -116,7 +116,7 @@ enum SWPGameObjectIds }; template <class AI, class T> -inline AI* GetSunwellPlateauAI(T* obj) +AI* GetSunwellPlateauAI(T* obj) { return GetInstanceAI<AI>(obj, SunwellPlateauScriptName); } diff --git a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp index 79c8eb1f05b..8a2496b55da 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/boss_archaedas.cpp @@ -26,14 +26,14 @@ On his death the vault door opens. EndScriptData */ #include "ScriptMgr.h" +#include "GameObject.h" +#include "GameObjectAI.h" #include "InstanceScript.h" #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" -#include "GameObjectAI.h" #include "SpellInfo.h" #include "uldaman.h" -#include "GameObject.h" enum Says { diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp index 0b6128af171..02b7a121b96 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp @@ -32,6 +32,7 @@ EndScriptData */ #include "MotionMaster.h" #include "ObjectAccessor.h" #include "uldaman.h" +#include <sstream> enum Spells { @@ -418,7 +419,7 @@ class instance_uldaman : public InstanceMapScript return str_data; } - void Load(const char* in) override + void Load(char const* in) override { if (!in) { diff --git a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp index becc9fcb5d7..b8539f686bf 100644 --- a/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp +++ b/src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp @@ -30,10 +30,10 @@ EndContentData */ #include "ScriptMgr.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "InstanceScript.h" #include "Player.h" #include "ScriptedCreature.h" -#include "GameObjectAI.h" #include "uldaman.h" /*###### @@ -102,7 +102,7 @@ class npc_jadespine_basilisk : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { - return new npc_jadespine_basiliskAI(creature); + return GetUldamanAI<npc_jadespine_basiliskAI>(creature); } }; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp index ee4137453df..8db37e7275a 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp @@ -23,11 +23,12 @@ #include "ScriptedCreature.h" #include "WorldStatePackets.h" #include "zulaman.h" +#include <sstream> class instance_zulaman : public InstanceMapScript { public: - instance_zulaman() : InstanceMapScript(ZulAmanScriptName, 568) { } + instance_zulaman() : InstanceMapScript(ZulamanScriptName, 568) { } struct instance_zulaman_InstanceScript : public InstanceScript { diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h index 4c2fadfb49f..5a482417563 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.h @@ -21,7 +21,7 @@ #include "CreatureAIImpl.h" uint32 const EncounterCount = 6; -#define ZulAmanScriptName "instance_zulaman" +#define ZulamanScriptName "instance_zulaman" #define DataHeader "ZA" enum ZADataTypes @@ -80,10 +80,10 @@ enum ZAWorldStates WORLD_STATE_ZULAMAN_TIMER = 3106, }; -template<typename AI> -CreatureAI* GetZulAmanAI(Creature* creature) +template <class AI, class T> +inline AI* GetZulAmanAI(T* obj) { - return GetInstanceAI<AI>(creature, ZulAmanScriptName); + return GetInstanceAI<AI>(obj, ZulamanScriptName); } #endif diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp index 8ff09f8bb9b..4dfb3a9e2d2 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp @@ -17,7 +17,6 @@ #include "ScriptMgr.h" #include "Creature.h" -#include "GameObject.h" #include "InstanceScript.h" #include "zulgurub.h" @@ -84,38 +83,6 @@ class instance_zulgurub : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) override - { - switch (go->GetEntry()) - { - case GO_VENOXIS_COIL: - case GO_ARENA_DOOR_1: - case GO_FORCEFIELD: - case GO_ZANZIL_DOOR: - case GO_THE_CACHE_OF_MADNESS_DOOR: - AddDoor(go, true); - break; - default: - break; - } - } - - void OnGameObjectRemove(GameObject* go) override - { - switch (go->GetEntry()) - { - case GO_VENOXIS_COIL: - case GO_ARENA_DOOR_1: - case GO_FORCEFIELD: - case GO_ZANZIL_DOOR: - case GO_THE_CACHE_OF_MADNESS_DOOR: - AddDoor(go, false); - break; - default: - break; - } - } - bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h index d4d2908dec5..517553727e6 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h +++ b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h @@ -20,8 +20,8 @@ #include "CreatureAIImpl.h" -#define DataHeader "ZG" #define ZGScriptName "instance_zulgurub" +#define DataHeader "ZG" uint32 const EncounterCount = 5; @@ -89,8 +89,8 @@ enum ZGGameObjectIds GO_THE_CACHE_OF_MADNESS_DOOR = 208843 }; -template<class AI, class T> -AI* GetZulGurubAI(T* obj) +template <class AI, class T> +inline AI* GetZulGurubAI(T* obj) { return GetInstanceAI<AI>(obj, ZGScriptName); } diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index 068cfbc74e6..818418e65d9 100644 --- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp @@ -146,7 +146,7 @@ class at_twilight_grove : public AreaTriggerScript public: at_twilight_grove() : AreaTriggerScript("at_twilight_grove") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override { if (player->GetQuestStatus(QUEST_NIGHTMARES_CORRUPTION) == QUEST_STATUS_INCOMPLETE) if (!player->FindNearestCreature(NPC_TWILIGHT_CORRUPTER, 500.0f, true)) diff --git a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp index 1751bf9c77c..7c7c2c742c2 100644 --- a/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp @@ -28,9 +28,8 @@ EndContentData */ #include "ScriptMgr.h" #include "MotionMaster.h" -#include "ScriptedCreature.h" -#include "ScriptedEscortAI.h" #include "Player.h" +#include "ScriptedEscortAI.h" /*###### ## npc_oox09hl diff --git a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp index 4ea7686519c..9ffe7b541fc 100644 --- a/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp @@ -73,7 +73,7 @@ public: me->SetEmoteState(EMOTE_STATE_NONE); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (bReset || spell->Id != SPELL_YENNIKUS_RELEASE) return; diff --git a/src/server/scripts/Events/fireworks_show.cpp b/src/server/scripts/Events/fireworks_show.cpp index 664bb5b5dff..2d4b9e2ab0b 100644 --- a/src/server/scripts/Events/fireworks_show.cpp +++ b/src/server/scripts/Events/fireworks_show.cpp @@ -17,13 +17,13 @@ #include "ScriptMgr.h" #include "Containers.h" +#include "CreatureAIImpl.h" #include "EventMap.h" +#include "GameEventMgr.h" #include "GameObject.h" #include "GameObjectAI.h" #include "GameTime.h" -#include "CreatureAIImpl.h" -#include "GameEventMgr.h" -#include "World.h" +#include "Util.h" enum FireworksShowTypeObjects { @@ -79,7 +79,7 @@ enum FireworksZones STORMWIND = 1519 }; -static const std::vector<Position> BootyBayPos = +std::vector<Position> const BootyBayPos = { { -14358.03f, 515.058f, 34.2664f, 3.68265f }, { -14357.49f, 490.8445f, 39.47329f, 0.9773831f }, @@ -108,7 +108,7 @@ static const std::vector<Position> BootyBayPos = { -14378.1f, 473.5608f, 40.16786f, 0.9773831f } }; -static const std::vector<Position> StormwindPos = +std::vector<Position> const StormwindPos = { { -8823.592f, 470.316f, 179.2295f, 1.239183f }, { -8883.005f, 590.1927f, 163.1264f, 0.9773831f }, @@ -229,7 +229,7 @@ static const std::vector<Position> StormwindPos = { -8872.734375f, 573.338440f, 97.723770f, 1.831103f } }; -static const std::vector<Position> OrgrimmarPos = +std::vector<Position> const OrgrimmarPos = { { 1609.075f, -4383.707f, 90.23414f, 0.3665176f }, { 1469.648f, -4371.285f, 113.8313f, 6.073746f }, @@ -326,7 +326,7 @@ static const std::vector<Position> OrgrimmarPos = { 1493.26253f, -4402.19919f, 59.147816f, 2.2917f } }; -static const std::vector<Position> IronForgePos = +std::vector<Position> const IronForgePos = { { -5196.038f, -858.4618f, 525.0447f, 6.073746f }, { -5195.734f, -887.6441f, 534.168f, 3.68265f }, @@ -387,7 +387,7 @@ static const std::vector<Position> IronForgePos = { -5194.976f, -759.9896f, 517.6288f, 3.630291f } }; -static const std::vector<Position> SilvermoonPos = +std::vector<Position> const SilvermoonPos = { { 9466.583f, -7307.326f, 107.8366f, 0.1047193f }, { 9411.616f, -7322.223f, 79.95399f, 2.722713f }, @@ -457,7 +457,7 @@ static const std::vector<Position> SilvermoonPos = { 9411.504f, -7288.202f, 112.2664f, 2.844883f } }; -static const std::vector<Position> ExodarPos = +std::vector<Position> const ExodarPos = { { -3992.465f, -11843.86f, 186.4043f, 2.199115f }, { -3948.378f, -11854.06f, 135.6206f, 3.47321f }, @@ -519,7 +519,7 @@ static const std::vector<Position> ExodarPos = { -4036.461f, -11783.4f, 142.8152f, 4.729844f } }; -static const std::vector<Position> ThunderBluffPos = +std::vector<Position> const ThunderBluffPos = { { -1234.804f, -19.72239f, 206.5436f, 0.1396245f }, { -1244.442f, -35.88308f, 206.82f, 4.729844f }, @@ -581,7 +581,7 @@ static const std::vector<Position> ThunderBluffPos = { -1240.617f, -41.39486f, 205.0362f, 5.846854f } }; -static const std::vector<Position> UndercityPos = +std::vector<Position> const UndercityPos = { { 1850.231f, 257.0156f, 124.1743f, 4.729844f }, { 1863.302f, 193.9063f, 114.5829f, 0.9773831f }, @@ -641,7 +641,7 @@ static const std::vector<Position> UndercityPos = { 1850.288f, 267.309f, 125.0537f, 3.630291f } }; -static const std::vector<Position> DarnassusPos = +std::vector<Position> const DarnassusPos = { { 8578.888f, 975.2604f, 42.48742f, 5.846854f }, { 8574.236f, 944.2083f, 44.71943f, 4.76475f }, @@ -704,20 +704,20 @@ static const std::vector<Position> DarnassusPos = { 8554.825f, 813.0746f, 78.88226f, 6.0912f } }; -static const std::unordered_map<uint32, std::vector<Position> const&> pos = +std::unordered_map<uint32, std::vector<Position> const*> const PositionsByZoneMap = { - { STRANGLETHORN_VALE, BootyBayPos }, - { STORMWIND, StormwindPos }, - { ORGRIMMAR, OrgrimmarPos }, - { DUROTAR, OrgrimmarPos }, - { DUN_MOROGH, IronForgePos }, - { IRONFORGE, IronForgePos }, - { EVERSONG_WOODS, SilvermoonPos }, - { EXODAR, ExodarPos }, - { THUNDERBLUFF, ThunderBluffPos }, - { UNDERCITY, UndercityPos }, - { TIRISFAL_GLADES, UndercityPos }, - { TELDRASSIL, DarnassusPos } + { STRANGLETHORN_VALE, &BootyBayPos }, + { STORMWIND, &StormwindPos }, + { ORGRIMMAR, &OrgrimmarPos }, + { DUROTAR, &OrgrimmarPos }, + { DUN_MOROGH, &IronForgePos }, + { IRONFORGE, &IronForgePos }, + { EVERSONG_WOODS, &SilvermoonPos }, + { EXODAR, &ExodarPos }, + { THUNDERBLUFF, &ThunderBluffPos }, + { UNDERCITY, &UndercityPos }, + { TIRISFAL_GLADES, &UndercityPos }, + { TELDRASSIL, &DarnassusPos } }; class go_cheer_speaker : public GameObjectScript @@ -733,7 +733,7 @@ public: _big = true; } - uint32 CheerPicker() + static uint32 CheerPicker() { uint32 newid = RAND( SOUND_CHEER_1, @@ -744,7 +744,7 @@ public: return newid; } - uint32 FireworksPicker() + static uint32 FireworksPicker() { uint32 newid = RAND( FIREWORK_SHOW_TYPE_1_RED, @@ -774,7 +774,7 @@ public: return newid; } - uint32 FireworksBIGOnlyPicker() + static uint32 FireworksBIGOnlyPicker() { uint32 newid = RAND( FIREWORK_SHOW_TYPE_1_RED_BIG, @@ -845,45 +845,44 @@ public: { switch (eventId) { - case EVENT_CHEER: - { - me->PlayDistanceSound(CheerPicker()); - break; - } - case EVENT_FIRE: - { - auto it = pos.find(me->GetZoneId()); - if (it != pos.end()) + case EVENT_CHEER: { - Position const& rndpos = Trinity::Containers::SelectRandomContainerElement(it->second); - float rndrot = frand(-1.0000000f, 1.0000000f); - float rndrot2 = frand(-1.0000000f, 1.0000000f); - - if (_big) + me->PlayDistanceSound(CheerPicker()); + break; + } + case EVENT_FIRE: + { + if (std::vector<Position> const* positions = Trinity::Containers::MapGetValuePtr(PositionsByZoneMap, me->GetZoneId())) { - if (GameObject* firework = me->SummonGameObject(FireworksBIGOnlyPicker(), rndpos, QuaternionData(0.f, 0.f, rndrot, rndrot2), 300)) + Position const& rndpos = Trinity::Containers::SelectRandomContainerElement(*positions); + float rndrot = frand(-1.0000000f, 1.0000000f); + float rndrot2 = frand(-1.0000000f, 1.0000000f); + + if (_big) { - firework->SetRespawnTime(0); - firework->Delete(); + if (GameObject* firework = me->SummonGameObject(FireworksBIGOnlyPicker(), rndpos, QuaternionData(0.f, 0.f, rndrot, rndrot2), 300)) + { + firework->SetRespawnTime(0); + firework->Delete(); + } } - } - else - { - if (GameObject* firework = me->SummonGameObject(FireworksPicker(), rndpos, QuaternionData(0.f, 0.f, rndrot, rndrot2), 300)) + else { - firework->SetRespawnTime(0); - firework->Delete(); + if (GameObject* firework = me->SummonGameObject(FireworksPicker(), rndpos, QuaternionData(0.f, 0.f, rndrot, rndrot2), 300)) + { + firework->SetRespawnTime(0); + firework->Delete(); + } } } - } - if (_started == true) - _events.ScheduleEvent(EVENT_FIRE, Seconds(1), Seconds(2)); + if (_started == true) + _events.ScheduleEvent(EVENT_FIRE, Seconds(1), Seconds(2)); - break; - } - default: - break; + break; + } + default: + break; } } } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 4dbc0faeefc..3483aa98bbc 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -17,9 +17,9 @@ #include "ScriptMgr.h" #include "blackfathom_deeps.h" -#include "GameObjectAI.h" -#include "GameObject.h" #include "InstanceScript.h" +#include "GameObject.h" +#include "GameObjectAI.h" #include "Player.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" @@ -232,7 +232,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { - return new npc_morriduneAI(creature); + return GetBlackfathomDeepsAI<npc_morriduneAI>(creature); } }; diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h index 06f2481e88d..1645c51d6bc 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h @@ -70,8 +70,8 @@ enum BFDGameObjectIds GO_ALTAR_OF_THE_DEEPS = 103016 }; -template<class AI, class T> -AI* GetBlackfathomDeepsAI(T* obj) +template <class AI, class T> +inline AI* GetBlackfathomDeepsAI(T* obj) { return GetInstanceAI<AI>(obj, BFDScriptName); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index 744fe8bbfe8..8995f69e2da 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -29,7 +29,7 @@ EndScriptData */ #include "InstanceScript.h" #include "Map.h" -const Position LorgusPosition[4] = +Position const LorgusPosition[4] = { { -458.500610f, -38.343079f, -33.474445f, 0.0f }, { -469.423615f, -88.400513f, -39.265102f, 0.0f }, @@ -37,7 +37,7 @@ const Position LorgusPosition[4] = { -759.640564f, 16.658913f, -29.159529f, 0.0f } }; -const Position SpawnsLocation[] = +Position const SpawnsLocation[] = { {-775.431f, -153.853f, -25.871f, 3.207f}, {-775.404f, -174.132f, -25.871f, 3.185f}, diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index f0ec8201354..fe9e8751aab 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -103,7 +103,7 @@ public: { if (waypointId == 7) { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 7bf194886de..92e648bcadf 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -141,7 +141,7 @@ public: { if (CheckTimer <= diff) { - if (Unit* Archimonde = ObjectAccessor::GetUnit(*me, ArchimondeGUID)) + if (Creature* Archimonde = ObjectAccessor::GetCreature(*me, ArchimondeGUID)) { if (Archimonde->HealthBelowPct(2) || !Archimonde->IsAlive()) DoCast(me, SPELL_DENOUEMENT_WISP); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 6c0312e4cc9..3e7aa8ca3bf 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -106,7 +106,7 @@ public: { if (waypointId == 7 && instance) { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_THRALL)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_THRALL)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 58ec719171b..ea4adb80dee 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -101,7 +101,7 @@ public: { if (waypointId == 7 && instance) { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_THRALL)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_THRALL)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index 2bc7280de07..16acd943c7f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -96,7 +96,7 @@ public: { if (waypointId == 7 && instance) { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h index fae71b7ff87..ad4ea550da0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h @@ -95,10 +95,10 @@ enum HYGameobjectIds #define MINRAIDDAMAGE 700000 // minimal damage before trash can drop loot and reputation, resets if faction leader dies -template<typename AI> -inline AI* GetHyjalAI(Creature* creature) +template <class AI, class T> +inline AI* GetHyjalAI(T* obj) { - return GetInstanceAI<AI>(creature, HyjalScriptName); + return GetInstanceAI<AI>(obj, HyjalScriptName); } #endif diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index eed14268a3a..82937c6b6af 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -674,7 +674,7 @@ void hyjalAI::DeSpawnVeins() { if (Faction == 1) { - Creature* unit=ObjectAccessor::GetCreature((*me), instance->GetGuidData(DATA_JAINAPROUDMOORE)); + Creature* unit = ObjectAccessor::GetCreature((*me), instance->GetGuidData(DATA_JAINAPROUDMOORE)); if (!unit)return; hyjalAI* ai = CAST_AI(hyjalAI, unit->AI()); if (!ai)return; @@ -686,7 +686,7 @@ void hyjalAI::DeSpawnVeins() } else if (Faction) { - Creature* unit=ObjectAccessor::GetCreature((*me), instance->GetGuidData(DATA_THRALL)); + Creature* unit = ObjectAccessor::GetCreature((*me), instance->GetGuidData(DATA_THRALL)); if (!unit) return; hyjalAI* ai = CAST_AI(hyjalAI, unit->AI()); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h index 02a08962741..af7643f0c97 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h @@ -203,6 +203,5 @@ struct hyjalAI : public EscortAI private: uint32 SpellTimer[3]; - //std::list<uint64> CreatureList; }; #endif diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 02997808b88..b5e2568bdd2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -449,7 +449,7 @@ public: { if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_THRALL)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_THRALL)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } @@ -461,8 +461,10 @@ public: if (Delay <= diff) { Delay=0; - }else{ - Delay-=diff; + } + else + { + Delay -= diff; return; } if (!meteor) @@ -485,7 +487,7 @@ public: CanMove = true; if (instance->GetData(DATA_ALLIANCE_RETREAT) && !instance->GetData(DATA_HORDE_RETREAT)) { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_THRALL)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_THRALL)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } else if (instance->GetData(DATA_ALLIANCE_RETREAT) && instance->GetData(DATA_HORDE_RETREAT)){ @@ -513,7 +515,7 @@ public: if (!imol) { DoCast(me, SPELL_IMMOLATION); - imol=true; + imol = true; } if (FlameBuffetTimer <= diff) { @@ -562,13 +564,13 @@ public: { if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_THRALL)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_THRALL)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } else { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } @@ -660,13 +662,13 @@ public: { if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_THRALL)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_THRALL)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } else { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } @@ -770,13 +772,13 @@ public: { if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_THRALL)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_THRALL)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } else { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } @@ -883,13 +885,13 @@ public: { if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_THRALL)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_THRALL)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } else { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } @@ -979,13 +981,13 @@ public: { if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_THRALL)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_THRALL)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } else { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } @@ -1065,13 +1067,13 @@ public: { if (instance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, attack thrall { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_THRALL)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_THRALL)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } else { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_JAINAPROUDMOORE)); if (target && target->IsAlive()) AddThreat(target, 0.0f); } @@ -1157,7 +1159,7 @@ public: { if (waypointId == 2 && !IsOverrun) { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_THRALL)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_THRALL)); if (target && target->IsAlive()) { AddThreat(target, 0.0f); @@ -1221,7 +1223,9 @@ public: { me->GetMotionMaster()->MoveChase(me->GetVictim()); MoveTimer = 2000; - } else MoveTimer-=diff; + } + else + MoveTimer -= diff; } if (FrostBreathTimer <= diff) @@ -1233,7 +1237,9 @@ public: me->GetMotionMaster()->Clear(); FrostBreathTimer = 4000; } - } else FrostBreathTimer -= diff; + } + else + FrostBreathTimer -= diff; } }; }; @@ -1278,7 +1284,7 @@ public: { if (waypointId == 2 && !IsOverrun) { - Unit* target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_THRALL)); + Creature* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_THRALL)); if (target && target->IsAlive()) { AddThreat(target, 0.0f); @@ -1354,12 +1360,14 @@ public: { float x, y, z; me->EnsureVictim()->GetPosition(x, y, z); - me->GetMotionMaster()->MovePoint(0, x, y, z+Zpos); + me->GetMotionMaster()->MovePoint(0, x, y, z + Zpos); Zpos -= 1.0f; if (Zpos <= 0) Zpos = 0; MoveTimer = 2000; - } else MoveTimer-=diff; + } + else + MoveTimer -= diff; } if (StrikeTimer <= diff) @@ -1370,8 +1378,12 @@ public: me->StopMoving(); me->GetMotionMaster()->Clear(); StrikeTimer = 2000 + rand32() % 1000; - } else StrikeTimer=0; - } else StrikeTimer -= diff; + } + else + StrikeTimer = 0; + } + else + StrikeTimer -= diff; } }; }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index 3a451ed3b80..9796c467438 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -30,6 +30,7 @@ EndScriptData */ #include "InstanceScript.h" #include "Log.h" #include "Map.h" +#include <sstream> /* Battle of Mount Hyjal encounters: 0 - Rage Winterchill event @@ -279,7 +280,7 @@ public: return str_data; } - void Load(const char* in) override + void Load(char const* in) override { if (!in) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h index dd8666c6cff..a9b9f4a9698 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h @@ -103,10 +103,10 @@ enum CSInstanceEvents EVENT_INFINITE_TIMER = 1 }; -template<typename AI> -inline AI* GetCullingOfStratholmeAI(Creature* creature) +template <class AI, class T> +inline AI* GetCullingOfStratholmeAI(T* obj) { - return GetInstanceAI<AI>(creature, CoSScriptName); + return GetInstanceAI<AI>(obj, CoSScriptName); } #endif diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index a754e1a0a05..e35f6b85741 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -24,11 +24,11 @@ EndScriptData */ #include "ScriptMgr.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "InstanceScript.h" #include "MotionMaster.h" #include "old_hillsbrad.h" #include "ScriptedEscortAI.h" -#include "GameObjectAI.h" /*###### ## go_barrel_old_hillsbrad diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 3e919e5288e..421de855691 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -30,9 +30,9 @@ EndContentData */ #include "ScriptMgr.h" #include "InstanceScript.h" -#include "Map.h" #include "ObjectAccessor.h" #include "old_hillsbrad.h" +#include "Map.h" #include "Player.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" @@ -350,7 +350,7 @@ public: case 106: { //trigger taretha to run down outside - if (Creature* Taretha = instance->instance->GetCreature(instance->GetGuidData(DATA_TARETHA))) + if (Creature* Taretha = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_TARETHA))) { if (Player* player = GetPlayerForEscort()) ENSURE_AI(EscortAI, (Taretha->AI()))->Start(false, true, player->GetGUID()); @@ -613,7 +613,7 @@ public: if (instance->GetGuidData(DATA_EPOCH).IsEmpty()) me->SummonCreature(ENTRY_EPOCH, 2639.13f, 698.55f, 65.43f, 4.59f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); - if (Creature* thrall = (ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_THRALL)))) + if (Creature* thrall = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_THRALL))) ENSURE_AI(npc_thrall_old_hillsbrad::npc_thrall_old_hillsbradAI, thrall->AI())->StartWP(); } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h index 950ea70df57..882b2e398bf 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h @@ -49,5 +49,4 @@ inline AI* GetOldHillsbradAI(T* obj) return GetInstanceAI<AI>(obj, OHScriptName); } - #endif diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp index 8d055a94676..18d41d52417 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_temporus.cpp @@ -85,7 +85,6 @@ public: } void MoveInLineOfSight(Unit* who) override - { //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == NPC_TIME_KEEPER) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp index 094d9ebdc5e..1ba5ce96763 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.cpp @@ -142,7 +142,7 @@ public: void EnterCombat(Unit* /*who*/) override { } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (SpellCorrupt_Timer) return; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h index 610d2ea87b7..16328a47d19 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h @@ -67,10 +67,10 @@ enum TBMCreatureIds NPC_INFINITE_VANQUISHER = 18995 }; -template<typename AI> -inline AI* GetBlackMorassAI(Creature* creature) +template <class AI, class T> +inline AI* GetBlackMorassAI(T* obj) { - return GetInstanceAI<AI>(creature, TBMScriptName); + return GetInstanceAI<AI>(obj, TBMScriptName); } #endif diff --git a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp index 94ce548ab26..501c6a60307 100644 --- a/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp +++ b/src/server/scripts/Kalimdor/DireMaul/instance_dire_maul.cpp @@ -67,7 +67,6 @@ public: { return new instance_dire_maul_InstanceMapScript(map); } - }; void AddSC_instance_dire_maul() diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp index 4de12767b62..83ecd9ca6c5 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp @@ -22,6 +22,7 @@ #include "halls_of_origination.h" #include "InstanceScript.h" #include "Map.h" +#include <sstream> DoorData const doorData[] = { diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp index 14d58ae49e5..30f0c91ba4b 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp @@ -23,6 +23,7 @@ SDCategory: Maraudon EndScriptData */ #include "ScriptMgr.h" +#include "maraudon.h" #include "ScriptedCreature.h" enum Spells @@ -39,7 +40,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { - return new celebras_the_cursedAI(creature); + return GetMaraudonAI<celebras_the_cursedAI>(creature); } struct celebras_the_cursedAI : public ScriptedAI diff --git a/src/server/scripts/Kalimdor/Maraudon/maraudon.h b/src/server/scripts/Kalimdor/Maraudon/maraudon.h index e0dd002ffa9..01226e42411 100644 --- a/src/server/scripts/Kalimdor/Maraudon/maraudon.h +++ b/src/server/scripts/Kalimdor/Maraudon/maraudon.h @@ -22,10 +22,10 @@ #define MaraudonScriptName "instance_maraudon" -template<typename AI> -inline AI* GetMaraudonAI(Creature* creature) +template <class AI, class T> +inline AI* GetMaraudonAI(T* obj) { - return GetInstanceAI<AI>(creature, MaraudonScriptName); + return GetInstanceAI<AI>(obj, MaraudonScriptName); } #endif // maraudon_h__ diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 6cb992f3b9b..7acd361d087 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -27,7 +27,6 @@ EndScriptData */ #include "ScriptMgr.h" #include "CellImpl.h" -#include "CreatureAIImpl.h" #include "GridNotifiersImpl.h" #include "InstanceScript.h" #include "MotionMaster.h" @@ -196,7 +195,7 @@ public: Talk(SAY_KILL); } - void SpellHit(Unit* /*pCaster*/, const SpellInfo* Spell) override + void SpellHit(Unit* /*pCaster*/, SpellInfo const* Spell) override { if (Spell->Id == SPELL_BREATH_EAST_TO_WEST || Spell->Id == SPELL_BREATH_WEST_TO_EAST || @@ -274,7 +273,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* Spell) override + void SpellHitTarget(Unit* target, SpellInfo const* Spell) override { //Workaround - Couldn't find a way to group this spells (All Eruption) if (((Spell->Id >= 17086 && Spell->Id <= 17095) || @@ -495,7 +494,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { - return GetInstanceAI<boss_onyxiaAI>(creature, OLScriptName); + return GetOnyxiaAI<boss_onyxiaAI>(creature); } }; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index d7ff367acde..fe964806ba2 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -39,7 +39,7 @@ BossBoundaryData const boundaries = class instance_onyxias_lair : public InstanceMapScript { public: - instance_onyxias_lair() : InstanceMapScript(OLScriptName, 249) { } + instance_onyxias_lair() : InstanceMapScript(OnyxiaScriptName, 249) { } InstanceScript* GetInstanceScript(InstanceMap* map) const override { diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h index 5b2d9f21ce0..69fff591ad8 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h +++ b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h @@ -18,7 +18,9 @@ #ifndef DEF_ONYXIAS_LAIR_H #define DEF_ONYXIAS_LAIR_H -#define OLScriptName "instance_onyxias_lair" +#include "CreatureAIImpl.h" + +#define OnyxiaScriptName "instance_onyxias_lair" #define DataHeader "OL" uint32 const EncounterCount = 1; @@ -70,4 +72,11 @@ enum OLAchievementData ACHIEV_CRITERIA_DEEP_BREATH_25_PLAYER = 12569, // Criteria for achievement 4407: She Deep Breaths More (25 player) Everybody evade Deep Breath ACHIEV_TIMED_START_EVENT = 6601, // Timed event for achievement 4402, 4005: More Dots! (10, 25 player) 5 min kill }; + +template <class AI, class T> +inline AI* GetOnyxiaAI(T* obj) +{ + return GetInstanceAI<AI>(obj, OnyxiaScriptName); +} + #endif diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index c93b7c55cf7..11480b6619d 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -28,13 +28,13 @@ EndContentData */ #include "ScriptMgr.h" #include "CellImpl.h" +#include "GameObjectAI.h" #include "GridNotifiersImpl.h" #include "InstanceScript.h" #include "MotionMaster.h" #include "Player.h" #include "razorfen_downs.h" #include "ScriptedCreature.h" -#include "GameObjectAI.h" #include "ScriptedGossip.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h index 8d4d3e042bb..1552b273406 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h @@ -63,8 +63,8 @@ enum RFDGameObjectIds GO_BELNISTRASZS_BRAZIER = 152097 }; -template<class AI, class T> -AI* GetRazorfenDownsAI(T* obj) +template <class AI, class T> +inline AI* GetRazorfenDownsAI(T* obj) { return GetInstanceAI<AI>(obj, RFDScriptName); } diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h index eb59999fcf6..c7b3a028281 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.h @@ -25,10 +25,10 @@ #define EVENT_WARD_KEEPER 1 -template<typename AI> -inline AI* GetRazorfenKraulAI(Creature* creature) +template <class AI, class T> +inline AI* GetRazorfenKraulAI(T* obj) { - return GetInstanceAI<AI>(creature, RFKScriptName); + return GetInstanceAI<AI>(obj, RFKScriptName); } #endif diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index 71ffb168471..1dba0df2ab3 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -17,7 +17,6 @@ #include "ScriptMgr.h" #include "InstanceScript.h" -#include "Map.h" #include "MotionMaster.h" #include "ObjectAccessor.h" #include "ruins_of_ahnqiraj.h" @@ -210,7 +209,7 @@ class boss_ayamiss : public CreatureScript break; case EVENT_SWARMER_ATTACK: for (GuidList::iterator i = _swarmers.begin(); i != _swarmers.end(); ++i) - if (Creature* swarmer = me->GetMap()->GetCreature(*i)) + if (Creature* swarmer = ObjectAccessor::GetCreature(*me, *i)) if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) swarmer->AI()->AttackStart(target); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp index 4dab5047481..86638522d5d 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp @@ -16,8 +16,8 @@ */ #include "ScriptMgr.h" -#include "GameObjectAI.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "InstanceScript.h" #include "Map.h" #include "MiscPackets.h" diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index 82f1c796cb3..df644afa51b 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -15,9 +15,9 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ScriptMgr.h" #include "ruins_of_ahnqiraj.h" #include "ScriptedCreature.h" +#include "ScriptMgr.h" enum Yells { diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h index e646a003b2b..0d68d290032 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h @@ -60,8 +60,8 @@ enum AQRGameObjectIds GO_OSSIRIAN_CRYSTAL = 180619 }; -template<class AI, class T> -AI* GetAQ20AI(T* obj) +template <class AI, class T> +inline AI* GetAQ20AI(T* obj) { return GetInstanceAI<AI>(obj, AQ20ScriptName); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 45e50529481..667e36d2d79 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -590,7 +590,7 @@ public: if (WisperTimer <= diff) { //Play random sound to the zone - Map::PlayerList const &PlayerList = me->GetMap()->GetPlayers(); + Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) me->PlayDirectSound(RANDOM_SOUND_WHISPER, itr->GetSource()); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 9a385210578..947e6e771e4 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -245,7 +245,7 @@ public: bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo({ SPELL_GENERIC_DISMOUNT, SPELL_TRUE_FULFILLMENT_2 }); + return ValidateSpellInfo({ SPELL_TRUE_FULFILLMENT_2, SPELL_GENERIC_DISMOUNT }); } void HandleEffect(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index 7e6a50056ea..cfe528c3b60 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -167,7 +167,7 @@ struct boss_twinemperorsAI : public ScriptedAI } } - void SpellHit(Unit* caster, const SpellInfo* entry) override + void SpellHit(Unit* caster, SpellInfo const* entry) override { if (caster == me) return; @@ -382,9 +382,13 @@ struct boss_twinemperorsAI : public ScriptedAI if (!me->IsNonMeleeSpellCast(true)) { DoCast(me, SPELL_BERSERK); - EnrageTimer = 60*60000; - } else EnrageTimer = 0; - } else EnrageTimer-=diff; + EnrageTimer = 60 * 60000; + } + else + EnrageTimer = 0; + } + else + EnrageTimer -= diff; } }; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp index 3d00417b211..50eb304600c 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -70,24 +70,24 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript { switch (creature->GetEntry()) { - case NPC_SKERAM: - SkeramGUID = creature->GetGUID(); - break; - case NPC_VEM: - VemGUID = creature->GetGUID(); - break; - case NPC_KRI: - KriGUID = creature->GetGUID(); - break; - case NPC_VEKLOR: - VeklorGUID = creature->GetGUID(); - break; - case NPC_VEKNILASH: - VeknilashGUID = creature->GetGUID(); - break; - case NPC_VISCIDUS: - ViscidusGUID = creature->GetGUID(); - break; + case NPC_SKERAM: + SkeramGUID = creature->GetGUID(); + break; + case NPC_VEM: + VemGUID = creature->GetGUID(); + break; + case NPC_KRI: + KriGUID = creature->GetGUID(); + break; + case NPC_VEKLOR: + VeklorGUID = creature->GetGUID(); + break; + case NPC_VEKNILASH: + VeknilashGUID = creature->GetGUID(); + break; + case NPC_VISCIDUS: + ViscidusGUID = creature->GetGUID(); + break; } } @@ -101,26 +101,26 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript { switch (type) { - case DATA_VEMISDEAD: - if (IsBossDied[0]) - return 1; - break; - - case DATA_VEKLORISDEAD: - if (IsBossDied[1]) - return 1; - break; - - case DATA_VEKNILASHISDEAD: - if (IsBossDied[2]) - return 1; - break; - - case DATA_BUG_TRIO_DEATH: - return BugTrioDeathCount; - - case DATA_CTHUN_PHASE: - return CthunPhase; + case DATA_VEMISDEAD: + if (IsBossDied[0]) + return 1; + break; + + case DATA_VEKLORISDEAD: + if (IsBossDied[1]) + return 1; + break; + + case DATA_VEKNILASHISDEAD: + if (IsBossDied[2]) + return 1; + break; + + case DATA_BUG_TRIO_DEATH: + return BugTrioDeathCount; + + case DATA_CTHUN_PHASE: + return CthunPhase; } return 0; } @@ -129,18 +129,18 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript { switch (identifier) { - case DATA_SKERAM: - return SkeramGUID; - case DATA_VEM: - return VemGUID; - case DATA_KRI: - return KriGUID; - case DATA_VEKLOR: - return VeklorGUID; - case DATA_VEKNILASH: - return VeknilashGUID; - case DATA_VISCIDUS: - return ViscidusGUID; + case DATA_SKERAM: + return SkeramGUID; + case DATA_VEM: + return VemGUID; + case DATA_KRI: + return KriGUID; + case DATA_VEKLOR: + return VeklorGUID; + case DATA_VEKNILASH: + return VeknilashGUID; + case DATA_VISCIDUS: + return ViscidusGUID; } return ObjectGuid::Empty; } // end GetGuidData @@ -149,25 +149,25 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript { switch (type) { - case DATA_VEM_DEATH: - IsBossDied[0] = true; - break; + case DATA_VEM_DEATH: + IsBossDied[0] = true; + break; - case DATA_BUG_TRIO_DEATH: - ++BugTrioDeathCount; - break; + case DATA_BUG_TRIO_DEATH: + ++BugTrioDeathCount; + break; - case DATA_VEKLOR_DEATH: - IsBossDied[1] = true; - break; + case DATA_VEKLOR_DEATH: + IsBossDied[1] = true; + break; - case DATA_VEKNILASH_DEATH: - IsBossDied[2] = true; - break; + case DATA_VEKNILASH_DEATH: + IsBossDied[2] = true; + break; - case DATA_CTHUN_PHASE: - CthunPhase = data; - break; + case DATA_CTHUN_PHASE: + CthunPhase = data; + break; } } }; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 907b735de86..05af73caed9 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -23,8 +23,6 @@ SDCategory: Temple of Ahn'Qiraj EndScriptData */ #include "ScriptMgr.h" -#include "CellImpl.h" -#include "GridNotifiersImpl.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "temple_of_ahnqiraj.h" diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h index 45903dd5ddf..b70febfb49f 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h @@ -64,10 +64,10 @@ enum AQTCreatures NPC_VEKNILASH = 15275 }; -template<typename AI> -inline AI* GetAQ40AI(Creature* creature) +template <class AI, class T> +inline AI* GetAQ40AI(T* obj) { - return GetInstanceAI<AI>(creature, AQ40ScriptName); + return GetInstanceAI<AI>(obj, AQ40ScriptName); } #endif diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp index 3fa16d392e8..d7730710aa2 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp @@ -28,6 +28,7 @@ EndScriptData */ #include "Log.h" #include "Map.h" #include "wailing_caverns.h" +#include <sstream> #define MAX_ENCOUNTER 9 @@ -117,7 +118,7 @@ public: return saveStream.str(); } - void Load(const char* in) override + void Load(char const* in) override { if (!in) { diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp index 8de66be387b..61574286512 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp @@ -30,8 +30,8 @@ EndContentData */ #include "MotionMaster.h" #include "ObjectAccessor.h" #include "Player.h" -#include "ScriptedGossip.h" #include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" #include "wailing_caverns.h" /*###### diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h index 297c14facb3..ffbfd30effb 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h @@ -39,10 +39,10 @@ enum WCDataTypes DATA_NARALEX = 3679, }; -template<typename AI> -inline AI* GetWailingCavernsAI(Creature* creature) +template <class AI, class T> +inline AI* GetWailingCavernsAI(T* obj) { - return GetInstanceAI<AI>(creature, WCScriptName); + return GetInstanceAI<AI>(obj, WCScriptName); } #endif diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index bc9819a64a5..0e6f2f9e4d6 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -218,9 +218,9 @@ public: switch (type) { case EVENT_PYRAMID: - PyramidPhase=data; + PyramidPhase = data; break; - }; + } } virtual void Update(uint32 diff) override diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 20caee55834..88c44d642ce 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -29,14 +29,13 @@ EndContentData */ #include "ScriptMgr.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "InstanceScript.h" -#include "Map.h" #include "MotionMaster.h" #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "GameObjectAI.h" #include "zulfarrak.h" /*###### @@ -226,7 +225,7 @@ public: private: void initBlyCrewMember(uint32 entry, float x, float y, float z) { - if (Creature* crew = instance->instance->GetCreature(instance->GetGuidData(entry))) + if (Creature* crew = ObjectAccessor::GetCreature(*me, instance->GetGuidData(entry))) { crew->SetReactState(REACT_AGGRESSIVE); crew->SetWalk(true); @@ -273,7 +272,7 @@ public: npc_weegli_blastfuseAI(Creature* creature) : ScriptedAI(creature) { instance = creature->GetInstanceScript(); - destroyingDoor=false; + destroyingDoor = false; Bomb_Timer = 10000; LandMine_Timer = 30000; } @@ -348,7 +347,7 @@ public: me->GetMotionMaster()->MovePoint(0, 1858.57f, 1146.35f, 14.745f); me->SetHomePosition(1858.57f, 1146.35f, 14.745f, 3.85f); // in case he gets interrupted Talk(SAY_WEEGLI_OK_I_GO); - destroyingDoor=true; + destroyingDoor = true; } } @@ -429,7 +428,7 @@ public: GameObjectAI* GetAI(GameObject* go) const override { - return new go_shallow_graveAI(go); + return GetZulFarrakAI<go_shallow_graveAI>(go); } }; @@ -448,7 +447,7 @@ class at_zumrah : public AreaTriggerScript public: at_zumrah() : AreaTriggerScript("at_zumrah") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override { Creature* pZumrah = player->FindNearestCreature(ZUMRAH_ID, 30.0f); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h index 00563114c00..a4eaca7664d 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h @@ -56,7 +56,7 @@ enum ZFPyramidPhases PYRAMID_KILLED_ALL_TROLLS, }; -template<class AI, class T> +template <class AI, class T> inline AI* GetZulFarrakAI(T* obj) { return GetInstanceAI<AI>(obj, ZFScriptName); diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index dbbc9326969..f4fe4b0d8a9 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -27,8 +27,8 @@ npc_ruul_snowhoof EndContentData */ #include "ScriptMgr.h" -#include "GameObjectAI.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "Player.h" #include "ScriptedEscortAI.h" #include "SpellInfo.h" diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index 23d0634ec67..26e856b1a84 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -32,8 +32,8 @@ npc_death_ravager EndContentData */ #include "ScriptMgr.h" -#include "GameObjectAI.h" #include "CellImpl.h" +#include "GameObjectAI.h" #include "GridNotifiersImpl.h" #include "Log.h" #include "MotionMaster.h" @@ -107,7 +107,7 @@ public: } } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->SpellFamilyFlags[2] & 0x80000000 && !_tappedBySpell) { diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp index 42e2541f477..de3c914722e 100644 --- a/src/server/scripts/Kalimdor/zone_durotar.cpp +++ b/src/server/scripts/Kalimdor/zone_durotar.cpp @@ -79,7 +79,7 @@ public: work = true; } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id != SPELL_AWAKEN_PEON) return; @@ -136,16 +136,7 @@ class spell_voodoo : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo( - { - SPELL_BREW, - SPELL_GHOSTLY, - SPELL_HEX1, - SPELL_HEX2, - SPELL_HEX3, - SPELL_GROW, - SPELL_LAUNCH - }); + return ValidateSpellInfo({ SPELL_BREW, SPELL_GHOSTLY, SPELL_HEX1, SPELL_HEX2, SPELL_HEX3, SPELL_GROW, SPELL_LAUNCH }); } void HandleDummy(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp index 6fc8ccf9238..6c96f6934d4 100644 --- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp @@ -29,7 +29,7 @@ EndContentData */ #include "MotionMaster.h" #include "Player.h" #include "QuestDef.h" -#include "ScriptedEscortAI.h" +#include "ScriptedCreature.h" #include "ScriptedGossip.h" #include "SpellInfo.h" #include "SpellScript.h" diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index 853c174edb5..0a4bda0cffe 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -84,7 +84,7 @@ public: DoCast(SPELL_OMEN_SUMMON_SPOTLIGHT); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_ELUNE_CANDLE) { diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index ebad575fef2..6fc163ad10b 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -35,13 +35,13 @@ go_wind_stone EndContentData */ #include "ScriptMgr.h" -#include "GameObjectAI.h" #include "CreatureAIImpl.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "Group.h" #include "MotionMaster.h" -#include "Player.h" #include "ObjectAccessor.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" #include "TemporarySummon.h" @@ -619,7 +619,7 @@ public: { Talk(ARYGOS_YELL_1); AnachronosQuestTrigger->AI()->EnterEvadeMode(); - eventEnd=true; + eventEnd = true; } break; } diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index ec516a0f9b3..04520f7ed09 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -224,7 +224,7 @@ public: me->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_FLARE || spell->Id == SPELL_FOLLY) { diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp index 4aae8ecaffa..50dce2a8864 100644 --- a/src/server/scripts/Kalimdor/zone_winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp @@ -29,8 +29,8 @@ go_elune_fire EndContentData */ #include "ScriptMgr.h" -#include "GameObjectAI.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "MotionMaster.h" #include "ObjectAccessor.h" #include "Player.h" diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h index e2e464bc196..f3aa82768d3 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.h @@ -82,7 +82,7 @@ enum AKGameObjectIds GO_SPHERE_2 = 193094 }; -template<class AI, class T> +template <class AI, class T> inline AI* GetAhnKahetAI(T* obj) { return GetInstanceAI<AI>(obj, AhnKahetScriptName); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp index 5f4a0a1072a..b69f630aa3f 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp @@ -238,13 +238,6 @@ class spell_ahn_kahet_swarm : public SpellScriptLoader { PrepareSpellScript(spell_ahn_kahet_swarm_SpellScript); - public: - spell_ahn_kahet_swarm_SpellScript() - { - _targetCount = 0; - } - - private: bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SWARM_BUFF }); @@ -277,7 +270,7 @@ class spell_ahn_kahet_swarm : public SpellScriptLoader OnEffectHit += SpellEffectFn(spell_ahn_kahet_swarm_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } - uint32 _targetCount; + uint32 _targetCount = 0; }; SpellScript* GetSpellScript() const override diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index eb129c37473..04f11878208 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -111,7 +111,7 @@ public: } } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (spell->Id == SPELL_INSANITY) { @@ -136,7 +136,7 @@ public: return; // summon twisted party members for this target - Map::PlayerList const &players = me->GetMap()->GetPlayers(); + Map::PlayerList const& players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) { Player* player = i->GetSource(); @@ -157,7 +157,7 @@ public: void ResetPlayersPhase() { - Map::PlayerList const &players = me->GetMap()->GetPlayers(); + Map::PlayerList const& players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) { Player* player = i->GetSource(); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index 7be1553d98e..d64ccae7cd2 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -26,7 +26,6 @@ #include "MotionMaster.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" -#include "TemporarySummon.h" enum Yells { diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index d75a6942b5e..01ab221855d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -18,13 +18,13 @@ #include "ScriptMgr.h" #include "ahnkahet.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "InstanceScript.h" #include "Map.h" #include "MotionMaster.h" #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" -#include "GameObjectAI.h" #include "Spell.h" #include "SpellScript.h" @@ -437,12 +437,7 @@ class spell_prince_taldaram_conjure_flame_sphere : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo( - { - SPELL_FLAME_SPHERE_SUMMON_1, - SPELL_FLAME_SPHERE_SUMMON_2, - SPELL_FLAME_SPHERE_SUMMON_3 - }); + return ValidateSpellInfo({ SPELL_FLAME_SPHERE_SUMMON_1, SPELL_FLAME_SPHERE_SUMMON_2, SPELL_FLAME_SPHERE_SUMMON_3 }); } void HandleScript(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp index d7317ffc724..41f941299bb 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp @@ -22,6 +22,7 @@ #include "GameObject.h" #include "InstanceScript.h" #include "Map.h" +#include <sstream> DoorData const doorData[] = { diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h index 732fa3aac64..89f32d19db6 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h @@ -66,10 +66,10 @@ enum ANInstanceActions ACTION_GATEWATCHER_GREET = 1 }; -template<typename AI> -inline AI* GetAzjolNerubAI(Creature* creature) +template <class AI, class T> +inline AI* GetAzjolNerubAI(T* obj) { - return GetInstanceAI<AI>(creature, AzjolNerubScriptName); + return GetInstanceAI<AI>(obj, AzjolNerubScriptName); } #endif // AZJOL_NERUB_H_ diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index a3442f83f79..a9b7551f43a 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -949,6 +949,7 @@ class spell_hadronox_periodic_summon_template_AuraScript : public AuraScript spell_hadronox_periodic_summon_template_AuraScript(uint32 topSpellId, uint32 bottomSpellId) : AuraScript(), _topSpellId(topSpellId), _bottomSpellId(bottomSpellId) { } PrepareAuraScript(spell_hadronox_periodic_summon_template_AuraScript); + private: bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ _topSpellId, _bottomSpellId }); @@ -987,7 +988,6 @@ class spell_hadronox_periodic_summon_template_AuraScript : public AuraScript OnEffectPeriodic += AuraEffectPeriodicFn(spell_hadronox_periodic_summon_template_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } - private: uint32 _topSpellId; uint32 _bottomSpellId; }; @@ -1092,12 +1092,7 @@ class spell_hadronox_web_doors : public SpellScriptLoader bool Validate(SpellInfo const* /*spell*/) override { - return ValidateSpellInfo( - { - SPELL_SUMMON_CHAMPION_PERIODIC, - SPELL_SUMMON_CRYPT_FIEND_PERIODIC, - SPELL_SUMMON_NECROMANCER_PERIODIC - }); + return ValidateSpellInfo({ SPELL_SUMMON_CHAMPION_PERIODIC, SPELL_SUMMON_CRYPT_FIEND_PERIODIC, SPELL_SUMMON_NECROMANCER_PERIODIC }); } void HandleDummy(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 7c3eb46d99a..4cb56b57e0a 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -19,9 +19,9 @@ * Comment: Find in the future best timers and the event is not implemented. */ -#include "Containers.h" #include "ScriptMgr.h" #include "azjol_nerub.h" +#include "Containers.h" #include "InstanceScript.h" #include "PassiveAI.h" #include "ScriptedCreature.h" diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index e5b49d744e2..66d888d1adf 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -25,34 +25,34 @@ DoorData const doorData[] = { { GO_KRIKTHIR_DOOR, DATA_KRIKTHIR, DOOR_TYPE_PASSAGE }, - { GO_ANUBARAK_DOOR_1, DATA_ANUBARAK, DOOR_TYPE_ROOM }, - { GO_ANUBARAK_DOOR_2, DATA_ANUBARAK, DOOR_TYPE_ROOM }, - { GO_ANUBARAK_DOOR_3, DATA_ANUBARAK, DOOR_TYPE_ROOM }, - { 0, 0, DOOR_TYPE_ROOM } // END + { GO_ANUBARAK_DOOR_1, DATA_ANUBARAK, DOOR_TYPE_ROOM }, + { GO_ANUBARAK_DOOR_2, DATA_ANUBARAK, DOOR_TYPE_ROOM }, + { GO_ANUBARAK_DOOR_3, DATA_ANUBARAK, DOOR_TYPE_ROOM }, + { 0, 0, DOOR_TYPE_ROOM } // END }; ObjectData const creatureData[] = { - { NPC_KRIKTHIR, DATA_KRIKTHIR }, - { NPC_HADRONOX, DATA_HADRONOX }, - { NPC_ANUBARAK, DATA_ANUBARAK }, - { NPC_WATCHER_NARJIL, DATA_WATCHER_GASHRA }, - { NPC_WATCHER_GASHRA, DATA_WATCHER_SILTHIK }, - { NPC_WATCHER_SILTHIK, DATA_WATCHER_NARJIL }, - { 0, 0 } // END + { NPC_KRIKTHIR, DATA_KRIKTHIR }, + { NPC_HADRONOX, DATA_HADRONOX }, + { NPC_ANUBARAK, DATA_ANUBARAK }, + { NPC_WATCHER_NARJIL, DATA_WATCHER_GASHRA }, + { NPC_WATCHER_GASHRA, DATA_WATCHER_SILTHIK }, + { NPC_WATCHER_SILTHIK, DATA_WATCHER_NARJIL }, + { 0, 0 } // END }; ObjectData const gameobjectData[] = { - { GO_ANUBARAK_DOOR_1, DATA_ANUBARAK_WALL }, + { GO_ANUBARAK_DOOR_1, DATA_ANUBARAK_WALL }, { GO_ANUBARAK_DOOR_3, DATA_ANUBARAK_WALL_2 }, - { 0, 0 } // END + { 0, 0 } // END }; BossBoundaryData const boundaries = { - { DATA_KRIKTHIR, new RectangleBoundary(400.0f, 580.0f, 623.5f, 810.0f) }, - { DATA_HADRONOX, new ZRangeBoundary(666.0f, 776.0f) }, + { DATA_KRIKTHIR, new RectangleBoundary(400.0f, 580.0f, 623.5f, 810.0f) }, + { DATA_HADRONOX, new ZRangeBoundary(666.0f, 776.0f) }, { DATA_ANUBARAK, new CircleBoundary(Position(550.6178f, 253.5917f), 26.0f) } }; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index bc68749811a..c28f227eae7 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -20,8 +20,8 @@ #include "GridNotifiersImpl.h" #include "InstanceScript.h" #include "MotionMaster.h" -#include "obsidian_sanctum.h" #include "ObjectAccessor.h" +#include "obsidian_sanctum.h" #include "ScriptedCreature.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp index 307d2a9393d..0cfb1059a77 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp @@ -20,8 +20,8 @@ #include "GridNotifiersImpl.h" #include "InstanceScript.h" #include "MotionMaster.h" -#include "obsidian_sanctum.h" #include "ObjectAccessor.h" +#include "obsidian_sanctum.h" #include "ScriptedCreature.h" #include "TemporarySummon.h" @@ -737,7 +737,7 @@ class npc_acolyte_of_vesperon : public CreatureScript vesperon->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); } - Map::PlayerList const &PlayerList = me->GetMap()->GetPlayers(); + Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers(); if (PlayerList.isEmpty()) return; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h index 6ba48c640fd..64365ca50b3 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h @@ -48,10 +48,10 @@ enum OSGameObjectIds GO_TWILIGHT_PORTAL = 193988 }; -template<typename AI> -inline AI* GetObsidianSanctumAI(Creature* creature) +template <class AI, class T> +inline AI* GetObsidianSanctumAI(T* obj) { - return GetInstanceAI<AI>(creature, OSScriptName); + return GetInstanceAI<AI>(obj, OSScriptName); } #endif // OBSIDIAN_SANCTUM_H_ diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index 2c8a9075d6c..76dea026e36 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -15,13 +15,12 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ScriptedCreature.h" -#include "InstanceScript.h" -#include "ObjectAccessor.h" #include "ScriptMgr.h" +#include "InstanceScript.h" +#include "ruby_sanctum.h" +#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" -#include "ruby_sanctum.h" enum Texts { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp index a20faea64fb..91968895d25 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp @@ -20,7 +20,7 @@ #include "MotionMaster.h" #include "ObjectAccessor.h" #include "ruby_sanctum.h" -#include "ScriptedEscortAI.h" +#include "ScriptedCreature.h" enum Texts { diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 262782979b6..7c640966554 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -765,7 +765,7 @@ class npc_halion_controller : public CreatureScript void DoCheckEvade() { - Map::PlayerList const &players = me->GetMap()->GetPlayers(); + Map::PlayerList const& players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) if (Player* player = i->GetSource()) if (player->IsAlive() && CheckBoundary(player) && !player->IsGameMaster()) @@ -1447,7 +1447,8 @@ class spell_halion_combustion_consumption : public SpellScriptLoader public: spell_halion_combustion_consumption_AuraScript(uint32 spellID) : AuraScript(), _markSpell(spellID) { } - bool Validate(SpellInfo const* /*spell*/) override + private: + bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ _markSpell }); } @@ -1543,9 +1544,10 @@ class spell_halion_marks : public SpellScriptLoader spell_halion_marks_AuraScript(uint32 summonSpell, uint32 removeSpell) : AuraScript(), _summonSpellId(summonSpell), _removeSpellId(removeSpell) { } + private: bool Validate(SpellInfo const* /*spell*/) override { - return ValidateSpellInfo({ _summonSpellId }); + return ValidateSpellInfo({ _summonSpellId, _removeSpellId }); } /// We were purged. Force removed stacks to zero and trigger the appropriated remove handler. @@ -1626,7 +1628,7 @@ class spell_halion_damage_aoe_summon : public SpellScriptLoader class spell_halion_twilight_realm_handlers : public SpellScriptLoader { public: - spell_halion_twilight_realm_handlers(const char* scriptName, uint32 beforeHitSpell, bool isApplyHandler) : SpellScriptLoader(scriptName), + spell_halion_twilight_realm_handlers(char const* scriptName, uint32 beforeHitSpell, bool isApplyHandler) : SpellScriptLoader(scriptName), _beforeHitSpell(beforeHitSpell), _isApplyHandler(isApplyHandler) { } @@ -1639,6 +1641,7 @@ class spell_halion_twilight_realm_handlers : public SpellScriptLoader _isApply(isApplyHandler), _beforeHitSpellId(beforeHitSpell) { } + private: bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ _beforeHitSpellId }); @@ -1698,11 +1701,7 @@ class spell_halion_clear_debuffs : public SpellScriptLoader bool Validate(SpellInfo const* /*spell*/) override { - return ValidateSpellInfo( - { - SPELL_CLEAR_DEBUFFS, - SPELL_TWILIGHT_REALM, - }); + return ValidateSpellInfo({ SPELL_CLEAR_DEBUFFS, SPELL_TWILIGHT_REALM }); } void HandleScript(SpellEffIndex effIndex) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index 7500fec1759..7cb74810fee 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -20,7 +20,6 @@ #include "MotionMaster.h" #include "ruby_sanctum.h" #include "ScriptedCreature.h" -#include "SpellMgr.h" #include "SpellScript.h" enum Texts @@ -232,10 +231,7 @@ class spell_saviana_conflagration_init : public SpellScriptLoader bool Validate(SpellInfo const* /*spell*/) override { - if (!sSpellMgr->GetSpellInfo(SPELL_FLAME_BEACON, DIFFICULTY_NONE) - || !sSpellMgr->GetSpellInfo(SPELL_CONFLAGRATION_2, DIFFICULTY_NONE)) - return false; - return true; + return ValidateSpellInfo({ SPELL_FLAME_BEACON, SPELL_CONFLAGRATION_2 }); } void FilterTargets(std::list<WorldObject*>& targets) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp index 708f51879f5..5302117a7e6 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp @@ -72,7 +72,6 @@ ObjectData const gameObjectData[] = { 0, 0 } //END }; - class instance_ruby_sanctum : public InstanceMapScript { public: diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp index d1fc9f9bbec..0a33d804083 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "InstanceScript.h" #include "MotionMaster.h" -#include "ObjectAccessor.h" #include "Player.h" #include "ruby_sanctum.h" #include "ScriptedCreature.h" @@ -206,7 +205,6 @@ class spell_ruby_sanctum_rallying_shout : public SpellScriptLoader OnEffectHit += SpellEffectFn(spell_ruby_sanctum_rallying_shout_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } - private: uint32 _targetCount = 0; }; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h index 63b97d2fb87..095e54609aa 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h @@ -129,7 +129,7 @@ enum RSInstanceSpell SPELL_BERSERK = 26662 }; -template<typename AI, typename T> +template <class AI, class T> inline AI* GetRubySanctumAI(T* obj) { return GetInstanceAI<AI>(obj, RSScriptName); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index f5aef90a1ae..a672a5ebba7 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -96,7 +96,7 @@ const Point MovementPoint[] = */ void AggroAllPlayers(Creature* temp) { - Map::PlayerList const &PlList = temp->GetMap()->GetPlayers(); + Map::PlayerList const& PlList = temp->GetMap()->GetPlayers(); if (PlList.isEmpty()) return; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 9e6de98a6e8..af1d910cd26 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -31,6 +31,7 @@ EndScriptData */ #include "MotionMaster.h" #include "Player.h" #include "trial_of_the_champion.h" +#include <sstream> #define MAX_ENCOUNTER 4 @@ -94,7 +95,7 @@ public: void OnCreatureCreate(Creature* creature) override { - Map::PlayerList const &players = instance->GetPlayers(); + Map::PlayerList const& players = instance->GetPlayers(); uint32 TeamInInstance = 0; if (!players.isEmpty()) @@ -292,7 +293,7 @@ public: return str_data; } - void Load(const char* in) override + void Load(char const* in) override { if (!in) { diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index 3ffb9d372f4..9e36ddaa655 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -368,8 +368,7 @@ public: void AggroAllPlayers(Creature* temp) { - Map::PlayerList const &PlList = me->GetMap()->GetPlayers(); - + Map::PlayerList const& PlList = me->GetMap()->GetPlayers(); if (PlList.isEmpty()) return; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h index 8f0af1de250..e802088e7f8 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h @@ -129,10 +129,10 @@ enum TCVehicles VEHICLE_BLACK_KNIGHT = 35491 }; -template<class AI> -inline AI* GetTrialOfTheChampionAI(Creature* creature) +template <class AI, class T> +inline AI* GetTrialOfTheChampionAI(T* obj) { - return GetInstanceAI<AI>(creature, ToCScriptName); + return GetInstanceAI<AI>(obj, ToCScriptName); } #endif diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index d9df4f1abb4..4d1db28dd04 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -25,8 +25,8 @@ #include "MotionMaster.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" -#include "SpellScript.h" #include "SpellAuraEffects.h" +#include "SpellScript.h" #include "TemporarySummon.h" #include "trial_of_the_crusader.h" diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index 44afc9f7deb..2f25fa6fec7 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -23,8 +23,8 @@ #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" -#include "SpellScript.h" #include "SpellAuraEffects.h" +#include "SpellScript.h" #include "TemporarySummon.h" #include "trial_of_the_crusader.h" @@ -343,7 +343,7 @@ enum Events EVENT_SPELL_LOCK = 2 }; -const Position FactionChampionLoc[] = +Position const FactionChampionLoc[] = { { 514.231f, 105.569f, 418.234f, 0 }, // 0 - Horde Initial Pos 0 { 508.334f, 115.377f, 418.234f, 0 }, // 1 - Horde Initial Pos 1 @@ -652,7 +652,7 @@ struct boss_faction_championsAI : public BossAI { if (who->GetTypeId() == TYPEID_PLAYER) { - Map::PlayerList const &players = me->GetMap()->GetPlayers(); + Map::PlayerList const& players = me->GetMap()->GetPlayers(); uint32 TeamInInstance = 0; if (!players.isEmpty()) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 54378f8b821..b2f6dfcf861 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -298,7 +298,7 @@ class npc_infernal_volcano : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { - return new npc_infernal_volcanoAI(creature); + return GetTrialOfTheCrusaderAI<npc_infernal_volcanoAI>(creature); } }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index fa54863673a..eed3903127c 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -22,8 +22,8 @@ #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" -#include "SpellScript.h" #include "SpellAuraEffects.h" +#include "SpellScript.h" #include "TemporarySummon.h" #include "trial_of_the_crusader.h" #include "Vehicle.h" @@ -860,7 +860,7 @@ class spell_gormok_fire_bomb : public SpellScriptLoader void TriggerFireBomb(SpellEffIndex /*effIndex*/) { - if (const WorldLocation* pos = GetExplTargetDest()) + if (WorldLocation const* pos = GetExplTargetDest()) { if (Unit* caster = GetCaster()) caster->SummonCreature(NPC_FIRE_BOMB, pos->GetPositionX(), pos->GetPositionY(), pos->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30*IN_MILLISECONDS); @@ -1110,7 +1110,7 @@ class boss_icehowl : public CreatureScript } if (events.ExecuteEvent() == EVENT_TRAMPLE) { - Map::PlayerList const &lPlayers = me->GetMap()->GetPlayers(); + Map::PlayerList const& lPlayers = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr) { if (Unit* player = itr->GetSource()) @@ -1364,7 +1364,7 @@ public: class spell_jormungars_snakes_spray : public SpellScriptLoader { public: - spell_jormungars_snakes_spray(const char* name, uint32 spellId) : SpellScriptLoader(name), _spellId(spellId) { } + spell_jormungars_snakes_spray(char const* name, uint32 spellId) : SpellScriptLoader(name), _spellId(spellId) { } class spell_jormungars_snakes_spray_SpellScript : public SpellScript { @@ -1373,6 +1373,7 @@ public: public: spell_jormungars_snakes_spray_SpellScript(uint32 spellId) : SpellScript(), _spellId(spellId) { } + private: bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ _spellId }); @@ -1389,7 +1390,6 @@ public: OnEffectHitTarget += SpellEffectFn(spell_jormungars_snakes_spray_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } - private: uint32 _spellId; }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 07ff15a8a64..9b2a37ada81 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -25,7 +25,6 @@ #include "InstanceScript.h" #include "MotionMaster.h" #include "ObjectAccessor.h" -#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" #include "SpellAuraEffects.h" @@ -632,9 +631,9 @@ class npc_unleashed_light : public CreatureScript { DoCastAOE(SPELL_UNLEASHED_LIGHT); me->GetMotionMaster()->MoveIdle(); - me->DespawnOrUnsummon(1*IN_MILLISECONDS); + me->DespawnOrUnsummon(1 * IN_MILLISECONDS); } - RangeCheckTimer = 0.5*IN_MILLISECONDS; + RangeCheckTimer = IN_MILLISECONDS / 2; } else RangeCheckTimer -= diff; 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 index 99e94275397..6025618cbf9 100644 --- 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 @@ -24,14 +24,15 @@ #include "Player.h" #include "TemporarySummon.h" #include "trial_of_the_crusader.h" +#include <sstream> BossBoundaryData const boundaries = { - { BOSS_BEASTS, new CircleBoundary(Position(563.26f, 139.6f), 75.0) }, - { BOSS_JARAXXUS, new CircleBoundary(Position(563.26f, 139.6f), 75.0) }, - { BOSS_CRUSADERS, new CircleBoundary(Position(563.26f, 139.6f), 75.0) }, - { BOSS_VALKIRIES, new CircleBoundary(Position(563.26f, 139.6f), 75.0) }, - { BOSS_ANUBARAK, new EllipseBoundary(Position(746.0f, 135.0f), 100.0, 75.0) } + { BOSS_BEASTS, new CircleBoundary(Position(563.26f, 139.6f), 75.0) }, + { BOSS_JARAXXUS, new CircleBoundary(Position(563.26f, 139.6f), 75.0) }, + { BOSS_CRUSADERS, new CircleBoundary(Position(563.26f, 139.6f), 75.0) }, + { BOSS_VALKIRIES, new CircleBoundary(Position(563.26f, 139.6f), 75.0) }, + { BOSS_ANUBARAK, new EllipseBoundary(Position(746.0f, 135.0f), 100.0, 75.0) } }; class instance_trial_of_the_crusader : public InstanceMapScript @@ -350,7 +351,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript { --TrialCounter; // decrease attempt counter at wipe - Map::PlayerList const &PlayerList = instance->GetPlayers(); + Map::PlayerList const& PlayerList = instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) if (Player* player = itr->GetSource()) player->SendUpdateWorldState(UPDATE_STATE_UI_COUNT, TrialCounter); @@ -644,7 +645,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript return SaveDataBuffer; } - void Load(const char* strIn) override + void Load(char const* strIn) override { if (!strIn) { 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 index 84f1868912c..f0dff06e3d9 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -93,7 +93,7 @@ Position const ToCSpawnLoc[] = { 549.951f, 261.55f, 394.73f, 4.74835f } // 2 Right }; -Position const ToCCommonLoc[23] = +Position const ToCCommonLoc[] = { { 559.257996f, 90.266197f, 395.122986f, 0 }, // 0 Barrent @@ -136,7 +136,7 @@ Position const LichKingLoc[] = { 563.547f, 141.613f, 393.908f, 0 } // 1 - Lich king end }; -Position const AnubarakLoc[6] = +Position const AnubarakLoc[] = { { 783.9305f, 132.9722f, 142.6711f, 3.141593f }, // 0 - Anub'arak Spawn Location (sniffed) { 695.240051f, 137.834824f, 142.200000f, 0 }, // 1 - Anub'arak move point location diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h index 8a47823687a..2c50de8ae6c 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h @@ -218,10 +218,10 @@ enum TCRAchievementData EVENT_START_TWINS_FIGHT = 21853 }; -template<typename AI> -inline AI* GetTrialOfTheCrusaderAI(Creature* creature) +template <class AI, class T> +inline AI* GetTrialOfTheCrusaderAI(T* obj) { - return GetInstanceAI<AI>(creature, ToCrScriptName); + return GetInstanceAI<AI>(obj, ToCrScriptName); } #endif diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 2e96274164d..0aa09881f0a 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -311,7 +311,7 @@ class spell_trollgore_invader_taunt : public SpellScriptLoader bool Validate(SpellInfo const* spellInfo) override { - return spellInfo->GetEffect(EFFECT_0) && ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0)->CalcValue()) }); + return spellInfo->GetEffect(EFFECT_0) && ValidateSpellInfo({ static_cast<uint32>(spellInfo->GetEffect(EFFECT_0)->CalcValue()) }); } void HandleTaunt(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h index 3cda33e5a4e..31165ce9ffd 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h +++ b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h @@ -86,10 +86,10 @@ enum DTKGameObjectIds GO_NOVOS_CRYSTAL_4 = 189302 }; -template<typename AI> -inline AI* GetDrakTharonKeepAI(Creature* creature) +template <class AI, class T> +inline AI* GetDrakTharonKeepAI(T* obj) { - return GetInstanceAI<AI>(creature, DrakTharonKeepScriptName); + return GetInstanceAI<AI>(obj, DrakTharonKeepScriptName); } #endif // DRAK_THARON_KEEP_H_ diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp index 10db14b13c0..6d87399d426 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -16,12 +16,11 @@ */ #include "ScriptMgr.h" -#include "Creature.h" -#include "CreatureAI.h" #include "drak_tharon_keep.h" #include "GameObject.h" #include "InstanceScript.h" #include "Map.h" +#include "ScriptedCreature.h" class instance_drak_tharon_keep : public InstanceMapScript { diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index c78424c0078..bc6edfdc3a9 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -22,8 +22,8 @@ #include "MotionMaster.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" -#include "SpellScript.h" #include "SpellAuraEffects.h" +#include "SpellScript.h" enum Yells { diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 265db80d353..fbd4a69b490 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -220,7 +220,7 @@ class boss_devourer_of_souls : public CreatureScript } } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) override + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override { if (spell->Id == H_SPELL_PHANTOM_BLAST) threeFaced = false; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h index 98ecb92b048..f1338736e6b 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h @@ -57,10 +57,10 @@ enum FOSCreatures NPC_CRUCIBLE_OF_SOULS = 37094 }; -template<typename AI> -inline AI* GetForgeOfSoulsAI(Creature* creature) +template <class AI, class T> +inline AI* GetForgeOfSoulsAI(T* obj) { - return GetInstanceAI<AI>(creature, FoSScriptName); + return GetInstanceAI<AI>(obj, FoSScriptName); } #endif // FORGE_OF_SOULS_H_ diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp index a89920f53ac..5774e372d2a 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp @@ -15,18 +15,17 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "AreaBoundary.h" #include "ScriptMgr.h" +#include "AreaBoundary.h" #include "Creature.h" #include "forge_of_souls.h" #include "InstanceScript.h" #include "Map.h" #include "Player.h" - BossBoundaryData const boundaries = { - { DATA_BRONJAHM, new CircleBoundary(Position(5297.3f, 2506.45f), 100.96) }, + { DATA_BRONJAHM, new CircleBoundary(Position(5297.3f, 2506.45f), 100.96) }, { DATA_DEVOURER_OF_SOULS, new ParallelogramBoundary(Position(5663.56f, 2570.53f), Position(5724.39f, 2520.45f), Position(5570.36f, 2461.42f)) } }; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index c9f556c401d..b4ad06a5716 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -19,7 +19,6 @@ #include "boss_horAI.h" #include "halls_of_reflection.h" #include "InstanceScript.h" -#include "ScriptedCreature.h" enum Texts { diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.h index 734c1980a5c..4d405956976 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_horAI.h @@ -15,6 +15,9 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef boss_horAI_h__ +#define boss_horAI_h__ + #include "ScriptedCreature.h" // Base class for FALRIC and MARWYN @@ -25,3 +28,5 @@ struct boss_horAI : BossAI void DoAction(int32 actionId) override; void JustSummoned(Creature* summon) override; }; + +#endif // boss_horAI_h__ diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index 2fd0ff5097a..8528aba9fb7 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -19,7 +19,6 @@ #include "boss_horAI.h" #include "halls_of_reflection.h" #include "InstanceScript.h" -#include "ScriptedCreature.h" #include "SpellAuraEffects.h" #include "SpellScript.h" diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h index 01fd75fed8e..acfe6234da1 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h @@ -221,10 +221,10 @@ class GameObjectDeleteDelayEvent : public BasicEvent ObjectGuid _gameObjectGUID; }; -template<typename AI> -inline AI* GetHallsOfReflectionAI(Creature* creature) +template <class AI, class T> +inline AI* GetHallsOfReflectionAI(T* obj) { - return GetInstanceAI<AI>(creature, HoRScriptName); + return GetInstanceAI<AI>(obj, HoRScriptName); } #endif // HALLS_OF_REFLECTION_H_ diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 3d83f74d33a..2834bbc7b72 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -16,18 +16,16 @@ */ #include "ScriptMgr.h" -#include "Containers.h" -#include "Creature.h" -#include "CreatureAI.h" -#include "GameObject.h" #include "halls_of_reflection.h" #include "InstanceScript.h" #include "Map.h" #include "PhasingHandler.h" #include "Player.h" +#include "ScriptedCreature.h" #include "TemporarySummon.h" #include "Transport.h" #include "WorldStatePackets.h" +#include <sstream> Position const JainaSpawnPos = { 5236.659f, 1929.894f, 707.7781f, 0.8726646f }; // Jaina Spawn Position Position const SylvanasSpawnPos = { 5236.667f, 1929.906f, 707.7781f, 0.8377581f }; // Sylvanas Spawn Position (sniffed) 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 3406e2be458..fb6b9c41435 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -171,7 +171,7 @@ class boss_garfrost : public CreatureScript events.ScheduleEvent(EVENT_RESUME_ATTACK, 5000); } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (spell->Id == SPELL_PERMAFROST_HELPER) { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 027eb2679dc..6239f430494 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -23,7 +23,7 @@ #include "pit_of_saron.h" #include "Player.h" #include "ScriptedCreature.h" -#include "SpellAuraEffects.h" +#include "SpellInfo.h" #include "SpellScript.h" #include "TemporarySummon.h" #include "Vehicle.h" @@ -545,7 +545,7 @@ class spell_krick_explosive_barrage : public SpellScriptLoader if (Unit* caster = GetCaster()) if (caster->GetTypeId() == TYPEID_UNIT) { - Map::PlayerList const &players = caster->GetMap()->GetPlayers(); + Map::PlayerList const& players = caster->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) if (Player* player = itr->GetSource()) if (player->IsWithinDist(caster, 60.0f)) // don't know correct range diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index e21e57e524b..b186f658d27 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -428,14 +428,6 @@ class spell_tyrannus_overlord_brand : public SpellScriptLoader { PrepareAuraScript(spell_tyrannus_overlord_brand_AuraScript); - public: - spell_tyrannus_overlord_brand_AuraScript() - { - oldAI = nullptr; - oldAIState = false; - } - - private: bool Load() override { return GetCaster() && GetCaster()->GetEntry() == NPC_TYRANNUS; @@ -470,8 +462,8 @@ class spell_tyrannus_overlord_brand : public SpellScriptLoader AfterEffectRemove += AuraEffectRemoveFn(spell_tyrannus_overlord_brand_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } - PlayerAI* oldAI; - bool oldAIState; + PlayerAI* oldAI = nullptr; + bool oldAIState = false; }; AuraScript* GetAuraScript() const override diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index ee5cc0c3269..6afdf400924 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -17,7 +17,6 @@ #include "ScriptMgr.h" #include "Creature.h" -#include "GameObject.h" #include "InstanceScript.h" #include "Map.h" #include "pit_of_saron.h" @@ -167,28 +166,6 @@ class instance_pit_of_saron : public InstanceMapScript } } - void OnGameObjectCreate(GameObject* go) override - { - switch (go->GetEntry()) - { - case GO_ICE_WALL: - case GO_HALLS_OF_REFLECTION_PORTCULLIS: - AddDoor(go, true); - break; - } - } - - void OnGameObjectRemove(GameObject* go) override - { - switch (go->GetEntry()) - { - case GO_ICE_WALL: - case GO_HALLS_OF_REFLECTION_PORTCULLIS: - AddDoor(go, false); - break; - } - } - bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 6443a2a12ee..043fdc44c4b 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -23,7 +23,6 @@ #include "Player.h" #include "ScriptedCreature.h" #include "SpellScript.h" -#include "SpellAuraEffects.h" #include "Vehicle.h" enum Spells @@ -116,7 +115,7 @@ class npc_ymirjar_flamebearer : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { - return new npc_ymirjar_flamebearerAI(creature); + return GetPitOfSaronAI<npc_ymirjar_flamebearerAI>(creature); } }; @@ -170,7 +169,7 @@ class npc_iceborn_protodrake : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { - return new npc_iceborn_protodrakeAI(creature); + return GetPitOfSaronAI<npc_iceborn_protodrakeAI>(creature); } }; @@ -229,7 +228,7 @@ class npc_geist_ambusher : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { - return new npc_geist_ambusherAI(creature); + return GetPitOfSaronAI<npc_geist_ambusherAI>(creature); } }; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h index 44d3bab4766..e721d9fc9e6 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h @@ -121,10 +121,10 @@ class ScheduledIcicleSummons : public BasicEvent Creature* _trigger; }; -template<typename AI> -inline AI* GetPitOfSaronAI(Creature* creature) +template <class AI, class T> +inline AI* GetPitOfSaronAI(T* obj) { - return GetInstanceAI<AI>(creature, PoSScriptName); + return GetInstanceAI<AI>(obj, PoSScriptName); } #endif // PIT_OF_SARON_H_ diff --git a/src/server/scripts/Northrend/Gundrak/gundrak.h b/src/server/scripts/Northrend/Gundrak/gundrak.h index db08165451a..8f35724d03e 100644 --- a/src/server/scripts/Northrend/Gundrak/gundrak.h +++ b/src/server/scripts/Northrend/Gundrak/gundrak.h @@ -93,7 +93,7 @@ enum GDInstanceMisc TIMER_STATUE_ACTIVATION = 3500 }; -template<class AI, class T> +template <class AI, class T> inline AI* GetGundrakAI(T* obj) { return GetInstanceAI<AI>(obj, GundrakScriptName); diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index 0a509af074b..20ec068009b 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -15,23 +15,24 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ScriptMgr.h" -#include "GameObjectAI.h" +#include "InstanceScript.h" #include "Creature.h" #include "EventMap.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "gundrak.h" -#include "InstanceScript.h" #include "Map.h" +#include "ScriptMgr.h" +#include <sstream> DoorData const doorData[] = { { GO_GAL_DARAH_DOOR_1, DATA_GAL_DARAH, DOOR_TYPE_PASSAGE }, { GO_GAL_DARAH_DOOR_2, DATA_GAL_DARAH, DOOR_TYPE_PASSAGE }, - { GO_GAL_DARAH_DOOR_3, DATA_GAL_DARAH, DOOR_TYPE_ROOM }, + { GO_GAL_DARAH_DOOR_3, DATA_GAL_DARAH, DOOR_TYPE_ROOM }, { GO_ECK_THE_FEROCIOUS_DOOR, DATA_MOORABI, DOOR_TYPE_PASSAGE }, { GO_ECK_THE_FEROCIOUS_DOOR_BEHIND, DATA_ECK_THE_FEROCIOUS, DOOR_TYPE_PASSAGE }, - { 0, 0, DOOR_TYPE_ROOM } // END + { 0, 0, DOOR_TYPE_ROOM } // END }; ObjectData const creatureData[] = diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 1c3728d0d06..46344185df7 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -20,15 +20,14 @@ #include "Map.h" #include "MotionMaster.h" #include "ObjectAccessor.h" +#include "PassiveAI.h" #include "Player.h" #include "ScriptedCreature.h" #include "Spell.h" #include "SpellAuraEffects.h" -#include "SpellAuras.h" #include "SpellInfo.h" #include "SpellScript.h" #include "TemporarySummon.h" -#include "PassiveAI.h" enum Texts { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 33978ff7e16..33234f60826 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -24,8 +24,6 @@ #include "Player.h" #include "ScriptedCreature.h" #include "SpellAuraEffects.h" -#include "SpellAuras.h" -#include "SpellInfo.h" #include "SpellMgr.h" #include "SpellScript.h" @@ -378,7 +376,7 @@ class boss_blood_queen_lana_thel : public CreatureScript } case EVENT_BLOOD_MIRROR: { - // victim can be NULL when this is processed in the same update tick as EVENT_AIR_PHASE + // victim can be nullptr when this is processed in the same update tick as EVENT_AIR_PHASE if (me->GetVictim()) { Player* newOfftank = SelectRandomTarget(true); @@ -540,12 +538,7 @@ class spell_blood_queen_vampiric_bite : public SpellScriptLoader bool Validate(SpellInfo const* /*spell*/) override { - return ValidateSpellInfo( - { - SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_PLR, - SPELL_FRENZIED_BLOODTHIRST, - SPELL_PRESENCE_OF_THE_DARKFALLEN - }); + return ValidateSpellInfo({ SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_PLR, SPELL_FRENZIED_BLOODTHIRST, SPELL_PRESENCE_OF_THE_DARKFALLEN }); } SpellCastResult CheckTarget() diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 1f206826126..6bdfd7296b8 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -1010,11 +1010,7 @@ class spell_deathbringer_blood_link : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo( - { - SPELL_BLOOD_LINK_POWER, - SPELL_BLOOD_POWER - }); + return ValidateSpellInfo({ SPELL_BLOOD_LINK_POWER, SPELL_BLOOD_POWER }); } void HandleDummy(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index a071eb87f2b..cf899c1915d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -18,6 +18,7 @@ #include "icecrown_citadel.h" #include "CellImpl.h" #include "CreatureTextMgr.h" +#include "GossipDef.h" #include "GridNotifiersImpl.h" #include "InstanceScript.h" #include "Map.h" @@ -26,12 +27,10 @@ #include "MoveSplineInit.h" #include "ObjectAccessor.h" #include "PassiveAI.h" -#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" #include "SpellAuraEffects.h" #include "SpellHistory.h" -#include "SpellInfo.h" #include "SpellMgr.h" #include "SpellScript.h" #include "TemporarySummon.h" @@ -1815,7 +1814,7 @@ class npc_gunship_cannon : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { - return new npc_gunship_cannonAI(creature); + return GetIcecrownCitadelAI<npc_gunship_cannonAI>(creature); } }; @@ -1830,11 +1829,7 @@ class spell_igb_rocket_pack : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo( - { - SPELL_ROCKET_PACK_DAMAGE, - SPELL_ROCKET_BURST - }); + return ValidateSpellInfo({ SPELL_ROCKET_PACK_DAMAGE, SPELL_ROCKET_BURST }); } void HandlePeriodic(AuraEffect const* /*aurEff*/) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 51422aefc9b..dffa7af0174 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -24,7 +24,6 @@ #include "PoolMgr.h" #include "ScriptedCreature.h" #include "SpellInfo.h" -#include "SpellMgr.h" #include "SpellScript.h" #include "TemporarySummon.h" @@ -454,7 +453,7 @@ class boss_lady_deathwhisper : public CreatureScript } } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { if (spell->Id == SPELL_SUMMON_SPIRITS) _nextVengefulShadeTargetGUID.push_back(target->GetGUID()); @@ -541,7 +540,7 @@ class boss_lady_deathwhisper : public CreatureScript } // helper for summoning wave mobs - void Summon(uint32 entry, const Position& pos) + void Summon(uint32 entry, Position const& pos) { if (TempSummon* summon = me->SummonCreature(entry, pos, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000)) summon->CastSpell(summon, SPELL_TELEPORT_VISUAL); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 55ae1114639..c89db35b38b 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -17,7 +17,6 @@ #include "icecrown_citadel.h" #include "DB2Stores.h" -#include "GameObject.h" #include "GridNotifiers.h" #include "Group.h" #include "InstanceScript.h" @@ -27,8 +26,6 @@ #include "ScriptedCreature.h" #include "Spell.h" #include "SpellAuraEffects.h" -#include "SpellAuras.h" -#include "SpellInfo.h" #include "SpellMgr.h" #include "SpellScript.h" #include "TemporarySummon.h" @@ -892,16 +889,9 @@ class spell_putricide_ooze_channel : public SpellScriptLoader { PrepareSpellScript(spell_putricide_ooze_channel_SpellScript); - public: - spell_putricide_ooze_channel_SpellScript() - { - _target = nullptr; - } - - private: bool Validate(SpellInfo const* spell) override { - return spell->ExcludeTargetAuraSpell && ValidateSpellInfo({ spell->ExcludeTargetAuraSpell }); + return ValidateSpellInfo({ spell->ExcludeTargetAuraSpell }); } // set up initial variables and check if caster is creature @@ -949,7 +939,7 @@ class spell_putricide_ooze_channel : public SpellScriptLoader AfterHit += SpellHitFn(spell_putricide_ooze_channel_SpellScript::StartAttack); } - WorldObject* _target; + WorldObject* _target = nullptr; }; SpellScript* GetSpellScript() const override diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index c6c3caf5aa8..524bdd671e9 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -16,14 +16,12 @@ */ #include "icecrown_citadel.h" -#include "Containers.h" #include "GridNotifiers.h" #include "InstanceScript.h" #include "Map.h" #include "ObjectAccessor.h" -#include "Player.h" #include "ScriptedCreature.h" -#include "SpellAuraEffects.h" +#include "SpellAuras.h" #include "SpellScript.h" #include "TemporarySummon.h" diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index b33cc623d91..3bfa19fc752 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -16,14 +16,12 @@ */ #include "icecrown_citadel.h" -#include "GameObject.h" #include "GridNotifiers.h" #include "InstanceScript.h" #include "Map.h" #include "MotionMaster.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" -#include "Player.h" #include "ScriptedCreature.h" #include "Spell.h" #include "SpellAuraEffects.h" diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 93d1d6f99a3..2648d8f55ae 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -18,17 +18,13 @@ #include "icecrown_citadel.h" #include "CellImpl.h" #include "CreatureTextMgr.h" -#include "GameObject.h" #include "GridNotifiersImpl.h" #include "InstanceScript.h" -#include "Map.h" #include "MotionMaster.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "Spell.h" #include "SpellAuraEffects.h" -#include "SpellAuras.h" -#include "SpellInfo.h" #include "SpellScript.h" #include "TemporarySummon.h" #include "Vehicle.h" @@ -2564,13 +2560,6 @@ class spell_the_lich_king_valkyr_target_search : public SpellScriptLoader { PrepareSpellScript(spell_the_lich_king_valkyr_target_search_SpellScript); - public: - spell_the_lich_king_valkyr_target_search_SpellScript() - { - _target = nullptr; - } - - private: bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_CHARGE }); @@ -2611,7 +2600,7 @@ class spell_the_lich_king_valkyr_target_search : public SpellScriptLoader OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_valkyr_target_search_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } - WorldObject* _target; + WorldObject* _target = nullptr; }; SpellScript* GetSpellScript() const override diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index f8f0afdc9b1..826314e1b41 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -24,7 +24,6 @@ #include "PhasingHandler.h" #include "ScriptedCreature.h" #include "SpellAuraEffects.h" -#include "SpellInfo.h" #include "SpellScript.h" enum Texts diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 882bf88c363..df11ab7be69 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -17,17 +17,13 @@ #include "icecrown_citadel.h" #include "CellImpl.h" -#include "GameObject.h" #include "GridNotifiersImpl.h" #include "InstanceScript.h" #include "MotionMaster.h" #include "ObjectAccessor.h" #include "PassiveAI.h" -#include "PetDefines.h" -#include "Player.h" #include "ScriptedEscortAI.h" #include "SmartAI.h" -#include "Spell.h" #include "SpellInfo.h" #include "SpellScript.h" #include "TemporarySummon.h" @@ -737,7 +733,7 @@ class npc_alchemist_adrianna : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { - return new npc_alchemist_adriannaAI(creature); + return GetIcecrownCitadelAI<npc_alchemist_adriannaAI>(creature); } }; @@ -1680,7 +1676,7 @@ class npc_frostwing_vrykul : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { - return new npc_frostwing_vrykulAI(creature); + return GetIcecrownCitadelAI<npc_frostwing_vrykulAI>(creature); } }; @@ -1724,7 +1720,7 @@ class npc_impaling_spear : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { - return new npc_impaling_spearAI(creature); + return GetIcecrownCitadelAI<npc_impaling_spearAI>(creature); } }; @@ -2123,6 +2119,7 @@ public: spell_trigger_spell_from_caster_SpellScript(uint32 triggerId, TriggerCastFlags triggerFlags) : SpellScript(), _triggerId(triggerId), _triggerFlags(triggerFlags) { } +private: bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ _triggerId }); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h index b019ecb8640..fa374e80421 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h @@ -533,8 +533,8 @@ enum ICAreaIds class spell_trigger_spell_from_caster : public SpellScriptLoader { public: - spell_trigger_spell_from_caster(char const* scriptName, uint32 triggerId); spell_trigger_spell_from_caster(char const* scriptName, uint32 triggerId, TriggerCastFlags triggerFlags); + spell_trigger_spell_from_caster(char const* scriptName, uint32 triggerId); SpellScript* GetSpellScript() const override; private: @@ -542,7 +542,7 @@ class spell_trigger_spell_from_caster : public SpellScriptLoader TriggerCastFlags _triggerFlags; }; -template<typename AI, typename T> +template <class AI, class T> inline AI* GetIcecrownCitadelAI(T* obj) { return GetInstanceAI<AI>(obj, ICCScriptName); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index 0a11d6e7830..884299da83c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -17,10 +17,7 @@ #include "icecrown_citadel.h" #include "AreaBoundary.h" -#include "Creature.h" #include "CreatureAI.h" -#include "EventMap.h" -#include "GameObject.h" #include "InstanceScript.h" #include "Map.h" #include "ObjectMgr.h" @@ -30,6 +27,7 @@ #include "Transport.h" #include "TransportMgr.h" #include "WorldStatePackets.h" +#include <sstream> enum EventIds { @@ -190,7 +188,7 @@ class instance_icecrown_citadel : public InstanceMapScript { if (!TeamInInstance) { - Map::PlayerList const &players = instance->GetPlayers(); + Map::PlayerList const& players = instance->GetPlayers(); if (!players.isEmpty()) if (Player* player = players.begin()->GetSource()) TeamInInstance = player->GetTeam(); diff --git a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp index 5e07ee5752f..f1572be2825 100644 --- a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp @@ -119,8 +119,8 @@ class npc_ioc_gunship_captain : public CreatureScript DoCast(me, SPELL_TELEPORT_VISUAL_ONLY); break; case EVENT_DESPAWN: - if (me->GetMap()->ToBattlegroundMap()) - if (Battleground* bgIoC = me->GetMap()->ToBattlegroundMap()->GetBG()) + if (BattlegroundMap* iocMap = me->GetMap()->ToBattlegroundMap()) + if (Battleground* bgIoC = iocMap->GetBG()) bgIoC->DelCreature(BG_IC_NPC_GUNSHIP_CAPTAIN_1); break; default: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index b6783166857..12786c9e7f6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -17,8 +17,8 @@ #include "ScriptMgr.h" #include "InstanceScript.h" -#include "naxxramas.h" #include "ObjectAccessor.h" +#include "naxxramas.h" #include "Player.h" #include "ScriptedCreature.h" diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index 8e3dbb5a271..bf287b7b417 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -22,7 +22,6 @@ #include "Player.h" #include "ScriptedCreature.h" #include "SpellAuras.h" -#include "SpellInfo.h" enum Yells { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 6fb81e414cb..2d1d1263978 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "GameTime.h" #include "ScriptMgr.h" +#include "GameTime.h" #include "InstanceScript.h" #include "Log.h" #include "Map.h" @@ -222,7 +222,7 @@ struct boss_four_horsemen_baseAI : public BossAI return; } instance->SetBossState(BOSS_HORSEMEN, IN_PROGRESS); - Map::PlayerList const &players = me->GetMap()->GetPlayers(); + Map::PlayerList const& players = me->GetMap()->GetPlayers(); if (players.isEmpty()) // sanity check ResetEncounter(); @@ -381,7 +381,7 @@ struct boss_four_horsemen_baseAI : public BossAI private: const Horseman _which; - const Position* _initialPath; + Position const* _initialPath; bool _myMovementFinished; uint8 _nextMovement; uint32 _timeDied; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 02a0fc01423..9ccf2bc33b6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -194,7 +194,7 @@ public: Creature* zombie = nullptr; for (SummonList::const_iterator itr = summons.begin(); !zombie && itr != summons.end(); ++itr) { - zombie=ObjectAccessor::GetCreature(*me, *itr); + zombie = ObjectAccessor::GetCreature(*me, *itr); if (!zombie || !zombie->IsAlive() || !zombie->IsWithinDistInMap(me, 10.0)) zombie = nullptr; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 328129b166f..002a712d496 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -233,7 +233,7 @@ class spell_heigan_eruption : public SpellScriptLoader void HandleScript(SpellEffIndex /*eff*/) { Unit* caster = GetCaster(); - if (!caster || !GetHitPlayer()) + if (!caster || !GetHitUnit()) return; if (GetHitDamage() >= int32(GetHitUnit()->GetHealth())) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index cbf20738444..2203c878b77 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -948,7 +948,7 @@ class at_kelthuzad_center : public AreaTriggerScript public: at_kelthuzad_center() : AreaTriggerScript("at_kelthuzad_center") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/, bool entered) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*at*/, bool entered) override { InstanceScript* instance = player->GetInstanceScript(); if (!instance || instance->GetBossState(BOSS_KELTHUZAD) != NOT_STARTED || !entered) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 323fa9dd6ef..81e9f59e578 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -87,7 +87,7 @@ struct WebTargetSelector : public std::unary_function<Unit*, bool> } private: - const Unit* _maexxna; + Unit const* _maexxna; }; class boss_maexxna : public CreatureScript diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index 9c7ae6063a5..04a6e6787f5 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -17,9 +17,7 @@ #include "ScriptMgr.h" #include "AreaBoundary.h" -#include "Creature.h" #include "CreatureAI.h" -#include "EventMap.h" #include "GameObject.h" #include "InstanceScript.h" #include "Map.h" @@ -479,7 +477,7 @@ class instance_naxxramas : public InstanceMapScript std::list<TempSummon*> spawns; instance->SummonCreatureGroup(nextFroggerWave, &spawns); if (!spawns.empty()) - (*spawns.begin())->GetMotionMaster()->MovePath(10 * NPC_FROGGER + nextFroggerWave, false); + spawns.front()->GetMotionMaster()->MovePath(10 * NPC_FROGGER + nextFroggerWave, false); events.Repeat(Seconds(1) + Milliseconds(666)); nextFroggerWave = (nextFroggerWave+1) % 3; break; diff --git a/src/server/scripts/Northrend/Naxxramas/naxxramas.h b/src/server/scripts/Northrend/Naxxramas/naxxramas.h index 82f148af184..23e2260a563 100644 --- a/src/server/scripts/Northrend/Naxxramas/naxxramas.h +++ b/src/server/scripts/Northrend/Naxxramas/naxxramas.h @@ -215,7 +215,8 @@ enum NAXInstanceTexts SAY_DIALOGUE_SAPPHIRON_LICH_KING2 = 2 }; -template<typename AI, typename T> + +template <class AI, class T> inline AI* GetNaxxramasAI(T* obj) { return GetInstanceAI<AI>(obj, NaxxramasScriptName); diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 4e5cb1eb864..f3b22adb5b7 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -30,7 +30,6 @@ Script Data End */ #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" -#include "Spell.h" #include "SpellInfo.h" #include "SpellScript.h" #include "TemporarySummon.h" @@ -1841,7 +1840,7 @@ class spell_malygos_vortex_visual : public SpellScriptLoader if (InstanceScript* instance = caster->GetInstanceScript()) { // Teleport spell - I'm not sure but might be it must be cast by each vehicle when it's passenger leaves it. - if (Creature* trigger = caster->GetMap()->GetCreature(instance->GetGuidData(DATA_TRIGGER))) + if (Creature* trigger = ObjectAccessor::GetCreature(*caster, instance->GetGuidData(DATA_TRIGGER))) trigger->CastSpell(targetPlayer, SPELL_VORTEX_6, true); } } diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h index 4c3faf67b5a..df840177a4d 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h @@ -87,10 +87,10 @@ enum EOEInstanceSpells SPELL_SUMMOM_RED_DRAGON_BUDDY = 56070 }; -template<typename AI> -inline AI* GetEyeOfEternityAI(Creature* creature) +template <class AI, class T> +inline AI* GetEyeOfEternityAI(T* obj) { - return GetInstanceAI<AI>(creature, EoEScriptName); + return GetInstanceAI<AI>(obj, EoEScriptName); } #endif diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index aa4707ea863..a3d881ec279 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -17,12 +17,12 @@ #include "ScriptMgr.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "InstanceScript.h" #include "nexus.h" #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" -#include "GameObjectAI.h" #include "SpellScript.h" enum Spells diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 48b1772ea95..3a250908c7f 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -23,7 +23,6 @@ #include "nexus.h" #include "ScriptedCreature.h" #include "TemporarySummon.h" -#include "World.h" enum Spells { diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 1bc6a8c429e..4ac561a865a 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -236,7 +236,7 @@ class npc_azure_ring_captain : public CreatureScript { switch (action) { - case ACTION_CALL_DRAGON_EVENT: + case ACTION_CALL_DRAGON_EVENT: if (Creature* varos = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_VAROS))) { if (Unit* victim = varos->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0)) diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 76914921416..50010ead3d0 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -18,7 +18,6 @@ #include "ScriptMgr.h" #include "Creature.h" #include "CreatureAI.h" -#include "EventMap.h" #include "GameObject.h" #include "InstanceScript.h" #include "Map.h" @@ -123,11 +122,10 @@ class instance_oculus : public InstanceMapScript void OnGameObjectCreate(GameObject* go) override { + InstanceScript::OnGameObjectCreate(go); + switch (go->GetEntry()) { - case GO_DRAGON_CAGE_DOOR: - AddDoor(go, true); - break; case GO_EREGOS_CACHE_N: case GO_EREGOS_CACHE_H: EregosCacheGUID = go->GetGUID(); @@ -137,18 +135,6 @@ class instance_oculus : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) override - { - switch (go->GetEntry()) - { - case GO_DRAGON_CAGE_DOOR: - AddDoor(go, false); - break; - default: - break; - } - } - void OnUnitDeath(Unit* unit) override { Creature* creature = unit->ToCreature(); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 29962252e21..d0004bf0c9e 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -26,8 +26,6 @@ #include "ScriptedGossip.h" #include "Spell.h" #include "SpellAuraEffects.h" -#include "SpellAuras.h" -#include "SpellInfo.h" #include "SpellScript.h" enum GossipNPCs @@ -267,7 +265,7 @@ class npc_ruby_emerald_amber_drake : public CreatureScript Initialize(); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (Unit* creator = ObjectAccessor::GetUnit(*me, me->GetCreatorGUID())) if (spell->Id == SPELL_GPS) diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h index a5ba299e931..6721a9805f0 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.h +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.h @@ -107,10 +107,10 @@ enum OCMisc POINT_MOVE_OUT = 1 }; -template<typename AI> -inline AI* GetOculusAI(Creature* creature) +template <class AI, class T> +inline AI* GetOculusAI(T* obj) { - return GetInstanceAI<AI>(creature, OculusScriptName); + return GetInstanceAI<AI>(obj, OculusScriptName); } #endif // OCULUS_H_ diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index df10cc676ed..337ccc79a0e 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -146,7 +146,7 @@ public: Talk(SAY_SLAY); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_DISPERSE) { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 0bb78ec7d8b..2ebe574753e 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -436,7 +436,7 @@ public: } } - void SpellHit(Unit* /*pCaster*/, const SpellInfo* pSpell) override + void SpellHit(Unit* /*pCaster*/, SpellInfo const* pSpell) override { // This is the dummy effect of the spells if (pSpell->Id == SPELL_SHATTER) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h index 360e9316e50..7db29ea3028 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h @@ -51,10 +51,10 @@ enum HOLGameObjectIds GO_LOKEN_THRONE = 192654 }; -template<typename AI> -inline AI* GetHallsOfLightningAI(Creature* creature) +template <class AI, class T> +inline AI* GetHallsOfLightningAI(T* obj) { - return GetInstanceAI<AI>(creature, HoLScriptName); + return GetInstanceAI<AI>(obj, HoLScriptName); } #endif // HALLS_OF_LIGHTNING_H_ diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp index d631bdc437a..735d80cdbe1 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -27,7 +27,7 @@ DoorData const doorData[] = { GO_VOLKHAN_DOOR, DATA_VOLKHAN, DOOR_TYPE_PASSAGE }, { GO_IONAR_DOOR, DATA_IONAR, DOOR_TYPE_PASSAGE }, { GO_LOKEN_DOOR, DATA_LOKEN, DOOR_TYPE_PASSAGE }, - { 0, 0, DOOR_TYPE_ROOM } // END + { 0, 0, DOOR_TYPE_ROOM } // END }; class instance_halls_of_lightning : public InstanceMapScript @@ -67,13 +67,10 @@ class instance_halls_of_lightning : public InstanceMapScript void OnGameObjectCreate(GameObject* go) override { + InstanceScript::OnGameObjectCreate(go); + switch (go->GetEntry()) { - case GO_VOLKHAN_DOOR: - case GO_IONAR_DOOR: - case GO_LOKEN_DOOR: - AddDoor(go, true); - break; case GO_LOKEN_THRONE: LokenGlobeGUID = go->GetGUID(); break; @@ -82,20 +79,6 @@ class instance_halls_of_lightning : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) override - { - switch (go->GetEntry()) - { - case GO_VOLKHAN_DOOR: - case GO_IONAR_DOOR: - case GO_LOKEN_DOOR: - AddDoor(go, false); - break; - default: - break; - } - } - bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index dce0790d997..f17ed5148f5 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -20,8 +20,8 @@ #include "InstanceScript.h" #include "ObjectAccessor.h" #include "Player.h" -#include "ScriptedGossip.h" #include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" #include "TemporarySummon.h" enum Texts diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h index 5b0c203d55d..9cbf93e9866 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h @@ -69,10 +69,10 @@ enum HOSGameObjectIds GO_TRIBUNAL_SKY_FLOOR = 191527 }; -template<typename AI> -inline AI* GetHallsOfStoneAI(Creature* creature) +template <class AI, class T> +inline AI* GetHallsOfStoneAI(T* obj) { - return GetInstanceAI<AI>(creature, HoSScriptName); + return GetInstanceAI<AI>(obj, HoSScriptName); } #endif // HALLS_OF_STONE_H_ diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index 8a63b0e85e4..41853110de9 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -74,6 +74,8 @@ class instance_halls_of_stone : public InstanceMapScript void OnGameObjectCreate(GameObject* go) override { + InstanceScript::OnGameObjectCreate(go); + switch (go->GetEntry()) { case GO_ABEDNEUM: @@ -97,21 +99,6 @@ class instance_halls_of_stone : public InstanceMapScript case GO_TRIBUNAL_SKY_FLOOR: TribunalSkyFloorGUID = go->GetGUID(); break; - case GO_SJONNIR_DOOR: - AddDoor(go, true); - break; - default: - break; - } - } - - void OnGameObjectRemove(GameObject* go) override - { - switch (go->GetEntry()) - { - case GO_SJONNIR_DOOR: - AddDoor(go, false); - break; default: break; } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index 66da79cc0a2..cac88a9edb9 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -16,14 +16,12 @@ */ #include "ScriptMgr.h" -#include "CellImpl.h" -#include "GridNotifiersImpl.h" #include "InstanceScript.h" +#include "Map.h" #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" #include "SpellAuras.h" -#include "SpellInfo.h" #include "SpellScript.h" #include "TemporarySummon.h" #include "ulduar.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index 7843bbc7e63..09a4081c4f2 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -19,11 +19,9 @@ #include "InstanceScript.h" #include "Map.h" #include "MotionMaster.h" -#include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" #include "SpellAuraEffects.h" -#include "SpellInfo.h" #include "SpellScript.h" #include "ulduar.h" @@ -280,7 +278,7 @@ class boss_general_vezax : public CreatureScript /* Player Range Check Purpose: If there are playersMin people within rangeMin, rangeMax: return a random players in that range. - If not, return NULL and allow other target selection + If not, return nullptr and allow other target selection */ Unit* CheckPlayersInRange(uint8 playersMin, float rangeMin, float rangeMax) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 38912c91b78..0069920827a 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -962,7 +962,7 @@ class npc_toasty_fire : public CreatureScript DoCast(me, SPELL_SINGED, true); } - void SpellHit(Unit* /*who*/, const SpellInfo* spell) override + void SpellHit(Unit* /*who*/, SpellInfo const* spell) override { if (spell->Id == SPELL_BLOCK_OF_ICE || spell->Id == SPELL_ICE_SHARD || spell->Id == SPELL_ICE_SHARD_HIT) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index b2c8dcc9022..32ac9ff5833 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "GameTime.h" #include "ScriptMgr.h" +#include "GameTime.h" #include "InstanceScript.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index 0a2c163906e..4e499f414b0 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -22,8 +22,6 @@ #include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "SpellAuraEffects.h" -#include "SpellAuras.h" -#include "SpellInfo.h" #include "SpellScript.h" #include "ulduar.h" #include "Vehicle.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 94fd523542b..91e028c4873 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -17,6 +17,7 @@ #include "ScriptMgr.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "GridNotifiers.h" #include "InstanceScript.h" #include "MotionMaster.h" @@ -25,7 +26,6 @@ #include "SpellAuraEffects.h" #include "SpellScript.h" #include "TemporarySummon.h" -#include "GameObjectAI.h" #include "ulduar.h" #include "Vehicle.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index ec543fc1768..2973926c8ea 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -17,16 +17,15 @@ #include "ScriptMgr.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "InstanceScript.h" #include "MotionMaster.h" #include "MoveSplineInit.h" #include "ObjectAccessor.h" -#include "PassiveAI.h" #include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" #include "SpellInfo.h" -#include "GameObjectAI.h" #include "SpellScript.h" #include "TemporarySummon.h" #include "ulduar.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 062e5bdb884..df299a03c50 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -15,23 +15,22 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "ScriptMgr.h" +#include "AreaBoundary.h" +#include "CellImpl.h" +#include "GridNotifiersImpl.h" +#include "InstanceScript.h" +#include "MotionMaster.h" #include "MoveSplineInit.h" +#include "ObjectAccessor.h" #include "Player.h" -#include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "SpellScript.h" #include "SpellAuraEffects.h" +#include "SpellMgr.h" +#include "SpellScript.h" #include "TypeContainerVisitor.h" -#include "CellImpl.h" -#include "GridNotifiersImpl.h" #include "ulduar.h" -#include "SpellAuras.h" -#include "SpellMgr.h" #include <G3D/Vector3.h> -#include "AreaBoundary.h" -#include "InstanceScript.h" -#include "ObjectAccessor.h" -#include "MotionMaster.h" enum Spells { @@ -321,8 +320,7 @@ enum DisplayIds THORIM_WEAPON_DISPLAY_ID = 45900 }; -uint32 const LightningOrbPathSize = 8; -G3D::Vector3 const LightningOrbPath[LightningOrbPathSize] = +Position const LightningOrbPath[] = { { 2134.889893f, -298.632996f, 438.247467f }, { 2134.570068f, -440.317993f, 438.247467f }, @@ -333,6 +331,7 @@ G3D::Vector3 const LightningOrbPath[LightningOrbPathSize] = { 2202.208008f, -262.939270f, 412.168976f }, { 2182.310059f, -263.233093f, 414.739410f } }; +std::size_t const LightningOrbPathSize = std::extent<decltype(LightningOrbPath)>::value; // used for trash jump calculation Position const ArenaCenter = { 2134.77f, -262.307f }; @@ -356,7 +355,7 @@ class HeightPositionCheck bool operator()(Position const* pos) const { - return pos->GetPositionZ() > THORIM_BALCONY_Z_CHECK == _ret; + return (pos->GetPositionZ() > THORIM_BALCONY_Z_CHECK) == _ret; } private: @@ -633,9 +632,14 @@ class boss_thorim : public CreatureScript summon->SetReactState(REACT_PASSIVE); summon->CastSpell(summon, SPELL_LIGHTNING_DESTRUCTION, true); - summon->GetMotionMaster()->MovePoint(EVENT_CHARGE_PREPATH, LightningOrbPath[LightningOrbPathSize - 1].x, LightningOrbPath[LightningOrbPathSize - 1].y, LightningOrbPath[LightningOrbPathSize - 1].z, false); + summon->GetMotionMaster()->MovePoint(EVENT_CHARGE_PREPATH, LightningOrbPath[LightningOrbPathSize - 1], false); - Movement::PointsArray path(LightningOrbPath, LightningOrbPath + LightningOrbPathSize); + Movement::PointsArray path; + path.reserve(LightningOrbPathSize); + std::transform(std::begin(LightningOrbPath), std::end(LightningOrbPath), std::back_inserter(path), [](Position const& pos) + { + return G3D::Vector3(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ()); + }); Movement::MoveSplineInit init(summon); init.MovebyPath(path); @@ -1867,11 +1871,7 @@ class spell_thorim_stormhammer : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo( - { - SPELL_STORMHAMMER_BOOMERANG, - SPELL_DEAFENING_THUNDER - }); + return ValidateSpellInfo({ SPELL_STORMHAMMER_BOOMERANG, SPELL_DEAFENING_THUNDER }); } void FilterTargets(std::list<WorldObject*>& targets) @@ -1929,11 +1929,7 @@ class spell_thorim_stormhammer_sif : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo( - { - SPELL_STORMHAMMER_BOOMERANG, - SPELL_SIF_TRANSFORM - }); + return ValidateSpellInfo({ SPELL_STORMHAMMER_BOOMERANG, SPELL_SIF_TRANSFORM }); } void HandleScript(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index c6fc0925bf6..ad0105717de 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -28,7 +28,6 @@ #include "ObjectAccessor.h" #include "PassiveAI.h" #include "ScriptedCreature.h" -#include "Spell.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "ulduar.h" @@ -940,13 +939,7 @@ class spell_xt002_heart_overload_periodic : public SpellScriptLoader bool Validate(SpellInfo const* /*spell*/) override { - return ValidateSpellInfo( - { - SPELL_ENERGY_ORB, - SPELL_RECHARGE_BOOMBOT, - SPELL_RECHARGE_PUMMELER, - SPELL_RECHARGE_SCRAPBOT - }); + return ValidateSpellInfo({ SPELL_ENERGY_ORB, SPELL_RECHARGE_BOOMBOT, SPELL_RECHARGE_PUMMELER, SPELL_RECHARGE_SCRAPBOT }); } void HandleScript(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index 8141e3d66ec..7855902bd8d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -27,8 +27,6 @@ #include "ScriptedCreature.h" #include "Spell.h" #include "SpellAuraEffects.h" -#include "SpellAuras.h" -#include "SpellInfo.h" #include "SpellScript.h" #include "TemporarySummon.h" #include "ulduar.h" diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index b22b5d242ff..a8567a60a64 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -17,18 +17,19 @@ #include "ScriptMgr.h" #include "AreaBoundary.h" +#include "CreatureAI.h" #include "GameObject.h" #include "InstanceScript.h" #include "Item.h" #include "Map.h" #include "Player.h" -#include "ScriptedCreature.h" #include "Spell.h" #include "SpellScript.h" #include "TemporarySummon.h" #include "ulduar.h" #include "Vehicle.h" #include "WorldStatePackets.h" +#include <sstream> static BossBoundaryData const boundaries = { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h index 4b2708f8a50..e845a503619 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h @@ -504,8 +504,6 @@ enum YoggSaronIllusions STORMWIND_ILLUSION = 2, }; -#define RegisterUlduarCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetUlduarAI) - class KeeperDespawnEvent : public BasicEvent { public: @@ -523,10 +521,12 @@ private: uint32 _despawnTimer; }; -template<typename AI, typename T> +template <class AI, class T> inline AI* GetUlduarAI(T* obj) { - return GetInstanceAI<AI>(obj, UlduarScriptName); + return GetInstanceAI<AI, T>(obj, UlduarScriptName); } +#define RegisterUlduarCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetUlduarAI) + #endif diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index fe0396efbb0..d39c822dddb 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -28,8 +28,6 @@ EndScriptData */ #include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "Spell.h" -#include "SpellAuraEffects.h" -#include "SpellInfo.h" #include "SpellScript.h" #include "utgarde_keep.h" diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index 0c9f8d43b28..f6b4c3365fa 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -20,6 +20,7 @@ #include "GameObject.h" #include "InstanceScript.h" #include "utgarde_keep.h" +#include <sstream> DoorData const doorData[] = { @@ -88,6 +89,8 @@ class instance_utgarde_keep : public InstanceMapScript void OnGameObjectCreate(GameObject* go) override { + InstanceScript::OnGameObjectCreate(go); + switch (go->GetEntry()) { case GO_BELLOW_1: @@ -126,23 +129,6 @@ class instance_utgarde_keep : public InstanceMapScript Forges[2].AnvilGUID = go->GetGUID(); HandleGameObject(ObjectGuid::Empty, Forges[2].Event != NOT_STARTED, go); break; - case GO_GIANT_PORTCULLIS_1: - case GO_GIANT_PORTCULLIS_2: - AddDoor(go, true); - break; - default: - break; - } - } - - void OnGameObjectRemove(GameObject* go) override - { - switch (go->GetEntry()) - { - case GO_GIANT_PORTCULLIS_1: - case GO_GIANT_PORTCULLIS_2: - AddDoor(go, false); - break; default: break; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h index 01f4cf00551..d23c211b89e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h @@ -87,10 +87,10 @@ struct ForgeInfo uint32 Event; }; -template<typename AI> -inline AI* GetUtgardeKeepAI(Creature* creature) +template <class AI, class T> +inline AI* GetUtgardeKeepAI(T* obj) { - return GetInstanceAI<AI>(creature, UKScriptName); + return GetInstanceAI<AI>(obj, UKScriptName); } #endif // UTGARDE_KEEP_H_ diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 19573eb24ff..f23e8fe27dc 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -16,16 +16,15 @@ */ #include "ScriptMgr.h" -#include "GameObject.h" #include "InstanceScript.h" +#include "GameObject.h" +#include "GameObjectAI.h" #include "MotionMaster.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" +#include "SpellScript.h" #include "TemporarySummon.h" -#include "GameObjectAI.h" #include "utgarde_pinnacle.h" -#include "SpellScript.h" -#include "SpellAuraEffects.h" enum Spells { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 4e35b0b4fc5..4d2315c4348 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -20,7 +20,6 @@ #include "InstanceScript.h" #include "MotionMaster.h" #include "MoveSplineInit.h" -#include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" #include "SpellAuras.h" @@ -442,7 +441,7 @@ public: } } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_LAUNCH_HARPOON) if (Creature* skadi = _instance->GetCreature(DATA_SKADI_THE_RUTHLESS)) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 45c812ff19c..414602ce8b3 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -20,7 +20,6 @@ #include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "SpellInfo.h" -#include "SpellScript.h" #include "TemporarySummon.h" #include "utgarde_pinnacle.h" diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp index c5621bc9fe5..47e95d0fc7c 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp @@ -17,7 +17,6 @@ #include "ScriptMgr.h" #include "AreaBoundary.h" -#include "Creature.h" #include "GameObject.h" #include "InstanceScript.h" #include "utgarde_pinnacle.h" diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h index 8fbe9038e66..c5566d9d940 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h @@ -97,7 +97,7 @@ enum UPGameObjectIds GO_KING_YMIRON_DOOR = 192174 }; -template<class AI, class T> +template <class AI, class T> inline AI* GetUtgardePinnacleAI(T* obj) { return GetInstanceAI<AI>(obj, UPScriptName); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index 861e46ab300..6316d4ee2fc 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -94,7 +94,7 @@ class boss_emalon : public CreatureScript { BossAI::JustSummoned(summoned); - // AttackStart has NULL-check for victim + // AttackStart has nullptr-check for victim if (summoned->AI()) summoned->AI()->AttackStart(me->GetVictim()); } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h index dee2c371360..0a7b7547a4a 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h +++ b/src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h @@ -52,10 +52,10 @@ enum VAAchievementSpells SPELL_EARTH_WIND_FIRE_ACHIEVEMENT_CHECK = 68308, }; -template<typename AI> -inline AI* GetVaultOfArchavonAI(Creature* creature) +template <class AI, class T> +inline AI* GetVaultOfArchavonAI(T* obj) { - return GetInstanceAI<AI>(creature, VoAScriptName); + return GetInstanceAI<AI>(obj, VoAScriptName); } #endif diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 8d7231d2ea3..eecd80e777d 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -20,7 +20,6 @@ #include "MotionMaster.h" #include "ScriptedCreature.h" #include "SpellAuras.h" -#include "SpellInfo.h" #include "SpellScript.h" #include "violet_hold.h" diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 647b25e2e15..5046342118e 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -19,7 +19,6 @@ #include "InstanceScript.h" #include "ScriptedCreature.h" #include "SpellAuraEffects.h" -#include "SpellInfo.h" #include "SpellScript.h" #include "violet_hold.h" diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 4cb4a6adee4..3abd0a6703d 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -25,8 +25,9 @@ #include "Player.h" #include "TaskScheduler.h" #include "TemporarySummon.h" -#include "WorldStatePackets.h" #include "violet_hold.h" +#include "WorldStatePackets.h" +#include <sstream> /* * TODO: diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 5a83845fbe3..7cd5ef0845b 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -23,8 +23,8 @@ #include "MotionMaster.h" #include "Player.h" #include "GameObjectAI.h" -#include "ScriptedGossip.h" #include "ScriptedEscortAI.h" +#include "ScriptedGossip.h" #include "SpellAuraEffects.h" #include "SpellScript.h" #include "TemporarySummon.h" @@ -237,7 +237,7 @@ Position const FifthPortalWPs[] = //{1827.100342f, 801.605957f, 44.363358f} }; -Position const SixthPoralWPs[] = +Position const SixthPortalWPs[] = { {1888.861084f, 805.074768f, 38.375790f}, {1869.793823f, 804.135804f, 38.647018f}, @@ -542,7 +542,7 @@ class npc_azure_saboteur : public CreatureScript _bossId = _instance->GetData(DATA_2ND_BOSS); } - template<size_t N> + template <size_t N> void StartSmoothPath(Position const (&path)[N]) { me->GetMotionMaster()->MoveSmoothPath(POINT_INTRO, &path[0], N, false); @@ -842,7 +842,7 @@ struct violet_hold_trashAI : public EscortAI _scheduler.CancelAll(); } - template<size_t N> + template <size_t N> Position const* GetPathAndInitLastWaypointFrom(Position const (&path)[N]) { _lastWaypointId = N - 1; @@ -881,7 +881,7 @@ struct violet_hold_trashAI : public EscortAI path = GetPathAndInitLastWaypointFrom(FifthPortalWPs); break; case 5: - path = GetPathAndInitLastWaypointFrom(SixthPoralWPs); + path = GetPathAndInitLastWaypointFrom(SixthPortalWPs); break; default: path = GetPathAndInitLastWaypointFrom(DefaultPortalWPs); @@ -1291,7 +1291,7 @@ class npc_violet_hold_defense_system : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { - return new npc_violet_hold_defense_systemAI(creature); + return GetVioletHoldAI<npc_violet_hold_defense_systemAI>(creature); } }; diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.h b/src/server/scripts/Northrend/VioletHold/violet_hold.h index 5f0b55490c8..d9202f03383 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.h +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.h @@ -155,7 +155,7 @@ enum VHInstanceMisc POINT_INTRO = 1 }; -template<class AI, class T> +template <class AI, class T> inline AI* GetVioletHoldAI(T* obj) { return GetInstanceAI<AI>(obj, VioletHoldScriptName); diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 7901c1fe6e5..6590046a80e 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -91,7 +91,7 @@ public: Initialize(); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (phase || spell->Id != SPELL_SET_CART) return; @@ -1458,7 +1458,7 @@ public: AttackStart(who); } - void SpellHit(Unit* pCaster, const SpellInfo* pSpell) override + void SpellHit(Unit* pCaster, SpellInfo const* pSpell) override { if (pSpell->Id == SPELL_ARCANE_CHAINS && pCaster->GetTypeId() == TYPEID_PLAYER && !HealthAbovePct(50) && !bEnslaved) { @@ -1568,7 +1568,7 @@ public: { } - void SpellHit(Unit* unit, const SpellInfo* spell) override + void SpellHit(Unit* unit, SpellInfo const* spell) override { if (spell->Id == SPELL_NEURAL_NEEDLE && unit->GetTypeId() == TYPEID_PLAYER) if (Player* player = unit->ToPlayer()) @@ -1646,7 +1646,7 @@ public: void JustDied(Unit* /*killer*/) override { - if (Player* player=GetPlayerForEscort()) + if (Player* player = GetPlayerForEscort()) player->FailQuest(QUEST_ESCAPING_THE_MIST); } @@ -2161,9 +2161,9 @@ enum HiddenCultist SAY_HIDDEN_CULTIST_4 = 3 }; -const char* GOSSIP_ITEM_TOM_HEGGER = "What do you know about the Cult of the Damned?"; -const char* GOSSIP_ITEM_GUARD_MITCHELLS = "How long have you worked for the Cult of the Damned?"; -const char* GOSSIP_ITEM_SALTY_JOHN_THORPE = "I have a reason to believe you're involved in the cultist activity"; +char const* GOSSIP_ITEM_TOM_HEGGER = "What do you know about the Cult of the Damned?"; +char const* GOSSIP_ITEM_GUARD_MITCHELLS = "How long have you worked for the Cult of the Damned?"; +char const* GOSSIP_ITEM_SALTY_JOHN_THORPE = "I have a reason to believe you're involved in the cultist activity"; class npc_hidden_cultist : public CreatureScript { @@ -2291,7 +2291,7 @@ public: bool GossipHello(Player* player) override { uint32 uiGossipText = 0; - const char* charGossipItem; + char const* charGossipItem; switch (me->GetEntry()) { diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index 7d123e54413..fca0eed9bf6 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -28,9 +28,9 @@ Script Data End */ #include "Mail.h" #include "Map.h" #include "MotionMaster.h" +#include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "Player.h" /******************************************************* * npc_mageguard_dalaran @@ -169,9 +169,8 @@ class npc_minigob_manabonk : public CreatureScript Player* SelectTargetInDalaran() { std::vector<Player*> PlayerInDalaranList; - PlayerInDalaranList.clear(); - Map::PlayerList const &players = me->GetMap()->GetPlayers(); + Map::PlayerList const& players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) if (Player* player = itr->GetSource()->ToPlayer()) if (player->GetZoneId() == ZONE_DALARAN && !player->IsFlying() && !player->IsMounted() && !player->IsGameMaster()) diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index b55c684e527..906c223a5a3 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -33,7 +33,7 @@ EndContentData */ #include "Player.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" -#include "SpellAuraEffects.h" +#include "SpellInfo.h" #include "SpellScript.h" #include "Vehicle.h" @@ -640,7 +640,7 @@ class npc_torturer_lecraft : public CreatureScript Talk (SAY_AGGRO, player); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id != SPELL_HIGH_EXECUTORS_BRANDING_IRON) return; @@ -715,7 +715,7 @@ class at_nearby_messenger_torvus : public AreaTriggerScript public: at_nearby_messenger_torvus() : AreaTriggerScript("at_nearby_messenger_torvus") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/, bool entered) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*at*/, bool entered) override { if (player->IsAlive() && entered) if (Quest const* quest = sObjectMgr->GetQuestTemplate(QUEST_MESSAGE_FROM_THE_WEST)) diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index 4d4f6d74cc3..6394ffffaf2 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -298,7 +298,7 @@ public: _gender = Data; } - void SpellHit(Unit* Caster, const SpellInfo* Spell) override + void SpellHit(Unit* Caster, SpellInfo const* Spell) override { if (Spell->Id == SPELL_OUTHOUSE_GROANS) { @@ -493,7 +493,7 @@ public: me->DespawnOrUnsummon(_despawnTimer); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id == SPELL_RENEW_SKIRMISHER && caster->GetTypeId() == TYPEID_PLAYER && caster->ToPlayer()->GetQuestStatus(QUEST_OVERWHELMED) == QUEST_STATUS_INCOMPLETE) @@ -953,12 +953,7 @@ public: bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo( - { - SPELL_WARHEAD_Z_CHECK, - SPELL_WARHEAD_SEEKING_LUMBERSHIP, - SPELL_WARHEAD_FUSE - }); + return ValidateSpellInfo({ SPELL_WARHEAD_Z_CHECK, SPELL_WARHEAD_SEEKING_LUMBERSHIP, SPELL_WARHEAD_FUSE }); } void HandleDummy(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index bae7b81a96c..e84d65c9349 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -226,7 +226,7 @@ public: me->DespawnOrUnsummon(); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id != SPELL_ICE_LANCE) return; @@ -1128,13 +1128,6 @@ class spell_close_rift : public SpellScriptLoader { PrepareAuraScript(spell_close_rift_AuraScript); - public: - spell_close_rift_AuraScript() - { - _counter = 0; - } - - private: bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DESPAWN_RIFT }); @@ -1152,7 +1145,7 @@ class spell_close_rift : public SpellScriptLoader } private: - uint8 _counter; + uint8 _counter = 0; }; diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index d778c5201cd..3c612756910 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -15,6 +15,7 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "ScriptMgr.h" #include "Battlefield.h" #include "BattlefieldMgr.h" #include "BattlefieldWG.h" @@ -25,7 +26,6 @@ #include "Player.h" #include "ScriptedCreature.h" #include "ScriptedGossip.h" -#include "ScriptMgr.h" #include "ScriptSystem.h" #include "SpellScript.h" #include "Vehicle.h" diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 0c6ffbd4e82..c5340b4e5e7 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -17,9 +17,9 @@ #include "ScriptMgr.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "MotionMaster.h" #include "ObjectAccessor.h" -#include "GameObjectAI.h" #include "Player.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" @@ -89,7 +89,7 @@ public: me->setDeathState(DEAD); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id == SPELL_UNLOCK_SHACKLE) { @@ -145,7 +145,7 @@ public: void MoveInLineOfSight(Unit* /*who*/) override { } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_FREE_RAGECLAW) { @@ -653,7 +653,7 @@ class spell_random_ingredient_aura : public SpellScriptLoader { SPELL_RANDOM_INGREDIENT_EASY, SPELL_RANDOM_INGREDIENT_MEDIUM, - SPELL_RANDOM_INGREDIENT_HARD, + SPELL_RANDOM_INGREDIENT_HARD }); } @@ -929,7 +929,7 @@ public: Reset(); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id != GYMERS_GRAB) return; diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index 5728331a762..3a52febaafd 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -22,7 +22,6 @@ #include "Player.h" #include "WorldStatePackets.h" - uint32 const OutdoorPvPHPBuffZonesNum = 6; // HP, citadel, ramparts, blood furnace, shattered halls, mag's lair uint32 const OutdoorPvPHPBuffZones[OutdoorPvPHPBuffZonesNum] = { 3483, 3563, 3562, 3713, 3714, 3836 }; @@ -253,7 +252,7 @@ void OPvPCapturePointHP::ChangeState() break; } - Map* map = sMapMgr->FindMap(530, 0); + Map* map = m_PvP->GetMap(); auto bounds = map->GetGameObjectBySpawnIdStore().equal_range(m_capturePointSpawnId); for (auto itr = bounds.first; itr != bounds.second; ++itr) itr->second->SetGoArtKit(artkit); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index 23aafd28899..5c85f1e6213 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -18,9 +18,9 @@ #include "ScriptMgr.h" #include "Creature.h" #include "GameObject.h" -#include "MapManager.h" #include "ObjectMgr.h" #include "OutdoorPvPNA.h" +#include "Map.h" #include "Player.h" #include "WorldStatePackets.h" @@ -155,30 +155,30 @@ uint32 OPvPCapturePointNA::GetAliveGuardsCount() { switch (itr->first) { - case NA_NPC_GUARD_01: - case NA_NPC_GUARD_02: - case NA_NPC_GUARD_03: - case NA_NPC_GUARD_04: - case NA_NPC_GUARD_05: - case NA_NPC_GUARD_06: - case NA_NPC_GUARD_07: - case NA_NPC_GUARD_08: - case NA_NPC_GUARD_09: - case NA_NPC_GUARD_10: - case NA_NPC_GUARD_11: - case NA_NPC_GUARD_12: - case NA_NPC_GUARD_13: - case NA_NPC_GUARD_14: - case NA_NPC_GUARD_15: - { - auto bounds = m_PvP->GetMap()->GetCreatureBySpawnIdStore().equal_range(itr->second); - for (auto itr2 = bounds.first; itr2 != bounds.second; ++itr2) - if (itr2->second->IsAlive()) - ++cnt; - break; - } - default: - break; + case NA_NPC_GUARD_01: + case NA_NPC_GUARD_02: + case NA_NPC_GUARD_03: + case NA_NPC_GUARD_04: + case NA_NPC_GUARD_05: + case NA_NPC_GUARD_06: + case NA_NPC_GUARD_07: + case NA_NPC_GUARD_08: + case NA_NPC_GUARD_09: + case NA_NPC_GUARD_10: + case NA_NPC_GUARD_11: + case NA_NPC_GUARD_12: + case NA_NPC_GUARD_13: + case NA_NPC_GUARD_14: + case NA_NPC_GUARD_15: + { + auto bounds = m_PvP->GetMap()->GetCreatureBySpawnIdStore().equal_range(itr->second); + for (auto itr2 = bounds.first; itr2 != bounds.second; ++itr2) + if (itr2->second->IsAlive()) + ++cnt; + break; + } + default: + break; } } return cnt; @@ -242,11 +242,11 @@ void OPvPCapturePointNA::DeSpawnGOs() void OPvPCapturePointNA::FactionTakeOver(uint32 team) { if (m_ControllingFaction) - sObjectMgr->RemoveGraveYardLink(NA_HALAA_GRAVEYARD, NA_HALAA_GRAVEYARD_ZONE, m_ControllingFaction, false); + sObjectMgr->RemoveGraveyardLink(NA_HALAA_GRAVEYARD, NA_HALAA_GRAVEYARD_ZONE, m_ControllingFaction, false); m_ControllingFaction = team; if (m_ControllingFaction) - sObjectMgr->AddGraveYardLink(NA_HALAA_GRAVEYARD, NA_HALAA_GRAVEYARD_ZONE, m_ControllingFaction, false); + sObjectMgr->AddGraveyardLink(NA_HALAA_GRAVEYARD, NA_HALAA_GRAVEYARD_ZONE, m_ControllingFaction, false); DeSpawnGOs(); DeSpawnNPCs(); SpawnGOsForTeam(team); @@ -488,11 +488,11 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player* player, GameObject* go) int32 retval = OPvPCapturePoint::HandleOpenGo(player, go); if (retval >= 0) { - const go_type * gos = nullptr; + go_type const* gos = nullptr; if (m_ControllingFaction == ALLIANCE) - gos=AllianceControlGOs; + gos = AllianceControlGOs; else if (m_ControllingFaction == HORDE) - gos=HordeControlGOs; + gos = HordeControlGOs; else return -1; @@ -503,101 +503,101 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player* player, GameObject* go) switch (retval) { - case NA_DESTROYED_ROOST_S: - del = NA_DESTROYED_ROOST_S; - add = NA_ROOST_S; - add2 = NA_BOMB_WAGON_S; - if (m_ControllingFaction == HORDE) - m_WyvernStateSouth = WYVERN_ALLIANCE; - else - m_WyvernStateSouth = WYVERN_HORDE; - UpdateWyvernRoostWorldState(NA_ROOST_S); - break; - case NA_DESTROYED_ROOST_N: - del = NA_DESTROYED_ROOST_N; - add = NA_ROOST_N; - add2 = NA_BOMB_WAGON_N; - if (m_ControllingFaction == HORDE) - m_WyvernStateNorth = WYVERN_ALLIANCE; - else - m_WyvernStateNorth = WYVERN_HORDE; - UpdateWyvernRoostWorldState(NA_ROOST_N); - break; - case NA_DESTROYED_ROOST_W: - del = NA_DESTROYED_ROOST_W; - add = NA_ROOST_W; - add2 = NA_BOMB_WAGON_W; - if (m_ControllingFaction == HORDE) - m_WyvernStateWest = WYVERN_ALLIANCE; - else - m_WyvernStateWest = WYVERN_HORDE; - UpdateWyvernRoostWorldState(NA_ROOST_W); - break; - case NA_DESTROYED_ROOST_E: - del = NA_DESTROYED_ROOST_E; - add = NA_ROOST_E; - add2 = NA_BOMB_WAGON_E; - if (m_ControllingFaction == HORDE) - m_WyvernStateEast = WYVERN_ALLIANCE; - else - m_WyvernStateEast = WYVERN_HORDE; - UpdateWyvernRoostWorldState(NA_ROOST_E); - break; - case NA_BOMB_WAGON_S: - del = NA_BOMB_WAGON_S; - del2 = NA_ROOST_S; - add = NA_DESTROYED_ROOST_S; - if (m_ControllingFaction == HORDE) - m_WyvernStateSouth = WYVERN_NEU_ALLIANCE; - else - m_WyvernStateSouth = WYVERN_NEU_HORDE; - UpdateWyvernRoostWorldState(NA_ROOST_S); - break; - case NA_BOMB_WAGON_N: - del = NA_BOMB_WAGON_N; - del2 = NA_ROOST_N; - add = NA_DESTROYED_ROOST_N; - if (m_ControllingFaction == HORDE) - m_WyvernStateNorth = WYVERN_NEU_ALLIANCE; - else - m_WyvernStateNorth = WYVERN_NEU_HORDE; - UpdateWyvernRoostWorldState(NA_ROOST_N); - break; - case NA_BOMB_WAGON_W: - del = NA_BOMB_WAGON_W; - del2 = NA_ROOST_W; - add = NA_DESTROYED_ROOST_W; - if (m_ControllingFaction == HORDE) - m_WyvernStateWest = WYVERN_NEU_ALLIANCE; - else - m_WyvernStateWest = WYVERN_NEU_HORDE; - UpdateWyvernRoostWorldState(NA_ROOST_W); - break; - case NA_BOMB_WAGON_E: - del = NA_BOMB_WAGON_E; - del2 = NA_ROOST_E; - add = NA_DESTROYED_ROOST_E; - if (m_ControllingFaction == HORDE) - m_WyvernStateEast = WYVERN_NEU_ALLIANCE; - else - m_WyvernStateEast = WYVERN_NEU_HORDE; - UpdateWyvernRoostWorldState(NA_ROOST_E); - break; - default: - return -1; - break; + case NA_DESTROYED_ROOST_S: + del = NA_DESTROYED_ROOST_S; + add = NA_ROOST_S; + add2 = NA_BOMB_WAGON_S; + if (m_ControllingFaction == HORDE) + m_WyvernStateSouth = WYVERN_ALLIANCE; + else + m_WyvernStateSouth = WYVERN_HORDE; + UpdateWyvernRoostWorldState(NA_ROOST_S); + break; + case NA_DESTROYED_ROOST_N: + del = NA_DESTROYED_ROOST_N; + add = NA_ROOST_N; + add2 = NA_BOMB_WAGON_N; + if (m_ControllingFaction == HORDE) + m_WyvernStateNorth = WYVERN_ALLIANCE; + else + m_WyvernStateNorth = WYVERN_HORDE; + UpdateWyvernRoostWorldState(NA_ROOST_N); + break; + case NA_DESTROYED_ROOST_W: + del = NA_DESTROYED_ROOST_W; + add = NA_ROOST_W; + add2 = NA_BOMB_WAGON_W; + if (m_ControllingFaction == HORDE) + m_WyvernStateWest = WYVERN_ALLIANCE; + else + m_WyvernStateWest = WYVERN_HORDE; + UpdateWyvernRoostWorldState(NA_ROOST_W); + break; + case NA_DESTROYED_ROOST_E: + del = NA_DESTROYED_ROOST_E; + add = NA_ROOST_E; + add2 = NA_BOMB_WAGON_E; + if (m_ControllingFaction == HORDE) + m_WyvernStateEast = WYVERN_ALLIANCE; + else + m_WyvernStateEast = WYVERN_HORDE; + UpdateWyvernRoostWorldState(NA_ROOST_E); + break; + case NA_BOMB_WAGON_S: + del = NA_BOMB_WAGON_S; + del2 = NA_ROOST_S; + add = NA_DESTROYED_ROOST_S; + if (m_ControllingFaction == HORDE) + m_WyvernStateSouth = WYVERN_NEU_ALLIANCE; + else + m_WyvernStateSouth = WYVERN_NEU_HORDE; + UpdateWyvernRoostWorldState(NA_ROOST_S); + break; + case NA_BOMB_WAGON_N: + del = NA_BOMB_WAGON_N; + del2 = NA_ROOST_N; + add = NA_DESTROYED_ROOST_N; + if (m_ControllingFaction == HORDE) + m_WyvernStateNorth = WYVERN_NEU_ALLIANCE; + else + m_WyvernStateNorth = WYVERN_NEU_HORDE; + UpdateWyvernRoostWorldState(NA_ROOST_N); + break; + case NA_BOMB_WAGON_W: + del = NA_BOMB_WAGON_W; + del2 = NA_ROOST_W; + add = NA_DESTROYED_ROOST_W; + if (m_ControllingFaction == HORDE) + m_WyvernStateWest = WYVERN_NEU_ALLIANCE; + else + m_WyvernStateWest = WYVERN_NEU_HORDE; + UpdateWyvernRoostWorldState(NA_ROOST_W); + break; + case NA_BOMB_WAGON_E: + del = NA_BOMB_WAGON_E; + del2 = NA_ROOST_E; + add = NA_DESTROYED_ROOST_E; + if (m_ControllingFaction == HORDE) + m_WyvernStateEast = WYVERN_NEU_ALLIANCE; + else + m_WyvernStateEast = WYVERN_NEU_HORDE; + UpdateWyvernRoostWorldState(NA_ROOST_E); + break; + default: + return -1; + break; } - if (del>-1) + if (del > -1) DelObject(del); - if (del2>-1) + if (del2 > -1) DelObject(del2); - if (add>-1) + if (add > -1) AddObject(add, gos[add].entry, gos[add].map, gos[add].pos, gos[add].rot); - if (add2>-1) + if (add2 > -1) AddObject(add2, gos[add2].entry, gos[add2].map, gos[add2].pos, gos[add2].rot); return retval; @@ -678,7 +678,7 @@ void OPvPCapturePointNA::ChangeState() break; } - auto bounds = sMapMgr->FindMap(530, 0)->GetGameObjectBySpawnIdStore().equal_range(m_capturePointSpawnId); + auto bounds = m_PvP->GetMap()->GetGameObjectBySpawnIdStore().equal_range(m_capturePointSpawnId); for (auto itr = bounds.first; itr != bounds.second; ++itr) itr->second->SetGoArtKit(artkit); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index 68d85ababfb..639ab1cd704 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -17,7 +17,7 @@ #include "ScriptMgr.h" #include "GameObject.h" -#include "MapManager.h" +#include "Map.h" #include "ObjectAccessor.h" #include "OutdoorPvPTF.h" #include "Player.h" @@ -337,46 +337,46 @@ void OPvPCapturePointTF::ChangeState() switch (m_State) { - case OBJECTIVESTATE_ALLIANCE: - { - m_TowerState = TF_TOWERSTATE_A; - artkit = 2; - uint32 alliance_towers = ((OutdoorPvPTF*)m_PvP)->GetAllianceTowersControlled(); - if (alliance_towers < TF_TOWER_NUM) - ((OutdoorPvPTF*)m_PvP)->SetAllianceTowersControlled(++alliance_towers); - - m_PvP->SendDefenseMessage(OutdoorPvPTFBuffZones[0], TEXT_SPIRIT_TOWER_TAKEN_ALLIANCE); - - for (GuidSet::iterator itr = m_activePlayers[0].begin(); itr != m_activePlayers[0].end(); ++itr) - if (Player* player = ObjectAccessor::FindPlayer(*itr)) - player->AreaExploredOrEventHappens(TF_ALLY_QUEST); - break; - } - case OBJECTIVESTATE_HORDE: - { - m_TowerState = TF_TOWERSTATE_H; - artkit = 1; - uint32 horde_towers = ((OutdoorPvPTF*)m_PvP)->GetHordeTowersControlled(); - if (horde_towers < TF_TOWER_NUM) - ((OutdoorPvPTF*)m_PvP)->SetHordeTowersControlled(++horde_towers); - - m_PvP->SendDefenseMessage(OutdoorPvPTFBuffZones[0], TEXT_SPIRIT_TOWER_TAKEN_HORDE); - - for (GuidSet::iterator itr = m_activePlayers[1].begin(); itr != m_activePlayers[1].end(); ++itr) - if (Player* player = ObjectAccessor::FindPlayer(*itr)) - player->AreaExploredOrEventHappens(TF_HORDE_QUEST); - break; - } - case OBJECTIVESTATE_NEUTRAL: - case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE: - case OBJECTIVESTATE_NEUTRAL_HORDE_CHALLENGE: - case OBJECTIVESTATE_ALLIANCE_HORDE_CHALLENGE: - case OBJECTIVESTATE_HORDE_ALLIANCE_CHALLENGE: - m_TowerState = TF_TOWERSTATE_N; - break; + case OBJECTIVESTATE_ALLIANCE: + { + m_TowerState = TF_TOWERSTATE_A; + artkit = 2; + uint32 alliance_towers = ((OutdoorPvPTF*)m_PvP)->GetAllianceTowersControlled(); + if (alliance_towers < TF_TOWER_NUM) + ((OutdoorPvPTF*)m_PvP)->SetAllianceTowersControlled(++alliance_towers); + + m_PvP->SendDefenseMessage(OutdoorPvPTFBuffZones[0], TEXT_SPIRIT_TOWER_TAKEN_ALLIANCE); + + for (GuidSet::iterator itr = m_activePlayers[0].begin(); itr != m_activePlayers[0].end(); ++itr) + if (Player* player = ObjectAccessor::FindPlayer(*itr)) + player->AreaExploredOrEventHappens(TF_ALLY_QUEST); + break; + } + case OBJECTIVESTATE_HORDE: + { + m_TowerState = TF_TOWERSTATE_H; + artkit = 1; + uint32 horde_towers = ((OutdoorPvPTF*)m_PvP)->GetHordeTowersControlled(); + if (horde_towers < TF_TOWER_NUM) + ((OutdoorPvPTF*)m_PvP)->SetHordeTowersControlled(++horde_towers); + + m_PvP->SendDefenseMessage(OutdoorPvPTFBuffZones[0], TEXT_SPIRIT_TOWER_TAKEN_HORDE); + + for (GuidSet::iterator itr = m_activePlayers[1].begin(); itr != m_activePlayers[1].end(); ++itr) + if (Player* player = ObjectAccessor::FindPlayer(*itr)) + player->AreaExploredOrEventHappens(TF_HORDE_QUEST); + break; + } + case OBJECTIVESTATE_NEUTRAL: + case OBJECTIVESTATE_NEUTRAL_ALLIANCE_CHALLENGE: + case OBJECTIVESTATE_NEUTRAL_HORDE_CHALLENGE: + case OBJECTIVESTATE_ALLIANCE_HORDE_CHALLENGE: + case OBJECTIVESTATE_HORDE_ALLIANCE_CHALLENGE: + m_TowerState = TF_TOWERSTATE_N; + break; } - auto bounds = sMapMgr->FindMap(530, 0)->GetGameObjectBySpawnIdStore().equal_range(m_capturePointSpawnId); + auto bounds = m_PvP->GetMap()->GetGameObjectBySpawnIdStore().equal_range(m_capturePointSpawnId); for (auto itr = bounds.first; itr != bounds.second; ++itr) itr->second->SetGoArtKit(artkit); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index f680db8eb2c..c181fd53902 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -162,11 +162,11 @@ bool OutdoorPvPZM::Update(uint32 diff) if (changed) { if (m_AllianceTowersControlled == ZM_NUM_BEACONS) - m_GraveYard->SetBeaconState(ALLIANCE); + m_Graveyard->SetBeaconState(ALLIANCE); else if (m_HordeTowersControlled == ZM_NUM_BEACONS) - m_GraveYard->SetBeaconState(HORDE); + m_Graveyard->SetBeaconState(HORDE); else - m_GraveYard->SetBeaconState(0); + m_Graveyard->SetBeaconState(0); } return changed; } @@ -175,12 +175,12 @@ void OutdoorPvPZM::HandlePlayerEnterZone(Player* player, uint32 zone) { if (player->GetTeam() == ALLIANCE) { - if (m_GraveYard->GetGraveYardState() & ZM_GRAVEYARD_A) + if (m_Graveyard->GetGraveyardState() & ZM_GRAVEYARD_A) player->CastSpell(player, ZM_CAPTURE_BUFF, true); } else { - if (m_GraveYard->GetGraveYardState() & ZM_GRAVEYARD_H) + if (m_Graveyard->GetGraveyardState() & ZM_GRAVEYARD_H) player->CastSpell(player, ZM_CAPTURE_BUFF, true); } OutdoorPvP::HandlePlayerEnterZone(player, zone); @@ -199,7 +199,7 @@ void OutdoorPvPZM::HandlePlayerLeaveZone(Player* player, uint32 zone) OutdoorPvPZM::OutdoorPvPZM() { m_TypeId = OUTDOOR_PVP_ZM; - m_GraveYard = nullptr; + m_Graveyard = nullptr; m_AllianceTowersControlled = 0; m_HordeTowersControlled = 0; } @@ -217,8 +217,8 @@ bool OutdoorPvPZM::SetupOutdoorPvP() AddCapturePoint(new OPvPCapturePointZM_Beacon(this, ZM_BEACON_WEST)); AddCapturePoint(new OPvPCapturePointZM_Beacon(this, ZM_BEACON_EAST)); - m_GraveYard = new OPvPCapturePointZM_GraveYard(this); - AddCapturePoint(m_GraveYard); // though the update function isn't used, the handleusego is! + m_Graveyard = new OPvPCapturePointZM_Graveyard(this); + AddCapturePoint(m_Graveyard); // though the update function isn't used, the handleusego is! return true; } @@ -234,36 +234,36 @@ void OutdoorPvPZM::HandleKillImpl(Player* player, Unit* killed) player->CastSpell(player, ZM_HordePlayerKillReward, true); } -bool OPvPCapturePointZM_GraveYard::Update(uint32 /*diff*/) +bool OPvPCapturePointZM_Graveyard::Update(uint32 /*diff*/) { bool retval = m_State != m_OldState; m_State = m_OldState; return retval; } -int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player* player, GameObject* go) +int32 OPvPCapturePointZM_Graveyard::HandleOpenGo(Player* player, GameObject* go) { int32 retval = OPvPCapturePoint::HandleOpenGo(player, go); if (retval >= 0) { - if (player->HasAura(ZM_BATTLE_STANDARD_A) && m_GraveYardState != ZM_GRAVEYARD_A) + if (player->HasAura(ZM_BATTLE_STANDARD_A) && m_GraveyardState != ZM_GRAVEYARD_A) { - m_GraveYardState = ZM_GRAVEYARD_A; + m_GraveyardState = ZM_GRAVEYARD_A; DelObject(0); // only one gotype is used in the whole outdoor pvp, no need to call it a constant AddObject(0, ZM_Banner_A.entry, ZM_Banner_A.map, ZM_Banner_A.pos, ZM_Banner_A.rot); - sObjectMgr->RemoveGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, HORDE); // rem gy - sObjectMgr->AddGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, ALLIANCE, false); // add gy + sObjectMgr->RemoveGraveyardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, HORDE); // rem gy + sObjectMgr->AddGraveyardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, ALLIANCE, false); // add gy m_PvP->TeamApplyBuff(TEAM_ALLIANCE, ZM_CAPTURE_BUFF); player->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_A); m_PvP->SendDefenseMessage(ZM_GRAVEYARD_ZONE, TEXT_TWIN_SPIRE_RUINS_TAKEN_ALLIANCE); } - else if (player->HasAura(ZM_BATTLE_STANDARD_H) && m_GraveYardState != ZM_GRAVEYARD_H) + else if (player->HasAura(ZM_BATTLE_STANDARD_H) && m_GraveyardState != ZM_GRAVEYARD_H) { - m_GraveYardState = ZM_GRAVEYARD_H; + m_GraveyardState = ZM_GRAVEYARD_H; DelObject(0); // only one gotype is used in the whole outdoor pvp, no need to call it a constant AddObject(0, ZM_Banner_H.entry, ZM_Banner_H.map, ZM_Banner_H.pos, ZM_Banner_H.rot); - sObjectMgr->RemoveGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, ALLIANCE); // rem gy - sObjectMgr->AddGraveYardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, HORDE, false); // add gy + sObjectMgr->RemoveGraveyardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, ALLIANCE); // rem gy + sObjectMgr->AddGraveyardLink(ZM_GRAVEYARD_ID, ZM_GRAVEYARD_ZONE, HORDE, false); // add gy m_PvP->TeamApplyBuff(TEAM_HORDE, ZM_CAPTURE_BUFF); player->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_H); m_PvP->SendDefenseMessage(ZM_GRAVEYARD_ZONE, TEXT_TWIN_SPIRE_RUINS_TAKEN_HORDE); @@ -273,11 +273,11 @@ int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player* player, GameObject* go) return retval; } -OPvPCapturePointZM_GraveYard::OPvPCapturePointZM_GraveYard(OutdoorPvP* pvp) +OPvPCapturePointZM_Graveyard::OPvPCapturePointZM_Graveyard(OutdoorPvP* pvp) : OPvPCapturePoint(pvp) { m_BothControllingFaction = 0; - m_GraveYardState = ZM_GRAVEYARD_N; + m_GraveyardState = ZM_GRAVEYARD_N; m_FlagCarrierGUID.Clear(); // add field scouts here AddCreature(ZM_ALLIANCE_FIELD_SCOUT, ZM_AllianceFieldScout.entry, ZM_AllianceFieldScout.map, ZM_AllianceFieldScout.pos); @@ -286,11 +286,11 @@ OPvPCapturePointZM_GraveYard::OPvPCapturePointZM_GraveYard(OutdoorPvP* pvp) AddObject(0, ZM_Banner_N.entry, ZM_Banner_N.map, ZM_Banner_N.pos, ZM_Banner_N.rot); } -void OPvPCapturePointZM_GraveYard::UpdateTowerState() +void OPvPCapturePointZM_Graveyard::UpdateTowerState() { - m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N, uint32((m_GraveYardState & ZM_GRAVEYARD_N) != 0)); - m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H, uint32((m_GraveYardState & ZM_GRAVEYARD_H) != 0)); - m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A, uint32((m_GraveYardState & ZM_GRAVEYARD_A) != 0)); + m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N, uint32((m_GraveyardState & ZM_GRAVEYARD_N) != 0)); + m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H, uint32((m_GraveyardState & ZM_GRAVEYARD_H) != 0)); + m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A, uint32((m_GraveyardState & ZM_GRAVEYARD_A) != 0)); m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY, uint32(m_BothControllingFaction == ALLIANCE)); m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY, uint32(m_BothControllingFaction != ALLIANCE)); @@ -298,11 +298,11 @@ void OPvPCapturePointZM_GraveYard::UpdateTowerState() m_PvP->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_NOT_READY, uint32(m_BothControllingFaction != HORDE)); } -void OPvPCapturePointZM_GraveYard::FillInitialWorldStates(WorldPackets::WorldState::InitWorldStates& packet) +void OPvPCapturePointZM_Graveyard::FillInitialWorldStates(WorldPackets::WorldState::InitWorldStates& packet) { - packet.Worldstates.emplace_back(uint32(ZM_MAP_GRAVEYARD_N), int32((m_GraveYardState & ZM_GRAVEYARD_N) != 0)); - packet.Worldstates.emplace_back(uint32(ZM_MAP_GRAVEYARD_H), int32((m_GraveYardState & ZM_GRAVEYARD_H) != 0)); - packet.Worldstates.emplace_back(uint32(ZM_MAP_GRAVEYARD_A), int32((m_GraveYardState & ZM_GRAVEYARD_A) != 0)); + packet.Worldstates.emplace_back(uint32(ZM_MAP_GRAVEYARD_N), int32((m_GraveyardState & ZM_GRAVEYARD_N) != 0)); + packet.Worldstates.emplace_back(uint32(ZM_MAP_GRAVEYARD_H), int32((m_GraveyardState & ZM_GRAVEYARD_H) != 0)); + packet.Worldstates.emplace_back(uint32(ZM_MAP_GRAVEYARD_A), int32((m_GraveyardState & ZM_GRAVEYARD_A) != 0)); packet.Worldstates.emplace_back(uint32(ZM_MAP_ALLIANCE_FLAG_READY), int32(m_BothControllingFaction == ALLIANCE)); packet.Worldstates.emplace_back(uint32(ZM_MAP_ALLIANCE_FLAG_NOT_READY), int32(m_BothControllingFaction != ALLIANCE)); @@ -310,7 +310,7 @@ void OPvPCapturePointZM_GraveYard::FillInitialWorldStates(WorldPackets::WorldSta packet.Worldstates.emplace_back(uint32(ZM_MAP_HORDE_FLAG_NOT_READY), int32(m_BothControllingFaction != HORDE)); } -void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction) +void OPvPCapturePointZM_Graveyard::SetBeaconState(uint32 controlling_faction) { // nothing to do here if (m_BothControllingFaction == controlling_faction) @@ -321,20 +321,20 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction) { case ALLIANCE: // if ally already controls the gy and taken back both beacons, return, nothing to do for us - if (m_GraveYardState & ZM_GRAVEYARD_A) + if (m_GraveyardState & ZM_GRAVEYARD_A) return; // ally doesn't control the gy, but controls the side beacons -> add gossip option, add neutral banner break; case HORDE: // if horde already controls the gy and taken back both beacons, return, nothing to do for us - if (m_GraveYardState & ZM_GRAVEYARD_H) + if (m_GraveyardState & ZM_GRAVEYARD_H) return; // horde doesn't control the gy, but controls the side beacons -> add gossip option, add neutral banner break; default: // if the graveyard is not neutral, then leave it that way // if the graveyard is neutral, then we have to dispel the buff from the flag carrier - if (m_GraveYardState & ZM_GRAVEYARD_N) + if (m_GraveyardState & ZM_GRAVEYARD_N) { // gy was neutral, thus neutral banner was spawned, it is possible that someone was taking the flag to the gy if (!m_FlagCarrierGUID.IsEmpty()) @@ -355,20 +355,20 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction) UpdateTowerState(); } -bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player* player, Creature* c, GossipMenuItems const& /*gso*/) +bool OPvPCapturePointZM_Graveyard::CanTalkTo(Player* player, Creature* c, GossipMenuItems const& /*gso*/) { std::map<ObjectGuid::LowType, uint32>::iterator itr = m_CreatureTypes.find(c->GetSpawnId()); if (itr != m_CreatureTypes.end()) { - if (itr->second == ZM_ALLIANCE_FIELD_SCOUT && player->GetTeam() == ALLIANCE && m_BothControllingFaction == ALLIANCE && !m_FlagCarrierGUID && m_GraveYardState != ZM_GRAVEYARD_A) + if (itr->second == ZM_ALLIANCE_FIELD_SCOUT && player->GetTeam() == ALLIANCE && m_BothControllingFaction == ALLIANCE && !m_FlagCarrierGUID && m_GraveyardState != ZM_GRAVEYARD_A) return true; - else if (itr->second == ZM_HORDE_FIELD_SCOUT && player->GetTeam() == HORDE && m_BothControllingFaction == HORDE && !m_FlagCarrierGUID && m_GraveYardState != ZM_GRAVEYARD_H) + else if (itr->second == ZM_HORDE_FIELD_SCOUT && player->GetTeam() == HORDE && m_BothControllingFaction == HORDE && !m_FlagCarrierGUID && m_GraveyardState != ZM_GRAVEYARD_H) return true; } return false; } -bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player* player, Creature* creature, uint32 /*gossipid*/) +bool OPvPCapturePointZM_Graveyard::HandleGossipOption(Player* player, Creature* creature, uint32 /*gossipid*/) { std::map<ObjectGuid::LowType, uint32>::iterator itr = m_CreatureTypes.find(creature->GetSpawnId()); if (itr != m_CreatureTypes.end()) @@ -393,7 +393,7 @@ bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player* player, Creature* return false; } -bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player* /*player*/, uint32 spellId) +bool OPvPCapturePointZM_Graveyard::HandleDropFlag(Player* /*player*/, uint32 spellId) { switch (spellId) { @@ -407,9 +407,9 @@ bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player* /*player*/, uint32 spe return false; } -uint32 OPvPCapturePointZM_GraveYard::GetGraveYardState() const +uint32 OPvPCapturePointZM_Graveyard::GetGraveyardState() const { - return m_GraveYardState; + return m_GraveyardState; } uint32 OutdoorPvPZM::GetAllianceTowersControlled() const diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h index b1195d5221c..0b6e144af2a 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h @@ -114,17 +114,17 @@ class OPvPCapturePointZM_Beacon : public OPvPCapturePoint uint32 m_TowerState; }; -enum ZM_GraveYardState +enum ZM_GraveyardState { ZM_GRAVEYARD_N = 1, ZM_GRAVEYARD_A = 2, ZM_GRAVEYARD_H = 4 }; -class OPvPCapturePointZM_GraveYard : public OPvPCapturePoint +class OPvPCapturePointZM_Graveyard : public OPvPCapturePoint { public: - OPvPCapturePointZM_GraveYard(OutdoorPvP* pvp); + OPvPCapturePointZM_Graveyard(OutdoorPvP* pvp); bool Update(uint32 diff) override; @@ -144,10 +144,10 @@ class OPvPCapturePointZM_GraveYard : public OPvPCapturePoint bool CanTalkTo(Player* player, Creature* creature, GossipMenuItems const& gso) override; - uint32 GetGraveYardState() const; + uint32 GetGraveyardState() const; private: - uint32 m_GraveYardState; + uint32 m_GraveyardState; protected: uint32 m_BothControllingFaction; @@ -180,7 +180,7 @@ class OutdoorPvPZM : public OutdoorPvP void SetHordeTowersControlled(uint32 count); private: - OPvPCapturePointZM_GraveYard * m_GraveYard; + OPvPCapturePointZM_Graveyard * m_Graveyard; uint32 m_AllianceTowersControlled; uint32 m_HordeTowersControlled; diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h index 842f4ca195b..5ea113cc547 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/auchenai_crypts.h @@ -32,10 +32,10 @@ enum ACDataTypes DATA_EXARCH_MALADAAR = 1 }; -template<typename AI> -inline AI* GetAuchenaiCryptsAI(Creature* creature) +template <class AI, class T> +inline AI* GetAuchenaiCryptsAI(T* obj) { - return GetInstanceAI<AI>(creature, ACScriptName); + return GetInstanceAI<AI>(obj, ACScriptName); } #endif // AUCHENAI_CRYPTS_H_ diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index c07ddb0cb23..0340a4dd2f1 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -57,7 +57,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { - return new boss_shirrak_the_dead_watcherAI(creature); + return GetAuchenaiCryptsAI<boss_shirrak_the_dead_watcherAI>(creature); } struct boss_shirrak_the_dead_watcherAI : public ScriptedAI @@ -111,7 +111,7 @@ public: if (Inhibitmagic_Timer <= diff) { float dist; - Map::PlayerList const &PlayerList = me->GetMap()->GetPlayers(); + Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) if (Player* i_pl = i->GetSource()) if (i_pl->IsAlive() && (dist = i_pl->GetDistance(me)) < 45) @@ -174,7 +174,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { - return new npc_focus_fireAI(creature); + return GetAuchenaiCryptsAI<npc_focus_fireAI>(creature); } struct npc_focus_fireAI : public ScriptedAI diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h b/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h index 94b178b1e87..2b6844017f0 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/mana_tombs.h @@ -34,10 +34,10 @@ enum MTDataTypes DATA_YOR = 3 }; -template<typename AI> -inline AI* GetManaTombsAI(Creature* creature) +template <class AI, class T> +inline AI* GetManaTombsAI(T* obj) { - return GetInstanceAI<AI>(creature, MTScriptName); + return GetInstanceAI<AI>(obj, MTScriptName); } #endif // MANA_TOMBS_H_ diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp index 8c9ca995f59..435167bba65 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp @@ -24,7 +24,7 @@ DoorData const doorData[] = { { GO_IKISS_DOOR, DATA_TALON_KING_IKISS, DOOR_TYPE_PASSAGE }, - { 0, 0, DOOR_TYPE_ROOM } // END + { 0, 0, DOOR_TYPE_ROOM } // END }; ObjectData const gameObjectData[] = diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h index b7b168c074e..bf64986f100 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h @@ -48,10 +48,10 @@ enum SHGameObjectIds GO_TALON_KING_COFFER = 187372 }; -template<typename AI> -inline AI* GetSethekkHallsAI(Creature* creature) +template <class AI, class T> +inline AI* GetSethekkHallsAI(T* obj) { - return GetInstanceAI<AI>(creature, SHScriptName); + return GetInstanceAI<AI>(obj, SHScriptName); } #endif // SETHEKK_HALLS_H_ diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index 416eec05c45..529107380fb 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -186,7 +186,7 @@ class boss_grandmaster_vorpil : public CreatureScript break; case EVENT_DRAW_SHADOWS: { - Map::PlayerList const &PlayerList = me->GetMap()->GetPlayers(); + Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) if (Player* i_pl = i->GetSource()) if (i_pl->IsAlive() && !i_pl->HasAura(SPELL_BANISH)) diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp index e1615bf2260..647f678fbb8 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp @@ -19,8 +19,8 @@ #include "black_temple.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" -#include "SpellScript.h" #include "SpellAuraEffects.h" +#include "SpellScript.h" enum Spells { diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.h b/src/server/scripts/Outland/BlackTemple/black_temple.h index 6e93e0c63c0..10be8f5c633 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.h +++ b/src/server/scripts/Outland/BlackTemple/black_temple.h @@ -137,7 +137,7 @@ enum BlackTempleMisc ACTION_OPEN_DOOR = 4 }; -template<class AI, class T> +template <class AI, class T> inline AI* GetBlackTempleAI(T* obj) { return GetInstanceAI<AI>(obj, BTScriptName); diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp index ba8ded29f51..0cbf6010f8d 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp @@ -16,14 +16,13 @@ */ #include "ScriptMgr.h" +#include "black_temple.h" #include "GridNotifiers.h" #include "ObjectAccessor.h" #include "PassiveAI.h" #include "ScriptedCreature.h" #include "SpellScript.h" -#include "black_temple.h" - enum Says { SAY_AGGRO = 0, diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 9de5e595a1e..e1476f65df2 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -678,7 +678,7 @@ public: void EnterEvadeModeIfNeeded() { - Map::PlayerList const &players = me->GetMap()->GetPlayers(); + Map::PlayerList const& players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) if (Player* player = i->GetSource()) if (player->IsAlive() && !player->IsGameMaster() && CheckBoundary(player)) diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp index 90939e47b9d..4acd27f7d32 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp @@ -15,15 +15,15 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "ScriptMgr.h" +#include "black_temple.h" #include "CellImpl.h" #include "GridNotifiersImpl.h" #include "InstanceScript.h" #include "PassiveAI.h" #include "ScriptedCreature.h" -#include "ScriptMgr.h" #include "SpellAuraEffects.h" #include "SpellScript.h" -#include "black_temple.h" enum Says { @@ -800,7 +800,7 @@ class spell_illidari_council_reflective_shield : public SpellScriptLoader return ValidateSpellInfo({ SPELL_REFLECTIVE_SHIELD_DAMAGE }); } - void OnAbsorb(AuraEffect* aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount) + void OnAbsorb(AuraEffect* aurEff, DamageInfo& dmgInfo, uint32& absorbAmount) { Unit* target = GetTarget(); if (dmgInfo.GetAttacker() == target) @@ -883,7 +883,11 @@ class spell_illidari_council_seal : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo({ SPELL_SEAL_OF_COMMAND, SPELL_SEAL_OF_BLOOD }); + return ValidateSpellInfo( + { + SPELL_SEAL_OF_COMMAND, + SPELL_SEAL_OF_BLOOD + }); } void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index b640a57a67c..c38bf68ea04 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -220,7 +220,11 @@ class spell_mother_shahraz_fatal_attraction : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo({ SPELL_SABER_LASH_IMMUNITY, SPELL_FATAL_ATTRACTION }); + return ValidateSpellInfo( + { + SPELL_SABER_LASH_IMMUNITY, + SPELL_FATAL_ATTRACTION + }); } void FilterTargets(std::list<WorldObject*>& targets) @@ -371,13 +375,7 @@ class spell_mother_shahraz_random_periodic : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo( - { - SPELL_BEAM_SINISTER, - SPELL_BEAM_VILE, - SPELL_BEAM_WICKED, - SPELL_BEAM_SINFUL - }); + return ValidateSpellInfo(RandomBeam); } void OnPeriodic(AuraEffect const* /*aurEffect*/) diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 50fbd937d53..34a8289629f 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -20,13 +20,12 @@ #include "InstanceScript.h" #include "MotionMaster.h" #include "ObjectAccessor.h" +#include "Player.h" #include "ScriptedCreature.h" #include "Spell.h" -#include "SpellInfo.h" -#include "TemporarySummon.h" -#include "SpellScript.h" #include "SpellAuraEffects.h" -#include "Player.h" +#include "SpellScript.h" +#include "TemporarySummon.h" enum Says { diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index a7d20d6dda2..23ba4d03d97 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -26,7 +26,6 @@ #include "ScriptedCreature.h" #include "ScriptedGossip.h" #include "SpellAuraEffects.h" -#include "SpellInfo.h" #include "SpellScript.h" #include "TemporarySummon.h" @@ -291,7 +290,7 @@ public: void EnterEvadeModeIfNeeded() { - Map::PlayerList const &players = me->GetMap()->GetPlayers(); + Map::PlayerList const& players = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i) if (Player* player = i->GetSource()) if (player->IsAlive() && !player->IsGameMaster() && CheckBoundary(player)) diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 76323235cdf..3544532d8d9 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -23,8 +23,8 @@ #include "PassiveAI.h" #include "Player.h" #include "ScriptedCreature.h" -#include "SpellScript.h" #include "SpellAuraEffects.h" +#include "SpellScript.h" #include "TemporarySummon.h" enum Says @@ -400,13 +400,13 @@ class spell_teron_gorefiend_shadow_of_death : public SpellScriptLoader { return ValidateSpellInfo( { - SPELL_SUMMON_SPIRIT, - SPELL_POSSESS_SPIRIT_IMMUNE, - SPELL_SPIRITUAL_VENGEANCE, - SPELL_SUMMON_SKELETRON_1, - SPELL_SUMMON_SKELETRON_2, - SPELL_SUMMON_SKELETRON_3, - SPELL_SUMMON_SKELETRON_4 + SPELL_SUMMON_SPIRIT, + SPELL_POSSESS_SPIRIT_IMMUNE, + SPELL_SPIRITUAL_VENGEANCE, + SPELL_SUMMON_SKELETRON_1, + SPELL_SUMMON_SKELETRON_2, + SPELL_SUMMON_SKELETRON_3, + SPELL_SUMMON_SKELETRON_4 }); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index f37cc338f65..c3861becf6b 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -16,8 +16,9 @@ */ #include "ScriptMgr.h" -#include "GameObjectAI.h" #include "black_temple.h" +#include "GameObjectAI.h" +#include "GridNotifiers.h" #include "GameObject.h" #include "InstanceScript.h" #include "ObjectAccessor.h" @@ -25,7 +26,6 @@ #include "ScriptedCreature.h" #include "SpellInfo.h" #include "SpellScript.h" -#include "GridNotifiers.h" enum Texts { @@ -91,7 +91,7 @@ public: Talk(SAY_DEATH); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_HURL_SPINE && me->HasAura(SPELL_TIDAL_SHIELD)) { diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp index 51983b77e20..241e8ba3629 100644 --- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp @@ -19,10 +19,10 @@ #include "AreaBoundary.h" #include "black_temple.h" #include "Creature.h" +#include "CreatureAI.h" #include "GameObject.h" #include "InstanceScript.h" #include "Map.h" -#include "ScriptedCreature.h" DoorData const doorData[] = { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index d5ef10dda82..b22c5ae38a4 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -221,7 +221,7 @@ public: if (!beam) { SummonBeams(); - beam=true; + beam = true; } //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index f90d9e27604..6aeb637d172 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -30,8 +30,8 @@ EndScriptData */ #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" -#include "Spell.h" #include "serpent_shrine.h" +#include "Spell.h" #include "TemporarySummon.h" enum LadyVashj @@ -256,7 +256,7 @@ public: void EnterCombat(Unit* who) override { // remove old tainted cores to prevent cheating in phase 2 - Map::PlayerList const &PlayerList = me->GetMap()->GetPlayers(); + Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) if (Player* player = itr->GetSource()) player->DestroyItemCount(31088, 1, true); @@ -326,7 +326,7 @@ public: } else { - AggroTimer-=diff; + AggroTimer -= diff; return; } } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 3e1933cf8c9..d4ffc18fd0e 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -792,7 +792,7 @@ public: if (Earthshock_Timer <= diff) { - Map::PlayerList const &PlayerList = me->GetMap()->GetPlayers(); + Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) { if (Player* i_pl = itr->GetSource()) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index 1a7e2d4719b..592d2fbbaa2 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -24,12 +24,12 @@ EndScriptData */ #include "ScriptMgr.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "InstanceScript.h" #include "Map.h" #include "MotionMaster.h" #include "Player.h" #include "ScriptedCreature.h" -#include "GameObjectAI.h" #include "serpent_shrine.h" #include "TemporarySummon.h" @@ -173,7 +173,6 @@ public: } void MoveInLineOfSight(Unit* who) override - { if (!CanStartEvent) // boss is invisible, don't attack return; @@ -242,7 +241,9 @@ public: DoCast(me, SPELL_SUBMERGE); PhaseTimer = 60000; // 60secs submerged Submerged = true; - } else PhaseTimer-=diff; + } + else + PhaseTimer -= diff; if (SpoutTimer <= diff) { @@ -253,19 +254,23 @@ public: WhirlTimer = 20000; // whirl directly after spout RotTimer = 20000; return; - } else SpoutTimer -= diff; + } + else + SpoutTimer -= diff; // Whirl directly after a Spout and at random times if (WhirlTimer <= diff) { WhirlTimer = 18000; DoCast(me, SPELL_WHIRL); - } else WhirlTimer -= diff; + } + else + WhirlTimer -= diff; if (CheckTimer <= diff)//check if there are players in melee range { InRange = false; - Map::PlayerList const &PlayerList = me->GetMap()->GetPlayers(); + Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers(); if (!PlayerList.isEmpty()) { for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) @@ -275,11 +280,13 @@ public: } } CheckTimer = 2000; - } else CheckTimer -= diff; + } + else + CheckTimer -= diff; if (RotTimer) { - Map::PlayerList const &PlayerList = me->GetMap()->GetPlayers(); + Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { if (i->GetSource() && i->GetSource()->IsAlive() && me->HasInArc(diff/20000.f*float(M_PI)*2.f, i->GetSource()) && me->IsWithinDist(i->GetSource(), SPOUT_DIST) && !i->GetSource()->IsInWater()) @@ -295,7 +302,9 @@ public: if (RotTimer <= diff) { RotTimer = 0; - } else RotTimer -= diff; + } + else + RotTimer -= diff; return; } @@ -307,7 +316,9 @@ public: if (target) DoCast(target, SPELL_GEYSER, true); GeyserTimer = rand32() % 5000 + 15000; - } else GeyserTimer -= diff; + } + else + GeyserTimer -= diff; if (!InRange) // if on players in melee range cast Waterbolt { @@ -319,7 +330,9 @@ public: if (target) DoCast(target, SPELL_WATERBOLT, true); WaterboltTimer = 3000; - } else WaterboltTimer -= diff; + } + else + WaterboltTimer -= diff; } if (!UpdateVictim()) @@ -342,7 +355,9 @@ public: SpoutTimer = 3000; // directly cast Spout after emerging! PhaseTimer = 120000; return; - } else PhaseTimer-=diff; + } + else + PhaseTimer -= diff; if (!me->IsThreatened()) // check if should evade { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp index 590ec8ad523..a86f3c71c2b 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp @@ -24,13 +24,14 @@ EndScriptData */ #include "ScriptMgr.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "InstanceScript.h" #include "Log.h" #include "Map.h" #include "Player.h" #include "serpent_shrine.h" #include "TemporarySummon.h" -#include "GameObjectAI.h" +#include <sstream> #define MAX_ENCOUNTER 6 @@ -132,7 +133,7 @@ class instance_serpent_shrine : public InstanceMapScript else Water = WATERSTATE_FRENZY; - Map::PlayerList const &PlayerList = instance->GetPlayers(); + Map::PlayerList const& PlayerList = instance->GetPlayers(); if (PlayerList.isEmpty()) return; for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) @@ -143,12 +144,11 @@ class instance_serpent_shrine : public InstanceMapScript { if (Water == WATERSTATE_SCALDING) { - if (!player->HasAura(SPELL_SCALDINGWATER)) - { player->CastSpell(player, SPELL_SCALDINGWATER, true); - } - } else if (Water == WATERSTATE_FRENZY) + + } + else if (Water == WATERSTATE_FRENZY) { //spawn frenzy if (DoSpawnFrenzy) @@ -392,7 +392,7 @@ class instance_serpent_shrine : public InstanceMapScript return stream.str(); } - void Load(const char* in) override + void Load(char const* in) override { if (!in) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index 6db0f751512..78e92d7b4f1 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -149,7 +149,7 @@ public: Talk(SAY_SLAY); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { //hack :( if (spell->Id == SPELL_WARLORDS_RAGE_PROC) diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h index 22846f6ac82..b153df14d6c 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h @@ -51,7 +51,7 @@ enum SVGameObjectIds GO_ACCESS_PANEL_MEK = 184126 }; -template<class AI, class T> +template <class AI, class T> inline AI* GetSteamVaultAI(T* obj) { return GetInstanceAI<AI>(obj, SteamVaultScriptName); diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp index b668c1a7989..ce777aa67c7 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp @@ -18,6 +18,7 @@ #include "ScriptMgr.h" #include "CreatureTextMgr.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "Group.h" #include "InstanceScript.h" #include "LFGMgr.h" @@ -25,9 +26,8 @@ #include "MotionMaster.h" #include "ObjectAccessor.h" #include "Player.h" -#include "ScriptedGossip.h" #include "ScriptedCreature.h" -#include "GameObjectAI.h" +#include "ScriptedGossip.h" #include "SpellAuraEffects.h" #include "SpellInfo.h" #include "SpellScript.h" diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h index 398225c4d01..0f0e877425e 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/the_slave_pens.h @@ -68,7 +68,7 @@ enum SPGameObjectIds GO_ICE_STONE = 187882 }; -template<class AI, class T> +template <class AI, class T> inline AI* GetSlavePensAI(T* obj) { return GetInstanceAI<AI>(obj, SPScriptName); diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/the_underbog.h b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/the_underbog.h index c32c7a05f30..a671d1c5fd0 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/the_underbog.h +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/the_underbog.h @@ -22,10 +22,10 @@ #define TheUndebogScriptName "instance_the_underbog" -template<typename AI> -inline AI* GetTheUnderbogAI(Creature* creature) +template <class AI, class T> +inline AI* GetTheUnderbogAI(T* obj) { - return GetInstanceAI<AI>(creature, TheUndebogScriptName); + return GetInstanceAI<AI>(obj, TheUndebogScriptName); } #endif // the_underbog_h__ diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index fa8a6e81b2b..038dc187265 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -122,7 +122,7 @@ class boss_gruul : public CreatureScript Talk(SAY_DEATH); } - void SpellHitTarget(Unit* target, const SpellInfo* pSpell) override + void SpellHitTarget(Unit* target, SpellInfo const* pSpell) override { //This to emulate effect1 (77) of SPELL_GROUND_SLAM, knock back to any direction //It's initially wrong, since this will cause fall damage, which is by comments, not intended. diff --git a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h index abd1fa9aceb..c7939dadc70 100644 --- a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h +++ b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h @@ -47,10 +47,10 @@ enum GLGameObjectIds GO_GRUUL_DOOR = 184662 }; -template<typename AI> -inline AI* GetGruulsLairAI(Creature* creature) +template <class AI, class T> +inline AI* GetGruulsLairAI(T* obj) { - return GetInstanceAI<AI>(creature, GLScriptName); + return GetInstanceAI<AI>(obj, GLScriptName); } #endif // GRUULS_LAIR_H_ diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp index b413d805e0f..60a2cb6d34d 100644 --- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp +++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp @@ -17,7 +17,6 @@ #include "ScriptMgr.h" #include "Creature.h" -#include "GameObject.h" #include "gruuls_lair.h" #include "InstanceScript.h" @@ -55,6 +54,8 @@ class instance_gruuls_lair : public InstanceMapScript void OnCreatureCreate(Creature* creature) override { + InstanceScript::OnCreatureCreate(creature); + switch (creature->GetEntry()) { case NPC_MAULGAR: @@ -71,48 +72,6 @@ class instance_gruuls_lair : public InstanceMapScript } } - void OnCreatureRemove(Creature* creature) override - { - switch (creature->GetEntry()) - { - case NPC_MAULGAR: - case NPC_KROSH_FIREHAND: - case NPC_OLM_THE_SUMMONER: - case NPC_KIGGLER_THE_CRAZED: - case NPC_BLINDEYE_THE_SEER: - AddMinion(creature, false); - break; - default: - break; - } - } - - void OnGameObjectCreate(GameObject* go) override - { - switch (go->GetEntry()) - { - case GO_MAULGAR_DOOR: - case GO_GRUUL_DOOR: - AddDoor(go, true); - break; - default: - break; - } - } - - void OnGameObjectRemove(GameObject* go) override - { - switch (go->GetEntry()) - { - case GO_MAULGAR_DOOR: - case GO_GRUUL_DOOR: - AddDoor(go, false); - break; - default: - break; - } - } - ObjectGuid GetGuidData(uint32 type) const override { switch (type) diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h index e3fd9704a0b..63c4bef65f2 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h @@ -82,7 +82,7 @@ enum BFActionIds ACTION_PREPARE_BROGGOK = 3 }; -template<class AI, class T> +template <class AI, class T> inline AI* GetBloodFurnaceAI(T* obj) { return GetInstanceAI<AI>(obj, BFScriptName); diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index 9a92c30ecc7..b5cac8fbcd7 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -18,12 +18,11 @@ #include "ScriptMgr.h" #include "blood_furnace.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "InstanceScript.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" -#include "GameObjectAI.h" #include "SpellAuraEffects.h" -#include "SpellInfo.h" #include "SpellScript.h" enum Yells diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index ebe2a9ebe09..452ce7bd2f1 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -17,13 +17,10 @@ #include "ScriptMgr.h" #include "blood_furnace.h" -#include "Map.h" #include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "Spell.h" #include "SpellAuras.h" -#include "SpellMgr.h" -#include "SpellInfo.h" #include "TemporarySummon.h" enum Kelidan diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index 014c4086716..6a5c804d41d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -17,11 +17,10 @@ #include "ScriptMgr.h" #include "blood_furnace.h" -#include "Creature.h" -#include "CreatureAI.h" #include "GameObject.h" #include "InstanceScript.h" #include "Map.h" +#include "ScriptedCreature.h" DoorData const doorData[] = { @@ -82,6 +81,8 @@ class instance_blood_furnace : public InstanceMapScript void OnGameObjectCreate(GameObject* go) override { + InstanceScript::OnGameObjectCreate(go); + switch (go->GetEntry()) { case GO_PRISON_DOOR_04: @@ -126,23 +127,6 @@ class instance_blood_furnace : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) override - { - switch (go->GetEntry()) - { - case GO_PRISON_DOOR_01: - case GO_PRISON_DOOR_02: - case GO_PRISON_DOOR_03: - case GO_PRISON_DOOR_04: - case GO_PRISON_DOOR_05: - case GO_SUMMON_DOOR: - AddDoor(go, false); - break; - default: - break; - } - } - ObjectGuid GetGuidData(uint32 type) const override { switch (type) diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index 5b2c6d1f6f8..ccec473f24d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -110,7 +110,7 @@ class boss_nazan : public CreatureScript } } - void SpellHitTarget(Unit* target, const SpellInfo* entry) override + void SpellHitTarget(Unit* target, SpellInfo const* entry) override { if (target && entry->Id == uint32(SPELL_FIREBALL)) me->SummonCreature(NPC_LIQUID_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), target->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 30000); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h index 3329d011ca7..f3115b745c5 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h @@ -48,10 +48,10 @@ enum HRGameobjectIds GO_FEL_IRON_CHEST_HEROIC = 185169 }; -template<typename AI> -inline AI* GetHellfireRampartsAI(Creature* creature) +template <class AI, class T> +inline AI* GetHellfireRampartsAI(T* obj) { - return GetInstanceAI<AI>(creature, HRScriptName); + return GetInstanceAI<AI>(obj, HRScriptName); } #endif diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index bdafad65efa..2e7cf22c93c 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -17,17 +17,15 @@ #include "ScriptMgr.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "InstanceScript.h" #include "magtheridons_lair.h" -#include "ObjectAccessor.h" +#include "PassiveAI.h" #include "Player.h" #include "ScriptedCreature.h" #include "SpellInfo.h" #include "TemporarySummon.h" #include "SpellScript.h" -#include "SpellAuraEffects.h" -#include "PassiveAI.h" -#include "GameObjectAI.h" enum Yells { @@ -460,7 +458,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { - return new npc_magtheridon_roomAI(creature); + return GetMagtheridonsLairAI<npc_magtheridon_roomAI>(creature); } }; @@ -488,7 +486,7 @@ public: GameObjectAI* GetAI(GameObject* go) const override { - return new go_manticron_cubeAI(go); + return GetMagtheridonsLairAI<go_manticron_cubeAI>(go); } }; @@ -571,7 +569,11 @@ class spell_magtheridon_shadow_grasp_visual : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo({ SPELL_SHADOW_CAGE, SPELL_SHADOW_GRASP_VISUAL }); + return ValidateSpellInfo( + { + SPELL_SHADOW_CAGE, + SPELL_SHADOW_GRASP_VISUAL + }); } void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index 233e72b0ad2..0a538face5c 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -15,14 +15,13 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "AreaBoundary.h" #include "ScriptMgr.h" -#include "Creature.h" -#include "CreatureAI.h" +#include "AreaBoundary.h" #include "GameObject.h" #include "InstanceScript.h" #include "magtheridons_lair.h" #include "Map.h" +#include "ScriptedCreature.h" BossBoundaryData const boundaries = { @@ -68,7 +67,7 @@ static MLDataTypes const collapseObjectDatas[] = class instance_magtheridons_lair : public InstanceMapScript { public: - instance_magtheridons_lair() : InstanceMapScript("instance_magtheridons_lair", 544) { } + instance_magtheridons_lair() : InstanceMapScript(MLScriptName, 544) { } struct instance_magtheridons_lair_InstanceMapScript : public InstanceScript { diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h index 87190d446b0..cd0b441fada 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h @@ -18,9 +18,9 @@ #ifndef DEF_MAGTHERIDONS_LAIR_H #define DEF_MAGTHERIDONS_LAIR_H -#define MLScriptName "instance_magtheridons_lair" #include "CreatureAIImpl.h" +#define MLScriptName "instance_magtheridons_lair" #define DataHeader "ML" uint32 const EncounterCount = 1; @@ -74,10 +74,10 @@ enum MLGameObjectIds GO_MAGTHERIDON_COLUMN_5 = 184637 }; -template<typename AI> -inline AI* GetMagtheridonsLairAI(Creature* creature) +template <class AI, class T> +inline AI* GetMagtheridonsLairAI(T* obj) { - return GetInstanceAI<AI>(creature, MLScriptName); + return GetInstanceAI<AI>(obj, MLScriptName); } #endif diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp index 27149503712..514300e96af 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp @@ -23,15 +23,14 @@ SDCategory: Hellfire Citadel, Shattered Halls EndScriptData */ #include "ScriptMgr.h" -#include "Creature.h" -#include "CreatureAI.h" -#include "GameObject.h" #include "InstanceScript.h" #include "Map.h" #include "Player.h" +#include "ScriptedCreature.h" #include "shattered_halls.h" #include "SpellAuras.h" #include "TemporarySummon.h" +#include <sstream> DoorData const doorData[] = { @@ -93,35 +92,11 @@ class instance_shattered_halls : public InstanceMapScript ex->SetDuration(executionTimer); } - void OnGameObjectCreate(GameObject* go) override - { - switch (go->GetEntry()) - { - case GO_GRAND_WARLOCK_CHAMBER_DOOR_1: - case GO_GRAND_WARLOCK_CHAMBER_DOOR_2: - AddDoor(go, true); - default: - break; - } - } - - void OnGameObjectRemove(GameObject* go) override - { - switch (go->GetEntry()) - { - case GO_GRAND_WARLOCK_CHAMBER_DOOR_1: - case GO_GRAND_WARLOCK_CHAMBER_DOOR_2: - AddDoor(go, false); - default: - break; - } - } - void OnCreatureCreate(Creature* creature) override { if (!_team) { - Map::PlayerList const &players = instance->GetPlayers(); + Map::PlayerList const& players = instance->GetPlayers(); if (!players.isEmpty()) if (Player* player = players.begin()->GetSource()) _team = player->GetTeam(); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp index 800a1149115..63503c6bbe6 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp @@ -21,8 +21,8 @@ #include "ObjectAccessor.h" #include "Player.h" #include "ScriptedCreature.h" -#include "SpellScript.h" #include "shattered_halls.h" +#include "SpellScript.h" #include "TemporarySummon.h" class at_nethekurse_exit : public AreaTriggerScript @@ -110,7 +110,7 @@ class boss_shattered_executioner : public CreatureScript if (instance->GetData(DATA_PRISONERS_EXECUTED) > 0) return; - Map::PlayerList const &players = instance->instance->GetPlayers(); + Map::PlayerList const& players = instance->instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { Player* pl = itr->GetSource(); @@ -129,7 +129,7 @@ class boss_shattered_executioner : public CreatureScript if (data == 1) { - Map::PlayerList const &players = instance->instance->GetPlayers(); + Map::PlayerList const& players = instance->instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { Player* pl = itr->GetSource(); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h index 008692222e2..b1ec4de98c4 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h @@ -91,11 +91,11 @@ enum SHActions ACTION_EXECUTIONER_TAUNT = 1 }; -const Position Executioner = { 152.8524f, -83.63912f, 2.021005f, 0.06981317f }; +Position const Executioner = { 152.8524f, -83.63912f, 2.021005f, 0.06981317f }; struct FactionSpawnerHelper { - FactionSpawnerHelper(uint32 allianceEntry, uint32 hordeEntry, const Position& pos) : _allianceNPC(allianceEntry), _hordeNPC(hordeEntry), _spawnPos(pos) { } + FactionSpawnerHelper(uint32 allianceEntry, uint32 hordeEntry, Position const& pos) : _allianceNPC(allianceEntry), _hordeNPC(hordeEntry), _spawnPos(pos) { } inline uint32 operator()(uint32 teamID) const { return teamID == ALLIANCE ? _allianceNPC : _hordeNPC; } inline Position const& GetPos() const { return _spawnPos; } @@ -106,17 +106,17 @@ private: Position const _spawnPos; }; -const FactionSpawnerHelper executionerVictims[VictimCount] = +FactionSpawnerHelper const executionerVictims[VictimCount] = { { NPC_CAPTAIN_ALINA, NPC_CAPTAIN_BONESHATTER, { 138.8807f, -84.22707f, 1.992269f, 0.06981317f } }, { NPC_ALLIANCE_VICTIM_1, NPC_HORDE_VICTIM_1, { 151.2411f, -91.02930f, 2.019741f, 1.57079600f } }, { NPC_ALLIANCE_VICTIM_2, NPC_HORDE_VICTIM_2, { 151.0459f, -77.51981f, 2.021008f, 4.74729500f } } }; -template<typename AI> -inline AI* GetShatteredHallsAI(Creature* creature) +template <class AI, class T> +inline AI* GetShatteredHallsAI(T* obj) { - return GetInstanceAI<AI>(creature, SHScriptName); + return GetInstanceAI<AI>(obj, SHScriptName); } #endif diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 60343d6be1c..f9ea0cef899 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -188,13 +188,13 @@ class boss_alar : public CreatureScript } } - void SpellHit(Unit*, const SpellInfo* spell) override + void SpellHit(Unit*, SpellInfo const* spell) override { if (spell->Id == SPELL_DIVE_BOMB_VISUAL) { me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true); me->SetDisplayId(11686); - //me->SendUpdateObjectToAllExcept(NULL); + //me->SendUpdateObjectToAllExcept(nullptr); } } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 7bd397539f0..1e1129b2f7f 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -28,7 +28,6 @@ EndScriptData */ #include "ObjectAccessor.h" #include "ScriptedCreature.h" #include "SpellAuras.h" -#include "SpellInfo.h" #include "SpellScript.h" #include "TemporarySummon.h" #include "the_eye.h" @@ -292,7 +291,7 @@ class boss_high_astromancer_solarian : public CreatureScript //After these 50 seconds she portals to the middle of the room and disappears, leaving 3 light portals behind. me->GetMotionMaster()->Clear(); me->UpdatePosition(CENTER_X, CENTER_Y, CENTER_Z, CENTER_O); - for (uint8 i=0; i <= 2; ++i) + for (uint8 i = 0; i <= 2; ++i) { if (!i) { @@ -309,15 +308,15 @@ class boss_high_astromancer_solarian : public CreatureScript } if ((std::abs(Portals[2][0] - Portals[1][0]) < 7) && (std::abs(Portals[2][1] - Portals[1][1]) < 7)) { - int i=1; + int i = 1; if (std::abs(CENTER_X + 26.0f - Portals[2][0]) < 7) i = -1; - Portals[2][0] = Portals[2][0]+7*i; + Portals[2][0] = Portals[2][0] + 7 * i; Portals[2][1] = Portal_Y(Portals[2][0], LARGE_PORTAL_RADIUS); } - for (int i=0; i <= 2; ++i) + for (int i = 0; i <= 2; ++i) { - if (Creature* Summoned = me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O, TEMPSUMMON_TIMED_DESPAWN, Phase2_Timer+Phase3_Timer+AppearDelay_Timer+1700)) + if (Creature* Summoned = me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O, TEMPSUMMON_TIMED_DESPAWN, Phase2_Timer + Phase3_Timer + AppearDelay_Timer + 1700)) { Summoned->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); Summoned->CastSpell(Summoned, SPELL_SPOTLIGHT, false); @@ -326,7 +325,7 @@ class boss_high_astromancer_solarian : public CreatureScript AppearDelay = true; } else - Phase1_Timer-=diff; + Phase1_Timer -= diff; } else if (Phase == 2) { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp index 86ae7f1a454..dcd2df56c41 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp @@ -106,13 +106,13 @@ class instance_the_eye : public InstanceMapScript { switch (identifier) { - case DATA_THALADREDTHEDARKENER: return ThaladredTheDarkener; - case DATA_LORDSANGUINAR: return LordSanguinar; - case DATA_GRANDASTROMANCERCAPERNIAN: return GrandAstromancerCapernian; - case DATA_MASTERENGINEERTELONICUS: return MasterEngineerTelonicus; - case DATA_KAELTHAS: return Kaelthas; - case DATA_HIGH_ASTROMANCER_SOLARIAN: return Astromancer; - case DATA_ALAR: return Alar; + case DATA_THALADREDTHEDARKENER: return ThaladredTheDarkener; + case DATA_LORDSANGUINAR: return LordSanguinar; + case DATA_GRANDASTROMANCERCAPERNIAN: return GrandAstromancerCapernian; + case DATA_MASTERENGINEERTELONICUS: return MasterEngineerTelonicus; + case DATA_KAELTHAS: return Kaelthas; + case DATA_HIGH_ASTROMANCER_SOLARIAN: return Astromancer; + case DATA_ALAR: return Alar; } return ObjectGuid::Empty; } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp index 9dd6bc36fb9..7d1a4c484fd 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp @@ -104,7 +104,7 @@ class npc_crystalcore_devastator : public CreatureScript CreatureAI* GetAI(Creature* creature) const override { - return new npc_crystalcore_devastatorAI(creature); + return GetTheEyeAI<npc_crystalcore_devastatorAI>(creature); } }; void AddSC_the_eye() diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h index 9eb9e5af0e5..f65b6714248 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h +++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h @@ -65,10 +65,10 @@ enum TEGameObjectIds GO_ARCANE_DOOR_RIGHT = 184325 }; -template<typename AI> -inline AI* GetTheEyeAI(Creature* creature) +template <class AI, class T> +inline AI* GetTheEyeAI(T* obj) { - return GetInstanceAI<AI>(creature, TheEyeScriptName); + return GetInstanceAI<AI>(obj, TheEyeScriptName); } #endif diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp index aae21c154b2..c1b6020c8e6 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp @@ -24,8 +24,8 @@ static DoorData const doorData[] = { { GO_DOOR_MOARG_1, DATA_GATEWATCHER_IRON_HAND, DOOR_TYPE_PASSAGE }, { GO_DOOR_MOARG_2, DATA_GATEWATCHER_GYROKILL, DOOR_TYPE_PASSAGE }, - { GO_DOOR_NETHERMANCER, DATA_NETHERMANCER_SEPRETHREA, DOOR_TYPE_ROOM }, - { 0, 0, DOOR_TYPE_ROOM } + { GO_DOOR_NETHERMANCER, DATA_NETHERMANCER_SEPRETHREA, DOOR_TYPE_ROOM }, + { 0, 0, DOOR_TYPE_ROOM } }; class instance_mechanar : public InstanceMapScript @@ -42,34 +42,6 @@ class instance_mechanar : public InstanceMapScript LoadDoorData(doorData); } - void OnGameObjectCreate(GameObject* gameObject) override - { - switch (gameObject->GetEntry()) - { - case GO_DOOR_MOARG_1: - case GO_DOOR_MOARG_2: - case GO_DOOR_NETHERMANCER: - AddDoor(gameObject, true); - break; - default: - break; - } - } - - void OnGameObjectRemove(GameObject* gameObject) override - { - switch (gameObject->GetEntry()) - { - case GO_DOOR_MOARG_1: - case GO_DOOR_MOARG_2: - case GO_DOOR_NETHERMANCER: - AddDoor(gameObject, false); - break; - default: - break; - } - } - bool SetBossState(uint32 type, EncounterState state) override { if (!InstanceScript::SetBossState(type, state)) diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h index a9e82e2402b..beca8bd3849 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h @@ -41,10 +41,10 @@ enum MRGameobjectIds GO_DOOR_NETHERMANCER = 184449 }; -template<typename AI> -inline AI* GetMechanarAI(Creature* creature) +template <class AI, class T> +inline AI* GetMechanarAI(T* obj) { - return GetInstanceAI<AI>(creature, MechanarScriptName); + return GetInstanceAI<AI>(obj, MechanarScriptName); } #endif diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h index fecbdd46d6e..efccf5a958d 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h @@ -64,10 +64,10 @@ enum AZGameObjectIds GO_WARDENS_SHIELD = 184802 // shield 'protecting' mellichar }; -template<typename AI> -inline AI* GetArcatrazAI(Creature* creature) +template <class AI, class T> +inline AI* GetArcatrazAI(T* obj) { - return GetInstanceAI<AI>(creature, ArcatrazScriptName); + return GetInstanceAI<AI>(obj, ArcatrazScriptName); } #endif // ARCATRAZ_H diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp index b3f075e943c..c37580351b6 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp @@ -66,12 +66,10 @@ class instance_arcatraz : public InstanceMapScript void OnGameObjectCreate(GameObject* go) override { + InstanceScript::OnGameObjectCreate(go); + switch (go->GetEntry()) { - case GO_CONTAINMENT_CORE_SECURITY_FIELD_ALPHA: - case GO_CONTAINMENT_CORE_SECURITY_FIELD_BETA: - AddDoor(go, true); - break; case GO_STASIS_POD_ALPHA: StasisPodGUIDs[0] = go->GetGUID(); break; @@ -95,19 +93,6 @@ class instance_arcatraz : public InstanceMapScript } } - void OnGameObjectRemove(GameObject* go) override - { - switch (go->GetEntry()) - { - case GO_CONTAINMENT_CORE_SECURITY_FIELD_ALPHA: - case GO_CONTAINMENT_CORE_SECURITY_FIELD_BETA: - AddDoor(go, false); - break; - default: - break; - } - } - void SetData(uint32 type, uint32 data) override { switch (type) diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp index f1926cfd9f0..0665d3f3fb7 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp @@ -96,7 +96,6 @@ class npc_warp_splinter_treant : public CreatureScript void MoveInLineOfSight(Unit* /*who*/) override { } - void UpdateAI(uint32 diff) override { if (!UpdateVictim() || !me->GetVictim()) diff --git a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h index 07b6b56c971..4c8fb6ae0d5 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h +++ b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h @@ -43,10 +43,10 @@ enum BCCreatureIds NPC_WARP_SPLINTER = 17977 }; -template<typename AI> -inline AI* GetBotanicaAI(Creature* creature) +template <class AI, class T> +inline AI* GetBotanicaAI(T* obj) { - return GetInstanceAI<AI>(creature, BotanicaScriptName); + return GetInstanceAI<AI>(obj, BotanicaScriptName); } #endif diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 9d1326ede7e..a34b659f2d3 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -31,13 +31,11 @@ EndContentData */ #include "ScriptMgr.h" #include "CellImpl.h" #include "CreatureAIImpl.h" -#include "GameObject.h" +#include "GameObjectAI.h" #include "GridNotifiersImpl.h" #include "MotionMaster.h" #include "ObjectAccessor.h" -#include "Player.h" #include "ScriptedCreature.h" -#include "GameObjectAI.h" #include "ScriptedGossip.h" #include "SpellInfo.h" #include "SpellScript.h" @@ -126,7 +124,7 @@ public: me->DespawnOrUnsummon(1); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (spell->Id == SPELL_T_PHASE_MODULATOR && caster->GetTypeId() == TYPEID_PLAYER) { @@ -843,7 +841,7 @@ class npc_simon_bunny : public CreatureScript } } - void SpellHitTarget(Unit* target, const SpellInfo* spell) override + void SpellHitTarget(Unit* target, SpellInfo const* spell) override { // Cast SPELL_BAD_PRESS_DAMAGE with scaled basepoints when the visual hits the target. // Need Fix: When SPELL_BAD_PRESS_TRIGGER hits target it triggers spell SPELL_BAD_PRESS_DAMAGE by itself diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index efda058ca6a..90391331d33 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -34,7 +34,6 @@ EndContentData */ #include "MotionMaster.h" #include "ObjectAccessor.h" #include "Player.h" -#include "QuestDef.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index b4572ce22f7..22bf85cca64 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -29,10 +29,9 @@ EndContentData */ #include "ScriptMgr.h" #include "GameObject.h" -#include "MotionMaster.h" #include "GameObjectAI.h" +#include "MotionMaster.h" #include "Player.h" -#include "QuestDef.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" #include "SpellInfo.h" @@ -144,7 +143,7 @@ public: } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) override + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override { if (spell->Id == SPELL_CHAIN_LIGHTNING) { @@ -517,7 +516,7 @@ public: summoned->AI()->AttackStart(me); } - void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell) override + void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override { if (spell->Id == SPELL_KUR_CHAIN_LIGHTNING) { diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index 1b7287a7d20..76f8e1d5959 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -31,11 +31,10 @@ EndContentData */ #include "ScriptMgr.h" #include "GameObject.h" +#include "GameObjectAI.h" #include "Log.h" #include "ObjectAccessor.h" -#include "GameObjectAI.h" #include "Player.h" -#include "QuestDef.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" @@ -318,7 +317,7 @@ class at_commander_dawnforge : public AreaTriggerScript public: at_commander_dawnforge() : AreaTriggerScript("at_commander_dawnforge") { } - bool OnTrigger(Player* player, const AreaTriggerEntry* /*areaTrigger*/, bool /*entered*/) override + bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/, bool /*entered*/) override { //if player lost aura or not have at all, we should not try start event. if (!player->HasAura(SPELL_SUNFURY_DISGUISE)) @@ -409,7 +408,7 @@ public: PlayerGUID = who->GetGUID(); } - //void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/) override + //void SpellHit(Unit* /*caster*/, SpellInfo const* /*spell*/) override //{ // DoCast(me, SPELL_DE_MATERIALIZE); //} @@ -607,7 +606,7 @@ public: // take the GO -> animation me->HandleEmoteCommand(EMOTE_STATE_LOOT); SetEscortPaused(true); - bTake=true; + bTake = true; } break; case 36: //return and quest_complete @@ -634,7 +633,7 @@ public: if (GameObject* go = GetClosestGameObjectWithEntry(me, GO_DRAENEI_MACHINE, INTERACTION_DISTANCE)) { SetEscortPaused(false); - bTake=false; + bTake = false; uiTakeTimer = 3000; go->Delete(); } diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index a286e2f7ec5..fb702cb6a42 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -42,7 +42,6 @@ EndContentData */ #include "MotionMaster.h" #include "ObjectAccessor.h" #include "Player.h" -#include "QuestDef.h" #include "ScriptedEscortAI.h" #include "ScriptedGossip.h" #include "SpellInfo.h" @@ -163,7 +162,7 @@ public: caster->AI()->SetData(TYPE_INFERNAL, DATA_DIED); } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_SUMMON_INFERNAL) { @@ -383,7 +382,7 @@ public: me->SetDisableGravity(false); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (!caster) return; @@ -510,7 +509,7 @@ public: Initialize(); } - void SpellHit(Unit* caster, const SpellInfo* spell) override + void SpellHit(Unit* caster, SpellInfo const* spell) override { if (!caster) return; @@ -1561,7 +1560,7 @@ public: } } - void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { if (spell->Id == SPELL_WHISTLE) { diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp index 767492c2b77..1dbdf9aabcc 100644 --- a/src/server/scripts/Pet/pet_dk.cpp +++ b/src/server/scripts/Pet/pet_dk.cpp @@ -26,7 +26,6 @@ #include "GridNotifiersImpl.h" #include "MotionMaster.h" #include "ScriptedCreature.h" -#include "SpellInfo.h" enum DeathKnightSpells { diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp index 04536ec32f3..42716b22dfa 100644 --- a/src/server/scripts/Pet/pet_mage.cpp +++ b/src/server/scripts/Pet/pet_mage.cpp @@ -27,7 +27,6 @@ #include "MotionMaster.h" #include "Pet.h" #include "PetAI.h" -#include "Player.h" #include "ScriptedCreature.h" enum MageSpells @@ -102,10 +101,10 @@ class npc_pet_mage_mirror_image : public CreatureScript } // Prioritize units with threat referenced to owner if (highestThreat > 0.0f && highestThreatUnit) - me->Attack(highestThreatUnit, false); + me->Attack(highestThreatUnit, false); // If there is no such target, try to attack nearest hostile unit if such exists else if (nearestPlayer) - me->Attack(nearestPlayer, false); + me->Attack(nearestPlayer, false); } bool IsInThreatList(Unit* target) diff --git a/src/server/scripts/ScriptPCH.h b/src/server/scripts/ScriptPCH.h index 97132f44720..56d5c570636 100644 --- a/src/server/scripts/ScriptPCH.h +++ b/src/server/scripts/ScriptPCH.h @@ -1,3 +1,20 @@ +/* + * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "CreatureAIImpl.h" #include "InstanceScript.h" #include "Map.h" diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp index 0c1ac135092..2556d465842 100644 --- a/src/server/scripts/Spells/spell_holiday.cpp +++ b/src/server/scripts/Spells/spell_holiday.cpp @@ -179,7 +179,11 @@ class spell_hallow_end_candy_pirate : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo({ SPELL_HALLOWS_END_CANDY_FEMALE_DEFIAS_PIRATE, SPELL_HALLOWS_END_CANDY_MALE_DEFIAS_PIRATE }); + return ValidateSpellInfo( + { + SPELL_HALLOWS_END_CANDY_FEMALE_DEFIAS_PIRATE, + SPELL_HALLOWS_END_CANDY_MALE_DEFIAS_PIRATE + }); } void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -350,7 +354,12 @@ class spell_hallow_end_tricky_treat : public SpellScriptLoader bool Validate(SpellInfo const* /*spell*/) override { - return ValidateSpellInfo({ SPELL_TRICKY_TREAT_SPEED, SPELL_TRICKY_TREAT_TRIGGER, SPELL_UPSET_TUMMY }); + return ValidateSpellInfo( + { + SPELL_TRICKY_TREAT_SPEED, + SPELL_TRICKY_TREAT_TRIGGER, + SPELL_UPSET_TUMMY + }); } void HandleScript(SpellEffIndex /*effIndex*/) @@ -468,7 +477,7 @@ class spell_pilgrims_bounty_buff_food : public SpellScriptLoader private: uint32 const _triggeredSpellId; public: - spell_pilgrims_bounty_buff_food(const char* name, uint32 triggeredSpellId) : SpellScriptLoader(name), _triggeredSpellId(triggeredSpellId) { } + spell_pilgrims_bounty_buff_food(char const* name, uint32 triggeredSpellId) : SpellScriptLoader(name), _triggeredSpellId(triggeredSpellId) { } class spell_pilgrims_bounty_buff_food_AuraScript : public AuraScript { @@ -668,17 +677,18 @@ class spell_pilgrims_bounty_well_fed : public SpellScriptLoader uint32 _triggeredSpellId; public: - spell_pilgrims_bounty_well_fed(const char* name, uint32 triggeredSpellId) : SpellScriptLoader(name), _triggeredSpellId(triggeredSpellId) { } + spell_pilgrims_bounty_well_fed(char const* name, uint32 triggeredSpellId) : SpellScriptLoader(name), _triggeredSpellId(triggeredSpellId) { } class spell_pilgrims_bounty_well_fed_SpellScript : public SpellScript { PrepareSpellScript(spell_pilgrims_bounty_well_fed_SpellScript); - private: + uint32 _triggeredSpellId; public: spell_pilgrims_bounty_well_fed_SpellScript(uint32 triggeredSpellId) : SpellScript(), _triggeredSpellId(triggeredSpellId) { } + private: bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ _triggeredSpellId }); @@ -773,13 +783,13 @@ class spell_pilgrims_bounty_on_plate : public SpellScriptLoader uint32 _triggeredSpellId4; public: - spell_pilgrims_bounty_on_plate(const char* name, uint32 triggeredSpellId1, uint32 triggeredSpellId2, uint32 triggeredSpellId3, uint32 triggeredSpellId4) : SpellScriptLoader(name), + spell_pilgrims_bounty_on_plate(char const* name, uint32 triggeredSpellId1, uint32 triggeredSpellId2, uint32 triggeredSpellId3, uint32 triggeredSpellId4) : SpellScriptLoader(name), _triggeredSpellId1(triggeredSpellId1), _triggeredSpellId2(triggeredSpellId2), _triggeredSpellId3(triggeredSpellId3), _triggeredSpellId4(triggeredSpellId4) { } class spell_pilgrims_bounty_on_plate_SpellScript : public SpellScript { PrepareSpellScript(spell_pilgrims_bounty_on_plate_SpellScript); - private: + uint32 _triggeredSpellId1; uint32 _triggeredSpellId2; uint32 _triggeredSpellId3; @@ -789,7 +799,8 @@ class spell_pilgrims_bounty_on_plate : public SpellScriptLoader spell_pilgrims_bounty_on_plate_SpellScript(uint32 triggeredSpellId1, uint32 triggeredSpellId2, uint32 triggeredSpellId3, uint32 triggeredSpellId4) : SpellScript(), _triggeredSpellId1(triggeredSpellId1), _triggeredSpellId2(triggeredSpellId2), _triggeredSpellId3(triggeredSpellId3), _triggeredSpellId4(triggeredSpellId4) { } - bool Validate(SpellInfo const* /*spellInfo*/) override + private: + bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( { @@ -892,19 +903,19 @@ class spell_pilgrims_bounty_a_serving_of : public SpellScriptLoader private: uint32 _triggeredSpellId; public: - spell_pilgrims_bounty_a_serving_of(const char* name, uint32 triggeredSpellId) : SpellScriptLoader(name), _triggeredSpellId(triggeredSpellId) { } + spell_pilgrims_bounty_a_serving_of(char const* name, uint32 triggeredSpellId) : SpellScriptLoader(name), _triggeredSpellId(triggeredSpellId) { } class spell_pilgrims_bounty_a_serving_of_AuraScript : public AuraScript { PrepareAuraScript(spell_pilgrims_bounty_a_serving_of_AuraScript); - private: uint32 _triggeredSpellId; public: spell_pilgrims_bounty_a_serving_of_AuraScript(uint32 triggeredSpellId) : AuraScript(), _triggeredSpellId(triggeredSpellId) { } - bool Validate(SpellInfo const* /*spellInfo*/) override + private: + bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ _triggeredSpellId }); } @@ -1006,6 +1017,14 @@ enum PX238WinterWondervolt SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_4 = 26274 }; +uint32 const WonderboltTransformSpells[] = +{ + SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_1, + SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_2, + SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_3, + SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_4 +}; + class spell_winter_veil_px_238_winter_wondervolt : public SpellScriptLoader { public: @@ -1017,34 +1036,20 @@ class spell_winter_veil_px_238_winter_wondervolt : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo( - { - SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_1, - SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_2, - SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_3, - SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_4 - }); + return ValidateSpellInfo(WonderboltTransformSpells); } void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); - uint32 const spells[4] = - { - SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_1, - SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_2, - SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_3, - SPELL_PX_238_WINTER_WONDERVOLT_TRANSFORM_4 - }; - if (Unit* target = GetHitUnit()) { - for (uint8 i = 0; i < 4; ++i) - if (target->HasAura(spells[i])) + for (uint32 spell : WonderboltTransformSpells) + if (target->HasAura(spell)) return; - target->CastSpell(target, spells[urand(0, 3)], true); + target->CastSpell(target, Trinity::Containers::SelectRandomContainerElement(WonderboltTransformSpells), true); } } @@ -1552,7 +1557,12 @@ class spell_gen_ribbon_pole_dancer_check : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo({ SPELL_HAS_FULL_MIDSUMMER_SET, SPELL_RIBBON_DANCE, SPELL_BURNING_HOT_POLE_DANCE }); + return ValidateSpellInfo( + { + SPELL_HAS_FULL_MIDSUMMER_SET, + SPELL_RIBBON_DANCE, + SPELL_BURNING_HOT_POLE_DANCE + }); } void PeriodicTick(AuraEffect const* /*aurEff*/) diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index bf39b8c83f0..61e551a055b 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -46,17 +46,18 @@ class spell_item_trigger_spell : public SpellScriptLoader uint32 _triggeredSpellId; public: - spell_item_trigger_spell(const char* name, uint32 triggeredSpellId) : SpellScriptLoader(name), _triggeredSpellId(triggeredSpellId) { } + spell_item_trigger_spell(char const* name, uint32 triggeredSpellId) : SpellScriptLoader(name), _triggeredSpellId(triggeredSpellId) { } class spell_item_trigger_spell_SpellScript : public SpellScript { PrepareSpellScript(spell_item_trigger_spell_SpellScript); - private: + uint32 _triggeredSpellId; public: spell_item_trigger_spell_SpellScript(uint32 triggeredSpellId) : SpellScript(), _triggeredSpellId(triggeredSpellId) { } + private: bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ _triggeredSpellId }); @@ -214,7 +215,7 @@ class spell_item_anger_capacitor : public SpellScriptLoader caster->RemoveAurasDueToSpell(SPELL_MOTE_OF_ANGER); uint32 spellId = SPELL_MANIFEST_ANGER_MAIN_HAND; if (Player* player = caster->ToPlayer()) - if (player->GetWeaponForAttack(OFF_ATTACK, true) && urand(0, 1)) + if (player->GetWeaponForAttack(OFF_ATTACK, true) && roll_chance_i(50)) spellId = SPELL_MANIFEST_ANGER_OFF_HAND; caster->CastSpell(target, spellId, true, nullptr, aurEff); @@ -607,6 +608,7 @@ class spell_item_defibrillate : public SpellScriptLoader public: spell_item_defibrillate_SpellScript(uint8 chance, uint32 failSpell) : SpellScript(), _chance(chance), _failSpell(failSpell) { } + private: bool Validate(SpellInfo const* /*spellInfo*/) override { return !_failSpell || ValidateSpellInfo({ _failSpell }); @@ -627,7 +629,6 @@ class spell_item_defibrillate : public SpellScriptLoader OnEffectHitTarget += SpellEffectFn(spell_item_defibrillate_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_RESURRECT); } - private: uint8 _chance; uint32 _failSpell; }; @@ -2982,7 +2983,11 @@ class spell_item_shard_of_the_scale : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo({ HealProc, DamageProc }); + return ValidateSpellInfo( + { + HealProc, + DamageProc + }); } void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) @@ -3106,14 +3111,9 @@ class spell_item_sunwell_neck : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - if (!sFactionStore.LookupEntry(FACTION_ALDOR) || - !sFactionStore.LookupEntry(FACTION_SCRYERS)) - return false; - return ValidateSpellInfo( - { - Aldors, - Scryers - }); + return ValidateSpellInfo({ Aldors, Scryers }) && + sFactionStore.LookupEntry(FACTION_ALDOR) && + sFactionStore.LookupEntry(FACTION_SCRYERS); } bool CheckProc(ProcEventInfo& eventInfo) @@ -3271,6 +3271,7 @@ public: { } + private: bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ _stackSpell, _triggerSpell }); @@ -3301,7 +3302,6 @@ public: OnEffectProc += AuraEffectProcFn(spell_item_trinket_stack_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } - private: uint32 _stackSpell; uint32 _triggerSpell; }; diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 75e873604c4..43ae326ade2 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -89,15 +89,8 @@ class spell_pal_ardent_defender : public SpellScriptLoader { PrepareAuraScript(spell_pal_ardent_defender_AuraScript); - public: - spell_pal_ardent_defender_AuraScript() - { - absorbPct = 0; - healPct = 0; - } - - private: - uint32 absorbPct, healPct; + uint32 _absorbPct = 0; + uint32 _healPct = 0; enum Spell { @@ -106,15 +99,13 @@ class spell_pal_ardent_defender : public SpellScriptLoader bool Validate(SpellInfo const* spellInfo) override { - if (!sSpellMgr->GetSpellInfo(PAL_SPELL_ARDENT_DEFENDER_HEAL)) - return false; - return true; + return ValidateSpellInfo({ PAL_SPELL_ARDENT_DEFENDER_HEAL }); } bool Load() override { - healPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(); - absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(); + _absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(); + _healPct = GetSpellInfo()->Effects[EFFECT_1].CalcValue(); return GetUnitOwner()->GetTypeId() == TYPEID_PLAYER; } @@ -124,7 +115,7 @@ class spell_pal_ardent_defender : public SpellScriptLoader amount = -1; } - void Absorb(AuraEffect* aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount) + void Absorb(AuraEffect* aurEff, DamageInfo& dmgInfo, uint32& absorbAmount) { Unit* victim = GetTarget(); int32 remainingHealth = victim->GetHealth() - dmgInfo.GetDamage(); @@ -135,15 +126,13 @@ class spell_pal_ardent_defender : public SpellScriptLoader // Cast healing spell, completely avoid damage absorbAmount = dmgInfo.GetDamage(); - uint32 defenseSkillValue = victim->GetDefenseSkillValue(); + float defenseSkillValue = victim->GetDefenseSkillValue(); // Max heal when defense skill denies critical hits from raid bosses // Formula: max defense at level + 140 (raiting from gear) - uint32 reqDefForMaxHeal = victim->getLevel() * 5 + 140; - float pctFromDefense = (defenseSkillValue >= reqDefForMaxHeal) - ? 1.0f - : float(defenseSkillValue) / float(reqDefForMaxHeal); + float reqDefForMaxHeal = victim->GetMaxSkillValueForLevel() + 140.0f; + float defenseFactor = std::min(1.0f, defenseSkillValue / reqDefForMaxHeal); - int32 healAmount = int32(victim->CountPctFromMaxHealth(uint32(healPct * pctFromDefense))); + int32 healAmount = int32(victim->CountPctFromMaxHealth(static_cast<uint32>(lroundf(_healPct * defenseFactor)))); victim->CastCustomSpell(victim, PAL_SPELL_ARDENT_DEFENDER_HEAL, &healAmount, nullptr, nullptr, true, nullptr, aurEff); victim->ToPlayer()->AddSpellCooldown(PAL_SPELL_ARDENT_DEFENDER_HEAL, 0, time(nullptr) + 120); } @@ -153,7 +142,7 @@ class spell_pal_ardent_defender : public SpellScriptLoader uint32 damageToReduce = (victim->GetHealth() < allowedHealth) ? dmgInfo.GetDamage() : allowedHealth - remainingHealth; - absorbAmount = CalculatePct(damageToReduce, absorbPct); + absorbAmount = CalculatePct(damageToReduce, _absorbPct); } } @@ -253,7 +242,11 @@ class spell_pal_avenging_wrath : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo({ SPELL_PALADIN_SANCTIFIED_WRATH, SPELL_PALADIN_SANCTIFIED_WRATH_TALENT_R1 }); + return ValidateSpellInfo( + { + SPELL_PALADIN_SANCTIFIED_WRATH, + SPELL_PALADIN_SANCTIFIED_WRATH_TALENT_R1 + }); } void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -870,7 +863,11 @@ class spell_pal_item_t6_trinket : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo({ SPELL_PALADIN_ENDURING_LIGHT, SPELL_PALADIN_ENDURING_JUDGEMENT }); + return ValidateSpellInfo( + { + SPELL_PALADIN_ENDURING_LIGHT, + SPELL_PALADIN_ENDURING_JUDGEMENT + }); } void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) @@ -925,6 +922,7 @@ class spell_pal_judgement : public SpellScriptLoader { PrepareSpellScript(spell_pal_judgement_SpellScript); + private: bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_JUDGEMENT_DAMAGE }); diff --git a/src/server/scripts/Spells/spell_pet.cpp b/src/server/scripts/Spells/spell_pet.cpp index 0ff0ebde0e5..e8743fa35fc 100644 --- a/src/server/scripts/Spells/spell_pet.cpp +++ b/src/server/scripts/Spells/spell_pet.cpp @@ -1436,13 +1436,6 @@ public: { PrepareAuraScript(spell_dk_pet_scaling_01_AuraScript); - public: - spell_dk_pet_scaling_01_AuraScript() - { - _tempHealth = 0; - } - - private: bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -1502,8 +1495,7 @@ public: DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_01_AuraScript::CalculateStrengthAmount, EFFECT_1, SPELL_AURA_MOD_STAT); } - private: - uint32 _tempHealth; + uint32 _tempHealth = 0; }; AuraScript* GetAuraScript() const override diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 6e663381abb..f4c9d83f36e 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -604,14 +604,7 @@ class spell_pri_guardian_spirit : public SpellScriptLoader { PrepareAuraScript(spell_pri_guardian_spirit_AuraScript); - public: - spell_pri_guardian_spirit_AuraScript() - { - healPct = 0; - } - - private: - uint32 healPct; + uint32 healPct = 0; bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -869,13 +862,6 @@ class spell_pri_mana_leech : public SpellScriptLoader { PrepareAuraScript(spell_pri_mana_leech_AuraScript); - public: - spell_pri_mana_leech_AuraScript() - { - _procTarget = nullptr; - } - - private: bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_MANA_LEECH_PROC }); @@ -899,8 +885,7 @@ class spell_pri_mana_leech : public SpellScriptLoader OnEffectProc += AuraEffectProcFn(spell_pri_mana_leech_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } - private: - Unit* _procTarget; + Unit* _procTarget = nullptr; }; AuraScript* GetAuraScript() const override diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index ff4f58685c0..abf23c8da85 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -21,15 +21,15 @@ * Scriptnames of files in this file should be prefixed with "spell_q#questID_". */ +#include "ScriptMgr.h" #include "CellImpl.h" #include "CreatureAIImpl.h" #include "CreatureTextMgr.h" #include "GridNotifiersImpl.h" #include "Player.h" -#include "ScriptMgr.h" #include "ScriptedCreature.h" -#include "SpellScript.h" #include "SpellAuraEffects.h" +#include "SpellScript.h" #include "Vehicle.h" class spell_generic_quest_update_entry_SpellScript : public SpellScript @@ -1047,13 +1047,7 @@ class spell_q14112_14145_chum_the_water: public SpellScriptLoader bool Validate(SpellInfo const* /*spellEntry*/) override { - return ValidateSpellInfo( - { - SUMMON_ANGRY_KVALDIR, - SUMMON_NORTH_SEA_MAKO, - SUMMON_NORTH_SEA_THRESHER, - SUMMON_NORTH_SEA_BLUE_SHARK - }); + return ValidateSpellInfo({ SUMMON_ANGRY_KVALDIR, SUMMON_NORTH_SEA_MAKO, SUMMON_NORTH_SEA_THRESHER, SUMMON_NORTH_SEA_BLUE_SHARK }); } void HandleScriptEffect(SpellEffIndex /*effIndex*/) @@ -1857,9 +1851,8 @@ class spell_q12847_summon_soul_moveto_bunny : public SpellScriptLoader enum BearFlankMaster { - SPELL_BEAR_FLANK_MASTER = 56565, SPELL_CREATE_BEAR_FLANK = 56566, - SPELL_BEAR_FLANK_FAIL = 56569 + SPELL_BEAR_FLANK_FAIL = 56569 }; class spell_q13011_bear_flank_master : public SpellScriptLoader @@ -1873,7 +1866,11 @@ class spell_q13011_bear_flank_master : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo({ SPELL_BEAR_FLANK_MASTER, SPELL_CREATE_BEAR_FLANK }); + return ValidateSpellInfo( + { + SPELL_CREATE_BEAR_FLANK, + SPELL_BEAR_FLANK_FAIL + }); } bool Load() override @@ -1919,7 +1916,7 @@ class spell_q13086_cannons_target : public SpellScriptLoader bool Validate(SpellInfo const* spellInfo) override { - return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0)->CalcValue()) }); + return ValidateSpellInfo({ static_cast<uint32>(spellInfo->GetEffect(EFFECT_0)->CalcValue()) }); } void HandleEffectDummy(SpellEffIndex /*effIndex*/) diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index e4595f56f27..23b05309a3d 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -74,13 +74,6 @@ class spell_rog_blade_flurry : public SpellScriptLoader { PrepareAuraScript(spell_rog_blade_flurry_AuraScript); - public: - spell_rog_blade_flurry_AuraScript() - { - _procTarget = nullptr; - } - - private: bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_BLADE_FLURRY_EXTRA_ATTACK }); @@ -112,8 +105,7 @@ class spell_rog_blade_flurry : public SpellScriptLoader OnEffectProc += AuraEffectProcFn(spell_rog_blade_flurry_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE); } - private: - Unit* _procTarget; + Unit* _procTarget = nullptr; }; AuraScript* GetAuraScript() const override @@ -132,14 +124,7 @@ class spell_rog_cheat_death : public SpellScriptLoader { PrepareAuraScript(spell_rog_cheat_death_AuraScript); - public: - spell_rog_cheat_death_AuraScript() - { - absorbChance = 0; - } - - private: - uint32 absorbChance; + uint32 absorbChance = 0; bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -234,13 +219,6 @@ class spell_rog_deadly_poison : public SpellScriptLoader { PrepareSpellScript(spell_rog_deadly_poison_SpellScript); - public: - spell_rog_deadly_poison_SpellScript() - { - _stackAmount = 0; - } - - private: bool Load() override { // at this point CastItem must already be initialized @@ -318,7 +296,7 @@ class spell_rog_deadly_poison : public SpellScriptLoader AfterHit += SpellHitFn(spell_rog_deadly_poison_SpellScript::HandleAfterHit); } - uint8 _stackAmount; + uint8 _stackAmount = 0; }; SpellScript* GetSpellScript() const override @@ -765,16 +743,13 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader { PrepareAuraScript(spell_rog_tricks_of_the_trade_AuraScript); - public: - spell_rog_tricks_of_the_trade_AuraScript() - { - _redirectTarget = nullptr; - } - - private: bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo({ SPELL_ROGUE_TRICKS_OF_THE_TRADE_DMG_BOOST, SPELL_ROGUE_TRICKS_OF_THE_TRADE_PROC }); + return ValidateSpellInfo( + { + SPELL_ROGUE_TRICKS_OF_THE_TRADE_DMG_BOOST, + SPELL_ROGUE_TRICKS_OF_THE_TRADE_PROC + }); } void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -806,8 +781,7 @@ class spell_rog_tricks_of_the_trade : public SpellScriptLoader OnEffectProc += AuraEffectProcFn(spell_rog_tricks_of_the_trade_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_DUMMY); } - private: - Unit* _redirectTarget; + Unit* _redirectTarget = nullptr; }; AuraScript* GetAuraScript() const override @@ -890,10 +864,7 @@ public: bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo( - { - SPELL_ROGUE_HONOR_AMONG_THIEVES_ENERGIZE - }); + return ValidateSpellInfo({ SPELL_ROGUE_HONOR_AMONG_THIEVES_ENERGIZE }); } void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 54f2123b64b..5a3f44d8688 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -691,7 +691,11 @@ class spell_sha_item_t6_trinket : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo({ SPELL_SHAMAN_ENERGY_SURGE, SPELL_SHAMAN_POWER_SURGE }); + return ValidateSpellInfo( + { + SPELL_SHAMAN_ENERGY_SURGE, + SPELL_SHAMAN_POWER_SURGE + }); } void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 3f59c6d2d7f..5f30a1399c0 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -1095,13 +1095,6 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader { PrepareAuraScript(spell_warr_sweeping_strikes_AuraScript); - public: - spell_warr_sweeping_strikes_AuraScript() - { - _procTarget = nullptr; - } - - private: bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK_1, SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK_2 }); @@ -1138,8 +1131,7 @@ class spell_warr_sweeping_strikes : public SpellScriptLoader OnEffectProc += AuraEffectProcFn(spell_warr_sweeping_strikes_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } - private: - Unit* _procTarget; + Unit* _procTarget = nullptr; }; AuraScript* GetAuraScript() const override @@ -1337,13 +1329,6 @@ class spell_warr_vigilance : public SpellScriptLoader { PrepareAuraScript(spell_warr_vigilance_AuraScript); - public: - spell_warr_vigilance_AuraScript() - { - _procTarget = nullptr; - } - - private: bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_VENGEANCE }); @@ -1388,8 +1373,7 @@ class spell_warr_vigilance : public SpellScriptLoader OnEffectRemove += AuraEffectRemoveFn(spell_warr_vigilance_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } - private: - Unit* _procTarget; + Unit* _procTarget = nullptr; }; AuraScript* GetAuraScript() const override diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index 698554344a1..c6839cdb836 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -769,7 +769,11 @@ class spell_mark_of_nature : public SpellScriptLoader bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo({ SPELL_MARK_OF_NATURE, SPELL_AURA_OF_NATURE }); + return ValidateSpellInfo( + { + SPELL_MARK_OF_NATURE, + SPELL_AURA_OF_NATURE + }); } void FilterTargets(std::list<WorldObject*>& targets) diff --git a/src/server/scripts/World/duel_reset.cpp b/src/server/scripts/World/duel_reset.cpp index 8abe6773416..58946c4475d 100644 --- a/src/server/scripts/World/duel_reset.cpp +++ b/src/server/scripts/World/duel_reset.cpp @@ -15,10 +15,10 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "GameTime.h" #include "ScriptMgr.h" -#include "Player.h" +#include "GameTime.h" #include "Pet.h" +#include "Player.h" #include "SpellHistory.h" #include "SpellInfo.h" #include "SpellMgr.h" diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 2635781f48c..dba64bed1cf 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -46,11 +46,11 @@ EndContentData */ #include "ScriptMgr.h" #include "DB2Structure.h" +#include "GameEventMgr.h" #include "GameObject.h" #include "GameObjectAI.h" #include "GameTime.h" #include "Log.h" -#include "Map.h" #include "MotionMaster.h" #include "Player.h" #include "ScriptedCreature.h" @@ -58,7 +58,6 @@ EndContentData */ #include "TemporarySummon.h" #include "WorldSession.h" #include "World.h" -#include "GameEventMgr.h" /*###### ## go_cat_figurine @@ -1696,7 +1695,7 @@ public: break; std::vector<Player*> playersNearby; - me->GetPlayerListInGrid(playersNearby, me->GetMap()->GetVisibilityRange()); + me->GetPlayerListInGrid(playersNearby, me->GetVisibilityRange()); for (Player* player : playersNearby) { if (player->GetTeamId() == TEAM_HORDE) diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp index 840161f8f9a..ca3b27140e4 100644 --- a/src/server/scripts/World/mob_generic_creature.cpp +++ b/src/server/scripts/World/mob_generic_creature.cpp @@ -36,7 +36,7 @@ public: } uint32 timer, interval; - const SpellInfo* spell; + SpellInfo const* spell; void UpdateAI(uint32 diff) override { diff --git a/src/server/scripts/World/npc_innkeeper.cpp b/src/server/scripts/World/npc_innkeeper.cpp index f4e0f3b9361..b994d1a9ee4 100644 --- a/src/server/scripts/World/npc_innkeeper.cpp +++ b/src/server/scripts/World/npc_innkeeper.cpp @@ -57,7 +57,7 @@ public: { if (IsHolidayActive(HOLIDAY_HALLOWS_END) && !player->HasAura(SPELL_TRICK_OR_TREATED)) { - const char* localizedEntry; + char const* localizedEntry; switch (player->GetSession()->GetSessionDbcLocale()) { case LOCALE_frFR: localizedEntry = LOCALE_TRICK_OR_TREAT_2; break; @@ -76,7 +76,7 @@ public: if (me->IsInnkeeper()) { - const char* localizedEntry; + char const* localizedEntry; switch (player->GetSession()->GetSessionDbcLocale()) { case LOCALE_deDE: localizedEntry = LOCALE_INNKEEPER_3; break; diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 1d47dbe9785..d67f51796c5 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -17,14 +17,15 @@ #include "ScriptMgr.h" #include "CellImpl.h" -#include "CreatureTextMgr.h" #include "CombatAI.h" +#include "CreatureTextMgr.h" #include "GameEventMgr.h" #include "GameObject.h" #include "GameObjectAI.h" #include "GridNotifiersImpl.h" #include "Log.h" #include "MotionMaster.h" +#include "MoveSplineInit.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "PassiveAI.h" @@ -38,7 +39,6 @@ #include "SpellMgr.h" #include "TemporarySummon.h" #include "Vehicle.h" -#include "MoveSplineInit.h" /*######## # npc_air_force_bots @@ -110,9 +110,9 @@ public: SpawnedGUID.Clear(); // find the correct spawnhandling - static uint32 entryCount = sizeof(spawnAssociations) / sizeof(SpawnAssociation); + static uint8 constexpr const EntryCount = uint8(std::extent<decltype(spawnAssociations)>::value); - for (uint8 i = 0; i < entryCount; ++i) + for (uint8 i = 0; i < EntryCount; ++i) { if (spawnAssociations[i].thisCreatureEntry == creature->GetEntry()) { |