diff --git a/contrib/extractor/dbcfile.h b/contrib/extractor/dbcfile.h index adb8edb3d..3dc5b82b9 100644 --- a/contrib/extractor/dbcfile.h +++ b/contrib/extractor/dbcfile.h @@ -77,7 +77,7 @@ class DBCFile return reinterpret_cast(file.stringTable + stringOffset); } private: - Record(DBCFile& file, unsigned char* offset): file(file), offset(offset) {} + Record(DBCFile& file, unsigned char* offset): offset(offset), file(file) {} unsigned char* offset; DBCFile& file; diff --git a/contrib/mmap/src/IntermediateValues.cpp b/contrib/mmap/src/IntermediateValues.cpp index dd28176ff..4ecfbe577 100644 --- a/contrib/mmap/src/IntermediateValues.cpp +++ b/contrib/mmap/src/IntermediateValues.cpp @@ -226,9 +226,7 @@ namespace MMAP allVerts.append(meshData.solidVerts); float* verts = allVerts.getCArray(); - int vertCount = allVerts.size() / 3; int* tris = allTris.getCArray(); - int triCount = allTris.size() / 3; for (int i = 0; i < allVerts.size() / 3; i++) fprintf(objFile, "v %f %f %f\n", verts[i * 3], verts[i * 3 + 1], verts[i * 3 + 2]); @@ -266,10 +264,14 @@ namespace MMAP return; } + int vertCount = allVerts.size() / 3; + fwrite(&vertCount, sizeof(int), 1, objFile); fwrite(verts, sizeof(float), vertCount * 3, objFile); fflush(objFile); + int triCount = allTris.size() / 3; + fwrite(&triCount, sizeof(int), 1, objFile); fwrite(tris, sizeof(int), triCount * 3, objFile); fflush(objFile); diff --git a/contrib/mmap/src/IntermediateValues.h b/contrib/mmap/src/IntermediateValues.h index 34f2f0fba..b37a025d9 100644 --- a/contrib/mmap/src/IntermediateValues.h +++ b/contrib/mmap/src/IntermediateValues.h @@ -36,8 +36,8 @@ namespace MMAP rcPolyMesh* polyMesh; rcPolyMeshDetail* polyMeshDetail; - IntermediateValues() : compactHeightfield(NULL), heightfield(NULL), - contours(NULL), polyMesh(NULL), polyMeshDetail(NULL) {} + IntermediateValues() : heightfield(nullptr), compactHeightfield(nullptr), + contours(nullptr), polyMesh(nullptr), polyMeshDetail(nullptr) {} ~IntermediateValues(); void writeIV(uint32 mapID, uint32 tileX, uint32 tileY); diff --git a/contrib/mmap/src/MapBuilder.cpp b/contrib/mmap/src/MapBuilder.cpp index 0e601e4bd..3954900ea 100644 --- a/contrib/mmap/src/MapBuilder.cpp +++ b/contrib/mmap/src/MapBuilder.cpp @@ -224,19 +224,18 @@ void filterLedgeSpans(const int walkableHeight, const int walkableClimbTransitio namespace MMAP { - MapBuilder::MapBuilder(float maxWalkableAngle, bool skipLiquid, + MapBuilder::MapBuilder(bool skipLiquid, bool skipContinents, bool skipJunkMaps, bool skipBattlegrounds, bool debugOutput, bool bigBaseUnit, bool quick, const char* offMeshFilePath) : - m_terrainBuilder(NULL), + m_terrainBuilder(nullptr), m_debugOutput(debugOutput), + m_offMeshFilePath(offMeshFilePath), m_skipContinents(skipContinents), m_skipJunkMaps(skipJunkMaps), m_skipBattlegrounds(skipBattlegrounds), - m_maxWalkableAngle(maxWalkableAngle), - m_bigBaseUnit(bigBaseUnit), m_quick(quick), - m_rcContext(NULL), - m_offMeshFilePath(offMeshFilePath) + m_bigBaseUnit(bigBaseUnit), + m_rcContext(nullptr) { m_terrainBuilder = new TerrainBuilder(skipLiquid, quick); @@ -408,7 +407,7 @@ namespace MMAP } if (!tiles->size()) return; - dtNavMesh* navMesh = NULL; + dtNavMesh* navMesh = nullptr; buildNavMesh(mapID, navMesh); if (!navMesh) { @@ -444,7 +443,7 @@ namespace MMAP return; // build navMesh - dtNavMesh* navMesh = NULL; + dtNavMesh* navMesh = nullptr; buildNavMesh(mapID, navMesh); if (!navMesh) { @@ -535,7 +534,7 @@ namespace MMAP // use Max because '32 - tileX' is negative for values over 32 float bmin[3], bmax[3]; - getTileBounds(tileXMax, tileYMax, NULL, 0, bmin, bmax); + getTileBounds(tileXMax, tileYMax, nullptr, 0, bmin, bmax); int maxTiles = tiles->size(); /*** now create the navmesh ***/ @@ -848,11 +847,11 @@ namespace MMAP // we may want to keep them in the future for debug // but right now, we don't have the code to merge them rcFreeHeightField(tile.solid); - tile.solid = NULL; + tile.solid = nullptr; rcFreeCompactHeightfield(tile.chf); - tile.chf = NULL; + tile.chf = nullptr; rcFreeContourSet(tile.cset); - tile.cset = NULL; + tile.cset = nullptr; } } @@ -972,7 +971,7 @@ namespace MMAP params.ch = config.ch; // will hold final navmesh - unsigned char* navData = NULL; + unsigned char* navData = nullptr; int navDataSize = 0; do @@ -1041,7 +1040,7 @@ namespace MMAP char message[1024]; sprintf(message, "[Map %03i] Failed to open %s for writing! \n", mapID, fileName); perror(message); - navMesh->removeTile(tileRef, NULL, NULL); + navMesh->removeTile(tileRef, nullptr, nullptr); continue; } @@ -1073,7 +1072,7 @@ namespace MMAP } } // now that tile is written to disk, we can unload it - navMesh->removeTile(tileRef, NULL, NULL); + navMesh->removeTile(tileRef, nullptr, nullptr); } while (0); } @@ -1203,7 +1202,7 @@ namespace MMAP // transform data vector tempVertices; vector tempTriangles; - WmoLiquid* liquid = NULL; + WmoLiquid* liquid = nullptr; (*it).getMeshData(tempVertices, tempTriangles, liquid); @@ -1320,11 +1319,11 @@ namespace MMAP return; } rcFreeHeightField(tile.solid); - tile.solid = NULL; + tile.solid = nullptr; rcFreeCompactHeightfield(tile.chf); - tile.chf = NULL; + tile.chf = nullptr; rcFreeContourSet(tile.cset); - tile.cset = NULL; + tile.cset = nullptr; IntermediateValues iv; iv.polyMesh = tile.pmesh; @@ -1344,8 +1343,8 @@ namespace MMAP } // Will be deleted by IntermediateValues - tile.pmesh = NULL; - tile.dmesh = NULL; + tile.pmesh = nullptr; + tile.dmesh = nullptr; // setup mesh parameters dtNavMeshCreateParams params; memset(¶ms, 0, sizeof(params)); @@ -1371,7 +1370,7 @@ namespace MMAP params.ch = config.ch; params.buildBvTree = true; - unsigned char* navData = NULL; + unsigned char* navData = nullptr; int navDataSize = 0; printf("* Building navmesh tile [%f %f %f to %f %f %f]\n", params.bmin[0], params.bmin[1], params.bmin[2], diff --git a/contrib/mmap/src/MapBuilder.h b/contrib/mmap/src/MapBuilder.h index c4102e2f3..e01c8df9d 100644 --- a/contrib/mmap/src/MapBuilder.h +++ b/contrib/mmap/src/MapBuilder.h @@ -59,15 +59,14 @@ namespace MMAP class MapBuilder { public: - MapBuilder(float maxWalkableAngle = 60.0f, - bool skipLiquid = false, + MapBuilder(bool skipLiquid = false, bool skipContinents = false, bool skipJunkMaps = true, bool skipBattlegrounds = false, bool debugOutput = false, bool bigBaseUnit = false, bool quick = false, - const char* offMeshFilePath = NULL); + const char* offMeshFilePath = nullptr); ~MapBuilder(); @@ -120,13 +119,10 @@ namespace MMAP bool m_skipJunkMaps; bool m_skipBattlegrounds; bool m_quick; - - float m_maxWalkableAngle; bool m_bigBaseUnit; // build performance - not really used for now rcContext* m_rcContext; - uint32 m_lastMapTriangle; }; } diff --git a/contrib/mmap/src/TerrainBuilder.cpp b/contrib/mmap/src/TerrainBuilder.cpp index 221cba4a0..a7d9fa1ac 100644 --- a/contrib/mmap/src/TerrainBuilder.cpp +++ b/contrib/mmap/src/TerrainBuilder.cpp @@ -26,7 +26,7 @@ namespace MMAP { - TerrainBuilder::TerrainBuilder(bool skipLiquid, bool quick) : m_skipLiquid(skipLiquid), m_V9(NULL), m_V8(NULL), m_mapId(0), m_quick(quick) { } + TerrainBuilder::TerrainBuilder(bool skipLiquid, bool quick) : m_skipLiquid(skipLiquid), m_V9(nullptr), m_V8(nullptr), m_quick(quick), m_mapId(0) { } TerrainBuilder::~TerrainBuilder() { } /**************************************************************************/ @@ -277,7 +277,7 @@ namespace MMAP j++; } delete [] liquid_map; - liquid_map = NULL; + liquid_map = nullptr; } else { @@ -584,7 +584,7 @@ namespace MMAP VMAPLoadResult result = vmapManager.loadMap("vmaps", mapID, tileX, tileY); InstanceTreeMap instanceTrees; vmapManager.getInstanceMapTree(instanceTrees); - ModelInstance* models = NULL; + ModelInstance* models = nullptr; uint32 count = 0; if (instanceTrees[mapID]) instanceTrees[mapID]->getModelInstances(models, count); @@ -625,7 +625,7 @@ namespace MMAP vector tempVertices; vector transformedVertices; vector tempTriangles; - WmoLiquid* liquid = NULL; + WmoLiquid* liquid = nullptr; (*it).getMeshData(tempVertices, tempTriangles, liquid); @@ -995,7 +995,7 @@ namespace MMAP void TerrainBuilder::loadOffMeshConnections(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, const char* offMeshFilePath) { // no meshfile input given? - if (offMeshFilePath == NULL) + if (offMeshFilePath == nullptr) return; FILE* fp = fopen(offMeshFilePath, "rb"); diff --git a/contrib/mmap/src/generator.cpp b/contrib/mmap/src/generator.cpp index 3f057ec35..2ef1b97a8 100644 --- a/contrib/mmap/src/generator.cpp +++ b/contrib/mmap/src/generator.cpp @@ -95,7 +95,7 @@ bool handleArgs(int argc, char** argv, bool &quick, char*& offMeshInputPath) { - char* param = NULL; + char* param = nullptr; for (int i = 1; i < argc; ++i) { if (strcmp(argv[i], "--maxAngle") == 0) @@ -117,7 +117,7 @@ bool handleArgs(int argc, char** argv, return false; char* stileX = strtok(param, ","); - char* stileY = strtok(NULL, ","); + char* stileY = strtok(nullptr, ","); int tilex = atoi(stileX); int tiley = atoi(stileY); @@ -267,7 +267,7 @@ int main(int argc, char** argv) silent = false, bigBaseUnit = false, quick = false; - char* offMeshInputPath = NULL; + char* offMeshInputPath = nullptr; bool validParam = handleArgs(argc, argv, mapnum, tileX, tileY, maxAngle, @@ -292,7 +292,7 @@ int main(int argc, char** argv) if (!checkDirectories(debugOutput)) return silent ? -3 : finish("Press any key to close...", -3); - MapBuilder builder(maxAngle, skipLiquid, skipContinents, skipJunkMaps, + MapBuilder builder(skipLiquid, skipContinents, skipJunkMaps, skipBattlegrounds, debugOutput, bigBaseUnit, quick, offMeshInputPath); if (tileX > -1 && tileY > -1 && mapnum >= 0) diff --git a/contrib/vmap_assembler/vmap_assembler.cpp b/contrib/vmap_assembler/vmap_assembler.cpp index 93be2340b..61dcfa414 100644 --- a/contrib/vmap_assembler/vmap_assembler.cpp +++ b/contrib/vmap_assembler/vmap_assembler.cpp @@ -40,9 +40,9 @@ int main(int argc, char* argv[]) src = "Buildings"; dest = "vmaps"; #ifdef WIN32 - int RetCode = mkdir (dest.c_str()); + /*int RetCode =*/ mkdir (dest.c_str()); #else - int RetCode = mkdir (dest.c_str(), 0777); + /*int RetCode =*/ mkdir (dest.c_str(), 0777); #endif } else diff --git a/contrib/vmap_extractor/vmapextract/model.cpp b/contrib/vmap_extractor/vmapextract/model.cpp index 58361360a..68b3b78d4 100644 --- a/contrib/vmap_extractor/vmapextract/model.cpp +++ b/contrib/vmap_extractor/vmapextract/model.cpp @@ -25,7 +25,7 @@ #include #include -Model::Model(std::string& filename) : filename(filename), vertices(nullptr), indices(nullptr) +Model::Model(std::string& filename) : vertices(nullptr), indices(nullptr), filename(filename) { } diff --git a/dep/include/g3dlite/G3D/MemoryManager.h b/dep/include/g3dlite/G3D/MemoryManager.h index be6f6400c..1c2c21ef5 100644 --- a/dep/include/g3dlite/G3D/MemoryManager.h +++ b/dep/include/g3dlite/G3D/MemoryManager.h @@ -62,11 +62,11 @@ public: typedef shared_ptr Ref; - virtual void* alloc(size_t s); + void* alloc(size_t s) override; - virtual void free(void* ptr); + void free(void* ptr) override; - virtual bool isThreadsafe() const; + bool isThreadsafe() const override; static AlignedMemoryManager::Ref create(); }; @@ -80,9 +80,9 @@ protected: public: typedef shared_ptr Ref; - virtual void* alloc(size_t s); - virtual void free(void* ptr); - virtual bool isThreadsafe() const; + void* alloc(size_t s) override; + void free(void* ptr) override; + bool isThreadsafe() const override; /** There's only one instance of this memory manager; it is cached after the first creation. */ diff --git a/dep/libmpq/libmpq/extract.c b/dep/libmpq/libmpq/extract.c index 1471e5754..05b82bd15 100644 --- a/dep/libmpq/libmpq/extract.c +++ b/dep/libmpq/libmpq/extract.c @@ -52,8 +52,8 @@ int32_t libmpq__decompress_huffman(uint8_t *in_buf, uint32_t in_size, uint8_t *o /* TODO: make typdefs of this structs? */ /* some common variables. */ int32_t tb = 0; - struct huffman_tree_s *ht; - struct huffman_input_stream_s *is; + struct huffman_tree_s *ht = NULL; + struct huffman_input_stream_s *is = NULL; /* allocate memory for the huffman tree. */ if ((ht = malloc(sizeof(struct huffman_tree_s))) == NULL || diff --git a/src/framework/GameSystem/GridReference.h b/src/framework/GameSystem/GridReference.h index add8f53fb..a08472bdc 100644 --- a/src/framework/GameSystem/GridReference.h +++ b/src/framework/GameSystem/GridReference.h @@ -31,21 +31,21 @@ class MANGOS_DLL_SPEC GridReference : public Reference, O { protected: - void targetObjectBuildLink() + void targetObjectBuildLink() override { // called from link() this->getTarget()->insertFirst(this); this->getTarget()->incSize(); } - void targetObjectDestroyLink() + void targetObjectDestroyLink() override { // called from unlink() if (this->isValid()) this->getTarget()->decSize(); } - void sourceObjectDestroyLink() + void sourceObjectDestroyLink() override { // called from invalidate() this->getTarget()->decSize(); @@ -58,7 +58,7 @@ class MANGOS_DLL_SPEC GridReference : public Reference, O { } - ~GridReference() + ~GridReference() override { this->unlink(); } diff --git a/src/framework/Network/MangosSocketMgrImpl.h b/src/framework/Network/MangosSocketMgrImpl.h index c35cc1c42..5500b98e5 100644 --- a/src/framework/Network/MangosSocketMgrImpl.h +++ b/src/framework/Network/MangosSocketMgrImpl.h @@ -194,10 +194,10 @@ MangosSocketMgr::MangosSocketMgr(): m_NetThreadsCount(0), m_SockOutKBuff(-1), m_SockOutUBuff(65536), - m_Interval(10000), m_UseNoDelay(true), - m_Acceptor(0), - m_port(0) + m_Interval(10000), + m_port(0), + m_Acceptor(0) { } diff --git a/src/game/AI/CreatureAI.cpp b/src/game/AI/CreatureAI.cpp index 690be41fa..fc6dfc68d 100644 --- a/src/game/AI/CreatureAI.cpp +++ b/src/game/AI/CreatureAI.cpp @@ -355,7 +355,7 @@ bool CreatureAI::UpdateVictim() void CreatureAI::DoCast(Unit* victim, uint32 spellId, bool triggered) { - if (!victim || m_creature->IsNonMeleeSpellCasted(false) && !triggered) + if (!victim || (m_creature->IsNonMeleeSpellCasted(false) && !triggered)) return; m_creature->CastSpell(victim, spellId, triggered); diff --git a/src/game/AI/CreatureAI.h b/src/game/AI/CreatureAI.h index 1660c8be4..a47982f69 100644 --- a/src/game/AI/CreatureAI.h +++ b/src/game/AI/CreatureAI.h @@ -66,7 +66,7 @@ struct CreatureAISpellsEntry : CreatureSpellsEntry class MANGOS_DLL_SPEC CreatureAI { public: - explicit CreatureAI(Creature* creature) : m_creature(creature), m_bUseAiAtControl(false), m_uLastAlertTime(0), m_uiCastingDelay(0), m_bMeleeAttack(true), m_bCombatMovement(true) + explicit CreatureAI(Creature* creature) : m_creature(creature), m_bUseAiAtControl(false), m_bMeleeAttack(true), m_bCombatMovement(true), m_uiCastingDelay(0), m_uLastAlertTime(0) { SetSpellsList(creature->GetCreatureInfo()->spell_list_id); } diff --git a/src/game/AI/CreatureEventAI.cpp b/src/game/AI/CreatureEventAI.cpp index c826af19b..afb9b1861 100644 --- a/src/game/AI/CreatureEventAI.cpp +++ b/src/game/AI/CreatureEventAI.cpp @@ -710,8 +710,8 @@ void CreatureEventAI::UpdateEventsOn_MoveInLineOfSight(Unit* pWho) if (m_creature->IsWithinDistInMap(pWho, fMaxAllowedRange)) { //if friendly event&&who is not hostile OR hostile event&&who is hostile - if (itr.Event.ooc_los.noHostile && !m_creature->IsHostileTo(pWho) || - !itr.Event.ooc_los.noHostile && m_creature->IsHostileTo(pWho)) + if ((itr.Event.ooc_los.noHostile && !m_creature->IsHostileTo(pWho)) || + (!itr.Event.ooc_los.noHostile && m_creature->IsHostileTo(pWho))) if (m_creature->IsWithinLOSInMap(pWho)) ProcessEvent(itr, pWho); } diff --git a/src/game/AI/GenericSpellAI.cpp b/src/game/AI/GenericSpellAI.cpp index f157b8b8a..168993697 100644 --- a/src/game/AI/GenericSpellAI.cpp +++ b/src/game/AI/GenericSpellAI.cpp @@ -130,7 +130,6 @@ struct MANGOS_DLL_DECL GenericSpellMob : public ScriptedAI void Reset() { std::vector::iterator it; - uint32 casterCD = 0; for (it = m_uiSpells.begin(); it != m_uiSpells.end(); ++it) { #ifdef DEBUG_ON @@ -225,7 +224,6 @@ struct MANGOS_DLL_DECL GenericSpellMob : public ScriptedAI case GENERIC_TARGET_FRIEND_DISPELL_CC: { std::list creaList = DoFindFriendlyCC(it->maxRange); - uint32 size = creaList.size(); while (!creaList.empty()) { diff --git a/src/game/AI/NullCreatureAI.h b/src/game/AI/NullCreatureAI.h index 10aea434a..e0e1ce2c8 100644 --- a/src/game/AI/NullCreatureAI.h +++ b/src/game/AI/NullCreatureAI.h @@ -32,7 +32,7 @@ class MANGOS_DLL_DECL NullCreatureAI : public CreatureAI { c->addUnitState(UNIT_STAT_IGNORE_MOVE_LOS); } - ~NullCreatureAI(); + ~NullCreatureAI() override; void MoveInLineOfSight(Unit *) override {} void AttackStart(Unit *) override {} diff --git a/src/game/AI/PetAI.cpp b/src/game/AI/PetAI.cpp index 3a22f8cce..3bbef5d97 100644 --- a/src/game/AI/PetAI.cpp +++ b/src/game/AI/PetAI.cpp @@ -41,7 +41,7 @@ int PetAI::Permissible(const Creature *creature) return PERMIT_BASE_NO; } -PetAI::PetAI(Creature *c) : CreatureAI(c), inCombat(false) +PetAI::PetAI(Creature *c) : CreatureAI(c) { UpdateAllies(); // Warlock imp has no melee attack diff --git a/src/game/AI/PetAI.h b/src/game/AI/PetAI.h index b3331427d..dc14abaee 100644 --- a/src/game/AI/PetAI.h +++ b/src/game/AI/PetAI.h @@ -54,7 +54,6 @@ class MANGOS_DLL_DECL PetAI : public CreatureAI void UpdateAllies(); - bool inCombat; bool hasMelee; std::set m_AllySet; uint32 m_updateAlliesTimer; diff --git a/src/game/AI/PlayerAI.cpp b/src/game/AI/PlayerAI.cpp index 8f1d8d0ea..3e62911a9 100644 --- a/src/game/AI/PlayerAI.cpp +++ b/src/game/AI/PlayerAI.cpp @@ -95,7 +95,7 @@ void PlayerAI::UpdateAI(const uint32 /*diff*/) { } -PlayerControlledAI::PlayerControlledAI(Player* pPlayer, Unit* caster) : uiGlobalCD(0), PlayerAI(pPlayer), controllerGuid(caster ? caster->GetObjectGuid() : ObjectGuid()) +PlayerControlledAI::PlayerControlledAI(Player* pPlayer, Unit* caster) : PlayerAI(pPlayer), controllerGuid(caster ? caster->GetObjectGuid() : ObjectGuid()), uiGlobalCD(0) { ASSERT(pPlayer); switch (pPlayer->getClass()) diff --git a/src/game/AI/PlayerAI.h b/src/game/AI/PlayerAI.h index dab56c471..e8b3b12ec 100644 --- a/src/game/AI/PlayerAI.h +++ b/src/game/AI/PlayerAI.h @@ -60,10 +60,10 @@ class MANGOS_DLL_SPEC PlayerControlledAI: public PlayerAI public: explicit PlayerControlledAI(Player* pPlayer, Unit* caster = nullptr); - virtual ~PlayerControlledAI(); + ~PlayerControlledAI() override; // Called at World update tick - virtual void UpdateAI(const uint32 /*diff*/); + void UpdateAI(const uint32 /*diff*/) override; Unit* FindController(); void UpdateTarget(Unit* victim); diff --git a/src/game/AI/ScriptedAI.h b/src/game/AI/ScriptedAI.h index 0b6f74b66..ac78a0858 100644 --- a/src/game/AI/ScriptedAI.h +++ b/src/game/AI/ScriptedAI.h @@ -20,7 +20,7 @@ enum SCEquip struct MANGOS_DLL_DECL ScriptedAI : CreatureAI { explicit ScriptedAI(Creature* pCreature); - ~ScriptedAI() {} + ~ScriptedAI() override {} //************* //CreatureAI Functions diff --git a/src/game/AI/ScriptedEscortAI.cpp b/src/game/AI/ScriptedEscortAI.cpp index cc75b75a3..f32cfeb58 100644 --- a/src/game/AI/ScriptedEscortAI.cpp +++ b/src/game/AI/ScriptedEscortAI.cpp @@ -25,9 +25,9 @@ enum npc_escortAI::npc_escortAI(Creature* pCreature) : ScriptedAI(pCreature), m_uiPlayerGUID(0), - m_uiDelayBeforeTheFirstWaypoint(2500), m_uiPlayerCheckTimer(1000), m_uiEscortState(STATE_ESCORT_NONE), + m_uiDelayBeforeTheFirstWaypoint(2500), m_pQuestForEscort(nullptr), m_currentWaypointIdx(0), m_bIsRunning(false), diff --git a/src/game/AI/ScriptedEscortAI.h b/src/game/AI/ScriptedEscortAI.h index bf3874155..c3b40c30f 100644 --- a/src/game/AI/ScriptedEscortAI.h +++ b/src/game/AI/ScriptedEscortAI.h @@ -40,7 +40,7 @@ class ChatHandler; struct MANGOS_DLL_DECL npc_escortAI : ScriptedAI { explicit npc_escortAI(Creature* pCreature); - ~npc_escortAI() {} + ~npc_escortAI() override {} void Aggro(Unit*) override; diff --git a/src/game/AI/ScriptedFollowerAI.cpp b/src/game/AI/ScriptedFollowerAI.cpp index fbd2303f0..1a029daea 100644 --- a/src/game/AI/ScriptedFollowerAI.cpp +++ b/src/game/AI/ScriptedFollowerAI.cpp @@ -21,9 +21,9 @@ enum FollowerAI::FollowerAI(Creature* pCreature) : ScriptedAI(pCreature), m_uiLeaderGUID(0), - m_pQuestForFollow(nullptr), m_uiUpdateFollowTimer(2500), m_uiFollowState(STATE_FOLLOW_NONE), + m_pQuestForFollow(nullptr), m_uiFollowDistance(0.0f) {} diff --git a/src/game/AI/ScriptedFollowerAI.h b/src/game/AI/ScriptedFollowerAI.h index ce057ed7e..c34254d6a 100644 --- a/src/game/AI/ScriptedFollowerAI.h +++ b/src/game/AI/ScriptedFollowerAI.h @@ -24,7 +24,7 @@ class MANGOS_DLL_DECL FollowerAI : public ScriptedAI { public: explicit FollowerAI(Creature* pCreature); - ~FollowerAI() {} + ~FollowerAI() override {} //virtual void WaypointReached(uint32 uiPointId) = 0; diff --git a/src/game/AI/ScriptedGossip.h b/src/game/AI/ScriptedGossip.h deleted file mode 100644 index 7cd583347..000000000 --- a/src/game/AI/ScriptedGossip.h +++ /dev/null @@ -1,2 +0,0 @@ -// Cf dossier game. -#include "ScriptedGossip.h" diff --git a/src/game/AI/ScriptedInstance.h b/src/game/AI/ScriptedInstance.h index 7d46630bf..73c65f673 100644 --- a/src/game/AI/ScriptedInstance.h +++ b/src/game/AI/ScriptedInstance.h @@ -30,7 +30,7 @@ class MANGOS_DLL_DECL ScriptedInstance : public InstanceData public: explicit ScriptedInstance(Map* pMap) : InstanceData(pMap) {} - ~ScriptedInstance() {} + ~ScriptedInstance() override {} // Default accessor functions GameObject* GetSingleGameObjectFromStorage(uint32 uiEntry); diff --git a/src/game/AI/ScriptedPetAI.h b/src/game/AI/ScriptedPetAI.h index 19b342076..0d67e923b 100644 --- a/src/game/AI/ScriptedPetAI.h +++ b/src/game/AI/ScriptedPetAI.h @@ -13,7 +13,7 @@ class ScriptedPetAI : public CreatureAI { public: explicit ScriptedPetAI(Creature* pCreature); - ~ScriptedPetAI() {} + ~ScriptedPetAI() override {} void MoveInLineOfSight(Unit* /*pWho*/) override; diff --git a/src/game/AI/TotemAI.h b/src/game/AI/TotemAI.h index 2e8e4c8a0..af0ad9622 100644 --- a/src/game/AI/TotemAI.h +++ b/src/game/AI/TotemAI.h @@ -44,7 +44,7 @@ class MANGOS_DLL_DECL TotemAI : public CreatureAI void MoveInLineOfSight(Unit *) override { }; void AttackStart(Unit *) override { }; - void UpdateAI(const uint32); + void UpdateAI(const uint32) override; static int Permissible(const Creature *); private: diff --git a/src/game/AccountMgr.cpp b/src/game/AccountMgr.cpp index 016fd165f..d073e77e2 100644 --- a/src/game/AccountMgr.cpp +++ b/src/game/AccountMgr.cpp @@ -348,13 +348,12 @@ void AccountMgr::LoadIPBanList(bool silent) } _ipBanned.clear(); - Field *fields = nullptr; std::unique_ptr bar = silent ? nullptr : std::make_unique(banresult->GetRowCount()); do { if (bar) bar->step(); - Field *fields = banresult->Fetch(); + Field* fields = banresult->Fetch(); uint32 unbandate = fields[1].GetUInt32(); uint32 bandate = fields[2].GetUInt32(); if (unbandate == bandate) @@ -390,13 +389,12 @@ void AccountMgr::LoadAccountBanList(bool silent) } _accountBanned.clear(); - Field *fields = nullptr; std::unique_ptr bar = silent ? nullptr : std::make_unique(banresult->GetRowCount()); do { if (bar) bar->step(); - Field *fields = banresult->Fetch(); + Field* fields = banresult->Fetch(); uint32 unbandate = fields[1].GetUInt32(); uint32 bandate = fields[2].GetUInt32(); if (unbandate == bandate) diff --git a/src/game/AdvancedPlayerBotAI.cpp b/src/game/AdvancedPlayerBotAI.cpp index 8abf25046..3af98a9ff 100644 --- a/src/game/AdvancedPlayerBotAI.cpp +++ b/src/game/AdvancedPlayerBotAI.cpp @@ -256,8 +256,6 @@ void AdvancedPlayerBotAI::WarlockBattleAI(Unit* NearestAttacker) if (!me->movespline->Finalized()) me->StopMoving(); - uint32 mana = me->GetPower(POWER_MANA); - float RandFactor = frand(0.0f, 1.0f); if (RandFactor < 0.1f) diff --git a/src/game/AdvancedPlayerBotAI.h b/src/game/AdvancedPlayerBotAI.h index bf50560e9..286e56afb 100644 --- a/src/game/AdvancedPlayerBotAI.h +++ b/src/game/AdvancedPlayerBotAI.h @@ -54,10 +54,10 @@ public: SeenCreature = nullptr; } - virtual ~AdvancedPlayerBotAI() + ~AdvancedPlayerBotAI() override {} - virtual void UpdateAI(const uint32 delta) override; + void UpdateAI(const uint32 delta) override; protected: diff --git a/src/game/AuctionHouse/AuctionHouseMgr.cpp b/src/game/AuctionHouse/AuctionHouseMgr.cpp index 2691bc259..25c07404b 100644 --- a/src/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/game/AuctionHouse/AuctionHouseMgr.cpp @@ -759,7 +759,6 @@ void AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player return; } - time_t currTime = sWorld.GetGameTime(); int loc_idx = player->GetSession()->GetSessionDbLocaleIndex(); LocaleConstant dbc_loc = player->GetSession()->GetSessionDbcLocale(); @@ -784,7 +783,7 @@ void AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player continue; if (query.auctionSlotID != 0xffffffff && proto->InventoryType != query.auctionSlotID && - (query.auctionSlotID != INVTYPE_CHEST || query.auctionSlotID == INVTYPE_CHEST && proto->InventoryType != INVTYPE_ROBE)) + (query.auctionSlotID != INVTYPE_CHEST || (query.auctionSlotID == INVTYPE_CHEST && proto->InventoryType != INVTYPE_ROBE))) continue; if (query.quality != 0xffffffff && proto->Quality < query.quality) diff --git a/src/game/AutoTesting/Tests/TestPCH.h b/src/game/AutoTesting/Tests/TestPCH.h index 35c114aca..02dc99afc 100644 --- a/src/game/AutoTesting/Tests/TestPCH.h +++ b/src/game/AutoTesting/Tests/TestPCH.h @@ -8,7 +8,7 @@ #ifndef GAME_AUTOTESTING_TESTS_TESTPCH_H_ #define GAME_AUTOTESTING_TESTS_TESTPCH_H_ -#include "AutoTesting/AutoTestingMgr.h" +#include "AutoTestingMgr.h" #include "Creature.h" #include "CreatureAI.h" #include "MoveMap.h" diff --git a/src/game/Battlegrounds/BattleGround.cpp b/src/game/Battlegrounds/BattleGround.cpp index 1b938372f..ee5c8faed 100644 --- a/src/game/Battlegrounds/BattleGround.cpp +++ b/src/game/Battlegrounds/BattleGround.cpp @@ -578,14 +578,11 @@ void BattleGround::EndBattleGround(Team winner) { uint32 bgTypeID = BATTLEGROUND_TYPE_NONE; - if (this->m_MaxPlayers == 40) + if (m_MaxPlayers == 40) bgTypeID = BATTLEGROUND_AV; + RemoveFromBGFreeSlotQueue(); - this->RemoveFromBGFreeSlotQueue(); - - uint32 loser_rating = 0; - uint32 winner_rating = 0; WorldPacket data; int32 winmsg_id = 0; diff --git a/src/game/Battlegrounds/BattleGroundAV.cpp b/src/game/Battlegrounds/BattleGroundAV.cpp index b388aaec5..d05ade41b 100644 --- a/src/game/Battlegrounds/BattleGroundAV.cpp +++ b/src/game/Battlegrounds/BattleGroundAV.cpp @@ -497,7 +497,6 @@ void BattleGroundAV::UpgradeArmor(Object* questGiver, Player *player) void BattleGroundAV::HandleQuestComplete(Unit* questGiver, uint32 questid, Player *player) { char sMessageRemaining[200] = ""; - uint32 faction_spell = 0; if (GetStatus() != STATUS_IN_PROGRESS) return; diff --git a/src/game/Battlegrounds/BattleGroundAV.h b/src/game/Battlegrounds/BattleGroundAV.h index 050975602..93f9abc8f 100644 --- a/src/game/Battlegrounds/BattleGroundAV.h +++ b/src/game/Battlegrounds/BattleGroundAV.h @@ -405,7 +405,7 @@ class BattleGroundAVScore : public BattleGroundScore { public: BattleGroundAVScore() : GraveyardsAssaulted(0), GraveyardsDefended(0), TowersAssaulted(0), TowersDefended(0), SecondaryObjectives(0), LieutnantCount(0), SecondaryNPC(0) {}; - virtual ~BattleGroundAVScore() {}; + ~BattleGroundAVScore() override {}; uint32 GraveyardsAssaulted; uint32 GraveyardsDefended; uint32 TowersAssaulted; @@ -421,33 +421,33 @@ class BattleGroundAV : public BattleGround public: BattleGroundAV(); - ~BattleGroundAV(); - void Update(uint32 diff); + ~BattleGroundAV() override; + void Update(uint32 diff) override; /* inherited from BattlegroundClass */ - virtual void AddPlayer(Player *plr); + void AddPlayer(Player *plr) override; - virtual void StartingEventCloseDoors(); - virtual void StartingEventOpenDoors(); + void StartingEventCloseDoors() override; + void StartingEventOpenDoors() override; // world states - virtual void FillInitialWorldStates(WorldPacket& data, uint32& count); + void FillInitialWorldStates(WorldPacket& data, uint32& count) override; - void RemovePlayer(Player *plr, ObjectGuid guid); - void HandleAreaTrigger(Player *Source, uint32 Trigger); - virtual void Reset(); + void RemovePlayer(Player *plr, ObjectGuid guid) override; + void HandleAreaTrigger(Player *Source, uint32 Trigger) override; + void Reset() override; void ResetTamedEvent(uint32 teamIdx); - SpellCastResult CheckSpellCast(Player* caster, SpellEntry const* spell); + SpellCastResult CheckSpellCast(Player* caster, SpellEntry const* spell) override; /*general stuff*/ void UpdateScore(BattleGroundTeamIndex teamIdx, int32 points); - void UpdatePlayerScore(Player *Source, uint32 type, uint32 value); + void UpdatePlayerScore(Player *Source, uint32 type, uint32 value) override; void UpgradeArmor(Object* questGiver, Player *player); uint32 GetActualArmorRessources(uint32 m_faction_id); /*handle stuff*/ // these are functions which get called from extern scripts - virtual void EventPlayerClickedOnFlag(Player *source, GameObject* target_obj); - void HandleKillPlayer(Player* player, Player *killer); - void HandleKillUnit(Creature *creature, Player *killer); + void EventPlayerClickedOnFlag(Player *source, GameObject* target_obj) override; + void HandleKillPlayer(Player* player, Player *killer) override; + void HandleKillUnit(Creature *creature, Player *killer) override; /** Challenge handler : air or ground assault, world boss assault */ bool isSnivvle; @@ -484,12 +484,12 @@ class BattleGroundAV : public BattleGround void HandleQuestComplete(Unit* questGiver, uint32 questid, Player *player); bool PlayerCanDoMineQuest(int32 GOId, Team team); - void EndBattleGround(Team winner); + void EndBattleGround(Team winner) override; - virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player *plr); + WorldSafeLocsEntry const* GetClosestGraveYard(Player *plr) override; static BattleGroundAVTeamIndex GetAVTeamIndexByTeamId(Team team) { return BattleGroundAVTeamIndex(GetTeamIndexByTeamId(team)); } - void HandleCommand(Player* player, ChatHandler* handler, char* args); + void HandleCommand(Player* player, ChatHandler* handler, char* args) override; private: /* Nodes occupying */ void EventPlayerAssaultsPoint(Player* player, BG_AV_Nodes node); diff --git a/src/game/Battlegrounds/BattleGroundMgr.cpp b/src/game/Battlegrounds/BattleGroundMgr.cpp index ca844d8da..6da605465 100644 --- a/src/game/Battlegrounds/BattleGroundMgr.cpp +++ b/src/game/Battlegrounds/BattleGroundMgr.cpp @@ -1357,17 +1357,12 @@ void BattleGroundMgr::BuildBattleGroundListPacket(WorldPacket *data, ObjectGuid if (!plr) return; - uint32 PlayerLevel = plr->getLevel(); - uint32 mapId = GetBattleGrounMapIdByTypeId(bgTypeId); data->Initialize(SMSG_BATTLEFIELD_LIST); *data << guid; // battlemaster guid *data << uint32(mapId); // battleground id *data << uint8(0x00); // unk - - size_t count_pos = data->wpos(); - uint32 count = 0; *data << uint32(0); // number of bg instances // battleground diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt index 686700061..b9a40048f 100644 --- a/src/game/CMakeLists.txt +++ b/src/game/CMakeLists.txt @@ -287,7 +287,6 @@ set (game_SRCS AI/ScriptedEscortAI.h AI/ScriptedFollowerAI.h AI/ScriptedGameObject.h - AI/ScriptedGossip.h AI/ScriptedInstance.h AI/ScriptedPetAI.h AI/TotemAI.h diff --git a/src/game/Chat/AsyncCommandHandlers.cpp b/src/game/Chat/AsyncCommandHandlers.cpp index c47e1b687..80605dff5 100644 --- a/src/game/Chat/AsyncCommandHandlers.cpp +++ b/src/game/Chat/AsyncCommandHandlers.cpp @@ -219,7 +219,7 @@ void PInfoHandler::HandleResponse(WorldSession* session, PInfoData *data) uint32 gold_out = mail_gold_outbox / GOLD; uint32 silv_out = (mail_gold_outbox % GOLD) / SILVER; uint32 copp_out = (mail_gold_outbox % GOLD) % SILVER; - cHandler.PSendSysMessage(LANG_PINFO_LEVEL, timeStr.c_str(), data->level, gold, silv, copp, gold_in, silv_in, silv_out, gold_out, silv_out, copp_out); + cHandler.PSendSysMessage(LANG_PINFO_LEVEL, timeStr.c_str(), data->level, gold, silv, copp, gold_in, silv_in, copp_in, gold_out, silv_out, copp_out); if (Guild* guild = sGuildMgr.GetPlayerGuild(data->target_guid)) cHandler.PSendSysMessage("Guild: %s", cHandler.playerLink(guild->GetName()).c_str()); diff --git a/src/game/Chat/Channel.cpp b/src/game/Chat/Channel.cpp index 834ad6662..4e48966e9 100644 --- a/src/game/Chat/Channel.cpp +++ b/src/game/Chat/Channel.cpp @@ -27,8 +27,8 @@ #include "Chat.h" Channel::Channel(std::string const& name) - : m_announce(true), m_moderate(false), m_name(name), m_flags(0), m_channelId(0), - m_securityLevel(0), m_area_dependant(true), m_levelRestricted(true) + : m_area_dependant(true), m_announce(true), m_moderate(false), m_levelRestricted(true), + m_name(name), m_flags(0), m_securityLevel(0), m_channelId(0) { // set special flags if built-in channel ChatChannelsEntry const* ch = GetChannelEntryFor(name); diff --git a/src/game/Chat/Chat.cpp b/src/game/Chat/Chat.cpp index 7595bb306..1c5ecc49d 100644 --- a/src/game/Chat/Chat.cpp +++ b/src/game/Chat/Chat.cpp @@ -1154,7 +1154,7 @@ ChatCommand * ChatHandler::getCommandTable() ChatHandler::ChatHandler(WorldSession* session) : m_session(session), sentErrorMessage(false), - m_cluster_is_master(true), m_cluster_is_node(true) + m_cluster_is_node(true), m_cluster_is_master(true) { if (session) { @@ -1295,7 +1295,6 @@ void ChatHandler::SendGlobalSysMessage(const char *str) // need copy to prevent corruption by strtok call in LineFromMessage original string char* buf = mangos_strdup(str); char* pos = buf; - ObjectGuid guid = m_session ? m_session->GetPlayer()->GetObjectGuid() : ObjectGuid(); while (char* line = LineFromMessage(pos)) { @@ -2105,9 +2104,6 @@ bool ChatHandler::isValidChatMessage(const char* message) if (!hasRandomProperty && properties.size() > 2) return false; - int dbLocale = m_session->GetSessionDbLocaleIndex(); - LocaleConstant dbcLocale = m_session->GetSessionDbcLocale(); - const ItemRandomPropertiesEntry* iProp = nullptr; for (auto iter = properties.begin(); iter != properties.end(); ++iter) { diff --git a/src/game/Chat/Chat.h b/src/game/Chat/Chat.h index dc1326883..39a6c6ecc 100644 --- a/src/game/Chat/Chat.h +++ b/src/game/Chat/Chat.h @@ -151,7 +151,7 @@ class MANGOS_DLL_SPEC ChatHandler ObjectGuid const& targetGuid = ObjectGuid(), char const* targetName = nullptr, char const* channelName = nullptr, uint8 playerRank = 0); protected: - explicit ChatHandler() : m_session(nullptr), sentErrorMessage(false), m_cluster_is_master(true), m_cluster_is_node(true) {} // for CLI subclass + explicit ChatHandler() : m_session(nullptr), sentErrorMessage(false), m_cluster_is_node(true), m_cluster_is_master(true) {} // for CLI subclass bool hasStringAbbr(const char* name, const char* part); @@ -1009,15 +1009,15 @@ class CliHandler : public ChatHandler : m_accountId(accountId), m_loginAccessLevel(accessLevel), m_callbackArg(callbackArg), m_print(zprint) {} // overwrite functions - const char *GetMangosString(int32 entry) const; - uint32 GetAccountId() const; - AccountTypes GetAccessLevel() const; - bool isAvailable(ChatCommand const& cmd) const; - void SendSysMessage(const char *str); - std::string GetNameLink() const; - bool needReportToTarget(Player* chr) const; - LocaleConstant GetSessionDbcLocale() const; - int GetSessionDbLocaleIndex() const; + const char *GetMangosString(int32 entry) const override; + uint32 GetAccountId() const override; + AccountTypes GetAccessLevel() const override; + bool isAvailable(ChatCommand const& cmd) const override; + void SendSysMessage(const char *str) override; + std::string GetNameLink() const override; + bool needReportToTarget(Player* chr) const override; + LocaleConstant GetSessionDbcLocale() const override; + int GetSessionDbLocaleIndex() const override; private: uint32 m_accountId; @@ -1032,14 +1032,14 @@ class NullChatHandler : public ChatHandler explicit NullChatHandler() {} // overwrite functions - const char *GetMangosString(int32 entry) const; - uint32 GetAccountId() const { return 0; } - AccountTypes GetAccessLevel() const { return SEC_PLAYER; } - bool isAvailable(ChatCommand const& cmd) const { return false; } - void SendSysMessage(const char *str) {} - std::string GetNameLink() const { return ""; } - LocaleConstant GetSessionDbcLocale() const; - int GetSessionDbLocaleIndex() const; + const char *GetMangosString(int32 entry) const override; + uint32 GetAccountId() const override { return 0; } + AccountTypes GetAccessLevel() const override { return SEC_PLAYER; } + bool isAvailable(ChatCommand const& cmd) const override { return false; } + void SendSysMessage(const char *str) override {} + std::string GetNameLink() const override { return ""; } + LocaleConstant GetSessionDbcLocale() const override; + int GetSessionDbLocaleIndex() const override; }; diff --git a/src/game/Commands/AccountCommands.cpp b/src/game/Commands/AccountCommands.cpp index 6e1814b69..6bedcf716 100644 --- a/src/game/Commands/AccountCommands.cpp +++ b/src/game/Commands/AccountCommands.cpp @@ -441,7 +441,7 @@ bool ChatHandler::HandleAddCharacterNoteCommand(char* args) return false; } std::string authorName = m_session ? m_session->GetPlayerName() : "Console"; - char* reason = ExtractQuotedOrLiteralArg(&args); + char const* reason = ExtractQuotedOrLiteralArg(&args); if (!reason) reason = ""; @@ -468,7 +468,7 @@ bool ChatHandler::HandleWarnCharacterCommand(char* args) return false; } std::string authorName = m_session ? m_session->GetPlayerName() : "Console"; - char* reason = ExtractQuotedOrLiteralArg(&args); + char const* reason = ExtractQuotedOrLiteralArg(&args); if (!reason) reason = ""; @@ -526,7 +526,7 @@ bool ChatHandler::HandleBanAllIPCommand(char* args) if (!ipStr) return false; - char* reason = ExtractQuotedOrLiteralArg(&args); + char const* reason = ExtractQuotedOrLiteralArg(&args); if (!reason) reason = ""; @@ -646,15 +646,15 @@ void ChatHandler::SendBanResult(BanMode mode, BanReturn result, std::string& ban case BAN_NOTFOUND: switch (mode) { - default: - PSendSysMessage(LANG_BAN_NOTFOUND, "account", banTarget.c_str()); - break; - case BAN_CHARACTER: - PSendSysMessage(LANG_BAN_NOTFOUND, "character", banTarget.c_str()); - break; - case BAN_IP: - PSendSysMessage(LANG_BAN_NOTFOUND, "ip", banTarget.c_str()); - break; + default: + PSendSysMessage(LANG_BAN_NOTFOUND, "account", banTarget.c_str()); + break; + case BAN_CHARACTER: + PSendSysMessage(LANG_BAN_NOTFOUND, "character", banTarget.c_str()); + break; + case BAN_IP: + PSendSysMessage(LANG_BAN_NOTFOUND, "ip", banTarget.c_str()); + break; } SetSentErrorMessage(true); return; diff --git a/src/game/Commands/LookupCommands.cpp b/src/game/Commands/LookupCommands.cpp index 487fa38e4..62bc3d71c 100644 --- a/src/game/Commands/LookupCommands.cpp +++ b/src/game/Commands/LookupCommands.cpp @@ -1159,12 +1159,7 @@ bool ChatHandler::HandleLookupPoolCommand(char * args) return false; std::string namepart = args; - - Player* player = m_session ? m_session->GetPlayer() : nullptr; - MapPersistentState* mapState = player ? player->GetMap()->GetPersistentState() : nullptr; - strToLower(namepart); - uint32 counter = 0; // spawn pools for expected map or for not initialized shared pools state for non-instanceable maps @@ -1355,7 +1350,6 @@ bool ChatHandler::HandleLookupSoundCommand(char* args) { uint32 id = itr.first; SoundEntriesEntry const& soundEntry = itr.second; - int loc = GetSessionDbcLocale(); std::string name = soundEntry.Name; if (name.empty()) diff --git a/src/game/Commands/MiscCommands.cpp b/src/game/Commands/MiscCommands.cpp index b2f267e34..e76eb30a2 100644 --- a/src/game/Commands/MiscCommands.cpp +++ b/src/game/Commands/MiscCommands.cpp @@ -1158,7 +1158,6 @@ bool ChatHandler::HandlePoolUpdateCommand(char* args) if (!ExtractUint32KeyFromLink(&args, "Hpool", pool_id)) return false; - PoolGroup& gobjGroup = sPoolMgr.GetPoolGameObjects(pool_id); PoolTemplateData const& pool_template = sPoolMgr.GetPoolTemplate(pool_id); PSendSysMessage("Pool #%u: %u objects spawned [limit = %u]", pool_id, spawns.GetSpawnedObjects(pool_id), pool_template.MaxLimit); @@ -1776,7 +1775,6 @@ bool ChatHandler::HandleBGStatusCommand(char *args) } std::string statusName; - bool bFull = it->second->HasFreeSlots(); BattleGroundStatus status = it->second->GetStatus(); switch (status) { diff --git a/src/game/Commands/TicketCommands.cpp b/src/game/Commands/TicketCommands.cpp index 913af6c87..50b55bd69 100644 --- a/src/game/Commands/TicketCommands.cpp +++ b/src/game/Commands/TicketCommands.cpp @@ -113,7 +113,7 @@ bool ChatHandler::HandleGMTicketCommentCommand(char* args) char* ticketIdStr = strtok((char*)args, " "); uint32 ticketId = atoi(ticketIdStr); - char* comment = strtok(nullptr, "\n"); + char const* comment = strtok(nullptr, "\n"); if (!comment) comment = ""; diff --git a/src/game/Conditions.cpp b/src/game/Conditions.cpp index 93ddccc92..d65b36730 100644 --- a/src/game/Conditions.cpp +++ b/src/game/Conditions.cpp @@ -378,7 +378,7 @@ bool inline ConditionEntry::Evaluate(WorldObject const* target, Map const* map, { const Map* pMap = map ? map : (source ? source->GetMap() : target->GetMap()); - if (InstanceData const* data = map->GetInstanceData()) + if (InstanceData const* data = pMap->GetInstanceData()) { switch (m_value3) { diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp index 8a45e9ae9..3a9d053f6 100644 --- a/src/game/GameEventMgr.cpp +++ b/src/game/GameEventMgr.cpp @@ -1142,8 +1142,6 @@ void GameEventMgr::UpdateSilithusPVP() struct tm *timeinfo; timeinfo = localtime(&rawtime); - uint32 TodayOfMonth = timeinfo->tm_mday; - /** Event start every 6hours for 2hours */ uint32 occurency = 6; if (timeinfo->tm_hour % occurency == 0 && timeinfo->tm_min == 0) diff --git a/src/game/Group/Group.cpp b/src/game/Group/Group.cpp index 01e0d252a..62dd82303 100644 --- a/src/game/Group/Group.cpp +++ b/src/game/Group/Group.cpp @@ -79,9 +79,9 @@ void Roll::targetObjectBuildLink() //============== Group ============================== //=================================================== -Group::Group() : m_Id(0), m_groupType(GROUPTYPE_NORMAL), - m_bgGroup(nullptr), m_lootMethod(FREE_FOR_ALL), m_lootThreshold(ITEM_QUALITY_UNCOMMON), - m_subGroupsCounts(nullptr), m_groupTeam(TEAM_NONE), m_leaderLastOnline(0), m_LFGAreaId(0) +Group::Group() : m_Id(0), m_leaderLastOnline(0), m_groupType(GROUPTYPE_NORMAL), + m_bgGroup(nullptr), m_lootMethod(FREE_FOR_ALL), m_lootThreshold(ITEM_QUALITY_UNCOMMON), + m_subGroupsCounts(nullptr), m_groupTeam(TEAM_NONE), m_LFGAreaId(0) { } @@ -215,8 +215,8 @@ bool Group::LoadMemberFromDB(uint32 guidLow, uint8 subgroup, bool assistant) SubGroupCounterIncrease(subgroup); Team playerTeam = Player::TeamForRace(data->uiRace); - if (m_groupTeam == ALLIANCE && playerTeam == HORDE || - m_groupTeam == HORDE && playerTeam == ALLIANCE) + if ((m_groupTeam == ALLIANCE && playerTeam == HORDE) || + (m_groupTeam == HORDE && playerTeam == ALLIANCE)) m_groupTeam = TEAM_CROSSFACTION; if (m_groupTeam == TEAM_NONE) m_groupTeam = playerTeam; @@ -320,8 +320,8 @@ bool Group::AddMember(ObjectGuid guid, const char* name, uint8 joinMethod) if (Player *player = sObjectMgr.GetPlayer(guid)) { - if (m_groupTeam == ALLIANCE && player->GetTeam() == HORDE || - m_groupTeam == HORDE && player->GetTeam() == ALLIANCE) + if ((m_groupTeam == ALLIANCE && player->GetTeam() == HORDE) || + (m_groupTeam == HORDE && player->GetTeam() == ALLIANCE)) m_groupTeam = TEAM_CROSSFACTION; if (m_groupTeam == TEAM_NONE) m_groupTeam = player->GetTeam(); @@ -580,8 +580,6 @@ bool Group::FillPremadeLFG(const ObjectGuid& plrGuid, Classes playerClass, Class uint32& DpsCount, std::list& processed) { // We grant the role unless someone else in the group has higher priority for it - bool grantRole = true; - RolesPriority priority = LFGQueue::getPriority(playerClass, requiredRole); for (member_citerator citr = GetMemberSlots().begin(); citr != GetMemberSlots().end(); ++citr) diff --git a/src/game/Group/Group.h b/src/game/Group/Group.h index 9b663c2f0..940ed753c 100644 --- a/src/game/Group/Group.h +++ b/src/game/Group/Group.h @@ -142,10 +142,10 @@ class Roll : public LootValidatorRef Roll(ObjectGuid _lootedTragetGuid, LootItem const& li) : lootedTargetGUID(_lootedTragetGuid), itemid(li.itemid), itemRandomPropId(li.randomPropertyId), totalPlayersRolling(0), totalNeed(0), totalGreed(0), totalPass(0), itemSlot(0) {} - ~Roll() { } + ~Roll() override { } void setLoot(Loot *pLoot) { link(pLoot, this); } Loot *getLoot() { return getTarget(); } - void targetObjectBuildLink(); + void targetObjectBuildLink() override; ObjectGuid lootedTargetGUID; uint32 itemid; diff --git a/src/game/Group/GroupReference.h b/src/game/Group/GroupReference.h index a698f309b..b8b3eef3f 100644 --- a/src/game/Group/GroupReference.h +++ b/src/game/Group/GroupReference.h @@ -31,12 +31,12 @@ class MANGOS_DLL_SPEC GroupReference : public Reference { protected: uint8 iSubGroup; - void targetObjectBuildLink(); - void targetObjectDestroyLink(); - void sourceObjectDestroyLink(); + void targetObjectBuildLink() override; + void targetObjectDestroyLink() override; + void sourceObjectDestroyLink() override; public: GroupReference() : Reference(), iSubGroup(0) {} - ~GroupReference() { unlink(); } + ~GroupReference() override { unlink(); } GroupReference *next() { return (GroupReference*)Reference::next(); } uint8 getSubGroup() const { return iSubGroup; } void setSubGroup(uint8 pSubGroup) { iSubGroup = pSubGroup; } diff --git a/src/game/Handlers/ChannelHandler.cpp b/src/game/Handlers/ChannelHandler.cpp index 467ce1476..31bcbf432 100644 --- a/src/game/Handlers/ChannelHandler.cpp +++ b/src/game/Handlers/ChannelHandler.cpp @@ -92,10 +92,12 @@ void WorldSession::HandleChannelListOpcode(WorldPacket& recvPacket) PlayerPointer player = GetPlayerPointer(); if (ChannelMgr* cMgr = channelMgr(player->GetTeam())) + { if (Channel *chn = cMgr->GetChannel(channelname, player, IsNode())) chn->List(player); else ForwardPacketToNode(); + } } void WorldSession::HandleChannelPasswordOpcode(WorldPacket& recvPacket) @@ -109,10 +111,12 @@ void WorldSession::HandleChannelPasswordOpcode(WorldPacket& recvPacket) PlayerPointer player = GetPlayerPointer(); if (ChannelMgr* cMgr = channelMgr(player->GetTeam())) + { if (Channel *chn = cMgr->GetChannel(channelname, player, IsNode())) chn->Password(player->GetObjectGuid(), pass.c_str()); else ForwardPacketToNode(); + } } void WorldSession::HandleChannelSetOwnerOpcode(WorldPacket& recvPacket) @@ -130,10 +134,12 @@ void WorldSession::HandleChannelSetOwnerOpcode(WorldPacket& recvPacket) PlayerPointer player = GetPlayerPointer(); if (ChannelMgr* cMgr = channelMgr(player->GetTeam())) + { if (Channel *chn = cMgr->GetChannel(channelname, player, IsNode())) chn->SetOwner(player->GetObjectGuid(), newp.c_str()); else ForwardPacketToNode(); + } } void WorldSession::HandleChannelOwnerOpcode(WorldPacket& recvPacket) @@ -145,10 +151,12 @@ void WorldSession::HandleChannelOwnerOpcode(WorldPacket& recvPacket) PlayerPointer player = GetPlayerPointer(); if (ChannelMgr* cMgr = channelMgr(player->GetTeam())) + { if (Channel *chn = cMgr->GetChannel(channelname, player, IsNode())) chn->SendWhoOwner(player->GetObjectGuid()); else ForwardPacketToNode(); + } } void WorldSession::HandleChannelModeratorOpcode(WorldPacket& recvPacket) @@ -165,10 +173,12 @@ void WorldSession::HandleChannelModeratorOpcode(WorldPacket& recvPacket) PlayerPointer player = GetPlayerPointer(); if (ChannelMgr* cMgr = channelMgr(player->GetTeam())) + { if (Channel *chn = cMgr->GetChannel(channelname, player, IsNode())) chn->SetModerator(player->GetObjectGuid(), otp.c_str()); else ForwardPacketToNode(); + } } void WorldSession::HandleChannelUnmoderatorOpcode(WorldPacket& recvPacket) @@ -185,10 +195,12 @@ void WorldSession::HandleChannelUnmoderatorOpcode(WorldPacket& recvPacket) PlayerPointer player = GetPlayerPointer(); if (ChannelMgr* cMgr = channelMgr(player->GetTeam())) + { if (Channel *chn = cMgr->GetChannel(channelname, player, IsNode())) chn->UnsetModerator(player->GetObjectGuid(), otp.c_str()); else ForwardPacketToNode(); + } } void WorldSession::HandleChannelMuteOpcode(WorldPacket& recvPacket) @@ -205,10 +217,12 @@ void WorldSession::HandleChannelMuteOpcode(WorldPacket& recvPacket) PlayerPointer player = GetPlayerPointer(); if (ChannelMgr* cMgr = channelMgr(player->GetTeam())) + { if (Channel *chn = cMgr->GetChannel(channelname, player, IsNode())) chn->SetMute(player->GetObjectGuid(), otp.c_str()); else ForwardPacketToNode(); + } } void WorldSession::HandleChannelUnmuteOpcode(WorldPacket& recvPacket) @@ -225,10 +239,12 @@ void WorldSession::HandleChannelUnmuteOpcode(WorldPacket& recvPacket) PlayerPointer player = GetPlayerPointer(); if (ChannelMgr* cMgr = channelMgr(player->GetTeam())) + { if (Channel *chn = cMgr->GetChannel(channelname, player, IsNode())) chn->UnsetMute(player->GetObjectGuid(), otp.c_str()); else ForwardPacketToNode(); + } } void WorldSession::HandleChannelInviteOpcode(WorldPacket& recvPacket) @@ -248,10 +264,12 @@ void WorldSession::HandleChannelInviteOpcode(WorldPacket& recvPacket) return; if (ChannelMgr* cMgr = channelMgr(player->GetTeam())) + { if (Channel *chn = cMgr->GetChannel(channelname, player, IsNode())) chn->Invite(player->GetObjectGuid(), otp.c_str()); else ForwardPacketToNode(); + } } void WorldSession::HandleChannelKickOpcode(WorldPacket& recvPacket) @@ -267,10 +285,12 @@ void WorldSession::HandleChannelKickOpcode(WorldPacket& recvPacket) PlayerPointer player = GetPlayerPointer(); if (ChannelMgr* cMgr = channelMgr(player->GetTeam())) + { if (Channel *chn = cMgr->GetChannel(channelname, player, IsNode())) chn->Kick(player->GetObjectGuid(), otp.c_str()); else ForwardPacketToNode(); + } } void WorldSession::HandleChannelBanOpcode(WorldPacket& recvPacket) @@ -287,10 +307,12 @@ void WorldSession::HandleChannelBanOpcode(WorldPacket& recvPacket) PlayerPointer player = GetPlayerPointer(); if (ChannelMgr* cMgr = channelMgr(player->GetTeam())) + { if (Channel *chn = cMgr->GetChannel(channelname, player, IsNode())) chn->Ban(player->GetObjectGuid(), otp.c_str()); else ForwardPacketToNode(); + } } void WorldSession::HandleChannelUnbanOpcode(WorldPacket& recvPacket) @@ -307,10 +329,12 @@ void WorldSession::HandleChannelUnbanOpcode(WorldPacket& recvPacket) PlayerPointer player = GetPlayerPointer(); if (ChannelMgr* cMgr = channelMgr(player->GetTeam())) + { if (Channel *chn = cMgr->GetChannel(channelname, player, IsNode())) chn->UnBan(player->GetObjectGuid(), otp.c_str()); else ForwardPacketToNode(); + } } void WorldSession::HandleChannelAnnouncementsOpcode(WorldPacket& recvPacket) @@ -322,10 +346,12 @@ void WorldSession::HandleChannelAnnouncementsOpcode(WorldPacket& recvPacket) PlayerPointer player = GetPlayerPointer(); if (ChannelMgr* cMgr = channelMgr(player->GetTeam())) + { if (Channel *chn = cMgr->GetChannel(channelname, player, IsNode())) chn->Announce(player->GetObjectGuid()); else ForwardPacketToNode(); + } } void WorldSession::HandleChannelModerateOpcode(WorldPacket& recvPacket) @@ -337,9 +363,11 @@ void WorldSession::HandleChannelModerateOpcode(WorldPacket& recvPacket) PlayerPointer player = GetPlayerPointer(); if (ChannelMgr* cMgr = channelMgr(player->GetTeam())) + { if (Channel *chn = cMgr->GetChannel(channelname, player, IsNode())) chn->Moderate(player->GetObjectGuid()); else ForwardPacketToNode(); + } } diff --git a/src/game/Handlers/ItemHandler.cpp b/src/game/Handlers/ItemHandler.cpp index 0ca953b4c..2da26d73c 100644 --- a/src/game/Handlers/ItemHandler.cpp +++ b/src/game/Handlers/ItemHandler.cpp @@ -868,7 +868,7 @@ void WorldSession::HandleAutoStoreBagItemOpcode(WorldPacket & recv_data) } // cheating: check if source bag / item or destination bag is in bank and player can't use bank - if (_player->IsBankPos(srcbag, srcslot) || dstbag >= BANK_SLOT_BAG_START && dstbag < BANK_SLOT_BAG_END) + if (_player->IsBankPos(srcbag, srcslot) || (dstbag >= BANK_SLOT_BAG_START && dstbag < BANK_SLOT_BAG_END)) { if (!CanUseBank()) return; diff --git a/src/game/Handlers/MailHandler.cpp b/src/game/Handlers/MailHandler.cpp index a85c5238c..556801726 100644 --- a/src/game/Handlers/MailHandler.cpp +++ b/src/game/Handlers/MailHandler.cpp @@ -55,7 +55,7 @@ bool WorldSession::CheckMailBox(ObjectGuid guid) class WorldSession::AsyncMailSendRequest { public: - AsyncMailSendRequest(): rcTeam(TEAM_NONE), mailsCount(0xFF), receiverPtr(nullptr), accountId(0), money(0), COD(0) {} + AsyncMailSendRequest(): accountId(0), money(0), COD(0), receiverPtr(nullptr), rcTeam(TEAM_NONE), mailsCount(0xFF) {} uint32 accountId; ObjectGuid senderGuid; ObjectGuid receiver; @@ -729,7 +729,7 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data) ASSERT(pl); // client can't work with packets > max int16 value - const uint32 maxPacketSize = 32767; + // const uint32 maxPacketSize = 32767; uint32 mailsCount = 0; // real send to client mails amount diff --git a/src/game/Handlers/MiscHandler.cpp b/src/game/Handlers/MiscHandler.cpp index 4a1916b62..0581f6d91 100644 --- a/src/game/Handlers/MiscHandler.cpp +++ b/src/game/Handlers/MiscHandler.cpp @@ -552,7 +552,6 @@ void WorldSession::HandleAddFriendOpcode(WorldPacket & recv_data) FriendsResult friendResult = FRIEND_NOT_FOUND; if (friendGuid) { - uint32 otherWorldMask = sObjectMgr.GetPlayerWorldMaskByGUID(friendLowGuid); if (friendGuid == GetMasterPlayer()->GetObjectGuid()) friendResult = FRIEND_SELF; else if (GetMasterPlayer()->GetTeam() != team && !sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_ADD_FRIEND) && GetSecurity() < SEC_MODERATOR) diff --git a/src/game/Handlers/MovementHandler.cpp b/src/game/Handlers/MovementHandler.cpp index 3389fb8a3..ad0067311 100644 --- a/src/game/Handlers/MovementHandler.cpp +++ b/src/game/Handlers/MovementHandler.cpp @@ -256,6 +256,7 @@ void WorldSession::HandleMoveTeleportAckOpcode(WorldPacket& recvData) // because the client will request the name for the old pet guid and receive no answer // result would be a pet named "unknown" if (pPlayerMover->GetTemporaryUnsummonedPetNumber()) + { if (sWorld.getConfig(CONFIG_BOOL_CONTINENTS_INSTANCIATE) && pPlayerMover->GetMap()->IsContinent()) { bool transition = false; @@ -264,6 +265,7 @@ void WorldSession::HandleMoveTeleportAckOpcode(WorldPacket& recvData) } else pPlayerMover->ResummonPetTemporaryUnSummonedIfAny(); + } //lets process all delayed operations on successful teleport pPlayerMover->ProcessDelayedOperations(); @@ -1052,8 +1054,9 @@ void WorldSession::HandleMoverRelocation(Unit* pMover, MovementInfo& movementInf pPlayerMover->m_movementInfo = movementInfo; // super smart decision; rework required - if (ObjectGuid lootGuid = pPlayerMover->GetLootGuid() && !lootGuid.IsItem()) - pPlayerMover->SendLootRelease(lootGuid); + if (ObjectGuid lootGuid = pPlayerMover->GetLootGuid()) + if (!lootGuid.IsItem()) + pPlayerMover->SendLootRelease(lootGuid); // Nostalrius - antiundermap1 if (movementInfo.HasMovementFlag(MOVEFLAG_FALLINGFAR)) diff --git a/src/game/Handlers/PetitionsHandler.cpp b/src/game/Handlers/PetitionsHandler.cpp index 7c768444d..88e040391 100644 --- a/src/game/Handlers/PetitionsHandler.cpp +++ b/src/game/Handlers/PetitionsHandler.cpp @@ -214,8 +214,6 @@ void WorldSession::HandlePetitionQueryOpcode(WorldPacket & recv_data) if (!petition) return; - uint8 signs = petition->GetSignatureCount(); - WorldPacket data(SMSG_PETITION_QUERY_RESPONSE, (4 + 8 + petition->GetName().size() + 1 + 2 + 4 * 11)); data << uint32(petitionguid); // petition guid data << ObjectGuid(petition->GetOwnerGuid()); // charter owner guid @@ -517,9 +515,6 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recv_data) // OK! - // signs - uint8 signs = petition->GetSignatureCount(); - Guild* guild = new Guild; if (!guild->Create(petition, _player)) { diff --git a/src/game/HardcodedEvents.cpp b/src/game/HardcodedEvents.cpp index b11c98dd5..2249856b2 100644 --- a/src/game/HardcodedEvents.cpp +++ b/src/game/HardcodedEvents.cpp @@ -551,10 +551,10 @@ SilithusWarEffortBattle::SilithusWarEffortBattle() : WorldEvent (EVENT_SILITHUS_ void SilithusWarEffortBattle::Update() { - for (BotEventInfo& BotInfo : Bots) - { - - } + //for (BotEventInfo& BotInfo : Bots) + //{ + // + //} } void SilithusWarEffortBattle::Enable() @@ -831,7 +831,6 @@ void ScourgeInvasionEvent::Update() time_t now = time(nullptr); - bool attackStateChange = false; for (auto it = invasionPoints.begin(); it != invasionPoints.end(); ++it) { uint32 numNecrosAlive = 0; @@ -967,7 +966,6 @@ void ScourgeInvasionEvent::HandleActiveZone(uint32 attackTimeVar, uint32 attackZ bool ScourgeInvasionEvent::OnEnable(uint32 attackZoneVar, uint32 attackTimeVar) { uint32 current1 = sObjectMgr.GetSavedVariable(attackZoneVar); - uint32 current2 = sObjectMgr.GetSavedVariable(attackZoneVar); if (!isValidZoneId(current1)) { @@ -1156,8 +1154,8 @@ uint32 ScourgeInvasionEvent::GetNewRandomZone(uint32 curr1, uint32 curr2) void ScourgeInvasionEvent::UpdateWorldState() { // Updating map icon worlstate - int ATTACK_ZONE1 = sObjectMgr.GetSavedVariable(VARIABLE_NAXX_ATTACK_ZONE1); - int ATTACK_ZONE2 = sObjectMgr.GetSavedVariable(VARIABLE_NAXX_ATTACK_ZONE2); + //int ATTACK_ZONE1 = sObjectMgr.GetSavedVariable(VARIABLE_NAXX_ATTACK_ZONE1); + //int ATTACK_ZONE2 = sObjectMgr.GetSavedVariable(VARIABLE_NAXX_ATTACK_ZONE2); int VICTORIES = sObjectMgr.GetSavedVariable(VARIABLE_NAXX_ATTACK_COUNT); int REMAINING_AZSHARA = sObjectMgr.GetSavedVariable(VARIABLE_SI_AZSHARA_REMAINING); diff --git a/src/game/HardcodedEvents.h b/src/game/HardcodedEvents.h index ec23f1eca..21f9ef215 100644 --- a/src/game/HardcodedEvents.h +++ b/src/game/HardcodedEvents.h @@ -219,11 +219,11 @@ public: { } - virtual ~BattlePlayerAI () + ~BattlePlayerAI () override { } - virtual void OnPlayerLogin(); + void OnPlayerLogin() override; }; diff --git a/src/game/HonorMgr.cpp b/src/game/HonorMgr.cpp index aad67c2a9..b70998420 100644 --- a/src/game/HonorMgr.cpp +++ b/src/game/HonorMgr.cpp @@ -955,8 +955,6 @@ float HonorMgr::HonorableKillPoints(Player* killer, Player* victim, uint32 group if (!killer || !victim || !groupSize) return 0.0; - uint32 today = sWorld.GetGameDay(); - uint32 totalKills = killer->GetHonorMgr().CalculateTotalKills(victim); uint32 victimRank = victim->GetHonorMgr().GetRank().visualRank; uint8 killerLevel = killer->getLevel(); diff --git a/src/game/HonorMgr.h b/src/game/HonorMgr.h index 764efaf45..a383206ff 100644 --- a/src/game/HonorMgr.h +++ b/src/game/HonorMgr.h @@ -34,8 +34,9 @@ typedef std::vector HonorStandingList; struct WeeklyScore { WeeklyScore() - : level(0), account(0), hk(0), dk(0), standing(0), highestRank(0), - cp(0.0f), oldRp(0.0f), newRp(0.0f), earning(0.0f) {} + : level(0), account(0), hk(0), dk(0), + cp(0.0f), oldRp(0.0f), newRp(0.0f), earning(0.0f), + standing(0), highestRank(0) {} uint8 level; uint32 account; @@ -54,7 +55,7 @@ typedef std::unordered_map WeeklyScoresHash; class HonorMaintenancer { public: - HonorMaintenancer() : m_markerToStart(false), m_lastMaintenanceDay(0), m_nextMaintenanceDay(0) {} + HonorMaintenancer() : m_lastMaintenanceDay(0), m_nextMaintenanceDay(0), m_markerToStart(false) {} ~HonorMaintenancer() {} void Initialize(); @@ -123,7 +124,7 @@ struct HonorCP struct HonorRankInfo { HonorRankInfo() - : rank(0), visualRank(0), minRP(0.0f), maxRP(0.0f), positive(true) {} + : rank(0), visualRank(0), maxRP(0.0f), minRP(0.0f), positive(true) {} uint8 rank; // internal range [0..18] int8 visualRank; // number visualized in rank bar [-4..14] diff --git a/src/game/LootMgr.cpp b/src/game/LootMgr.cpp index d49e8c076..23f3e4d7e 100644 --- a/src/game/LootMgr.cpp +++ b/src/game/LootMgr.cpp @@ -496,7 +496,7 @@ bool Loot::FillLoot(uint32 loot_id, LootStore const& store, Player* loot_owner, return false; } - _personal = true; + m_personal = true; items.reserve(MAX_NR_LOOT_ITEMS); m_questItems.reserve(MAX_NR_QUEST_ITEMS); @@ -507,13 +507,13 @@ bool Loot::FillLoot(uint32 loot_id, LootStore const& store, Player* loot_owner, if (!personal && group) { roundRobinPlayer = loot_owner->GetGUID(); - _personal = false; + m_personal = false; for (GroupReference *itr = group->GetFirstMember(); itr != nullptr; itr = itr->next()) if (Player* pl = itr->getSource()) { if (!looted || (pl->IsInWorld() && pl->IsAtGroupRewardDistance(looted))) { - _allowedLooters.push_back(pl->GetObjectGuid()); + m_allowedLooters.push_back(pl->GetObjectGuid()); FillNotNormalLootFor(pl); } } @@ -531,10 +531,10 @@ bool Loot::FillLoot(uint32 loot_id, LootStore const& store, Player* loot_owner, bool Loot::IsAllowedLooter(ObjectGuid guid, bool doPersonalCheck) const { - if (doPersonalCheck && _personal) + if (doPersonalCheck && m_personal) return true; - for (std::vector::const_iterator it = _allowedLooters.begin(); it != _allowedLooters.end(); ++it) + for (std::vector::const_iterator it = m_allowedLooters.begin(); it != m_allowedLooters.end(); ++it) if ((*it) == guid) return true; return false; @@ -543,7 +543,7 @@ bool Loot::IsAllowedLooter(ObjectGuid guid, bool doPersonalCheck) const void Loot::FillNotNormalLootFor(Player* pl) { if (pl->IsInWorld()) - _allowedLooters.push_back(pl->GetObjectGuid()); + m_allowedLooters.push_back(pl->GetObjectGuid()); uint32 plguid = pl->GetGUIDLow(); diff --git a/src/game/LootMgr.h b/src/game/LootMgr.h index ed15eecc4..1f8b9c04d 100644 --- a/src/game/LootMgr.h +++ b/src/game/LootMgr.h @@ -223,8 +223,8 @@ class LootValidatorRef : public Reference { public: LootValidatorRef() {} - void targetObjectDestroyLink() {} - void sourceObjectDestroyLink() {} + void targetObjectDestroyLink() override {} + void sourceObjectDestroyLink() override {} }; //===================================================== @@ -257,7 +257,7 @@ struct Loot QuestItemMap const& GetPlayerFFAItems() const { return m_playerFFAItems; } QuestItemMap const& GetPlayerNonQuestNonFFAConditionalItems() const { return m_playerNonQuestNonFFAConditionalItems; } - bool _personal; + bool m_personal; LootItemList items; uint32 gold; uint8 unlootedCount; @@ -265,13 +265,13 @@ struct Loot LootType loot_type; // required for for proper item loot finish (store internal loot types in different from 3.x version, in fact this meaning that it send same loot types for interesting cases like 3.x version code, skip pre-3.x client loot type limitaitons) Loot(WorldObject const* lootTarget, uint32 _gold = 0) : - _personal(false), + m_personal(false), gold(_gold), unlootedCount(0), - m_lootTarget(lootTarget), - loot_type(LOOT_CORPSE), roundRobinPlayer(0), - _groupTeam(TEAM_CROSSFACTION) + loot_type(LOOT_CORPSE), + m_lootTarget(lootTarget), + m_groupTeam(TEAM_CROSSFACTION) { } ~Loot() { clear(); } @@ -307,9 +307,9 @@ struct Loot unlootedCount = 0; m_LootValidatorRefManager.clearReferences(); roundRobinPlayer = 0; - _allowedLooters.clear(); - _personal = true; - _groupTeam = TEAM_CROSSFACTION; + m_allowedLooters.clear(); + m_personal = true; + m_groupTeam = TEAM_CROSSFACTION; } void leaveOnlyQuestItems() @@ -345,8 +345,8 @@ struct Loot void FillNotNormalLootFor(Player* player); - uint32 GetTeam() const { return _groupTeam; } - void SetTeam(Team team) { _groupTeam = team; } + uint32 GetTeam() const { return m_groupTeam; } + void SetTeam(Team team) { m_groupTeam = team; } LootItemList m_questItems; QuestItemMap m_playerQuestItems; @@ -362,11 +362,11 @@ struct Loot // All rolls are registered here. They need to know, when the loot is not valid anymore LootValidatorRefManager m_LootValidatorRefManager; - std::vector _allowedLooters; + std::vector m_allowedLooters; // What is looted WorldObject const* m_lootTarget; - Team _groupTeam; + Team m_groupTeam; }; struct LootView diff --git a/src/game/MapNodes/AbstractPlayer.h b/src/game/MapNodes/AbstractPlayer.h index 84ca5ccdd..6feed5793 100644 --- a/src/game/MapNodes/AbstractPlayer.h +++ b/src/game/MapNodes/AbstractPlayer.h @@ -66,29 +66,29 @@ public: PlayerWrapper() : player(*((T*)nullptr)) {} PlayerWrapper(PlayerWrapper const& other) : player(other.player) {} - virtual ObjectGuid GetObjectGuid() const; - virtual Team GetTeam() const; - virtual const char* GetName() const; - virtual uint32 GetZoneId() const; - virtual uint32 GetAreaId() const; - virtual uint8 getClass() const; - virtual uint8 getRace() const; - virtual uint32 getLevel() const; - virtual uint32 GetGuildId() const; - virtual bool IsAFK() const; - virtual bool IsDND() const; - virtual bool IsGameMaster() const; - virtual uint8 GetChatTag() const; - virtual WorldSession* GetSession() const; - virtual PlayerSocial* GetSocial() const; + ObjectGuid GetObjectGuid() const override; + Team GetTeam() const override; + const char* GetName() const override; + uint32 GetZoneId() const override; + uint32 GetAreaId() const override; + uint8 getClass() const override; + uint8 getRace() const override; + uint32 getLevel() const override; + uint32 GetGuildId() const override; + bool IsAFK() const override; + bool IsDND() const override; + bool IsGameMaster() const override; + uint8 GetChatTag() const override; + WorldSession* GetSession() const override; + PlayerSocial* GetSocial() const override; - virtual void JoinedChannel(Channel *c); - virtual void LeftChannel(Channel *c); + void JoinedChannel(Channel *c) override; + void LeftChannel(Channel *c) override; - virtual Player* ToPlayer() const; - virtual MasterPlayer* ToMasterPlayer() const; + Player* ToPlayer() const override; + MasterPlayer* ToMasterPlayer() const override; - virtual bool ok() const; + bool ok() const override; protected: T& player; }; diff --git a/src/game/MapNodes/MasterPlayer.cpp b/src/game/MapNodes/MasterPlayer.cpp index 9bacf16f0..894a53012 100644 --- a/src/game/MapNodes/MasterPlayer.cpp +++ b/src/game/MapNodes/MasterPlayer.cpp @@ -7,8 +7,8 @@ #include "ObjectAccessor.h" MasterPlayer::MasterPlayer(WorldSession* s): - m_session(s), m_social(nullptr), m_mailsUpdated(false), - m_speakTime(0), m_speakCount(0) + m_speakTime(0), m_speakCount(0), m_social(nullptr), + m_session(s), m_mailsUpdated(false) { } diff --git a/src/game/MapNodes/NodeSession.cpp b/src/game/MapNodes/NodeSession.cpp index 8964b6a5e..bc8eb9cf0 100644 --- a/src/game/MapNodes/NodeSession.cpp +++ b/src/game/MapNodes/NodeSession.cpp @@ -7,8 +7,8 @@ NodeSession::NodeSession(MapSocket* sock): m_socket(sock), m_lastReceivedPacketTime(0), - itemGuidsGenerator(1000), petGuidsGenerator(1000), - m_isConnectedToMaster(!sock->IsServerSide()), m_isReady(false) + m_isConnectedToMaster(!sock->IsServerSide()), m_isReady(false), + itemGuidsGenerator(1000), petGuidsGenerator(1000) { ASSERT(sock); sock->AddReference(); diff --git a/src/game/MapNodes/NodeSession.h b/src/game/MapNodes/NodeSession.h index 368b6a599..7e2d420e1 100644 --- a/src/game/MapNodes/NodeSession.h +++ b/src/game/MapNodes/NodeSession.h @@ -131,7 +131,7 @@ protected: struct GuidsGenerator { - GuidsGenerator(uint32 minFreeGuids) : m_newGuidsRequestSent(false), m_minFreeGuids(minFreeGuids), m_freeGuidsCount(0) {} + GuidsGenerator(uint32 minFreeGuids) : m_newGuidsRequestSent(false), m_freeGuidsCount(0), m_minFreeGuids(minFreeGuids) {} void ReadFreeGuids(WorldPacket& pkt); uint32 Generate(); diff --git a/src/game/MapNodes/Serializers/PlayerSerializer.h b/src/game/MapNodes/Serializers/PlayerSerializer.h index 4377c6644..0e6e7a8c2 100644 --- a/src/game/MapNodes/Serializers/PlayerSerializer.h +++ b/src/game/MapNodes/Serializers/PlayerSerializer.h @@ -367,7 +367,7 @@ void Player::SerializeSpells(MaNGOS::Serializer::WriteSerializer& buf) uint32 spell_id; bool is_spell_active; bool is_spell_disabled; - for (PlayerSpellMap::iterator itr = m_spells.begin(), next = m_spells.begin(); itr != m_spells.end(); ++itr) + for (PlayerSpellMap::iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr) { // add only changed/new not dependent spells if (!itr->second.dependent) diff --git a/src/game/Maps/GridNotifiers.h b/src/game/Maps/GridNotifiers.h index d34dd7b4f..a520e8a7e 100644 --- a/src/game/Maps/GridNotifiers.h +++ b/src/game/Maps/GridNotifiers.h @@ -1544,30 +1544,6 @@ namespace MaNGOS NearestHostileUnitInAttackDistanceCheck(NearestHostileUnitInAttackDistanceCheck const&); }; - class GameObjectWithDbGUIDCheck - { - public: - GameObjectWithDbGUIDCheck(WorldObject const& obj, uint32 db_guid) : i_obj(obj), i_db_guid(db_guid) {} - bool operator()(GameObject const* go) const - { - return go->GetDBTableGUIDLow() == i_db_guid; - } - private: - WorldObject const& i_obj; - uint32 i_db_guid; - }; - class CreatureWithDbGUIDCheck - { - public: - CreatureWithDbGUIDCheck(WorldObject const* obj, uint32 lowguid) : i_obj(obj), i_lowguid(lowguid) {} - bool operator()(Creature* u) - { - return u->GetDBTableGUIDLow() == i_lowguid; - } - private: - WorldObject const* i_obj; - uint32 i_lowguid; - }; class AllWorldObjectsInRange { public: diff --git a/src/game/Maps/GridStates.h b/src/game/Maps/GridStates.h index 39a84a907..2992bee00 100644 --- a/src/game/Maps/GridStates.h +++ b/src/game/Maps/GridStates.h @@ -34,29 +34,29 @@ class MANGOS_DLL_DECL GridState class MANGOS_DLL_DECL InvalidState : public GridState { public: - virtual ~InvalidState() {} - void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const; + ~InvalidState() override {} + void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const override; }; class MANGOS_DLL_DECL ActiveState : public GridState { public: - virtual ~ActiveState() {} - void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const; + ~ActiveState() override {} + void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const override; }; class MANGOS_DLL_DECL IdleState : public GridState { public: - virtual ~IdleState() {} - void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const; + ~IdleState() override {} + void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const override; }; class MANGOS_DLL_DECL RemovalState : public GridState { public: - virtual ~RemovalState() {} - void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const; + ~RemovalState() override {} + void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const override; }; #endif diff --git a/src/game/Maps/InstanceData.h b/src/game/Maps/InstanceData.h index e13991103..8478e4d02 100644 --- a/src/game/Maps/InstanceData.h +++ b/src/game/Maps/InstanceData.h @@ -38,7 +38,7 @@ class MANGOS_DLL_SPEC InstanceData : public ZoneScript public: explicit InstanceData(Map *map) : instance(map) { SetMap(map); } - virtual ~InstanceData() {} + ~InstanceData() override {} Map *instance; diff --git a/src/game/Maps/Map.cpp b/src/game/Maps/Map.cpp index 40da51ff9..a745ce9ac 100644 --- a/src/game/Maps/Map.cpp +++ b/src/game/Maps/Map.cpp @@ -664,7 +664,7 @@ inline void Map::UpdateActiveCellsCallback(uint32 diff, uint32 now, uint32 threa class MapAsynchCellsWorker : public ACE_Based::Runnable { public: - MapAsynchCellsWorker(int i, int nthreads, uint32 _diff, uint32 _now, uint32 _step, Map* m) : threadIdx(i), nThreads(nthreads), now(_now), diff(_diff), map(m), step(_step) + MapAsynchCellsWorker(int i, int nthreads, uint32 _diff, uint32 _now, uint32 _step, Map* m) : threadIdx(i), nThreads(nthreads), diff(_diff), now(_now), step(_step), map(m) { } @@ -867,7 +867,6 @@ void Map::DoUpdate(uint32 maxDiff) void Map::Update(uint32 t_diff) { uint32 updateMapTime = WorldTimer::getMSTime(); - uint32 timeDiff = 0; _dynamicTree.update(t_diff); ProcessSessionPackets(PACKET_PROCESS_DB_QUERY); // TODO: Move somewhere else ? @@ -2777,7 +2776,7 @@ WorldObject* Map::GetWorldObjectOrPlayer(ObjectGuid guid) class ObjectUpdatePacketBuilder : public ACE_Based::Runnable { public: - ObjectUpdatePacketBuilder(std::set::iterator& a, std::set::iterator& b, uint32 now) : begin(a), end(b), beginTime(now), current(a) + ObjectUpdatePacketBuilder(std::set::iterator& a, std::set::iterator& b, uint32 now) : begin(a), current(a), end(b), beginTime(now) { } @@ -2836,7 +2835,6 @@ void Map::SendObjectUpdates() threads = objectsCount; uint32 step = objectsCount / threads; - uint32 i = 0; ACE_Based::Thread** updaters = threads > 1 ? new ACE_Based::Thread*[threads - 1] : nullptr; ObjectUpdatePacketBuilder** objUpdaters = new ObjectUpdatePacketBuilder*[threads]; std::set::iterator itBegin = i_objectsToClientUpdate.begin(); @@ -2894,7 +2892,7 @@ void Map::SendObjectUpdates() class VisibilityUpdater : public ACE_Based::Runnable { public: - VisibilityUpdater(std::set::iterator& a, std::set::iterator& b, uint32 now) : begin(a), end(b), beginTime(now), current(a) + VisibilityUpdater(std::set::iterator& a, std::set::iterator& b, uint32 now) : begin(a), current(a), end(b), beginTime(now) { } @@ -2947,7 +2945,6 @@ void Map::UpdateVisibilityForRelocations() threads = objectsCount; uint32 step = objectsCount / threads; - uint32 i = 0; ACE_Based::Thread** updaters = threads > 1 ? new ACE_Based::Thread*[threads - 1] : nullptr; VisibilityUpdater** visUpdaters = new VisibilityUpdater*[threads]; std::set::iterator itBegin = i_unitsRelocated.begin(); diff --git a/src/game/Maps/Map.h b/src/game/Maps/Map.h index ed3fb007e..2086c4c88 100644 --- a/src/game/Maps/Map.h +++ b/src/game/Maps/Map.h @@ -219,7 +219,7 @@ struct ScriptedEventTarget struct ScriptedEvent { ScriptedEvent(uint32 eventId, ObjectGuid source, ObjectGuid target, Map& map, time_t expireTime, uint32 failureCondition, uint32 failureScript, uint32 successCondition, uint32 successScript) : - m_uiEventId(eventId), m_Source(source), m_Target(target), m_Map(map), m_tExpireTime(expireTime), m_uiFailureCondition(failureCondition), m_uiFailureScript(failureScript), m_uiSuccessCondition(successCondition), m_uiSuccessScript(successScript), m_bEnded(false) {} + m_Source(source), m_Target(target), m_Map(map), m_uiEventId(eventId), m_tExpireTime(expireTime), m_bEnded(false), m_uiFailureCondition(failureCondition), m_uiFailureScript(failureScript), m_uiSuccessCondition(successCondition), m_uiSuccessScript(successScript) {} ObjectGuid m_Source; ObjectGuid m_Target; @@ -328,7 +328,7 @@ class MANGOS_DLL_SPEC Map : public GridRefManager, public MaNGOS::Obj Map(uint32 id, time_t, uint32 InstanceId); public: - virtual ~Map(); + ~Map() override; void PrintInfos(ChatHandler& handler); void SpawnActiveObjects(); // currently unused for normal maps @@ -995,7 +995,7 @@ class MANGOS_DLL_SPEC WorldMap : public Map public: WorldMap(uint32 id, time_t expiry, uint32 instance = 0) : Map(id, expiry, instance) {} - ~WorldMap() {} + ~WorldMap() override {} // can't be nullptr for loaded map WorldPersistentState* GetPersistanceState() const; @@ -1007,7 +1007,7 @@ class MANGOS_DLL_SPEC DungeonMap : public Map public: DungeonMap(uint32 id, time_t, uint32 InstanceId); - ~DungeonMap(); + ~DungeonMap() override; bool Add(Player*) override; void Remove(Player*, bool) override; void Update(uint32) override; @@ -1036,7 +1036,7 @@ class MANGOS_DLL_SPEC BattleGroundMap : public Map public: BattleGroundMap(uint32 id, time_t, uint32 InstanceId); - ~BattleGroundMap(); + ~BattleGroundMap() override; void Update(uint32) override; bool Add(Player*) override; diff --git a/src/game/Maps/MapManager.cpp b/src/game/Maps/MapManager.cpp index 5d201962a..fde49a23f 100644 --- a/src/game/Maps/MapManager.cpp +++ b/src/game/Maps/MapManager.cpp @@ -37,11 +37,12 @@ INSTANTIATE_SINGLETON_2(MapManager, MapManagerLock); INSTANTIATE_CLASS_MUTEX(MapManager, ACE_Recursive_Thread_Mutex); MapManager::MapManager() - : i_gridCleanUpDelay(sWorld.getConfig(CONFIG_UINT32_INTERVAL_GRIDCLEAN)), - i_MaxInstanceId(RESERVED_INSTANCES_LAST), + : i_GridStateErrorCount(0), - i_continentUpdateFinished(nullptr), + i_gridCleanUpDelay(sWorld.getConfig(CONFIG_UINT32_INTERVAL_GRIDCLEAN)), + i_MaxInstanceId(RESERVED_INSTANCES_LAST), i_maxContinentThread(0), + i_continentUpdateFinished(nullptr), asyncMapUpdating(false) { i_timer.SetInterval(sWorld.getConfig(CONFIG_UINT32_INTERVAL_MAPUPDATE)); @@ -266,7 +267,7 @@ public: class ContinentAsyncUpdater : public ACE_Based::Runnable { public: - ContinentAsyncUpdater(uint32 updateDiff, Map* m) : diff(updateDiff), map(m) + ContinentAsyncUpdater(uint32 updateDiff, Map* m) : map(m), diff(updateDiff) { } diff --git a/src/game/Maps/MapPersistentStateMgr.h b/src/game/Maps/MapPersistentStateMgr.h index 1e30dcc1f..39b1fbfc7 100644 --- a/src/game/Maps/MapPersistentStateMgr.h +++ b/src/game/Maps/MapPersistentStateMgr.h @@ -153,9 +153,9 @@ class WorldPersistentState : public MapPersistentState */ explicit WorldPersistentState(uint16 MapId, uint16 instanceId) : MapPersistentState(MapId, instanceId) {} - ~WorldPersistentState() {} + ~WorldPersistentState() override {} protected: - bool CanBeUnload() const; // overwrite MapPersistentState::CanBeUnload + bool CanBeUnload() const override; // overwrite MapPersistentState::CanBeUnload }; /* @@ -176,7 +176,7 @@ class DungeonPersistentState : public MapPersistentState - when a group bound to the instance is loaded */ DungeonPersistentState(uint16 MapId, uint32 InstanceId, time_t resetTime, bool canReset); - ~DungeonPersistentState(); + ~DungeonPersistentState() override; void UnbindThisState(); uint8 GetPlayerCount() const { return m_playerList.size(); } @@ -210,7 +210,7 @@ class DungeonPersistentState : public MapPersistentState void DeleteRespawnTimesAndData(); protected: - bool CanBeUnload() const; // overwrite MapPersistentState::CanBeUnload + bool CanBeUnload() const override; // overwrite MapPersistentState::CanBeUnload bool HasBounds() const { return !m_playerList.empty() || !m_groupList.empty(); } private: @@ -236,9 +236,9 @@ class BattleGroundPersistentState : public MapPersistentState BattleGroundPersistentState(uint16 MapId, uint32 InstanceId) : MapPersistentState(MapId, InstanceId) {} - ~BattleGroundPersistentState() {} + ~BattleGroundPersistentState() override {} protected: - bool CanBeUnload() const; // overwrite MapPersistentState::CanBeUnload + bool CanBeUnload() const override; // overwrite MapPersistentState::CanBeUnload }; enum ResetEventType diff --git a/src/game/Maps/MapReference.h b/src/game/Maps/MapReference.h index e76360ce4..f070f5fdf 100644 --- a/src/game/Maps/MapReference.h +++ b/src/game/Maps/MapReference.h @@ -28,13 +28,13 @@ class MANGOS_DLL_SPEC MapReference : public Reference { protected: - inline void targetObjectBuildLink(); - inline void targetObjectDestroyLink(); - inline void sourceObjectDestroyLink(); + inline void targetObjectBuildLink() override; + inline void targetObjectDestroyLink() override; + inline void sourceObjectDestroyLink() override; public: MapReference() : Reference() {} - ~MapReference() { unlink(); } + ~MapReference() override { unlink(); } MapReference *next() { return (MapReference*)Reference::next(); } MapReference const *next() const { return (MapReference const*)Reference::next(); } }; diff --git a/src/game/Maps/MoveMap.cpp b/src/game/Maps/MoveMap.cpp index a0cdc3ae7..f64bcf922 100644 --- a/src/game/Maps/MoveMap.cpp +++ b/src/game/Maps/MoveMap.cpp @@ -188,7 +188,7 @@ bool MMapManager::loadMap(uint32 mapId, int32 x, int32 y) fclose(file); - dtMeshHeader* header = (dtMeshHeader*)data; + //dtMeshHeader* header = (dtMeshHeader*)data; dtTileRef tileRef = 0; // memory allocated for data is now managed by detour, and will be deallocated when the tile is removed diff --git a/src/game/Maps/PathFinder.cpp b/src/game/Maps/PathFinder.cpp index a943d95ef..d339dcdfb 100644 --- a/src/game/Maps/PathFinder.cpp +++ b/src/game/Maps/PathFinder.cpp @@ -33,9 +33,9 @@ ////////////////// PathInfo ////////////////// PathInfo::PathInfo(const Unit* owner) : - m_polyLength(0), m_type(PATHFIND_BLANK), - m_useStraightPath(false), m_forceDestination(false), m_pointPathLimit(MAX_POINT_PATH_LENGTH), - m_sourceUnit(owner), m_navMesh(nullptr), m_navMeshQuery(nullptr), m_transport(nullptr), m_targetAllowedFlags(0) + m_polyLength(0), m_type(PATHFIND_BLANK), m_useStraightPath(false), m_forceDestination(false), + m_pointPathLimit(MAX_POINT_PATH_LENGTH), m_transport(nullptr), m_sourceUnit(owner), + m_navMesh(nullptr), m_navMeshQuery(nullptr), m_targetAllowedFlags(0) { //DEBUG_FILTER_LOG(LOG_FILTER_PATHFINDING, "++ PathFinder::PathInfo for %u \n", m_sourceUnit->GetGUIDLow()); createFilter(); @@ -122,7 +122,6 @@ dtPolyRef PathInfo::FindWalkPoly(dtNavMeshQuery const* query, float const* point // WARNING : Nav mesh coords are Y, Z, X (and not X, Y, Z) float extents[3] = {5.0f, zSearchDist, 5.0f}; - int polyCount = 0; dtPolyRef polyRef; // Default recastnavigation method @@ -351,7 +350,7 @@ void PathInfo::BuildPolyPath(const Vector3 &startPos, const Vector3 &endPos) // free and invalidate old path data clear(); - unsigned int const threadId = (uintptr_t) ACE_Based::Thread::currentId(); + //unsigned int const threadId = (uintptr_t) ACE_Based::Thread::currentId(); //if (threadId != m_navMeshQuery->m_owningThread) //sLog.outError("CRASH: We are using a dtNavMeshQuery from thread %u which belongs to thread %u!", threadId, m_navMeshQuery->m_owningThread); @@ -485,7 +484,7 @@ void PathInfo::BuildUnderwaterPath() // set start and a default next position m_pathPoints[0] = getStartPosition(); m_pathPoints[1] = getActualEndPosition(); - float ground = 0.0f; + GridMapLiquidData liquidData; uint32 liquidStatus = m_sourceUnit->GetTerrain()->getLiquidStatus(getActualEndPosition().x, getActualEndPosition().y, getActualEndPosition().z, MAP_ALL_LIQUIDS, &liquidData); // No water here ... diff --git a/src/game/Maps/ZoneScript.h b/src/game/Maps/ZoneScript.h index 93ab16ae9..b351daa76 100644 --- a/src/game/Maps/ZoneScript.h +++ b/src/game/Maps/ZoneScript.h @@ -269,7 +269,7 @@ class OutdoorPvP : public ZoneScript OutdoorPvP(); // dtor - virtual ~OutdoorPvP(); + ~OutdoorPvP() override; // deletes all gos/creatures spawned by the pvp void DeleteSpawns(); diff --git a/src/game/Movement/FleeingMovementGenerator.h b/src/game/Movement/FleeingMovementGenerator.h index 7a0ae4c02..4c8b9b22a 100644 --- a/src/game/Movement/FleeingMovementGenerator.h +++ b/src/game/Movement/FleeingMovementGenerator.h @@ -35,7 +35,7 @@ class MANGOS_DLL_SPEC FleeingMovementGenerator : public MovementGeneratorMedium< bool Update(T &, const uint32 &); void unitSpeedChanged() override { _forceUpdate = true; } - MovementGeneratorType GetMovementGeneratorType() const { return FLEEING_MOTION_TYPE; } + MovementGeneratorType GetMovementGeneratorType() const override { return FLEEING_MOTION_TYPE; } protected: bool _forceWalking; @@ -56,7 +56,7 @@ class MANGOS_DLL_SPEC TimedFleeingMovementGenerator : public FleeingMovementGene FleeingMovementGenerator(fright), i_totalFleeTime(time) {} - MovementGeneratorType GetMovementGeneratorType() const { return TIMED_FLEEING_MOTION_TYPE; } + MovementGeneratorType GetMovementGeneratorType() const override { return TIMED_FLEEING_MOTION_TYPE; } bool Update(Unit &, const uint32 &); void Initialize(Unit &); void Finalize(Unit &); diff --git a/src/game/Movement/FollowerReference.h b/src/game/Movement/FollowerReference.h index fe77ef811..5a57fd14a 100644 --- a/src/game/Movement/FollowerReference.h +++ b/src/game/Movement/FollowerReference.h @@ -30,8 +30,8 @@ class Unit; class MANGOS_DLL_SPEC FollowerReference : public Reference { protected: - void targetObjectBuildLink(); - void targetObjectDestroyLink(); - void sourceObjectDestroyLink(); + void targetObjectBuildLink() override; + void targetObjectDestroyLink() override; + void sourceObjectDestroyLink() override; }; #endif diff --git a/src/game/Movement/MovementGenerator.h b/src/game/Movement/MovementGenerator.h index 18d3fe45a..da3e6d341 100644 --- a/src/game/Movement/MovementGenerator.h +++ b/src/game/Movement/MovementGenerator.h @@ -72,37 +72,37 @@ template class MANGOS_DLL_SPEC MovementGeneratorMedium : public MovementGenerator { public: - void Initialize(Unit &u) + void Initialize(Unit &u) override { //u->AssertIsType(); (static_cast(this))->Initialize(*((T*)&u)); } - void Finalize(Unit &u) + void Finalize(Unit &u) override { //u->AssertIsType(); (static_cast(this))->Finalize(*((T*)&u)); } - void Interrupt(Unit &u) + void Interrupt(Unit &u) override { //u->AssertIsType(); (static_cast(this))->Interrupt(*((T*)&u)); } - void Reset(Unit &u) + void Reset(Unit &u) override { //u->AssertIsType(); (static_cast(this))->Reset(*((T*)&u)); } - bool Update(Unit &u, const uint32 &time_diff) + bool Update(Unit &u, const uint32 &time_diff) override { //u->AssertIsType(); return (static_cast(this))->Update(*((T*)&u), time_diff); } - void UpdateAsync(Unit &u, uint32 time_diff) + void UpdateAsync(Unit &u, uint32 time_diff) override { //u->AssertIsType(); (static_cast(this))->UpdateAsync(*((T*)&u), time_diff); } - bool GetResetPosition(Unit& u, float& x, float& y, float& z) + bool GetResetPosition(Unit& u, float& x, float& y, float& z) override { //u->AssertIsType(); return (static_cast(this))->GetResetPosition(*((T*)&u), x, y, z); @@ -130,7 +130,7 @@ struct MovementGeneratorFactory : SelectableMovement { explicit MovementGeneratorFactory(MovementGeneratorType mgt) : SelectableMovement(mgt) {} - MovementGenerator* Create(void *) const; + MovementGenerator* Create(void *) const override; }; typedef FactoryHolder MovementGeneratorCreator; diff --git a/src/game/Movement/MovementPacketSender.cpp b/src/game/Movement/MovementPacketSender.cpp index 3d7f13403..e8748f344 100644 --- a/src/game/Movement/MovementPacketSender.cpp +++ b/src/game/Movement/MovementPacketSender.cpp @@ -247,7 +247,9 @@ void MovementPacketSender::SendMovementFlagChangeToController(Unit* unit, Player case WATER_WALK: opcode = pendingChange.apply ? SMSG_MOVE_WATER_WALK : SMSG_MOVE_LAND_WALK; break; case SET_HOVER: opcode = pendingChange.apply ? SMSG_MOVE_SET_HOVER : SMSG_MOVE_UNSET_HOVER; break; case FEATHER_FALL: opcode = pendingChange.apply ? SMSG_MOVE_FEATHER_FALL : SMSG_MOVE_NORMAL_FALL; break; - default: sLog.outError("MovementPacketSender::SendMovementFlagChangeToController: Unsupported movement change (%u), data not sent to client.", pendingChange.movementChangeType); + default: + sLog.outError("MovementPacketSender::SendMovementFlagChangeToController: Unsupported movement change (%u), data not sent to client.", pendingChange.movementChangeType); + return; } #if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_8_4 diff --git a/src/game/Movement/PointMovementGenerator.h b/src/game/Movement/PointMovementGenerator.h index 4dd30b93d..daa274e7d 100644 --- a/src/game/Movement/PointMovementGenerator.h +++ b/src/game/Movement/PointMovementGenerator.h @@ -30,7 +30,7 @@ class MANGOS_DLL_SPEC PointMovementGenerator { public: PointMovementGenerator(uint32 _id, float _x, float _y, float _z, uint32 options, float _speed = 0.0f, float finalOrientation = -10.0f) : - id(_id), i_x(_x), i_y(_y), i_z(_z), _options(options), speed(_speed), _recalculateSpeed(false), _finalO(finalOrientation) {} + id(_id), i_x(_x), i_y(_y), i_z(_z), _finalO(finalOrientation), _options(options), speed(_speed), _recalculateSpeed(false) {} virtual ~PointMovementGenerator() {} virtual void Initialize(T &); @@ -43,7 +43,7 @@ class MANGOS_DLL_SPEC PointMovementGenerator void unitSpeedChanged() { _recalculateSpeed = true; } - MovementGeneratorType GetMovementGeneratorType() const { return POINT_MOTION_TYPE; } + MovementGeneratorType GetMovementGeneratorType() const override { return POINT_MOTION_TYPE; } bool GetDestination(float& x, float& y, float& z) const { x=i_x; y=i_y; z=i_z; return true; } protected: @@ -62,7 +62,7 @@ class MANGOS_DLL_SPEC DistancingMovementGenerator DistancingMovementGenerator(float _x, float _y, float _z) : PointMovementGenerator(0, _x, _y, _z, MOVE_PATHFINDING | MOVE_RUN_MODE) {} - MovementGeneratorType GetMovementGeneratorType() const { return DISTANCING_MOTION_TYPE; } + MovementGeneratorType GetMovementGeneratorType() const override { return DISTANCING_MOTION_TYPE; } bool Update(Creature&, const uint32 &diff); void MovementInform(Creature &) override; }; @@ -74,7 +74,7 @@ class MANGOS_DLL_SPEC AssistanceMovementGenerator AssistanceMovementGenerator(float _x, float _y, float _z) : PointMovementGenerator(0, _x, _y, _z, true) {} - MovementGeneratorType GetMovementGeneratorType() const { return ASSISTANCE_MOTION_TYPE; } + MovementGeneratorType GetMovementGeneratorType() const override { return ASSISTANCE_MOTION_TYPE; } void Initialize(Creature& unit) override; void Finalize(Creature &) override; }; @@ -89,7 +89,7 @@ class EffectMovementGenerator : public MovementGenerator void Interrupt(Unit &) {} void Reset(Unit &) {} bool Update(Unit &u, const uint32 &); - MovementGeneratorType GetMovementGeneratorType() const { return EFFECT_MOTION_TYPE; } + MovementGeneratorType GetMovementGeneratorType() const override { return EFFECT_MOTION_TYPE; } private: uint32 m_Id; }; @@ -100,7 +100,7 @@ class MANGOS_DLL_SPEC ChargeMovementGenerator { public: ChargeMovementGenerator(T& attacker, Unit& victim, uint32 interpolationDelay = 0, bool triggerAttack = false, float speed = 0.0f) : - path(&attacker), victimGuid(victim.GetObjectGuid()), _recalculateSpeed(false), _interpolateDelay(interpolationDelay), _triggerAttack(triggerAttack), _scheduleStopMoving(false), _speed(speed) + path(&attacker), victimGuid(victim.GetObjectGuid()), _recalculateSpeed(false), _triggerAttack(triggerAttack), _interpolateDelay(interpolationDelay), _scheduleStopMoving(false), _speed(speed) { ComputePath(attacker, victim); } @@ -112,7 +112,7 @@ class MANGOS_DLL_SPEC ChargeMovementGenerator void Reset(T &unit); bool Update(T &, const uint32 &diff); - MovementGeneratorType GetMovementGeneratorType() const { return CHARGE_MOTION_TYPE; } + MovementGeneratorType GetMovementGeneratorType() const override { return CHARGE_MOTION_TYPE; } void unitSpeedChanged() { _recalculateSpeed = true; } protected: PathFinder path; diff --git a/src/game/Movement/WaypointManager.h b/src/game/Movement/WaypointManager.h index b5e79acb7..b34f4cc57 100644 --- a/src/game/Movement/WaypointManager.h +++ b/src/game/Movement/WaypointManager.h @@ -61,7 +61,7 @@ struct WaypointNode WaypointBehavior * behavior; WaypointNode() : x(0.0f), y(0.0f), z(0.0f), orientation(0.0f), delay(0), wander_distance(0.0f), script_id(0), behavior(nullptr) {} WaypointNode(float _x, float _y, float _z, float _o, uint32 _delay, float _wander_distance, uint32 _script_id, WaypointBehavior * _behavior) - : x(_x), y(_y), z(_z), orientation(_o), delay(_delay), script_id(_script_id), behavior(_behavior), wander_distance(_wander_distance) {} + : x(_x), y(_y), z(_z), orientation(_o), delay(_delay), wander_distance(_wander_distance), script_id(_script_id), behavior(_behavior) {} }; typedef std::map < uint32 /*pointId*/, WaypointNode > WaypointPath; diff --git a/src/game/Movement/WaypointMovementGenerator.h b/src/game/Movement/WaypointMovementGenerator.h index f4ef1bff9..b42c16f01 100644 --- a/src/game/Movement/WaypointMovementGenerator.h +++ b/src/game/Movement/WaypointMovementGenerator.h @@ -70,7 +70,7 @@ class MANGOS_DLL_SPEC WaypointMovementGenerator public PathMovementBase { public: - WaypointMovementGenerator(Creature &, bool repeating = true) : i_nextMoveTime(0), m_isArrivalDone(false), m_repeating(repeating), m_lastReachedWaypoint(0), m_isWandering(false) {} + WaypointMovementGenerator(Creature &, bool repeating = true) : i_nextMoveTime(0), m_isArrivalDone(false), m_repeating(repeating), m_isWandering(false), m_lastReachedWaypoint(0) {} ~WaypointMovementGenerator() { i_path = nullptr; } void Initialize(Creature &u); void Interrupt(Creature &); diff --git a/src/game/Movement/spline/MoveSpline.cpp b/src/game/Movement/spline/MoveSpline.cpp index ef08f6797..4f62a2c24 100644 --- a/src/game/Movement/spline/MoveSpline.cpp +++ b/src/game/Movement/spline/MoveSpline.cpp @@ -149,7 +149,7 @@ void MoveSpline::Initialize(const MoveSplineInitArgs& args) init_spline(args); } -MoveSpline::MoveSpline() : m_Id(0), time_passed(0), point_Idx(0), point_Idx_offset(0), transportGuid(0), mvtOrigin("Unknown"), last_point_sent_Idx(-1) +MoveSpline::MoveSpline() : m_Id(0), transportGuid(0), time_passed(0), point_Idx(0), last_point_sent_Idx(-1), point_Idx_offset(0), mvtOrigin("Unknown") { splineflags.done = true; } diff --git a/src/game/Movement/spline/packet_builder.cpp b/src/game/Movement/spline/packet_builder.cpp index ca917fbc3..cfacd039b 100644 --- a/src/game/Movement/spline/packet_builder.cpp +++ b/src/game/Movement/spline/packet_builder.cpp @@ -88,7 +88,6 @@ int32 WriteLinearPath(const Spline& spline, ByteBuffer& data, uint32 star const Vector3* real_path = &spline.getPoint(1); Vector3 destination = real_path[last_idx]; - size_t lastIndexPos = data.wpos(); data << (last_idx - start + 1); data << destination; if (last_idx > 1) diff --git a/src/game/ObjectGridLoader.cpp b/src/game/ObjectGridLoader.cpp index 89dbfc7c0..848d8f1c7 100644 --- a/src/game/ObjectGridLoader.cpp +++ b/src/game/ObjectGridLoader.cpp @@ -85,7 +85,7 @@ class ObjectWorldLoader { public: explicit ObjectWorldLoader(ObjectGridLoader& gloader) - : i_cell(gloader.i_cell), i_grid(gloader.i_grid), i_map(gloader.i_map), i_corpses(0) + : i_cell(gloader.i_cell), i_map(gloader.i_map), i_corpses(0) {} void Visit(CorpseMapType &m); @@ -94,7 +94,6 @@ public: private: Cell i_cell; - NGridType &i_grid; Map* i_map; public: uint32 i_corpses; diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 659491357..d32c4df7f 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -127,12 +127,12 @@ template uint32 IdGenerator::Generate(); template uint64 IdGenerator::Generate(); ObjectMgr::ObjectMgr() : - m_FirstTemporaryCreatureGuid(1), - m_FirstTemporaryGameObjectGuid(1), m_GuildIds("Guild ids"), m_MailIds("Mail ids"), m_GroupIds("Group ids"), m_PetitionIds("Petition ids"), + m_FirstTemporaryCreatureGuid(1), + m_FirstTemporaryGameObjectGuid(1), // Nostalrius DBCLocaleIndex(0), m_OldMailCounter(0) diff --git a/src/game/Objects/Bag.h b/src/game/Objects/Bag.h index 95b4ca659..0cacc3555 100644 --- a/src/game/Objects/Bag.h +++ b/src/game/Objects/Bag.h @@ -35,12 +35,12 @@ class Bag : public Item public: Bag(); - ~Bag(); + ~Bag() override; - void AddToWorld(); - void RemoveFromWorld(); + void AddToWorld() override; + void RemoveFromWorld() override; - bool Create(uint32 guidlow, uint32 itemid, ObjectGuid ownerGuid = ObjectGuid()); + bool Create(uint32 guidlow, uint32 itemid, ObjectGuid ownerGuid = ObjectGuid()) override; void Clear(); void StoreItem(uint8 slot, Item *pItem, bool update); @@ -57,19 +57,19 @@ class Bag : public Item // DB operations // overwrite virtual Item::SaveToDB - void SaveToDB(); + void SaveToDB() override; // overwrite virtual Item::LoadFromDB - bool LoadFromDB(uint32 guidLow, ObjectGuid ownerGuid, Field* fields, uint32 entry); + bool LoadFromDB(uint32 guidLow, ObjectGuid ownerGuid, Field* fields, uint32 entry) override; // overwrite virtual Item::DeleteFromDB - void DeleteFromDB(); + void DeleteFromDB() override; - void BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) const; + void BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) const override; /** * @brief Call this before reading unserialization * @return false iif the Item is corrupt. */ - bool PrepareWakeUp(uint32 low_guid, ItemPrototype const* proto, Player const* owner); + bool PrepareWakeUp(uint32 low_guid, ItemPrototype const* proto, Player const* owner) override; protected: diff --git a/src/game/Objects/Corpse.h b/src/game/Objects/Corpse.h index 19d9d9a5e..d9f7b5106 100644 --- a/src/game/Objects/Corpse.h +++ b/src/game/Objects/Corpse.h @@ -54,10 +54,10 @@ class Corpse : public WorldObject { public: explicit Corpse( CorpseType type = CORPSE_BONES ); - ~Corpse( ); + ~Corpse( ) override; - void AddToWorld(); - void RemoveFromWorld(); + void AddToWorld() override; + void RemoveFromWorld() override; bool Create( uint32 guidlow ); bool Create( uint32 guidlow, Player *owner ); @@ -74,7 +74,7 @@ class Corpse : public WorldObject void ResetGhostTime() { m_time = time(nullptr); } CorpseType GetType() const { return m_type; } - ReputationRank GetReactionTo(WorldObject const* target) const final override; + ReputationRank GetReactionTo(WorldObject const* target) const final ; bool IsHostileTo(WorldObject const* target) const override; bool IsFriendlyTo(WorldObject const* target) const override; @@ -92,8 +92,8 @@ class Corpse : public WorldObject bool IsExpired(time_t t) const; void SetFactionTemplate(FactionTemplateEntry const* entry) { m_faction = entry; } FactionTemplateEntry const* GetFactionTemplate() { return m_faction; } - uint32 getFaction() const final override { return m_faction->ID; } - uint32 getLevel() const final override; + uint32 getFaction() const final { return m_faction->ID; } + uint32 getLevel() const final ; private: GridReference m_gridRef; FactionTemplateEntry const* m_faction; diff --git a/src/game/Objects/Creature.cpp b/src/game/Objects/Creature.cpp index f690276c8..9e365399a 100644 --- a/src/game/Objects/Creature.cpp +++ b/src/game/Objects/Creature.cpp @@ -2210,7 +2210,7 @@ bool Creature::CanInitiateAttack() class DynamicRespawnRatesChecker { public: - DynamicRespawnRatesChecker(Creature* crea) : _count(0), _me(crea), _hasNearbyEscort(false) + DynamicRespawnRatesChecker(Creature* crea) : _count(0), _hasNearbyEscort(false) { _myLevel = crea->getLevel(); _maxLevelDiff = sWorld.getConfig(CONFIG_UINT32_DYN_RESPAWN_PLAYERS_LEVELDIFF); @@ -2232,7 +2232,6 @@ public: bool HasNearbyEscort() const { return _hasNearbyEscort; } private: uint32 _count; - Creature* _me; uint32 _myLevel; uint32 _maxLevelDiff; bool _hasNearbyEscort; @@ -2248,7 +2247,7 @@ void Creature::ApplyDynamicRespawnDelay(uint32& delay, CreatureData const* data) // Only affects rares and above with the forced flag if (GetCreatureInfo()->rank > CREATURE_ELITE_ELITE) - if (data && !(data->spawnFlags & SPAWN_FLAG_FORCE_DYNAMIC_ELITE) || !data) + if (!data || !(data->spawnFlags & SPAWN_FLAG_FORCE_DYNAMIC_ELITE)) return; if (getLevel() > sWorld.getConfig(CONFIG_UINT32_DYN_RESPAWN_AFFECT_LEVEL_BELOW)) diff --git a/src/game/Objects/Creature.h b/src/game/Objects/Creature.h index f398673de..b7ac405d3 100644 --- a/src/game/Objects/Creature.h +++ b/src/game/Objects/Creature.h @@ -496,7 +496,7 @@ class MANGOS_DLL_SPEC Creature : public Unit public: explicit Creature(CreatureSubtype subtype = CREATURE_SUBTYPE_GENERIC); - virtual ~Creature(); + ~Creature() override; void AddToWorld() override; void RemoveFromWorld() override; diff --git a/src/game/Objects/DynamicObject.cpp b/src/game/Objects/DynamicObject.cpp index 5d78e830f..31effdfad 100644 --- a/src/game/Objects/DynamicObject.cpp +++ b/src/game/Objects/DynamicObject.cpp @@ -30,7 +30,7 @@ #include "GridNotifiersImpl.h" #include "SpellMgr.h" -DynamicObject::DynamicObject() : WorldObject(), m_effIndex(EFFECT_INDEX_0), m_spellId(0), m_aliveDuration(0), m_positive(false), m_radius(0) +DynamicObject::DynamicObject() : WorldObject(), m_spellId(0), m_effIndex(EFFECT_INDEX_0), m_aliveDuration(0), m_radius(0), m_positive(false), m_channeled(false) { m_objectType |= TYPEMASK_DYNAMICOBJECT; m_objectTypeId = TYPEID_DYNAMICOBJECT; diff --git a/src/game/Objects/DynamicObject.h b/src/game/Objects/DynamicObject.h index 089d7e66b..e30c4702e 100644 --- a/src/game/Objects/DynamicObject.h +++ b/src/game/Objects/DynamicObject.h @@ -41,8 +41,8 @@ class DynamicObject : public WorldObject typedef std::map AffectedMap; explicit DynamicObject(); - void AddToWorld(); - void RemoveFromWorld(); + void AddToWorld() override; + void RemoveFromWorld() override; bool Create(uint32 guidlow, WorldObject* caster, uint32 spellId, SpellEffectIndex effIndex, float x, float y, float z, int32 duration, float radius, DynamicObjectType type); void Update(uint32 update_diff, uint32 p_time) override; @@ -63,10 +63,10 @@ class DynamicObject : public WorldObject bool IsHostileTo(WorldObject const* target) const override; bool IsFriendlyTo(WorldObject const* target) const override; - uint32 getFaction() const final override; - uint32 getLevel() const final override; + uint32 getFaction() const final ; + uint32 getLevel() const final ; - float GetObjectBoundingRadius() const // overwrite WorldObject version + float GetObjectBoundingRadius() const override // overwrite WorldObject version { return 0.0f; // dynamic object not have real interact size } diff --git a/src/game/Objects/GameObject.cpp b/src/game/Objects/GameObject.cpp index b0149a64b..836fa834f 100644 --- a/src/game/Objects/GameObject.cpp +++ b/src/game/Objects/GameObject.cpp @@ -49,8 +49,8 @@ GameObject::GameObject() : WorldObject(), loot(this), - m_goInfo(nullptr), - m_visible(true) + m_visible(true), + m_goInfo(nullptr) { m_objectType |= TYPEMASK_GAMEOBJECT; m_objectTypeId = TYPEID_GAMEOBJECT; @@ -574,7 +574,7 @@ void GameObject::Update(uint32 update_diff, uint32 /*p_time*/) { // In Instances GO_FLAG_LOCKED or GO_FLAG_NO_INTERACT are not changed uint32 currentLockOrInteractFlags = GetUInt32Value(GAMEOBJECT_FLAGS) & (GO_FLAG_LOCKED | GO_FLAG_NO_INTERACT); - SetUInt32Value(GAMEOBJECT_FLAGS, GetGOInfo()->flags & ~(GO_FLAG_LOCKED | GO_FLAG_NO_INTERACT) | currentLockOrInteractFlags); + SetUInt32Value(GAMEOBJECT_FLAGS, (GetGOInfo()->flags & ~(GO_FLAG_LOCKED | GO_FLAG_NO_INTERACT)) | currentLockOrInteractFlags); } else SetUInt32Value(GAMEOBJECT_FLAGS, GetGOInfo()->flags); diff --git a/src/game/Objects/GameObject.h b/src/game/Objects/GameObject.h index fe14f25be..5f77b7992 100644 --- a/src/game/Objects/GameObject.h +++ b/src/game/Objects/GameObject.h @@ -581,10 +581,10 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject { public: explicit GameObject(); - ~GameObject(); + ~GameObject() override; - void AddToWorld(); - void RemoveFromWorld(); + void AddToWorld() override; + void RemoveFromWorld() override; bool Create(uint32 guidlow, uint32 name_id, Map *map, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 animprogress, GOState go_state); void Update(uint32 update_diff, uint32 p_time) override; @@ -598,7 +598,7 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject void UpdateRotationFields(float rotation2 = 0.0f, float rotation3 = 0.0f); // overwrite WorldObject function for proper name localization - const char* GetNameForLocaleIdx(int32 locale_idx) const; + const char* GetNameForLocaleIdx(int32 locale_idx) const override; void SaveToDB(); void SaveToDB(uint32 mapid); @@ -684,7 +684,7 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject void SendGameObjectCustomAnim(uint32 animId = 0); void SendGameObjectReset(); - float GetObjectBoundingRadius() const; // overwrite WorldObject version + float GetObjectBoundingRadius() const override; // overwrite WorldObject version void Use(Unit* user); @@ -714,12 +714,12 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject void AddUse() { ++m_useTimes; } uint32 GetUseCount() const { return m_useTimes; } - void SaveRespawnTime(); + void SaveRespawnTime() override; Loot loot; - bool HasQuest(uint32 quest_id) const; - bool HasInvolvedQuest(uint32 quest_id) const; + bool HasQuest(uint32 quest_id) const override; + bool HasInvolvedQuest(uint32 quest_id) const override; bool ActivateToQuest(Player *pTarget) const; uint32 GetDefaultGossipMenuId() const override { return GetGOInfo()->GetGossipMenuId(); } void UseDoorOrButton(uint32 time_to_restore = 0, bool alternative = false); @@ -762,9 +762,9 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject void SetVisible(bool b); bool isVisibleForInState(WorldObject const* pDetector, WorldObject const* viewPoint, bool inVisibleList) const override; - uint32 getFaction() const final override { return GetGOInfo()->faction; } - uint32 getLevel() const final override; - bool IsValidAttackTarget(Unit const* target) const final override; + uint32 getFaction() const final { return GetGOInfo()->faction; } + uint32 getLevel() const final ; + bool IsValidAttackTarget(Unit const* target) const final ; protected: bool m_visible; uint32 m_spellId; diff --git a/src/game/Objects/Item.h b/src/game/Objects/Item.h index ef073a840..387a4dd3f 100644 --- a/src/game/Objects/Item.h +++ b/src/game/Objects/Item.h @@ -239,7 +239,7 @@ class MANGOS_DLL_SPEC Item : public Object Item(); virtual bool Create(uint32 guidlow, uint32 itemid, ObjectGuid ownerGuid = ObjectGuid()); - virtual void RemoveFromWorld(); + void RemoveFromWorld() override; ItemPrototype const* GetProto() const; bool ChangeEntry(ItemPrototype const* pNewProto); @@ -340,13 +340,13 @@ class MANGOS_DLL_SPEC Item : public Object uState = state; } - bool HasQuest(uint32 quest_id) const { return GetProto()->StartQuest == quest_id; } - bool HasInvolvedQuest(uint32 /*quest_id*/) const { return false; } + bool HasQuest(uint32 quest_id) const override { return GetProto()->StartQuest == quest_id; } + bool HasInvolvedQuest(uint32 /*quest_id*/) const override { return false; } bool IsConjuredConsumable() const { return GetProto()->IsConjuredConsumable(); } - void AddToClientUpdateList(); - void RemoveFromClientUpdateList(); - void BuildUpdateData(UpdateDataMapType& update_players); + void AddToClientUpdateList() override; + void RemoveFromClientUpdateList() override; + void BuildUpdateData(UpdateDataMapType& update_players) override; void SetGeneratedLoot(bool value) { generatedLoot = value; } bool HasGeneratedLootSecondary() { return generatedLoot; } // todo, remove and add condition to HasGeneratedLoot diff --git a/src/game/Objects/Object.cpp b/src/game/Objects/Object.cpp index 2cfa077dd..ad807b4aa 100644 --- a/src/game/Objects/Object.cpp +++ b/src/game/Objects/Object.cpp @@ -1293,8 +1293,8 @@ void WorldObject::SetVisibilityModifier(float f) } WorldObject::WorldObject() - : m_isActiveObject(false), m_currMap(nullptr), m_mapId(0), m_InstanceId(0), m_lootAndXPRangeModifier(0), - m_visibilityModifier(DEFAULT_VISIBILITY_MODIFIER), m_creatureSummonCount(0), m_summonLimitAlert(0) + : m_isActiveObject(false), m_visibilityModifier(DEFAULT_VISIBILITY_MODIFIER), m_currMap(nullptr), + m_mapId(0), m_InstanceId(0), m_lootAndXPRangeModifier(0), m_creatureSummonCount(0), m_summonLimitAlert(0) { // Phasing worldMask = WORLD_DEFAULT_OBJECT; @@ -1805,8 +1805,8 @@ bool WorldObject::GetRandomPoint(float x, float y, float z, float distance, floa if (map->GetWalkRandomPosition(GetTransport(), rand_x, rand_y, rand_z, distance, moveAllowed)) { // Giant type creatures walk underwater - if (isType(TYPEMASK_UNIT) && !ToUnit()->CanSwim() || - IsCreature() && ToCreature()->GetCreatureInfo()->type == CREATURE_TYPE_GIANT) + if ((isType(TYPEMASK_UNIT) && !ToUnit()->CanSwim()) || + (IsCreature() && ToCreature()->GetCreatureInfo()->type == CREATURE_TYPE_GIANT)) return true; // La position renvoyee par le pathfinding est tout au fond de l'eau. On randomise ca un peu ... float ground = 0.0f; diff --git a/src/game/Objects/Object.h b/src/game/Objects/Object.h index 7285cf85e..8de1f3899 100644 --- a/src/game/Objects/Object.h +++ b/src/game/Objects/Object.h @@ -729,7 +729,7 @@ class MANGOS_DLL_SPEC WorldObject : public Object WorldObject * const m_obj; }; - virtual ~WorldObject ( ) {} + ~WorldObject ( ) override {} virtual void Update(uint32 /*update_diff*/, uint32 /*time_diff*/); diff --git a/src/game/Objects/Pet.cpp b/src/game/Objects/Pet.cpp index bc2ea455b..306c7def3 100644 --- a/src/game/Objects/Pet.cpp +++ b/src/game/Objects/Pet.cpp @@ -62,9 +62,8 @@ bool UnsummonPetDelayEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/) Pet::Pet(PetType type) : Creature(CREATURE_SUBTYPE_PET), m_TrainingPoints(0), m_resetTalentsCost(0), m_resetTalentsTime(0), - m_removed(false), m_happinessTimer(7500), m_loyaltyTimer(12000), m_petType(type), m_duration(0), - m_loyaltyPoints(0), m_bonusdamage(0), m_auraUpdateMask(0), m_loading(false), - m_enabled(true), m_unSummoned(false), m_focusTimer(4000) + m_removed(false), m_focusTimer(4000), m_happinessTimer(7500), m_loyaltyTimer(12000), m_petType(type), m_duration(0), + m_loyaltyPoints(0), m_bonusdamage(0), m_auraUpdateMask(0), m_loading(false), m_pTmpCache(nullptr), m_unSummoned(false), m_enabled(true) { m_name = "Pet"; m_regenTimer = REGEN_TIME_FULL; @@ -76,8 +75,6 @@ Pet::Pet(PetType type) : SetReactState(REACT_PASSIVE); else if (type == GUARDIAN_PET) // always aggressive SetReactState(REACT_AGGRESSIVE); - - m_pTmpCache = nullptr; } Pet::~Pet() @@ -1625,7 +1622,6 @@ void Pet::_LoadSpellCooldowns() continue; data << uint32(spell_id); - uint32 timer = uint32(db_time - curTime) * IN_MILLISECONDS; data << uint32(uint32(db_time - curTime)*IN_MILLISECONDS); AddSpellCooldown(spell_id, 0, db_time, db_cat_time, spell->Category); diff --git a/src/game/Objects/Pet.h b/src/game/Objects/Pet.h index 493a79725..47938373a 100644 --- a/src/game/Objects/Pet.h +++ b/src/game/Objects/Pet.h @@ -146,7 +146,7 @@ class MANGOS_DLL_SPEC Pet : public Creature { public: explicit Pet(PetType type = MAX_PET_TYPE); - virtual ~Pet(); + ~Pet() override; void AddToWorld() override; void RemoveFromWorld() override; diff --git a/src/game/Objects/Player.cpp b/src/game/Objects/Player.cpp index cdd3b489c..01d57bed2 100644 --- a/src/game/Objects/Player.cpp +++ b/src/game/Objects/Player.cpp @@ -1095,8 +1095,6 @@ DrunkenState Player::GetDrunkenstateByValue(uint16 value) void Player::SetDrunkValue(uint16 newDrunkenValue, uint32 itemId) { - uint32 oldDrunkenState = Player::GetDrunkenstateByValue(m_drunk); - m_drunk = newDrunkenValue; SetUInt16Value(PLAYER_BYTES_3, 0, uint16(getGender()) | (m_drunk & 0xFFFE)); @@ -1930,9 +1928,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati } else { - Map* oldmap = IsInWorld() ? GetMap() : nullptr; // check if we can enter before stopping combat / removing pet / totems / interrupting spells - // Check enter rights before map getting to avoid creating instance copy for player // this check not dependent from map instance copy and same for all instance copies of selected map if (!sMapMgr.CanPlayerEnter(mapid, this)) @@ -3542,7 +3538,7 @@ bool Player::IsNeedCastPassiveLikeSpellAtLearn(SpellEntry const* spellInfo) cons // note: form passives activated with shapeshift spells be implemented by HandleShapeshiftBoosts instead of spell_learn_spell // talent dependent passives activated at form apply have proper stance data - bool need_cast = (!spellInfo->Stances || !form && (spellInfo->AttributesEx2 & SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT)); + bool need_cast = (!spellInfo->Stances || (!form && (spellInfo->AttributesEx2 & SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT))); // Check CasterAuraStates return need_cast && (!spellInfo->CasterAuraState || HasAuraState(AuraState(spellInfo->CasterAuraState))); @@ -4241,7 +4237,6 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe charDelete_method = 0; else { - uint32 level = 0; PlayerCacheData const* data = sObjectMgr.GetPlayerDataByGUID(playerguid); if (data && data->uiLevel < charDelete_minLvl) charDelete_method = 0; @@ -5147,7 +5142,6 @@ float Player::GetSpellCritFromIntellect() const // increases his intelligence by other means (enchants, buffs, talents, ...) //[TZERO] from mangos 3462 for 1.12 MUST BE CHECKED - float val = 0.0f; static const struct { @@ -7605,7 +7599,7 @@ void Player::SendLoot(ObjectGuid guid, LootType loot_type, Player* pVictim) { uint32 level = pVictim->getLevel(); bones->loot.gold = (uint32)(urand(50, 150) * 0.016f * pow(((float)level) / 5.76f, 2.5f) * sWorld.getConfig(CONFIG_FLOAT_RATE_DROP_MONEY)); - bones->loot._personal = true; // Everyone can loot the corpse + bones->loot.m_personal = true; // Everyone can loot the corpse if (BattleGround* bg = GetBattleGround()) { if (bg->GetTypeID() == BATTLEGROUND_AV) @@ -8051,8 +8045,8 @@ void Player::SendInitWorldStates(uint32 zoneid) const // Scourge Invasion - Patch 1.11 if (sGameEventMgr.IsActiveEvent(GAME_EVENT_SCOURGE_INVASION)) { - int ATTACK_ZONE1 = sObjectMgr.GetSavedVariable(VARIABLE_NAXX_ATTACK_ZONE1); - int ATTACK_ZONE2 = sObjectMgr.GetSavedVariable(VARIABLE_NAXX_ATTACK_ZONE2); + //int ATTACK_ZONE1 = sObjectMgr.GetSavedVariable(VARIABLE_NAXX_ATTACK_ZONE1); + //int ATTACK_ZONE2 = sObjectMgr.GetSavedVariable(VARIABLE_NAXX_ATTACK_ZONE2); int VICTORIES = sObjectMgr.GetSavedVariable(VARIABLE_NAXX_ATTACK_COUNT); int REMAINING_AZSHARA = sObjectMgr.GetSavedVariable(VARIABLE_SI_AZSHARA_REMAINING); int REMAINING_BLASTED_LANDS = sObjectMgr.GetSavedVariable(VARIABLE_SI_BLASTED_LANDS_REMAINING); @@ -8503,7 +8497,7 @@ Item* Player::GetItemByPos(uint16 pos) const Item* Player::GetItemByPos(uint8 bag, uint8 slot) const { - if (bag == INVENTORY_SLOT_BAG_0 && (slot < BANK_SLOT_BAG_END || slot >= KEYRING_SLOT_START && slot < KEYRING_SLOT_END)) + if (bag == INVENTORY_SLOT_BAG_0 && (slot < BANK_SLOT_BAG_END || (slot >= KEYRING_SLOT_START && slot < KEYRING_SLOT_END))) return m_items[slot]; else if ((bag >= INVENTORY_SLOT_BAG_START && bag < INVENTORY_SLOT_BAG_END) || (bag >= BANK_SLOT_BAG_START && bag < BANK_SLOT_BAG_END)) @@ -10047,7 +10041,6 @@ InventoryResult Player::CanUseAmmo(uint32 item) const return msg; /*if( GetReputationMgr().GetReputation() < pProto->RequiredReputation ) - /*if ( GetReputationMgr().GetReputation() < pProto->RequiredReputation ) return EQUIP_ERR_CANT_EQUIP_REPUTATION; */ @@ -15729,9 +15722,8 @@ DungeonPersistentState* Player::GetBoundInstanceSaveForSelfOrGroup(uint32 mapid) // then the player's group bind and finally the solo bind. if (!pBind || !pBind->perm) { - InstanceGroupBind *groupBind = nullptr; if (Group *group = GetGroup()) - if (groupBind = group->GetBoundInstance(mapid)) + if (InstanceGroupBind* groupBind = group->GetBoundInstance(mapid)) state = groupBind->state; } @@ -15747,8 +15739,6 @@ void Player::SendRaidInfo() const size_t p_counter = data.wpos(); data << uint32(counter); // placeholder - time_t now = time(nullptr); - for (BoundInstancesMap::const_iterator itr = m_boundInstances.begin(); itr != m_boundInstances.end(); ++itr) { if (itr->second.perm) @@ -16512,7 +16502,7 @@ void Player::_SaveSpells() SqlStatement stmtDel = CharacterDatabase.CreateStatement(delSpells, "DELETE FROM character_spell WHERE guid = ? and spell = ?"); SqlStatement stmtIns = CharacterDatabase.CreateStatement(insSpells, "INSERT INTO character_spell (guid,spell,active,disabled) VALUES (?, ?, ?, ?)"); - for (PlayerSpellMap::iterator itr = m_spells.begin(), next = m_spells.begin(); itr != m_spells.end();) + for (PlayerSpellMap::iterator itr = m_spells.begin(); itr != m_spells.end();) { if (itr->second.state == PLAYERSPELL_REMOVED || itr->second.state == PLAYERSPELL_CHANGED) stmtDel.PExecute(GetGUIDLow(), itr->first); @@ -19139,7 +19129,6 @@ void Player::RemoveItemDependentAurasAndCasts(Item * pItem) SpellAuraHolder* holder = itr->second; // skip passive (passive item dependent spells work in another way) and not self applied auras - SpellEntry const* spellInfo = holder->GetSpellProto(); if (holder->IsPassive() || holder->GetCasterGuid() != GetObjectGuid()) { ++itr; @@ -20722,11 +20711,9 @@ bool Player::ChangeReputationsForRace(uint8 oldRace, uint8 newRace) // Calcul des reputations/flags de base int newIdx = pFactionEntry->GetIndexFitTo(newRaceMask, getClassMask()); int32 newBaseRep = newIdx >= 0 ? pFactionEntry->BaseRepValue[newIdx] : 0; - uint32 newInitFlags = newIdx >= 0 ? pFactionEntry->ReputationFlags[newIdx] : 0; - int oldIdx = pFactionEntry->GetIndexFitTo(oldRaceMask, getClassMask()); int32 oldBaseRep = oldIdx >= 0 ? pFactionEntry->BaseRepValue[oldIdx] : 0; - uint32 oldInitFlags = oldIdx >= 0 ? pFactionEntry->ReputationFlags[oldIdx] : 0; + // De signe different et non nulles. if (newBaseRep * oldBaseRep < 0) { diff --git a/src/game/Objects/Player.h b/src/game/Objects/Player.h index 7e7bf3fa7..830e84a7f 100644 --- a/src/game/Objects/Player.h +++ b/src/game/Objects/Player.h @@ -115,7 +115,7 @@ typedef std::unordered_map PlayerSpellMap; // Spell modifier (used to modify other spells) struct SpellModifier { - SpellModifier() : charges(0), ownerAura(nullptr), value(0), spellId(0), op(MAX_SPELLMOD), type(SPELLMOD_TYPE_NONE) {} + SpellModifier() : op(MAX_SPELLMOD), type(SPELLMOD_TYPE_NONE), charges(0), value(0), mask(0), spellId(0), ownerAura(nullptr) {} SpellModifier(SpellModOp _op, SpellModType _type, int32 _value, uint32 _spellId, uint64 _mask, int16 _charges = 0) : op(_op), type(_type), charges(_charges), value(_value), mask(_mask), spellId(_spellId), ownerAura(nullptr) @@ -875,9 +875,9 @@ class MANGOS_DLL_SPEC Player final: public Unit friend void Item::RemoveFromUpdateQueueOf(Player* player); public: explicit Player (WorldSession* session); - ~Player(); + ~Player() override; - void CleanupsBeforeDelete(); + void CleanupsBeforeDelete() override; static UpdateMask updateVisualBits; static void InitVisibleBits(); @@ -1344,8 +1344,8 @@ class MANGOS_DLL_SPEC Player final: public Unit void _SaveBGData(); void _SaveStats(); - void _SetCreateBits(UpdateMask* updateMask, Player* target) const; - void _SetUpdateBits(UpdateMask* updateMask, Player* target) const; + void _SetCreateBits(UpdateMask* updateMask, Player* target) const override; + void _SetUpdateBits(UpdateMask* updateMask, Player* target) const override; uint32 m_nextSave; public: void SaveToDB(bool online = true, bool force = false); @@ -1385,7 +1385,7 @@ class MANGOS_DLL_SPEC Player final: public Unit void RemovePet(PetSaveMode mode); void RemoveMiniPet(); - Pet* GetMiniPet() const; + Pet* GetMiniPet() const override; void AutoReSummonPet(); // use only in Pet::Unsummon/Spell::DoSummon @@ -1414,12 +1414,12 @@ class MANGOS_DLL_SPEC Player final: public Unit void SendInitialSpells() const; bool AddSpell(uint32 spell_id, bool active, bool learning, bool dependent, bool disabled); public: - bool HasSpell(uint32 spell) const; + bool HasSpell(uint32 spell) const override; bool HasActiveSpell(uint32 spell) const; // show in spellbook TrainerSpellState GetTrainerSpellState(TrainerSpell const* trainer_spell) const; bool IsSpellFitByClassAndRace(uint32 spell_id, uint32* pReqlevel = nullptr) const; - bool IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectIndex index, bool castOnSelf) const; - virtual void ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs); + bool IsImmuneToSpellEffect(SpellEntry const* spellInfo, SpellEffectIndex index, bool castOnSelf) const override; + void ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs) override; void SendClearCooldown(uint32 spell_id, Unit* target) const; void SendClearAllCooldowns(Unit* target) const; void SendSpellCooldown(uint32 spellId, uint32 cooldown, ObjectGuid target) const; @@ -1529,15 +1529,15 @@ class MANGOS_DLL_SPEC Player final: public Unit void ClearComboPoints(); void SetComboPoints(); - bool UpdateStats(Stats stat); - bool UpdateAllStats(); - void UpdateResistances(uint32 school); - void UpdateArmor(); - void UpdateMaxHealth(); - void UpdateMaxPower(Powers power); + bool UpdateStats(Stats stat) override; + bool UpdateAllStats() override; + void UpdateResistances(uint32 school) override; + void UpdateArmor() override; + void UpdateMaxHealth() override; + void UpdateMaxPower(Powers power) override; void UpdateManaRegen() override; - void UpdateAttackPowerAndDamage(bool ranged = false); - void UpdateDamagePhysical(WeaponAttackType attType); + void UpdateAttackPowerAndDamage(bool ranged = false) override; + void UpdateDamagePhysical(WeaponAttackType attType) override; void UpdateSpellDamageAndHealingBonus(); void UpdateDefenseBonusesMod(); void UpdateBlockPercentage(); @@ -1549,7 +1549,7 @@ class MANGOS_DLL_SPEC Player final: public Unit void UpdateSpellCritChance(uint32 school); void CalculateMinMaxDamage(WeaponAttackType attType, bool normalized, float& min_damage, float& max_damage, uint8 index = 0) const; - uint32 GetShieldBlockValue() const; // overwrite Unit version (virtual) + uint32 GetShieldBlockValue() const override; // overwrite Unit version (virtual) bool CanParry() const { return m_canParry; } void SetCanParry(bool value); bool CanBlock() const { return m_canBlock; } @@ -1737,8 +1737,8 @@ class MANGOS_DLL_SPEC Player final: public Unit void UpdateUnderwaterState(); void CheckAreaExploreAndOutdoor(void); public: - void AddToWorld(); - void RemoveFromWorld(); + void AddToWorld() override; + void RemoveFromWorld() override; /* Switch from instanceId of same map. * Assumes that you can enter the map. @@ -1834,9 +1834,9 @@ class MANGOS_DLL_SPEC Player final: public Unit void SetLongSight(const Aura* aura = nullptr); void UpdateLongSight(); - bool CanWalk() const { return true; } - bool CanSwim() const { return true; } - bool CanFly() const { return IsFlying(); } + bool CanWalk() const override { return true; } + bool CanSwim() const override { return true; } + bool CanFly() const override { return IsFlying(); } void SetFly(bool enable) override; @@ -1888,8 +1888,8 @@ class MANGOS_DLL_SPEC Player final: public Unit void SetXYSpeed(float speed) { xy_speed = speed; } void SetInWater(bool apply); - bool IsInWater() const { return m_isInWater; } - bool IsUnderWater() const; + bool IsInWater() const override { return m_isInWater; } + bool IsUnderWater() const override; void SendInitialPacketsBeforeAddToMap(); void SendInitialPacketsAfterAddToMap(bool login = true); @@ -2013,7 +2013,7 @@ class MANGOS_DLL_SPEC Player final: public Unit void RemoveAI(); void ModPossessPet(Pet* pet, bool apply, AuraRemoveMode m_removeMode = AURA_REMOVE_BY_DEFAULT); - void SetDeathState(DeathState s); // overwrite Unit::SetDeathState + void SetDeathState(DeathState s) override; // overwrite Unit::SetDeathState /*********************************************************/ /*** SESSION SYSTEM ***/ @@ -2029,8 +2029,8 @@ class MANGOS_DLL_SPEC Player final: public Unit WorldSession* GetSession() const { return m_session; } void SetSession(WorldSession* s); - void BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) const; - void DestroyForPlayer(Player* target) const; + void BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) const override; + void DestroyForPlayer(Player* target) const override; void SendLogXPGain(uint32 GivenXP,Unit* victim,uint32 RestXP) const; void SendMessageToSet(WorldPacket* data, bool self) const override; @@ -2122,7 +2122,7 @@ class MANGOS_DLL_SPEC Player final: public Unit void RepopAtGraveyard(); // Nostalrius : Phasing - virtual void SetWorldMask(uint32 newMask); + void SetWorldMask(uint32 newMask) override; void RemoveDelayedOperation(uint32 operation) { @@ -2369,16 +2369,14 @@ class MANGOS_DLL_SPEC Player final: public Unit /*********************************************************/ public: - void UpdateSpeakTime(); bool CanSpeak() const; - void ChangeSpeakTime(int utime); bool FallGround(uint8 fallMode); /// Anticheat MovementAnticheatInterface* GetCheatData() const { return m_session->GetCheatData(); } void OnDisconnected(); void RelocateToLastClientPosition(); - void GetSafePosition(float &x, float &y, float &z, Transport* onTransport = nullptr) const; + void GetSafePosition(float &x, float &y, float &z, Transport* onTransport = nullptr) const override; /*********************************************************/ /*** PACKET BROADCASTER ***/ diff --git a/src/game/Objects/TemporarySummon.cpp b/src/game/Objects/TemporarySummon.cpp index be3f7480c..292c0b320 100644 --- a/src/game/Objects/TemporarySummon.cpp +++ b/src/game/Objects/TemporarySummon.cpp @@ -24,8 +24,7 @@ #include "CreatureAI.h" TemporarySummon::TemporarySummon(ObjectGuid summoner) : - Creature(CREATURE_SUBTYPE_TEMPORARY_SUMMON), m_type(TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN), m_timer(0), m_lifetime(0), m_summoner(summoner), - m_forceTargetUpdateTimer(1000), m_unSummonInformed(false) + Creature(CREATURE_SUBTYPE_TEMPORARY_SUMMON), m_type(TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN), m_timer(0), m_lifetime(0), m_summoner(summoner), m_unSummonInformed(false) { } @@ -200,19 +199,6 @@ void TemporarySummon::Update(uint32 update_diff, uint32 diff) break; } - /* Potential hack to force updates at target index if it is not networked normally - if (isAlive() && isInCombat() && m_forceTargetUpdateTimer) - { - if (m_forceTargetUpdateTimer <= diff) - { - m_forceTargetUpdateTimer = 0; - // 64bit value, so it fills two indexes in the 32bit value mapping - ForceValuesUpdateAtIndex(UNIT_FIELD_TARGET); - ForceValuesUpdateAtIndex(UNIT_FIELD_TARGET+1) - } - else - m_forceTargetUpdateTimer -= diff; - }*/ Creature::Update(update_diff, diff); } diff --git a/src/game/Objects/TemporarySummon.h b/src/game/Objects/TemporarySummon.h index 01b0910df..82c0aba77 100644 --- a/src/game/Objects/TemporarySummon.h +++ b/src/game/Objects/TemporarySummon.h @@ -29,7 +29,7 @@ class TemporarySummon : public Creature { public: explicit TemporarySummon(ObjectGuid summoner = ObjectGuid()); - virtual ~TemporarySummon(); + ~TemporarySummon() override; void Update(uint32 update_diff, uint32 time) override; void Summon(TempSummonType type, uint32 lifetime); @@ -44,7 +44,6 @@ class TemporarySummon : public Creature uint32 m_lifetime; ObjectGuid m_summoner; bool m_justDied = false; - uint32 m_forceTargetUpdateTimer; bool m_unSummonInformed; void InformSummonerOfDespawn(); }; diff --git a/src/game/Objects/Totem.h b/src/game/Objects/Totem.h index ef23d509b..6ed037e2f 100644 --- a/src/game/Objects/Totem.h +++ b/src/game/Objects/Totem.h @@ -35,7 +35,7 @@ class Totem : public Creature { public: explicit Totem(); - virtual ~Totem(){}; + ~Totem() override{}; bool Create(uint32 guidlow, CreatureCreatePos& cPos, CreatureInfo const* cinfo, Unit* owner); void Update(uint32 update_diff, uint32 time) override; void Summon(Unit* owner); @@ -48,16 +48,16 @@ class Totem : public Creature void SetDuration(uint32 dur) { m_duration = dur; } void SetOwner(Unit* owner); - bool UpdateStats(Stats /*stat*/) { return true; } - bool UpdateAllStats() { return true; } - void UpdateResistances(uint32 /*school*/) {} - void UpdateArmor() {} - void UpdateMaxHealth() {} - void UpdateMaxPower(Powers /*power*/) {} - void UpdateAttackPowerAndDamage(bool /*ranged*/ ) {} - void UpdateDamagePhysical(WeaponAttackType /*attType*/) {} + bool UpdateStats(Stats /*stat*/) override { return true; } + bool UpdateAllStats() override { return true; } + void UpdateResistances(uint32 /*school*/) override {} + void UpdateArmor() override {} + void UpdateMaxHealth() override {} + void UpdateMaxPower(Powers /*power*/) override {} + void UpdateAttackPowerAndDamage(bool /*ranged*/ ) override {} + void UpdateDamagePhysical(WeaponAttackType /*attType*/) override {} - bool IsImmuneToSpellEffect(SpellEntry const *spellInfo, SpellEffectIndex index, bool castOnSelf) const; + bool IsImmuneToSpellEffect(SpellEntry const *spellInfo, SpellEffectIndex index, bool castOnSelf) const override; protected: TotemType m_type; diff --git a/src/game/Objects/Unit.cpp b/src/game/Objects/Unit.cpp index c152434d8..d8d30245d 100644 --- a/src/game/Objects/Unit.cpp +++ b/src/game/Objects/Unit.cpp @@ -3997,7 +3997,6 @@ void Unit::DeleteAuraHolder(SpellAuraHolder *holder) void Unit::RemoveSpellAuraHolder(SpellAuraHolder *holder, AuraRemoveMode mode) { // Statue unsummoned at holder remove - SpellEntry const* AurSpellInfo = holder->GetSpellProto(); Totem* statue = nullptr; WorldObject* caster = holder->GetRealCaster(); bool isChanneled = holder->IsChanneled(); // cache for after the holder is deleted @@ -6167,7 +6166,6 @@ bool Unit::isVisibleForOrDetect(WorldObject const* pDetector, WorldObject const* if (m_Visibility == VISIBILITY_RESPAWN) return false; - Map& _map = *pDetector->GetMap(); Unit const* pDetectorUnit = pDetector->ToUnit(); Player const* pDetectorPlayer = pDetector->ToPlayer(); @@ -7977,9 +7975,9 @@ CharmInfo* Unit::InitCharmInfo(Unit *charm) } CharmInfo::CharmInfo(Unit* unit) - : m_unit(unit), m_CommandState(COMMAND_FOLLOW), m_reactState(REACT_PASSIVE), m_petnumber(0), - _isCommandAttack(false), _isAtStay(false), _isFollowing(false), _isReturning(false), - _stayX(0.0f), _stayY(0.0f), _stayZ(0.0f), _isCommandFollow(false), m_originalFactionTemplate(nullptr) + : m_unit(unit), m_originalFactionTemplate(nullptr), m_CommandState(COMMAND_FOLLOW), m_reactState(REACT_PASSIVE), m_petnumber(0), + _isCommandAttack(false), _isCommandFollow(false), _isAtStay(false), _isFollowing(false), _isReturning(false), + _stayX(0.0f), _stayY(0.0f), _stayZ(0.0f) { for (int i = 0; i < CREATURE_MAX_SPELLS; ++i) m_charmspells[i].SetActionAndType(0, ACT_DISABLED); @@ -8803,10 +8801,12 @@ void Unit::UpdateModelData() SetFloatValue(UNIT_FIELD_COMBATREACH, (GetObjectScale() / displayEntry->scale) * modelInfo->combat_reach); if (CreatureModelDataEntry const* modelData = sCreatureModelDataStore.LookupEntry(displayEntry->ModelId)) + { if (modelData->collisionHeight > 0.f && modelData->modelScale > 0.f) m_modelCollisionHeight = modelData->collisionHeight / modelData->modelScale; else m_modelCollisionHeight = 2.f; + } } else { diff --git a/src/game/Objects/Unit.h b/src/game/Objects/Unit.h index f933063dd..4dfc925d4 100644 --- a/src/game/Objects/Unit.h +++ b/src/game/Objects/Unit.h @@ -981,7 +981,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject typedef std::set ComboPointHolderSet; typedef std::map SingleCastSpellTargetMap; - virtual ~Unit ( ); + ~Unit ( ) override; void AddToWorld() override; void RemoveFromWorld() override; @@ -1199,7 +1199,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject return !hasUnitState(UNIT_STAT_NO_FREE_MOVE) && !GetOwnerGuid(); } - uint32 getLevel() const final override { return GetUInt32Value(UNIT_FIELD_LEVEL); } + uint32 getLevel() const final { return GetUInt32Value(UNIT_FIELD_LEVEL); } void SetLevel(uint32 lvl); uint8 getRace() const { return GetByteValue(UNIT_FIELD_BYTES_0, 0); } uint32 getRaceMask() const { return getRace() ? 1 << (getRace()-1) : 0x0; } @@ -1263,7 +1263,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject virtual void SetSheath( SheathState sheathed ) { SetByteValue(UNIT_FIELD_BYTES_2, 0, sheathed); } // faction template id - uint32 getFaction() const final override { return GetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE); } + uint32 getFaction() const final { return GetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE); } void setFaction(uint32 faction) { SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE, faction ); } bool IsHostileTo(WorldObject const* target) const override; @@ -1306,7 +1306,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject // Kills the victim. void DoKillUnit(Unit *victim = nullptr); - uint32 DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDamage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask, SpellEntry const *spellProto, bool durabilityLoss, Spell* spell = nullptr) final override; + uint32 DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDamage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask, SpellEntry const *spellProto, bool durabilityLoss, Spell* spell = nullptr) final ; // Called after this unit kills someone. void Kill(Unit* pVictim, SpellEntry const *spellProto, bool durabilityLoss = true); void PetOwnerKilledUnit(Unit* pVictim); @@ -1401,7 +1401,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject void RemoveSpellbyDamageTaken(AuraType auraType, uint32 damage); void RemoveFearEffectsByDamageTaken(uint32 damage, uint32 exceptSpellId, DamageEffectType damagetype); - bool IsValidAttackTarget(Unit const* target) const final override; + bool IsValidAttackTarget(Unit const* target) const final ; bool isTargetableForAttack(bool inversAlive = false, bool isAttackerPlayer = false) const; bool isAttackableByAOE(bool requireDeadTarget = false, bool isCasterPlayer = false) const; bool isPassiveToHostile() const { return HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE); } @@ -1560,7 +1560,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject bool IsCharmerOrOwnerPlayerOrPlayerItself() const; Player* GetCharmerOrOwnerPlayerOrPlayerItself() const; - Player* GetAffectingPlayer() const final override; + Player* GetAffectingPlayer() const final ; void SetPet(Pet* pet); void SetCharm(Unit* pet); @@ -1722,7 +1722,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject void UpdateVisibilityAndView() override; // overwrite WorldObject::UpdateVisibilityAndView() // common function for visibility checks for player/creatures with detection code - bool isVisibleForOrDetect(WorldObject const* pDetector, WorldObject const* viewPoint, bool detect, bool inVisibleList = false, bool* alert = nullptr) const final override; + bool isVisibleForOrDetect(WorldObject const* pDetector, WorldObject const* viewPoint, bool detect, bool inVisibleList = false, bool* alert = nullptr) const final ; bool canDetectInvisibilityOf(Unit const* u) const; bool canDetectStealthOf(Unit const* u, float distance, bool* alert = nullptr) const; @@ -1808,7 +1808,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject uint32 MeleeDamageBonusTaken(WorldObject* pCaster, uint32 pdamage, WeaponAttackType attType, SpellEntry const *spellProto = nullptr, DamageEffectType damagetype = DIRECT_DAMAGE, uint32 stack = 1, Spell* spell = nullptr, bool flat = true); bool IsSpellBlocked(WorldObject* pCaster, Unit *pVictim, SpellEntry const *spellProto, WeaponAttackType attackType = BASE_ATTACK); - bool IsSpellCrit(Unit const* pVictim, SpellEntry const* spellProto, SpellSchoolMask schoolMask, WeaponAttackType attackType = BASE_ATTACK, Spell* spell = nullptr) const final override; + bool IsSpellCrit(Unit const* pVictim, SpellEntry const* spellProto, SpellSchoolMask schoolMask, WeaponAttackType attackType = BASE_ATTACK, Spell* spell = nullptr) const final ; bool IsTriggeredAtSpellProcEvent(Unit *pVictim, SpellAuraHolder* holder, SpellEntry const* procSpell, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, bool isVictim, SpellProcEventEntry const*& spellProcEvent ); // Aura proc handlers diff --git a/src/game/PacketBroadcast/MovementBroadcaster.cpp b/src/game/PacketBroadcast/MovementBroadcaster.cpp index 6ebc9ef8b..0f715b0c6 100644 --- a/src/game/PacketBroadcast/MovementBroadcaster.cpp +++ b/src/game/PacketBroadcast/MovementBroadcaster.cpp @@ -5,7 +5,7 @@ #include "Player.h" MovementBroadcaster::MovementBroadcaster(std::size_t threads, std::chrono::milliseconds frequency) - : m_sleep_timer(frequency), m_num_threads(threads) + : m_num_threads(threads), m_sleep_timer(frequency) { if (threads) sLog.outInfo("[NETWORK] Movement broadcaster configured to run every %ums " diff --git a/src/game/PacketBroadcast/PlayerBroadcaster.cpp b/src/game/PacketBroadcast/PlayerBroadcaster.cpp index 1d747dc79..55f3923a7 100644 --- a/src/game/PacketBroadcast/PlayerBroadcaster.cpp +++ b/src/game/PacketBroadcast/PlayerBroadcaster.cpp @@ -7,7 +7,7 @@ uint32 PlayerBroadcaster::num_bcaster_created = 0; uint32 PlayerBroadcaster::num_bcaster_deleted = 0; PlayerBroadcaster::PlayerBroadcaster(WorldSocket* w_socket, const ObjectGuid& self, std::size_t max_queue) - : m_socket(w_socket), m_self(self), MAX_QUEUE_SIZE(max_queue), instanceId(0), lastUpdatePackets(0) + : MAX_QUEUE_SIZE(max_queue), m_socket(w_socket), m_self(self), instanceId(0), lastUpdatePackets(0) { if (m_socket) m_socket->AddReference(); diff --git a/src/game/PlayerBots/PlayerBotAI.h b/src/game/PlayerBots/PlayerBotAI.h index 39b292447..e02ec5c6f 100644 --- a/src/game/PlayerBots/PlayerBotAI.h +++ b/src/game/PlayerBots/PlayerBotAI.h @@ -14,12 +14,12 @@ class PlayerBotAI: public PlayerAI { public: explicit PlayerBotAI(Player* pPlayer = nullptr) : PlayerAI(pPlayer), botEntry(nullptr) {} - virtual ~PlayerBotAI() {} - virtual void Remove(); + ~PlayerBotAI() override {} + void Remove() override; virtual bool OnSessionLoaded(PlayerBotEntry* entry, WorldSession* sess); virtual void OnBotEntryLoad(PlayerBotEntry* entry) {} - virtual void UpdateAI(const uint32 /*diff*/); // Handle delayed teleports + void UpdateAI(const uint32 /*diff*/) override; // Handle delayed teleports virtual void OnPlayerLogin() {} virtual void BeforeAddToMap(Player* player) {} // me=nullptr at call // Helpers @@ -34,8 +34,8 @@ class PlayerCreatorAI: public PlayerBotAI PlayerBotAI(pPlayer), _race(_race_), _class(_class_), _mapId(mapId), _instanceId(instanceId), _x(x), _y(y), _z(z), _o(o) { } - virtual ~PlayerCreatorAI() {} - virtual bool OnSessionLoaded(PlayerBotEntry* entry, WorldSession* sess) + ~PlayerCreatorAI() override {} + bool OnSessionLoaded(PlayerBotEntry* entry, WorldSession* sess) override { return SpawnNewPlayer(sess, _class, _race, _mapId, _instanceId, _x, _y, _z, _o); } @@ -54,25 +54,25 @@ class PlayerBotFleeingAI : public PlayerBotAI { public: PlayerBotFleeingAI() : PlayerBotAI() {} - virtual void OnPlayerLogin(); + void OnPlayerLogin() override; }; class MageOrgrimmarAttackerAI: public PlayerBotAI { public: explicit MageOrgrimmarAttackerAI(Player* pPlayer = nullptr) : PlayerBotAI(pPlayer) {} - virtual ~MageOrgrimmarAttackerAI() {} - virtual bool OnSessionLoaded(PlayerBotEntry* entry, WorldSession* sess); - virtual void UpdateAI(const uint32 /*diff*/); + ~MageOrgrimmarAttackerAI() override {} + bool OnSessionLoaded(PlayerBotEntry* entry, WorldSession* sess) override; + void UpdateAI(const uint32 /*diff*/) override; }; class PopulateAreaBotAI: public PlayerBotAI { public: - explicit PopulateAreaBotAI(uint32 map, float x, float y, float z, uint32 team, float radius, Player* pPlayer = nullptr) : PlayerBotAI(pPlayer), _map(map), _x(x), _y(y), _z(z), _team(team), _radius(radius) {} - virtual ~PopulateAreaBotAI() {} - virtual void BeforeAddToMap(Player* player); // me=nullptr at call - virtual void OnPlayerLogin(); + explicit PopulateAreaBotAI(uint32 map, float x, float y, float z, uint32 team, float radius, Player* pPlayer = nullptr) : PlayerBotAI(pPlayer), _map(map), _x(x), _y(y), _z(z), _radius(radius), _team(team) {} + ~PopulateAreaBotAI() override {} + void BeforeAddToMap(Player* player) override; // me=nullptr at call + void OnPlayerLogin() override; protected: uint32 _map; float _x, _y, _z; diff --git a/src/game/PlayerBots/PlayerBotMgr.cpp b/src/game/PlayerBots/PlayerBotMgr.cpp index edf7c7394..b4eedcda8 100644 --- a/src/game/PlayerBots/PlayerBotMgr.cpp +++ b/src/game/PlayerBots/PlayerBotMgr.cpp @@ -374,7 +374,6 @@ bool PlayerBotMgr::deleteBot(uint32 playerGUID) std::map::iterator iter = m_bots.find(playerGUID); if (iter == m_bots.end()) return false; - uint32 accountId = iter->second->accountId; if (iter->second->state == PB_STATE_LOADING) m_stats.loadingCount--; diff --git a/src/game/PlayerBots/PlayerBotMgr.h b/src/game/PlayerBots/PlayerBotMgr.h index 2417838a9..f0d0b04c7 100644 --- a/src/game/PlayerBots/PlayerBotMgr.h +++ b/src/game/PlayerBots/PlayerBotMgr.h @@ -30,9 +30,9 @@ struct PlayerBotEntry bool customBot; // Enabled even if PlayerBot system disabled (AutoTesting system for example) PlayerBotAI* ai; - PlayerBotEntry(uint64 guid, uint32 account, uint32 _chance): playerGUID(guid), accountId(account), chance(_chance), state(PB_STATE_OFFLINE), isChatBot(false), ai(nullptr), customBot(false) + PlayerBotEntry(uint64 guid, uint32 account, uint32 _chance): playerGUID(guid), accountId(account), chance(_chance), state(PB_STATE_OFFLINE), isChatBot(false), customBot(false), ai(nullptr) {} - PlayerBotEntry(): state(PB_STATE_OFFLINE), isChatBot(false), ai(nullptr), accountId(0), playerGUID(0), chance(100.0f), customBot(false) + PlayerBotEntry(): playerGUID(0), accountId(0), chance(100.0f), state(PB_STATE_OFFLINE), isChatBot(false), customBot(false), ai(nullptr) {} }; diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp index 1e56e84bd..cd4e3a674 100644 --- a/src/game/SocialMgr.cpp +++ b/src/game/SocialMgr.cpp @@ -209,7 +209,7 @@ void SocialMgr::GetFriendInfo(MasterPlayer* player, uint32 friend_lowguid, Frien PlayerSocialMap::const_iterator itr = player->GetSocial()->m_playerSocialMap.find(friend_lowguid); if (itr != player->GetSocial()->m_playerSocialMap.end()) - + { // PLAYER see his team only and PLAYER can't see MODERATOR, GAME MASTER, ADMINISTRATOR characters // MODERATOR, GAME MASTER, ADMINISTRATOR can see all if (pFriend && pFriend->GetName() && @@ -233,6 +233,7 @@ void SocialMgr::GetFriendInfo(MasterPlayer* player, uint32 friend_lowguid, Frien friendInfo.Level = 0; friendInfo.Class = 0; } + } } void SocialMgr::MakeFriendStatusPacket(FriendsResult result, uint32 guid, WorldPacket *data) diff --git a/src/game/Spells/Spell.cpp b/src/game/Spells/Spell.cpp index 9f269750d..1260a0efa 100644 --- a/src/game/Spells/Spell.cpp +++ b/src/game/Spells/Spell.cpp @@ -290,7 +290,7 @@ void SpellCastTargets::write(ByteBuffer& data) const } Spell::Spell(Unit* caster, SpellEntry const *info, bool triggered, ObjectGuid originalCasterGUID, SpellEntry const* triggeredBy, Unit* victim, SpellEntry const* triggeredByParent): - m_caster(caster), m_casterUnit(caster), m_spellInfo(info), m_triggeredBySpellInfo(triggeredBy), m_triggeredByParentSpellInfo(triggeredByParent), m_IsTriggeredSpell(triggered) + m_spellInfo(info), m_triggeredBySpellInfo(triggeredBy), m_triggeredByParentSpellInfo(triggeredByParent), m_caster(caster), m_casterUnit(caster), m_IsTriggeredSpell(triggered) { MANGOS_ASSERT(caster != nullptr && info != nullptr); MANGOS_ASSERT(info == sSpellMgr.GetSpellEntry(info->Id) && "`info` must be pointer to a sSpellMgr element"); @@ -328,7 +328,7 @@ Spell::Spell(Unit* caster, SpellEntry const *info, bool triggered, ObjectGuid or } Spell::Spell(GameObject* caster, SpellEntry const *info, bool triggered, ObjectGuid originalCasterGUID, SpellEntry const* triggeredBy, Unit* victim, SpellEntry const* triggeredByParent): - m_caster(caster), m_casterGo(caster), m_spellInfo(info), m_triggeredBySpellInfo(triggeredBy), m_triggeredByParentSpellInfo(triggeredByParent), m_IsTriggeredSpell(triggered) + m_spellInfo(info), m_triggeredBySpellInfo(triggeredBy), m_triggeredByParentSpellInfo(triggeredByParent), m_caster(caster), m_casterGo(caster), m_IsTriggeredSpell(triggered) { MANGOS_ASSERT(caster != nullptr && info != nullptr); MANGOS_ASSERT(info == sSpellMgr.GetSpellEntry(info->Id) && "`info` must be pointer to a sSpellMgr element"); @@ -4079,9 +4079,9 @@ void Spell::update(uint32 difftime) if (pGo->GetGoType() == GAMEOBJECT_TYPE_SUMMONING_RITUAL && m_spellInfo->Id == pInfo->summoningRitual.spellId && // too many helpers cancelled - (pGo->GetUniqueUseCount() < pInfo->summoningRitual.reqParticipants|| + (pGo->GetUniqueUseCount() < pInfo->summoningRitual.reqParticipants || // the warlock cancelled - !pInfo->summoningRitual.ritualPersistent && !pGo->GetOwner())) + (!pInfo->summoningRitual.ritualPersistent && !pGo->GetOwner()))) { cancel(); pGo->SetGoState(GO_STATE_READY); @@ -8006,7 +8006,7 @@ bool Spell::IsTriggeredSpellWithRedundentData() const { return m_triggeredByAuraSpell || m_triggeredBySpellInfo || // possible not need after above check? - m_IsTriggeredSpell && (m_spellInfo->manaCost || m_spellInfo->ManaCostPercentage); + (m_IsTriggeredSpell && (m_spellInfo->manaCost || m_spellInfo->ManaCostPercentage)); } bool Spell::HaveTargetsForEffect(SpellEffectIndex effect) const @@ -8442,14 +8442,14 @@ void Spell::FillRaidOrPartyTargets(UnitList &TagUnitMap, Unit* target, float rad && target->getLevel() + 10 >= m_spellInfo->spellLevel && !m_caster->IsHostileTo(target)) { - if (target == m_caster && withcaster || - target != m_caster && m_caster->IsWithinDistInMap(target, radius)) + if ((target == m_caster && withcaster) || + (target != m_caster && m_caster->IsWithinDistInMap(target, radius))) TagUnitMap.push_back(target); if (withPets) if (Pet* pet = target->GetPet()) - if (pet == m_caster && withcaster || - pet != m_caster && m_caster->IsWithinDistInMap(pet, radius)) + if ((pet == m_caster && withcaster) || + (pet != m_caster && m_caster->IsWithinDistInMap(pet, radius))) TagUnitMap.push_back(pet); } } @@ -8457,14 +8457,14 @@ void Spell::FillRaidOrPartyTargets(UnitList &TagUnitMap, Unit* target, float rad else { Unit* ownerOrSelf = pTarget ? pTarget : target->GetCharmerOrOwnerOrSelf(); - if (ownerOrSelf == m_caster && withcaster || - ownerOrSelf != m_caster && m_caster->IsWithinDistInMap(ownerOrSelf, radius)) + if ((ownerOrSelf == m_caster && withcaster) || + (ownerOrSelf != m_caster && m_caster->IsWithinDistInMap(ownerOrSelf, radius))) TagUnitMap.push_back(ownerOrSelf); if (withPets) if (Pet* pet = ownerOrSelf->GetPet()) - if (pet == m_caster && withcaster || - pet != m_caster && m_caster->IsWithinDistInMap(pet, radius)) + if ((pet == m_caster && withcaster) || + (pet != m_caster && m_caster->IsWithinDistInMap(pet, radius))) TagUnitMap.push_back(pet); } } diff --git a/src/game/Spells/Spell.h b/src/game/Spells/Spell.h index 13c5b602d..8a6302ad7 100644 --- a/src/game/Spells/Spell.h +++ b/src/game/Spells/Spell.h @@ -783,11 +783,11 @@ class SpellEvent : public BasicEvent { public: SpellEvent(Spell* spell); - virtual ~SpellEvent(); + ~SpellEvent() override; - virtual bool Execute(uint64 e_time, uint32 p_time); - virtual void Abort(uint64 e_time); - virtual bool IsDeletable() const; + bool Execute(uint64 e_time, uint32 p_time) override; + void Abort(uint64 e_time) override; + bool IsDeletable() const override; Spell* GetSpell() { return m_Spell; } protected: Spell* m_Spell; @@ -797,10 +797,10 @@ class ChannelResetEvent : public BasicEvent { public: ChannelResetEvent(Unit* _caster) : caster(_caster) {} - virtual ~ChannelResetEvent() {} + ~ChannelResetEvent() override {} - virtual bool Execute(uint64 e_time, uint32 p_time); - virtual void Abort(uint64 e_time); + bool Execute(uint64 e_time, uint32 p_time) override; + void Abort(uint64 e_time) override; protected: Unit* caster; }; diff --git a/src/game/Spells/SpellAuras.cpp b/src/game/Spells/SpellAuras.cpp index 3adb42a77..ff31fced8 100644 --- a/src/game/Spells/SpellAuras.cpp +++ b/src/game/Spells/SpellAuras.cpp @@ -4232,7 +4232,6 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real) // equipment after the cast. #if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_9_4 Unit *target = GetTarget(); - SpellEntry const* spellProto = GetSpellProto(); // For prevent double apply bonuses bool loading = (target->GetTypeId() == TYPEID_PLAYER && ((Player*)target)->GetSession()->PlayerLoading()); diff --git a/src/game/Spells/SpellAuras.h b/src/game/Spells/SpellAuras.h index efdaab9ce..ce5b6e418 100644 --- a/src/game/Spells/SpellAuras.h +++ b/src/game/Spells/SpellAuras.h @@ -575,10 +575,10 @@ class MANGOS_DLL_SPEC AreaAura : public Aura { public: AreaAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* currentBasePoints, SpellAuraHolder* holder, Unit* target, Unit* caster = nullptr, Item* castItem = nullptr); - ~AreaAura(); + ~AreaAura() override; protected: - void Update(uint32 diff); - void UpdateForAffected(uint32 diff); + void Update(uint32 diff) override; + void UpdateForAffected(uint32 diff) override; private: float m_radius; AreaAuraType m_areaAuraType; @@ -588,9 +588,9 @@ class MANGOS_DLL_SPEC PersistentAreaAura : public Aura { public: PersistentAreaAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* currentBasePoints, SpellAuraHolder* holder, Unit* target, Unit* caster = nullptr, Item* castItem = nullptr); - ~PersistentAreaAura(); + ~PersistentAreaAura() override; protected: - void Update(uint32 diff); + void Update(uint32 diff) override; }; class MANGOS_DLL_SPEC SingleEnemyTargetAura : public Aura @@ -598,8 +598,8 @@ class MANGOS_DLL_SPEC SingleEnemyTargetAura : public Aura friend Aura* CreateAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* currentBasePoints, SpellAuraHolder* holder, Unit* target, Unit* caster, Item* castItem); public: - ~SingleEnemyTargetAura(); - Unit* GetTriggerTarget() const; + ~SingleEnemyTargetAura() override; + Unit* GetTriggerTarget() const override; protected: SingleEnemyTargetAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* currentBasePoints, SpellAuraHolder* holder, Unit* target, Unit* caster = nullptr, Item* castItem = nullptr); diff --git a/src/game/Spells/SpellEffects.cpp b/src/game/Spells/SpellEffects.cpp index bf6063761..3f82ffaa9 100644 --- a/src/game/Spells/SpellEffects.cpp +++ b/src/game/Spells/SpellEffects.cpp @@ -305,8 +305,6 @@ void Spell::EffectInstaKill(SpellEffectIndex /*eff_idx*/) if (m_caster == unitTarget) // prevent interrupt message finish(); - WorldObject* caster = GetCastingObject(); // we need the original casting object - #if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_8_4 WorldPacket data(SMSG_SPELLINSTAKILLLOG, (8 + 4)); data << unitTarget->GetObjectGuid(); // Victim GUID @@ -3531,9 +3529,6 @@ void Spell::EffectSummonGuardian(SpellEffectIndex eff_idx) return; } - // set timer for unsummon - int32 duration = m_spellInfo->CalculateDuration(m_casterUnit); - // second direct cast unsummon guardian(s) (guardians without like functionality have cooldown > spawn time) if (!m_IsTriggeredSpell && m_casterUnit->GetTypeId() == TYPEID_PLAYER) { @@ -5052,7 +5047,6 @@ void Spell::EffectScriptEffect(SpellEffectIndex eff_idx) { if (Group* pGroup = pPlayerTarget->GetGroup()) { - uint32 zone_id = pPlayerTarget->GetCachedZoneId(); for (GroupReference* itr = pGroup->GetFirstMember(); itr != nullptr; itr = itr->next()) { Player* pGroupMember = itr->getSource(); @@ -6233,7 +6227,6 @@ void Spell::EffectPlayerPull(SpellEffectIndex eff_idx) float dx = unitTarget->GetPositionX() - m_caster->GetPositionX(); float dy = unitTarget->GetPositionY() - m_caster->GetPositionY(); float dist = sqrt((dx * dx) + (dy * dy)); - const float distXY = (dist > 0 ? dist : 0); float yDist = m_caster->GetPositionZ() - unitTarget->GetPositionZ(); float horizontalSpeed = dist / 1.5f; float verticalSpeed = 12.0f + (yDist*0.5f); diff --git a/src/game/Spells/SpellEntry.h b/src/game/Spells/SpellEntry.h index 91d94bf4d..690dba982 100644 --- a/src/game/Spells/SpellEntry.h +++ b/src/game/Spells/SpellEntry.h @@ -997,8 +997,8 @@ class SpellEntry // passive spells with SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT are already active without shapeshift, do no recast! // Feline Swiftness Passive 2a not have 0x1 mask in Stance field in spell data as expected - return ((Stances & (1 << (form - 1)) || Id == 24864 && form == FORM_CAT) && - !(AttributesEx2 & SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT)); + return ((Stances & (1 << (form - 1)) || (Id == 24864 && form == FORM_CAT)) && + !HasAttribute(SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT)); } // Spell effects require a specific power type on the target diff --git a/src/game/Spells/SpellMgr.cpp b/src/game/Spells/SpellMgr.cpp index 111e74bec..7d42e6ee6 100644 --- a/src/game/Spells/SpellMgr.cpp +++ b/src/game/Spells/SpellMgr.cpp @@ -3152,7 +3152,7 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32 if (questStart) { // not in expected required quest state - if (!player || (!questStartCanActive || !player->IsActiveQuest(questStart)) && !player->GetQuestRewardStatus(questStart)) + if (!player || ((!questStartCanActive || !player->IsActiveQuest(questStart)) && !player->GetQuestRewardStatus(questStart))) return false; } diff --git a/src/game/Spells/SpellMgr.h b/src/game/Spells/SpellMgr.h index 72e5d2b82..414133b41 100644 --- a/src/game/Spells/SpellMgr.h +++ b/src/game/Spells/SpellMgr.h @@ -479,7 +479,6 @@ class SpellMgr bool IsMorePowerfullSpell(uint32 powerfullSpell, uint32 otherSpell, SpellGroup group) const { // The most powerfull spell appears after less powerfull spells in the list. - bool spellPassed = false; for (SpellGroupSpellMap::const_iterator itr = mSpellGroupSpell.begin(); itr != mSpellGroupSpell.end(); ++itr) { if (itr->first != group) diff --git a/src/game/Threat/HostileRefManager.h b/src/game/Threat/HostileRefManager.h index d8d900d2b..925df1ade 100644 --- a/src/game/Threat/HostileRefManager.h +++ b/src/game/Threat/HostileRefManager.h @@ -36,7 +36,7 @@ class HostileRefManager : public RefManager { public: explicit HostileRefManager(Unit *pOwner); - ~HostileRefManager(); + ~HostileRefManager() override; Unit* getOwner() { return iOwner; } diff --git a/src/game/Threat/ThreatManager.cpp b/src/game/Threat/ThreatManager.cpp index bd07502c0..b375cd81e 100644 --- a/src/game/Threat/ThreatManager.cpp +++ b/src/game/Threat/ThreatManager.cpp @@ -345,8 +345,8 @@ HostileReference* ThreatContainer::selectNextVictim(Creature* pAttacker, Hostile break; } - if (currentRef->getThreat() > 1.3f * pCurrentVictim->getThreat() || - currentRef->getThreat() > 1.1f * pCurrentVictim->getThreat() && pAttacker->CanReachWithMeleeAutoAttack(target)) + if ((currentRef->getThreat() > 1.3f * pCurrentVictim->getThreat()) || + (currentRef->getThreat() > 1.1f * pCurrentVictim->getThreat() && pAttacker->CanReachWithMeleeAutoAttack(target))) { //implement 110% threat rule for targets in melee range found = true; //and 130% rule for targets in ranged distances diff --git a/src/game/Transports/Transport.h b/src/game/Transports/Transport.h index 96687408a..d0a66c400 100644 --- a/src/game/Transports/Transport.h +++ b/src/game/Transports/Transport.h @@ -33,7 +33,7 @@ class Transport : public GameObject public: typedef std::set PassengerSet; - ~Transport(); + ~Transport() override; bool Create(uint32 guidlow, uint32 entry, uint32 mapid, float x, float y, float z, float ang, uint32 animprogress); void CleanupsBeforeDelete() override; diff --git a/src/game/UnitAuraProcHandler.cpp b/src/game/UnitAuraProcHandler.cpp index e4627a510..4f68d48d7 100644 --- a/src/game/UnitAuraProcHandler.cpp +++ b/src/game/UnitAuraProcHandler.cpp @@ -1157,7 +1157,7 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura } // default case - if (!target || target != this && !target->isAlive()) + if (!target || (target != this && !target->isAlive())) return SPELL_AURA_PROC_FAILED; if (cooldown && HasSpellCooldown(triggered_spell_id)) @@ -1626,7 +1626,7 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d target = !(procFlags & PROC_FLAG_SUCCESSFUL_POSITIVE_SPELL) && Spells::IsPositiveSpell(trigger_spell_id) ? this : pVictim; // default case - if (!target || target != this && !target->isAlive()) + if (!target || (target != this && !target->isAlive())) return SPELL_AURA_PROC_FAILED; if (basepoints[EFFECT_INDEX_0] || basepoints[EFFECT_INDEX_1] || basepoints[EFFECT_INDEX_2]) diff --git a/src/game/World.cpp b/src/game/World.cpp index 562e657b4..50b7647fd 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -2265,8 +2265,8 @@ class BanQueryHolder : public SqlQueryHolder public: BanQueryHolder(BanMode mode, std::string banTarget, uint32 duration, std::string reason, uint32 realmId, std::string author, uint32 authorAccountId) - : m_mode(mode), m_banTarget(banTarget), m_duration(duration), m_reason(reason), m_realmId(realmId), m_author(author), - m_accountId(authorAccountId) + : m_mode(mode), m_duration(duration), m_reason(reason), m_realmId(realmId), + m_author(author), m_banTarget(banTarget), m_accountId(authorAccountId) { } diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp index e0c6a5f35..7a568797a 100644 --- a/src/game/WorldSession.cpp +++ b/src/game/WorldSession.cpp @@ -83,7 +83,7 @@ WorldSession::WorldSession(uint32 id, WorldSocket *sock, AccountTypes sec, time_ m_sessionDbLocaleIndex(sObjectMgr.GetIndexForLocale(locale)), m_latency(0), m_tutorialState(TUTORIALDATA_UNCHANGED), m_warden(nullptr), m_cheatData(nullptr), m_bot(nullptr), m_lastReceivedPacketTime(0), _clientOS(CLIENT_OS_UNKNOWN), _gameBuild(0), _charactersCount(10), _characterMaxLevel(0), _clientHashComputeStep(HASH_NOT_COMPUTED), m_masterSession(nullptr), m_nodeSession(nullptr), - m_masterPlayer(nullptr), m_lastPubChannelMsgTime(NULL), m_moveRejectTime(0) + m_lastPubChannelMsgTime(NULL), m_moveRejectTime(0), m_masterPlayer(nullptr) { if (sock) { diff --git a/src/game/WorldSession.h b/src/game/WorldSession.h index 91b5f7a3c..5378b2612 100644 --- a/src/game/WorldSession.h +++ b/src/game/WorldSession.h @@ -232,9 +232,9 @@ class MapSessionFilter : public PacketFilter m_processLogout = false; m_processType = PACKET_PROCESS_MAP; } - ~MapSessionFilter() {} + ~MapSessionFilter() override {} - virtual bool Process(WorldPacket * packet); + bool Process(WorldPacket * packet) override; }; //class used to filer only thread-unsafe packets from queue @@ -247,7 +247,7 @@ class WorldSessionFilter : public PacketFilter m_processLogout = true; m_processType = PACKET_PROCESS_WORLD; } - ~WorldSessionFilter() {} + ~WorldSessionFilter() override {} }; class ForwardToMaster_Exception {}; diff --git a/src/game/vmap/GameObjectModel.h b/src/game/vmap/GameObjectModel.h index 03e07fcb8..904387b50 100644 --- a/src/game/vmap/GameObjectModel.h +++ b/src/game/vmap/GameObjectModel.h @@ -45,7 +45,7 @@ class GameObjectModel float iScale; VMAP::WorldModel* iModel; - GameObjectModel() : collision_enabled(false), iModel(nullptr), iInvScale(0), iScale(0) {} + GameObjectModel() : collision_enabled(false), iInvScale(0), iScale(0), iModel(nullptr) {} bool initialize(const GameObject* const pGo, const GameObjectDisplayInfoEntry* pDisplayInfo); public: diff --git a/src/game/vmap/MapTree.cpp b/src/game/vmap/MapTree.cpp index 41a6d59e0..ab4882b43 100644 --- a/src/game/vmap/MapTree.cpp +++ b/src/game/vmap/MapTree.cpp @@ -58,7 +58,7 @@ protected: class MapIntersectionFinderCallback { public: - MapIntersectionFinderCallback(ModelInstance* val): prims(val), result(nullptr) {} + MapIntersectionFinderCallback(ModelInstance* val): result(nullptr), prims(val) {} bool operator()(const G3D::Ray& ray, uint32 entry, float& distance, bool pStopAtFirstHit = true) { bool hit = prims[entry].intersectRay(ray, distance, pStopAtFirstHit); @@ -337,7 +337,7 @@ bool StaticMapTree::InitMap(std::string const& fname, VMapManager2* vm) char chunk[8]; // general info if (!readChunk(rf, chunk, VMAP_MAGIC, 8)) success = false; - char tiled; + char tiled = 0; if (success && fread(&tiled, sizeof(char), 1, rf) != 1) success = false; iIsTiled = bool(tiled); // Nodes @@ -417,7 +417,7 @@ bool StaticMapTree::LoadMapTile(uint32 tileX, uint32 tileY, VMapManager2* vm) char chunk[8]; if (!readChunk(tf, chunk, VMAP_MAGIC, 8)) result = false; - uint32 numSpawns; + uint32 numSpawns = 0; if (result && fread(&numSpawns, sizeof(uint32), 1, tf) != 1) result = false; for (uint32 i = 0; i < numSpawns && result; ++i) diff --git a/src/game/vmap/ModelInstance.cpp b/src/game/vmap/ModelInstance.cpp index 2f05247b3..2052c77db 100644 --- a/src/game/vmap/ModelInstance.cpp +++ b/src/game/vmap/ModelInstance.cpp @@ -118,10 +118,10 @@ bool ModelInstance::isUnderModel(const G3D::Vector3& p, float* outDist, float* i Vector3 up(0, 0, 1); Vector3 pModel = iInvRot * (p - iPos) * iInvScale; up = iInvRot * up * iInvScale; - Vector3 zDirModel = iInvRot * Vector3(0.f, 0.f, -1.f); if (iModel->IsUnderObject(pModel, up, flags & MOD_M2, outDist, inDist)) return true; + return false; } diff --git a/src/game/vmap/TileAssembler.cpp b/src/game/vmap/TileAssembler.cpp index 5f9a66c25..a59f92f4a 100644 --- a/src/game/vmap/TileAssembler.cpp +++ b/src/game/vmap/TileAssembler.cpp @@ -55,7 +55,7 @@ Vector3 ModelPosition::transform(const Vector3& pIn) const //================================================================= -TileAssembler::TileAssembler(std::string const& pSrcDirName, std::string const& pDestDirName) : iSrcDir(pSrcDirName), iDestDir(pDestDirName) +TileAssembler::TileAssembler(std::string const& pSrcDirName, std::string const& pDestDirName) : iDestDir(pDestDirName), iSrcDir(pSrcDirName) { iCurrentUniqueNameId = 0; iFilterMethod = nullptr; diff --git a/src/game/vmap/VMapManager2.h b/src/game/vmap/VMapManager2.h index 78e588d9f..f61a271a1 100644 --- a/src/game/vmap/VMapManager2.h +++ b/src/game/vmap/VMapManager2.h @@ -90,7 +90,7 @@ namespace VMAP void unloadMap(unsigned int pMapId) override; bool isInLineOfSight(unsigned int pMapId, float x1, float y1, float z1, float x2, float y2, float z2) override; - ModelInstance* FindCollisionModel(unsigned int mapId, float x0, float y0, float z0, float x1, float y1, float z1); + ModelInstance* FindCollisionModel(unsigned int mapId, float x0, float y0, float z0, float x1, float y1, float z1) override; /** fill the hit pos and return true, if an object was hit */ diff --git a/src/game/vmap/WorldModel.cpp b/src/game/vmap/WorldModel.cpp index 07e40bf60..f57b61c8d 100644 --- a/src/game/vmap/WorldModel.cpp +++ b/src/game/vmap/WorldModel.cpp @@ -512,7 +512,7 @@ class UnderObjectCheckerCallback { public: UnderObjectCheckerCallback(const std::vector& vals, const Vector3& up, bool _ism2): - prims(vals.begin()), hit(vals.end()), zVec(up), m2(_ism2), outDist(-1), inDist(-1) {} + prims(vals.begin()), hit(vals.end()), m2(_ism2), zVec(up), outDist(-1), inDist(-1) {} std::vector::const_iterator prims; std::vector::const_iterator hit; bool m2; diff --git a/src/mangosd/Master.cpp b/src/mangosd/Master.cpp index be90e9e26..2e5048531 100644 --- a/src/mangosd/Master.cpp +++ b/src/mangosd/Master.cpp @@ -513,7 +513,7 @@ int Master::Run() b[3].Event.KeyEvent.wVirtualScanCode = 0x1c; b[3].Event.KeyEvent.wRepeatCount = 1; DWORD numb; - BOOL ret = WriteConsoleInput(hStdIn, b, 4, &numb); + WriteConsoleInput(hStdIn, b, 4, &numb); cliThread->wait(); @@ -693,7 +693,7 @@ void Master::_OnSignal(int s) sObjectAccessor.SaveAllPlayers(); ACE_Based::Thread::Sleep(25000); // Wait enough time to execute the SQL queries. } - *((int*)nullptr) = 42; // Crash for real now. + *((volatile int*)nullptr) = 42; // Crash for real now. return; } diff --git a/src/realmd/AuthSocket.cpp b/src/realmd/AuthSocket.cpp index 69b293bbe..9d33516a3 100644 --- a/src/realmd/AuthSocket.cpp +++ b/src/realmd/AuthSocket.cpp @@ -179,8 +179,7 @@ typedef struct AuthHandler std::array VersionChallenge = { { 0xBA, 0xA3, 0x1E, 0x99, 0xA0, 0x0B, 0x21, 0x57, 0xFC, 0x37, 0x3F, 0xB3, 0x69, 0xCD, 0xD2, 0xF1 } }; /// Constructor - set the N and g values for SRP6 -AuthSocket::AuthSocket() : gridSeed(0), promptPin(false), _accountId(0), _lastRealmListRequest(0), -_geoUnlockPIN(0) +AuthSocket::AuthSocket() : promptPin(false), gridSeed(0), _geoUnlockPIN(0), _accountId(0), _lastRealmListRequest(0) { N.SetHexStr("894B645E89E1535BBDAD5B8B290650530801B18EBFBF5E8FAB3C82872A3E9BB7"); g.SetDword(7); @@ -547,7 +546,7 @@ bool AuthSocket::_HandleLogonChallenge() // figure out whether we need to display the PIN grid promptPin = locked; // always prompt if the account is IP locked & 2FA is enabled - if (!locked && ((lockFlags & ALWAYS_ENFORCE) == ALWAYS_ENFORCE) || _geoUnlockPIN) + if ((!locked && ((lockFlags & ALWAYS_ENFORCE) == ALWAYS_ENFORCE)) || _geoUnlockPIN) { promptPin = true; // prompt if the lock hasn't been triggered but ALWAYS_ENFORCE is set } diff --git a/src/realmd/AuthSocket.h b/src/realmd/AuthSocket.h index cf2ab709f..1b688359a 100644 --- a/src/realmd/AuthSocket.h +++ b/src/realmd/AuthSocket.h @@ -97,7 +97,7 @@ class AuthSocket: public BufferedSocket BigNumber K; BigNumber _reconnectProof; - bool _authed, promptPin; + bool promptPin; eStatus _status; @@ -110,7 +110,6 @@ class AuthSocket: public BufferedSocket BigNumber serverSecuritySalt; LockFlag lockFlags; uint32 gridSeed; - bool _geolocked; uint32_t _geoUnlockPIN; static constexpr uint32 Win = 'Win'; diff --git a/src/scripts/battlegrounds/battleground_alterac.cpp b/src/scripts/battlegrounds/battleground_alterac.cpp index 1eef4db22..1dda8757d 100644 --- a/src/scripts/battlegrounds/battleground_alterac.cpp +++ b/src/scripts/battlegrounds/battleground_alterac.cpp @@ -48,7 +48,7 @@ class npc_alterac_bossHelper { public: ThreatListCopier(Unit* destination) : _dest(destination) {} - bool Process(Unit* unit) + bool Process(Unit* unit) override { _dest->AI()->AttackStart(unit); return false; @@ -101,7 +101,7 @@ struct npc_VanndarAI : public ScriptedAI, public npc_alterac_bossHelper bool m_bCombat5; bool m_bLeashed; - void Reset() + void Reset() override { m_uiGlobalCooldown = 0; @@ -118,7 +118,7 @@ struct npc_VanndarAI : public ScriptedAI, public npc_alterac_bossHelper m_bCombat5 = true; } - void EnterEvadeMode() + void EnterEvadeMode() override { if (m_bLeashed) DoScriptText(SAY_VANNDAR_RESET, m_creature); @@ -129,7 +129,7 @@ struct npc_VanndarAI : public ScriptedAI, public npc_alterac_bossHelper ScriptedAI::EnterEvadeMode(); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (m_bAggro) { @@ -138,7 +138,7 @@ struct npc_VanndarAI : public ScriptedAI, public npc_alterac_bossHelper } } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* pWho) override { if (m_creature->getVictim()) return; @@ -147,7 +147,7 @@ struct npc_VanndarAI : public ScriptedAI, public npc_alterac_bossHelper AttackStart(pWho); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (m_creature->GetMapId() == 30) if (m_creature->GetDistance2d(POSITION_VANNDAR_CENTER_X, POSITION_VANNDAR_CENTER_Y) > 35.0f) @@ -342,7 +342,7 @@ struct npc_DrekTharAI : public ScriptedAI, public npc_alterac_bossHelper bool m_bCombat5; bool m_bLeashed; - void Reset() + void Reset() override { m_uiGlobalCooldown = 0; @@ -375,7 +375,7 @@ struct npc_DrekTharAI : public ScriptedAI, public npc_alterac_bossHelper } - void EnterEvadeMode() + void EnterEvadeMode() override { if (m_bLeashed) DoScriptText(SAY_DREKTHAR_RESET, m_creature); @@ -386,7 +386,7 @@ struct npc_DrekTharAI : public ScriptedAI, public npc_alterac_bossHelper ScriptedAI::EnterEvadeMode(); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (m_bAggro) { @@ -395,7 +395,7 @@ struct npc_DrekTharAI : public ScriptedAI, public npc_alterac_bossHelper } } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* pWho) override { if (m_creature->getVictim()) return; @@ -404,7 +404,7 @@ struct npc_DrekTharAI : public ScriptedAI, public npc_alterac_bossHelper AttackStart(pWho); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (m_creature->GetMapId() == 30) { @@ -579,7 +579,7 @@ struct npc_BalindaAI : public ScriptedAI bool m_bSayAggro; bool m_bReset; - void Reset() + void Reset() override { m_uiGlobalCooldown = 0; @@ -596,7 +596,7 @@ struct npc_BalindaAI : public ScriptedAI m_bSayAggro = true; } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* pWho) override { if (m_creature->getVictim()) return; @@ -605,7 +605,7 @@ struct npc_BalindaAI : public ScriptedAI AttackStart(pWho); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (m_bSayAggro) { @@ -614,7 +614,7 @@ struct npc_BalindaAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -819,7 +819,7 @@ struct npc_GalvangarAI : public ScriptedAI bool m_bSayAggro; bool m_bReset; - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (m_bSayAggro) { @@ -828,7 +828,7 @@ struct npc_GalvangarAI : public ScriptedAI } } - void Reset() + void Reset() override { m_uiGlobalCooldown = 0; @@ -845,7 +845,7 @@ struct npc_GalvangarAI : public ScriptedAI m_bSayAggro = true; } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* pWho) override { if (m_creature->getVictim()) return; @@ -854,7 +854,7 @@ struct npc_GalvangarAI : public ScriptedAI AttackStart(pWho); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) @@ -1030,7 +1030,7 @@ struct npc_WarMasterAI : public ScriptedAI uint32 m_uiEnrage_Timer; bool m_isKilled; - void Reset() + void Reset() override { m_uiGlobalCooldown = 0; m_uiCharge_Timer = 0; @@ -1042,7 +1042,7 @@ struct npc_WarMasterAI : public ScriptedAI m_creature->clearUnitState(UNIT_STAT_ROOT); } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* pWho) override { if (m_creature->getVictim()) return; @@ -1055,12 +1055,12 @@ struct npc_WarMasterAI : public ScriptedAI } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) override { m_isKilled = true; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { /* Prevents the following bug: * The war master is killed @@ -1216,11 +1216,11 @@ struct npc_AlteracBowmanAI : public ScriptedAI uint32 m_uiShoot_Timer; uint32 m_uiReset_Timer; - void JustReachedHome() + void JustReachedHome() override { m_creature->AddAura(SPELL_ROOT_SELF, ADD_AURA_PERMANENT); } - void Reset() + void Reset() override { m_uiShoot_Timer = 100; m_uiReset_Timer = 3000; @@ -1231,13 +1231,13 @@ struct npc_AlteracBowmanAI : public ScriptedAI return m_creature->GetDistance(pTarget) < 80.0f && m_creature->IsWithinLOSInMap(pTarget); } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* pWho) override { if (pWho && !m_creature->getVictim() && m_creature->IsValidAttackTarget(pWho) && TargetWithinShootRange(pWho)) AttackStart(pWho); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->IsInEvadeMode() && (!m_creature->getVictim() || !TargetWithinShootRange(m_creature->getVictim()))) { @@ -1267,7 +1267,7 @@ struct npc_AlteracBowmanAI : public ScriptedAI DoMeleeAttackIfReady(); } - void GetAIInformation(ChatHandler& reader) + void GetAIInformation(ChatHandler& reader) override { reader.PSendSysMessage("npc_AlteracBowmanAI::GetAIInformation"); reader.PSendSysMessage("victim: %s", m_creature->getVictim() ? m_creature->getVictim()->GetName() : "nullptr"); @@ -1296,12 +1296,12 @@ struct npc_AlteracDardoshAI : public ScriptedAI // ScriptedInstance* m_pInstance; // remplacer par BG? uint32 m_uiCleave_Timer; - void Reset() + void Reset() override { m_uiCleave_Timer = 1000; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -1422,12 +1422,12 @@ struct npc_ram_wolf_tamedAI : public ScriptedAI ObjectGuid playerGuid; - uint32 GetData(uint32) + uint32 GetData(uint32) override { return playerGuid.GetCounter(); } - void Reset() + void Reset() override { } @@ -1437,7 +1437,7 @@ struct npc_ram_wolf_tamedAI : public ScriptedAI m_creature->DisappearAndDie(); } - void SpellHit(Unit* caster, SpellEntry const* spell) + void SpellHit(Unit* caster, SpellEntry const* spell) override { if (spell->Id == SPELL_COLLAR_USING_ALLIANCE || spell->Id == SPELL_COLLAR_USING_HORDE) AttackStart(caster); @@ -1472,7 +1472,7 @@ struct npc_ram_wolf_tamedAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { /** The tamed beast musn't attack */ if (m_creature->GetEntry() == NPC_RAM_TAMED || m_creature->GetEntry() == NPC_WOLF_TAMED) @@ -1528,12 +1528,12 @@ struct RamWolfMasterAI : public ScriptedAI uint32 m_uiEntryQuest; uint32 m_uiCheckTimer; - void Reset() + void Reset() override { m_uiCheckTimer = 200; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { /** Check if Tamed beast are in 10 meters radius */ if (m_uiCheckTimer < uiDiff) @@ -1692,7 +1692,7 @@ struct AV_NpcEventTroopsAI : public npc_escortAI uint32 Point; uint32 leaderDie_Timer; - void Reset() + void Reset() override { /** Use the corresponding mount depending on the NPC */ if (m_creature->GetEntry() == AV_NPC_RAMRIDER) @@ -1717,7 +1717,7 @@ struct AV_NpcEventTroopsAI : public npc_escortAI } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { /** Cavalry dismount in case of aggro situation */ if (m_creature->GetEntry() == AV_NPC_RAMRIDER || @@ -1729,11 +1729,11 @@ struct AV_NpcEventTroopsAI : public npc_escortAI SetEscortPaused(true); } - void WaypointReached(uint32 i) + void WaypointReached(uint32 i) override { } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { uint32 commander_id = 0; @@ -1782,10 +1782,10 @@ class npc_korrak_the_bloodragerAI: public ScriptedAI Reset(); m_yell = false; } - void Reset() + void Reset() override { } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_appeared) { @@ -2149,7 +2149,7 @@ struct AV_NpcEventAI : public npc_escortAI } } - void JustRespawned() + void JustRespawned() override { b_isSpeechDone = false; isGobSummoned = false; @@ -2220,7 +2220,7 @@ struct AV_NpcEventAI : public npc_escortAI } } - void Reset() + void Reset() override { if ((m_creature->GetEntry() == AV_NPC_ENTRY_VIPORE && m_creature->GetDistance(-1221.27f, -354.51f, 57.7f) < 5.0f) || (m_creature->GetEntry() == AV_NPC_ENTRY_ICHMAN && m_creature->GetDistance(-1291.28f, -266.65f, 91.66f) < 5.0f)) @@ -2270,7 +2270,7 @@ struct AV_NpcEventAI : public npc_escortAI } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { /** Cavalry dismount in case of aggro situation */ if (m_creature->GetEntry() == AV_NPC_RAMRIDER_CMD || @@ -2289,7 +2289,7 @@ struct AV_NpcEventAI : public npc_escortAI SetEscortPaused(true); } - void WaypointReached(uint32 i) + void WaypointReached(uint32 i) override { switch (i) { @@ -2475,7 +2475,7 @@ struct AV_NpcEventAI : public npc_escortAI } } - void JustDied(Unit* pWho) + void JustDied(Unit* pWho) override { /** Unlock speech for Cavalry again */ b_isSpeechDone = false; @@ -2639,7 +2639,7 @@ struct AV_NpcEventAI : public npc_escortAI } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { switch (m_creature->GetEntry()) { @@ -2974,11 +2974,11 @@ bool GossipHello_npc_AVBlood_collector(Player* pPlayer, Creature* pCreature) bool b_objectiveGlobalAirAssaultLieutenant = false; bool b_objectiveGlobalAirAssaultCommander = false; uint32 m_faction_id = (pPlayer->GetTeam() == ALLIANCE) ? BG_TEAM_ALLIANCE : BG_TEAM_HORDE; - uint32 m_actual_ressources; - uint32 m_actual_ressources2; - uint32 m_objective_ressources; - uint32 m_challenge; - uint32 m_minRepAssault; + uint32 m_actual_ressources = 0; + uint32 m_actual_ressources2 = 0; + uint32 m_objective_ressources = 0; + uint32 m_challenge = 0; + uint32 m_minRepAssault = 0; uint16 uiMessage = 0; uint16 uiMessageGlobalAirAssault = 0; @@ -3498,7 +3498,7 @@ struct AV_npc_troops_chief_EventAI : public npc_escortAI Reset(); } - void Reset() + void Reset() override { if (isAggro) { @@ -3510,13 +3510,13 @@ struct AV_npc_troops_chief_EventAI : public npc_escortAI } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { isAggro = true; SetEscortPaused(true); } - void WaypointReached(uint32 i) + void WaypointReached(uint32 i) override { switch (i) { @@ -3555,7 +3555,7 @@ struct AV_npc_troops_chief_EventAI : public npc_escortAI } } - void JustDied(Unit* pWho) + void JustDied(Unit* pWho) override { isAggro = false; // Unlock speech for Cavalry again @@ -3587,7 +3587,7 @@ struct AV_npc_troops_chief_EventAI : public npc_escortAI } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { uint32 m_uiTroopsType = 0; uint16 m_uiWarcryBC; @@ -3666,7 +3666,6 @@ bool QuestComplete_AV_npc_troops_chief(Player* pPlayer, Creature* pQuestGiver, Q return false; uint32 m_faction_id = (pPlayer->GetTeam() == ALLIANCE) ? BG_TEAM_ALLIANCE : BG_TEAM_HORDE; - uint32 m_ressources_delivered = pQuest->ReqItemCount[0]; if (pQuestGiver->GetEntry() == AV_NPC_MARSHAL_TERAVAINE) { @@ -4073,7 +4072,7 @@ struct AV_WarRiderAI : public ScriptedAI bool isAttacking; bool isMovingToPoint; - void Reset() + void Reset() override { isAttacking = false; m_creature->SetFly(true); @@ -4084,12 +4083,12 @@ struct AV_WarRiderAI : public ScriptedAI m_uiStunBombAttack_Timer = 13000; m_uiTimerGoDown = 2000; } - void JustReachedHome() + void JustReachedHome() override { m_creature->GetMotionMaster()->MoveRandom(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!isMovingToPoint) { @@ -4208,7 +4207,7 @@ struct AV_BeaconInvocationObjectAI : public GameObjectAI m_invocationTimer = 60000; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_invocationTimer < uiDiff) { @@ -4227,7 +4226,7 @@ struct AV_BeaconInvocationObjectAI : public GameObjectAI m_invocationTimer -= uiDiff; } /** Triggered when a player successfully finishes the channelling. Disable the beacon. */ - bool OnUse(Unit* /*user*/) + bool OnUse(Unit* /*user*/) override { me->AddObjectToRemoveList(); return true; @@ -4251,7 +4250,7 @@ class go_av_landmineAI: public GameObjectAI if (GameObjectData const* info = me->GetGOData()) m_respawnTimer = info->GetRandomRespawnTime(); } - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 const diff) override { if (me->isSpawned()) return; @@ -4264,7 +4263,7 @@ class go_av_landmineAI: public GameObjectAI if (!bg->IsActiveEvent(m_eventIdx, 0)) me->SetRespawnTime(urand(m_respawnTimer / 2, m_respawnTimer)); } - bool OnUse(Unit* user) + bool OnUse(Unit* user) override { if (!me->IsHostileTo(user)) return true; // Do not attack friends ! @@ -4306,7 +4305,7 @@ class av_world_boss_baseai: public npc_escortAI } bg->SpawnEvent(bgEvent, 0, true, true); } - void EnterEvadeMode() + void EnterEvadeMode() override { // Modified version of npc_escortAI::EnterEvadeMode Unit::SpellAuraHolderMap& creatureAuras = m_creature->GetSpellAuraHolderMap(); @@ -4328,7 +4327,7 @@ class av_world_boss_baseai: public npc_escortAI ReturnToCombatStartPosition(); Reset(); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) override { Map* m = m_creature->GetMap(); if (!m || !m->IsBattleGround()) @@ -4401,7 +4400,7 @@ struct AV_NpcEventWorldBoss_H_AI : public av_world_boss_baseai bool isInvocated; bool isYelling; - void Reset() + void Reset() override { m_uiBlizzardTimer = 10000; m_uiFrostBoltTimer = 1000; @@ -4421,13 +4420,13 @@ struct AV_NpcEventWorldBoss_H_AI : public av_world_boss_baseai } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { isAggro = true; SetEscortPaused(true); } - void WaypointReached(uint32 i) + void WaypointReached(uint32 i) override { /** If last waypoint reached, then say "Your base is forfeit, puny mortals!" */ switch (i) @@ -4442,7 +4441,7 @@ struct AV_NpcEventWorldBoss_H_AI : public av_world_boss_baseai } } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { if (pVictim->GetTypeId() == TYPEID_PLAYER) { @@ -4453,7 +4452,7 @@ struct AV_NpcEventWorldBoss_H_AI : public av_world_boss_baseai } } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { if (!isYelling) { @@ -4608,7 +4607,7 @@ struct AV_NpcEventWorldBoss_A_AI : public av_world_boss_baseai uint32 m_uiEngageTimer; bool isInvocated; - void Reset() + void Reset() override { m_uiRootsTimer = 8500; m_uiFaerieFireTimer = 5500; @@ -4627,13 +4626,13 @@ struct AV_NpcEventWorldBoss_A_AI : public av_world_boss_baseai } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { isAggro = true; SetEscortPaused(true); } - void WaypointReached(uint32 i) + void WaypointReached(uint32 i) override { if (i == 1) DoScriptText(SAY_IVUS_PAST_FIELD, m_creature); @@ -4644,7 +4643,7 @@ struct AV_NpcEventWorldBoss_A_AI : public av_world_boss_baseai } } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { if (isInvocated == false) { @@ -4758,11 +4757,11 @@ struct AV_CommanderAI : public ScriptedAI uint32 m_uiGripOfCommand_Timer; - void Reset() + void Reset() override { } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { switch (m_creature->GetEntry()) { @@ -4801,7 +4800,7 @@ struct AV_DismountAI : public ScriptedAI uint32 m_uiMount; uint32 m_uiGripOfCommand_Timer; - void Reset() + void Reset() override { switch (m_creature->GetEntry()) { @@ -4840,12 +4839,12 @@ struct AV_DismountAI : public ScriptedAI m_creature->Mount(m_uiMount); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->Unmount(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { switch (m_creature->GetEntry()) { @@ -4892,7 +4891,7 @@ struct FrostwolfShamanAI : public ScriptedAI bool b_isFirstAggro; bool b_isChanneling; - void Reset() + void Reset() override { m_creature->CastSpell(m_creature, SPELL_LIGHTNING_SHIELD, false); m_uiFrostShock_Timer = 5000; @@ -4904,7 +4903,7 @@ struct FrostwolfShamanAI : public ScriptedAI m_creature->CastSpell(m_creature, AV_INVOCATION_SPELL, false); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (b_isFirstAggro) { @@ -4921,7 +4920,7 @@ struct FrostwolfShamanAI : public ScriptedAI m_creature->Unmount(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -4973,7 +4972,7 @@ struct DruidOfTheGroveAI : public ScriptedAI bool b_isFirstAggro; bool b_isChanneling; - void Reset() + void Reset() override { m_creature->CastSpell(m_creature, SPELL_THORNS, false); m_uiEntanglingRoots_Timer = 3000; @@ -4985,7 +4984,7 @@ struct DruidOfTheGroveAI : public ScriptedAI m_creature->CastSpell(m_creature, AV_INVOCATION_SPELL, false); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (b_isFirstAggro) { @@ -5002,7 +5001,7 @@ struct DruidOfTheGroveAI : public ScriptedAI m_creature->Unmount(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -5110,16 +5109,17 @@ class npc_av_battle_npc_summoner: public ScriptedAI public: npc_av_battle_npc_summoner(Creature* c, uint32 factionId, float targetX, float targetY, float targetZ): ScriptedAI(c), + m_timer(0), + m_totalElapsedTime(0), + m_despawnAfterTime(0), m_factionId(factionId), m_destX(targetX), m_destY(targetY), - m_destZ(targetZ), - m_despawnAfterTime(0), - m_totalElapsedTime(0) + m_destZ(targetZ) { Reset(); } - void Reset() + void Reset() override { m_timer = 0; } @@ -5211,14 +5211,14 @@ class npc_av_battle_npc_summoner: public ScriptedAI } } - void OnRemoveFromWorld() + void OnRemoveFromWorld() override { for (int i = 0; i < TOTAL_NPC_PER_SPAWN; ++i) if (Creature* c = m_creature->GetMap()->GetCreature(m_summoned[i])) c->DeleteLater(); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { /* Despawn when the capitain is killed */ bool despawn = false; @@ -5334,7 +5334,7 @@ struct MineNPC_AI : public ScriptedAI uint32 m_uiFlashBomb_Timer; uint32 m_uiLandMine_Timer; - void Reset() + void Reset() override { m_bIsBombLaunched = false; m_uiBomb_Timer = 2700; @@ -5342,7 +5342,7 @@ struct MineNPC_AI : public ScriptedAI m_uiLandMine_Timer = 9000; } - void JustRespawned() + void JustRespawned() override { Map* map = me->GetMap(); if (!map->IsBattleGround()) @@ -5360,11 +5360,11 @@ struct MineNPC_AI : public ScriptedAI break; } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -5453,11 +5453,11 @@ struct AV_mineNpcAI : public ScriptedAI float m_destZ; uint32 m_originalEntry; - void Reset() + void Reset() override { } - void JustRespawned() + void JustRespawned() override { uint32 m_newEntry = SelectCreatureEntry(); if (m_newEntry != 0 && m_creature->GetEntry() != m_newEntry) @@ -5593,7 +5593,7 @@ struct AV_mineNpcAI : public ScriptedAI return 0; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { uint32 m_newEntry = SelectCreatureEntry(); if (m_newEntry != 0 && m_creature->GetEntry() != m_newEntry) @@ -5618,10 +5618,10 @@ class npc_av_trigger_for_questAI: public ScriptedAI { Reset(); } - void Reset() + void Reset() override { } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) override { if (!who || !who->IsPlayer() || !who->IsWithinDist(m_creature, 10.0f, false)) return; diff --git a/src/scripts/custom/boss_arena_hardog.cpp b/src/scripts/custom/boss_arena_hardog.cpp index d4e4a0eb2..ef037b6fa 100644 --- a/src/scripts/custom/boss_arena_hardog.cpp +++ b/src/scripts/custom/boss_arena_hardog.cpp @@ -225,7 +225,7 @@ struct arena_szerelmesAI : public ScriptedAI uint32 Shoot_Timer; uint32 add_Timer; - void Reset() + void Reset() override { Shoot_Timer = 15000; Pummel_Timer = 7000; @@ -233,19 +233,19 @@ struct arena_szerelmesAI : public ScriptedAI add_Timer = 60000; } - void Aggro(Unit* pPlayer) + void Aggro(Unit* pPlayer) override { add_Timer = 1000; DoCastSpellIfCan(m_creature->getVictim(), SPELL_FAIL); } - void JustDied(Unit* Victim) + void JustDied(Unit* Victim) override { while (Creature* Add = m_creature->FindNearestCreature(NPC_ADD, 100.0f)) Add->DisappearAndDie(); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -340,7 +340,7 @@ struct npc_karlekAI : public ScriptedAI ArenaBossSzerelmesStatus eEventStatus; uint32 m_uiEventResetTimer; - void Reset() + void Reset() override { } @@ -390,7 +390,7 @@ struct npc_karlekAI : public ScriptedAI } // L'event se reset si le boss despawn. - void SummonedCreatureDespawn(Creature* pSummoned) + void SummonedCreatureDespawn(Creature* pSummoned) override { if (pSummoned->GetObjectGuid() == m_uiSzerelmesGUID) { @@ -400,14 +400,14 @@ struct npc_karlekAI : public ScriptedAI } // L'event se complete si le boss meurt. - void SummonedCreatureJustDied(Creature* pSummoned) + void SummonedCreatureJustDied(Creature* pSummoned) override { if (pSummoned->GetObjectGuid() == m_uiSzerelmesGUID) CompleteEvent(); } - void UpdateAI(const uint32 diff, Player *pPlayer) + void UpdateAI(uint32 const diff) override { if (Creature* pSzerelmes = m_creature->GetMap()->GetCreature(m_uiSzerelmesGUID)) { @@ -424,7 +424,6 @@ struct npc_karlekAI : public ScriptedAI return; DoMeleeAttackIfReady(); - } }; diff --git a/src/scripts/custom/event_attack_city.cpp b/src/scripts/custom/event_attack_city.cpp index 3c9660197..9c9954b68 100644 --- a/src/scripts/custom/event_attack_city.cpp +++ b/src/scripts/custom/event_attack_city.cpp @@ -149,7 +149,7 @@ struct npc_attack_masterAI : public ScriptedAI // Fonctions generiques #if 1 - void Reset() + void Reset() override { } void SetAttackableInList(MobsGUIDList mobsList, bool bAttackable) @@ -525,7 +525,7 @@ struct npc_attack_masterAI : public ScriptedAI } } #endif - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (uiCD < uiDiff) { @@ -624,7 +624,7 @@ struct npc_event_wave_mobAI : public ScriptedAI std::vector m_lSpells; std::vector m_lGobj; - void Reset() + void Reset() override { uiCD = urand(5, 10) * 1000; } @@ -766,7 +766,7 @@ struct npc_event_wave_mobAI : public ScriptedAI return nullptr; return nearest; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (ME->IsStopped() && !ME->getVictim()) { @@ -788,7 +788,7 @@ struct npc_event_wave_mobAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) override { if (bIsBad) DoSpawnDestruction(); @@ -848,7 +848,7 @@ struct npc_guard_masterAI : public ScriptedAI uint64 uiTarget; // Fonctions generiques #if 1 - void Reset() + void Reset() override { uiTarget = 0; } @@ -860,7 +860,7 @@ struct npc_guard_masterAI : public ScriptedAI { ME->MonsterYell(what, 0, 0); } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* pWho) override { if (!uiTarget && pWho->GetTypeId() != TYPEID_PLAYER) DoAllAttack(pWho); @@ -995,7 +995,7 @@ struct npc_guard_masterAI : public ScriptedAI } } #endif - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (uiCD < uiDiff) { diff --git a/src/scripts/custom/gmisland.cpp b/src/scripts/custom/gmisland.cpp index 8a53f7ba7..ac4a4046d 100644 --- a/src/scripts/custom/gmisland.cpp +++ b/src/scripts/custom/gmisland.cpp @@ -47,14 +47,14 @@ struct boss_gmislandAI : public ScriptedAI std::vector spells; std::vector gmSpells; - void Reset() + void Reset() override { uiGlobalCD = 0; uiGmRefreshTimer = 0; m_creature->SetObjectScale(1.0f); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER) { @@ -89,7 +89,7 @@ struct boss_gmislandAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { uiGeneralTimer += uiDiff; uiGmRefreshTimer += uiDiff; diff --git a/src/scripts/custom/npc_escort.cpp b/src/scripts/custom/npc_escort.cpp index e3a9c80a1..ec628af1d 100644 --- a/src/scripts/custom/npc_escort.cpp +++ b/src/scripts/custom/npc_escort.cpp @@ -18,7 +18,7 @@ struct npc_escort_genericAI : public npc_escortAI // ATTENTION : Peut etre nullptr CreatureEscortData const* m_pEscortData; - void Reset() + void Reset() override { if (Player* pPlayer = GetPlayerForEscort()) { @@ -37,7 +37,7 @@ struct npc_escort_genericAI : public npc_escortAI } } - void EnterEvadeMode() + void EnterEvadeMode() override { //m_creature->RemoveAllAuras(); m_creature->DeleteThreatList(); @@ -64,7 +64,7 @@ struct npc_escort_genericAI : public npc_escortAI Reset(); } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { if (!m_pEscortData) return; @@ -76,7 +76,7 @@ struct npc_escort_genericAI : public npc_escortAI pPlayer->GroupEventHappens(m_pEscortData->uiQuestEntry, m_creature); } } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (!m_pEscortData) return; @@ -87,7 +87,7 @@ struct npc_escort_genericAI : public npc_escortAI pPlayer->FailQuest(m_pEscortData->uiQuestEntry); } } - void JustStartedEscort() + void JustStartedEscort() override { if (!m_pEscortData) return; @@ -110,7 +110,7 @@ struct npc_escort_genericAI : public npc_escortAI } } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { if (!m_pEscortData) return; diff --git a/src/scripts/custom/npc_j_eevee.h b/src/scripts/custom/npc_j_eevee.h index 7463c2e57..4180fc56e 100644 --- a/src/scripts/custom/npc_j_eevee.h +++ b/src/scripts/custom/npc_j_eevee.h @@ -5,14 +5,14 @@ struct npc_j_eevee_dreadsteedAI : public ScriptedAI { npc_j_eevee_dreadsteedAI(Creature* pCreature); - void Reset(); + void Reset() override; uint64 guidPlayer; uint32 waitTimer; uint8 currentPoint; bool waypointReached; - void MovementInform(uint32 uiType, uint32 uiPointId); - void UpdateAI(const uint32 uiDiff); + void MovementInform(uint32 uiType, uint32 uiPointId) override; + void UpdateAI(const uint32 uiDiff) override; void SetPlayerGuid(uint64 playerGuid); void ShoutFreedom(); @@ -21,7 +21,7 @@ struct npc_j_eevee_dreadsteedAI : public ScriptedAI struct npc_j_eevee_scholomanceAI : public ScriptedAI { npc_j_eevee_scholomanceAI(Creature* pCreature); - void Reset(); + void Reset() override; uint64 guidPlayer; uint32 waitTimer; @@ -30,8 +30,8 @@ struct npc_j_eevee_scholomanceAI : public ScriptedAI bool waypointReached; bool finished; - void MovementInform(uint32 uiType, uint32 uiPointId); - void UpdateAI(const uint32 uiDiff); + void MovementInform(uint32 uiType, uint32 uiPointId) override; + void UpdateAI(const uint32 uiDiff) override; }; #endif diff --git a/src/scripts/custom/zero_creatures.cpp b/src/scripts/custom/zero_creatures.cpp index a306a32e5..3e238a5f4 100644 --- a/src/scripts/custom/zero_creatures.cpp +++ b/src/scripts/custom/zero_creatures.cpp @@ -105,7 +105,7 @@ struct Zero_boss_razorgoreAI : public ScriptedAI uint32 Razor_Phase_2; uint32 Razor_Remove_Auras; - void Reset() + void Reset() override { Cleave_Timer = 15000; //These times are probably wrong WarStomp_Timer = 35000; @@ -124,7 +124,7 @@ struct Zero_boss_razorgoreAI : public ScriptedAI } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); @@ -132,13 +132,13 @@ struct Zero_boss_razorgoreAI : public ScriptedAI DoPlaySoundToSet(m_creature, 8272); } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { DoScriptText(SAY_DEATH, m_creature); m_pInstance->SetData(TYPE_RAZORGORE, DONE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -399,7 +399,7 @@ struct Mob_Grethok_The_ControllerAI : public ScriptedAI uint32 Slow_Timer; uint32 Razorgore_Spawn; - void Reset() + void Reset() override { Greater_Polymorph_Timer = 3000; Dominate_Mind_Timer = 1000; @@ -408,12 +408,12 @@ struct Mob_Grethok_The_ControllerAI : public ScriptedAI Razorgore_Spawn = 1; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/arathi_highlands/arathi_highlands.cpp b/src/scripts/eastern_kingdoms/arathi_highlands/arathi_highlands.cpp index 38393f9d4..4c9436cb1 100644 --- a/src/scripts/eastern_kingdoms/arathi_highlands/arathi_highlands.cpp +++ b/src/scripts/eastern_kingdoms/arathi_highlands/arathi_highlands.cpp @@ -55,9 +55,9 @@ struct npc_professor_phizzlethorpeAI : public npc_escortAI Reset(); } - void Reset() { } + void Reset() override { } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { Player* pPlayer = GetPlayerForEscort(); @@ -97,12 +97,12 @@ struct npc_professor_phizzlethorpeAI : public npc_escortAI } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { DoScriptText(SAY_AGGRO, m_creature); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { pSummoned->AI()->AttackStart(m_creature); } diff --git a/src/scripts/eastern_kingdoms/blasted_lands/blasted_lands.cpp b/src/scripts/eastern_kingdoms/blasted_lands/blasted_lands.cpp index 829926f06..60350b71e 100644 --- a/src/scripts/eastern_kingdoms/blasted_lands/blasted_lands.cpp +++ b/src/scripts/eastern_kingdoms/blasted_lands/blasted_lands.cpp @@ -57,7 +57,7 @@ struct ThadiusGrimshadeAI : public ScriptedAI uint64 grimshadeGUID; uint64 playerGUID; - void Reset() + void Reset() override { } @@ -70,7 +70,7 @@ struct ThadiusGrimshadeAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (underEvent) { diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/arena_challenge_ai.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/arena_challenge_ai.cpp index d75494b73..50e29742e 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/arena_challenge_ai.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/arena_challenge_ai.cpp @@ -61,14 +61,14 @@ struct npc_theldrenAI : public ScriptedAI uint32 m_uiMortalStrikeTimer; uint32 m_uiFearTimer; - void Reset() + void Reset() override { m_uiInterceptTimer = 10000; m_uiMortalStrikeTimer = 10000; m_uiFearTimer = 30000; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -119,7 +119,7 @@ struct npc_va_jashniAI : public ScriptedAI uint32 m_uiShieldTimer; uint32 m_uiRenewTimer; - void Reset() + void Reset() override { // The values on the heals are huge... Maybe wrong spells. If not, they // should have massive cooldowns @@ -128,7 +128,7 @@ struct npc_va_jashniAI : public ScriptedAI m_uiRenewTimer = 30000; // renew is 2000 health every 3 sec... } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (m_uiFlashHealTimer < diff) { @@ -183,14 +183,14 @@ struct npc_korvAI : public ScriptedAI uint32 m_uiEarthbindTimer; uint32 m_uiFireNovaTimer; - void Reset() + void Reset() override { m_uiFrostShockTimer = 10000; m_uiEarthbindTimer = 20000; m_uiFireNovaTimer = 20000; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -240,12 +240,12 @@ struct npc_leftyAI : public ScriptedAI uint32 m_uiFiveFingerTimer; - void Reset() + void Reset() override { m_uiFiveFingerTimer = 2000; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -279,7 +279,7 @@ struct npc_snokh_blackspineAI : public ScriptedAI uint32 m_uiFlamestrikeTimer; uint32 m_uiPolymorphTimer; - void Reset() + void Reset() override { m_uiPyroblastTimer = 15000; m_uiScorchTimer = 4000; @@ -287,7 +287,7 @@ struct npc_snokh_blackspineAI : public ScriptedAI m_uiPolymorphTimer = 30000; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -347,13 +347,13 @@ struct npc_volidaAI : public ScriptedAI uint32 m_uiBlizzardTimer; uint32 m_uiConeOfColdTimer; - void Reset() + void Reset() override { m_uiBlizzardTimer = 4000; m_uiConeOfColdTimer = 20000; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -399,7 +399,7 @@ struct npc_malgen_longspearAI : public ScriptedAI bool m_bIsFeigned; ObjectGuid m_petGuid; - void Reset() + void Reset() override { m_uiAimedShotTimer = 8000; m_uiMultiShotTimer = 15000; @@ -411,7 +411,7 @@ struct npc_malgen_longspearAI : public ScriptedAI m_petGuid = ObjectGuid(); } - void EnterEvadeMode() + void EnterEvadeMode() override { if (Creature *creature = m_creature->GetMap()->GetCreature(m_petGuid)) { @@ -420,7 +420,7 @@ struct npc_malgen_longspearAI : public ScriptedAI } } - void EnterCombat(Unit *enemy) + void EnterCombat(Unit *enemy) override { // Summon pet if (Creature *creature = m_creature->GetMap()->GetCreature(m_petGuid)) @@ -433,7 +433,7 @@ struct npc_malgen_longspearAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_bIsFeigned && (!m_creature->SelectHostileTarget() || !m_creature->getVictim())) return; @@ -441,8 +441,6 @@ struct npc_malgen_longspearAI : public ScriptedAI if (m_uiFeignDeathTimer < diff) { // Feign death, lay trap, re-acquire target - Unit *currentTarget = m_creature->getVictim(); - if (DoCastSpellIfCan(m_creature, SPELL_MALGEN_LONGSPEAR_FEIGN_DEATH, CF_TRIGGERED) == CAST_OK) { // Feign for 1 secs, then trap and repop diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/blackrock_depths.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/blackrock_depths.cpp index 06c374fd9..cf7962d93 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/blackrock_depths.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/blackrock_depths.cpp @@ -119,7 +119,7 @@ struct npc_grimstoneAI : public npc_escortAI bool GroupIsWiped; - void Reset() + void Reset() override { m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -265,7 +265,7 @@ struct npc_grimstoneAI : public npc_escortAI MobDeath_Timer = 2500; } - void WaypointReached(uint32 i) + void WaypointReached(uint32 i) override { switch (i) { @@ -303,7 +303,7 @@ struct npc_grimstoneAI : public npc_escortAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_pInstance) return; @@ -583,7 +583,7 @@ struct mob_phalanxAI : public ScriptedAI float m_fKeepDoorOrientation; bool m_bActivated; - void Reset() + void Reset() override { m_fKeepDoorOrientation = 2.06059f; m_uiCallPatrolTimer = 0; @@ -610,7 +610,7 @@ struct mob_phalanxAI : public ScriptedAI m_bActivated = true; } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE) return; @@ -619,7 +619,7 @@ struct mob_phalanxAI : public ScriptedAI m_creature->GetMotionMaster()->MovePoint(1, 868.122f, -223.884f, -43.695f, MOVE_PATHFINDING, 0, 2.06059f); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_pInstance) return; @@ -1017,7 +1017,7 @@ struct npc_rocknotAI : public npc_escortAI float m_fInitialOrientation; - void Reset() + void Reset() override { if (!m_pInstance) return; @@ -1383,7 +1383,7 @@ struct npc_hurley_blackbreathAI : public ScriptedAI } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE) return; @@ -1407,7 +1407,7 @@ struct npc_hurley_blackbreathAI : public ScriptedAI DoScriptText(SAY_HURLEY_AGGRO, m_creature); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -1493,19 +1493,19 @@ struct npc_watchman_doomgripAI : public ScriptedAI uint32 BoireLaPotionDeSoins_Timer; uint32 FracasserArmure_Timer; - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(TYPE_DOOMGRIP, DONE); } - void Reset() + void Reset() override { BoireLaPotionDeSoins_Timer = 0; FracasserArmure_Timer = 1000; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { std::list m_lGolems; GetCreatureListWithEntryInGrid(m_lGolems, m_creature, NPC_WARBRINGER_CONSTRUCT, 20.0f); @@ -1524,7 +1524,7 @@ struct npc_watchman_doomgripAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -1583,13 +1583,13 @@ struct npc_ribbly_fermevanneAI : public ScriptedAI uint32 BiseGenou_Timer; uint32 Suriner_Timer; - void Reset() + void Reset() override { BiseGenou_Timer = urand(3000, 9000); Suriner_Timer = urand(2000, 10000); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -1667,7 +1667,7 @@ struct npc_golem_lord_argelmachAI : public ScriptedAI uint32 ChaineDEclaires_Timer; uint32 Horion_Timer; - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->GetMotionMaster()->MovePoint(0, 846.801025f, 16.280600f, -53.639500f); //m_creature->MonsterYell("Golems, votre Seigneur a besoin de vous!", 0, pWho); @@ -1677,20 +1677,20 @@ struct npc_golem_lord_argelmachAI : public ScriptedAI m_pInstance->SetData(DATA_ARGELMACH_AGGRO, IN_PROGRESS); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(DATA_ARGELMACH_AGGRO, DONE); } - void Reset() + void Reset() override { BouclierDeFoudre_Timer = 0; ChaineDEclaires_Timer = 5000; Horion_Timer = 2000; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_ambassador_flamelash.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_ambassador_flamelash.cpp index 3f1ccdd45..f345a1def 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_ambassador_flamelash.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_ambassador_flamelash.cpp @@ -52,7 +52,7 @@ struct boss_ambassador_flamelashAI : public ScriptedAI GuidList lBurningSpirits; - void Reset() + void Reset() override { for (uint8 i = 0; i < DWARF_RUNES_MAX; i++) m_uiSpiritTimer[i] = 5 * IN_MILLISECONDS; @@ -113,7 +113,7 @@ struct boss_ambassador_flamelashAI : public ScriptedAI pWho->CastSpell(m_creature, SPELL_BURNING_SPIRIT, true); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_anubshiah.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_anubshiah.cpp index c20ce40aa..bedba6c5b 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_anubshiah.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_anubshiah.cpp @@ -42,7 +42,7 @@ struct boss_anubshiahAI : public ScriptedAI uint32 DemonArmor_Timer; uint32 EnvelopingWeb_Timer; - void Reset() + void Reset() override { ShadowBolt_Timer = 7000; CurseOfTongues_Timer = 24000; @@ -51,7 +51,7 @@ struct boss_anubshiahAI : public ScriptedAI EnvelopingWeb_Timer = 16000; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_emperor_dagran_thaurissan.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_emperor_dagran_thaurissan.cpp index 99bb978c2..d65c4c64d 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_emperor_dagran_thaurissan.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_emperor_dagran_thaurissan.cpp @@ -50,7 +50,7 @@ struct boss_emperor_dagran_thaurissanAI : public ScriptedAI uint32 m_uiIronfoeTimer; uint32 m_uiCallForHelp_Timer; - void Reset() + void Reset() override { m_uiHandOfThaurissan_Timer = urand(5000, 7500); m_uiAvatarOfFlame_Timer = 18000; @@ -58,13 +58,13 @@ struct boss_emperor_dagran_thaurissanAI : public ScriptedAI m_uiCallForHelp_Timer = 8000; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { DoScriptText(SAY_AGGRO, m_creature); m_creature->CallForHelp(VISIBLE_RANGE); } - void JustDied(Unit* pVictim) + void JustDied(Unit* pVictim) override { if (!m_pInstance) return; @@ -79,12 +79,12 @@ struct boss_emperor_dagran_thaurissanAI : public ScriptedAI } } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { DoScriptText(SAY_SLAY, m_creature); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -167,7 +167,7 @@ struct boss_moira_bronzebeardAI : public ScriptedAI uint32 m_uiShadowWordPain_Timer; uint32 m_uiSmite_Timer; - void Reset() + void Reset() override { m_uiHeal_Timer = 12000; //These times are probably wrong m_uiMindBlast_Timer = 16000; @@ -175,7 +175,7 @@ struct boss_moira_bronzebeardAI : public ScriptedAI m_uiSmite_Timer = 8000; } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) { @@ -188,7 +188,7 @@ struct boss_moira_bronzebeardAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_general_angerforge.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_general_angerforge.cpp index 6ea011635..7d920773b 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_general_angerforge.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_general_angerforge.cpp @@ -67,18 +67,18 @@ struct boss_general_angerforgeAI : public ScriptedAI uint32 m_uiSunderArmorTimer; uint32 m_uiAlarmTimer; - void Reset() + void Reset() override { m_uiSunderArmorTimer = urand(5 * IN_MILLISECONDS, 10 * IN_MILLISECONDS); m_uiAlarmTimer = 0; } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { pSummoned->GetMotionMaster()->MoveFollow(m_creature, 0.0f, 0.0f); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_gorosh_the_dervish.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_gorosh_the_dervish.cpp index ef4e8c3e7..5f53241d5 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_gorosh_the_dervish.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_gorosh_the_dervish.cpp @@ -39,14 +39,14 @@ struct boss_gorosh_the_dervishAI : public ScriptedAI uint32 MortalStrike_Timer; uint32 Bloodlust_Timer; - void Reset() + void Reset() override { WhirlWind_Timer = 12000; MortalStrike_Timer = 22000; Bloodlust_Timer = 0; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_grizzle.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_grizzle.cpp index 01e548fe2..e65014b49 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_grizzle.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_grizzle.cpp @@ -38,13 +38,13 @@ struct boss_grizzleAI : public ScriptedAI uint32 GroundTremor_Timer; uint32 Frenzy_Timer; - void Reset() + void Reset() override { GroundTremor_Timer = 12000; Frenzy_Timer = 0; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_high_interrogator_gerstahn.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_high_interrogator_gerstahn.cpp index ba9e105fc..38ae41443 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_high_interrogator_gerstahn.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_high_interrogator_gerstahn.cpp @@ -43,7 +43,7 @@ struct boss_high_interrogator_gerstahnAI : public ScriptedAI uint32 m_uiPsychicScream_Timer; uint32 m_uiShadowShield_Timer; - void Reset() + void Reset() override { m_uiShadowWordPain_Timer = 4000; m_uiManaBurn_Timer = 14000; @@ -51,7 +51,7 @@ struct boss_high_interrogator_gerstahnAI : public ScriptedAI m_uiShadowShield_Timer = 8000; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_magmus.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_magmus.cpp index 029d4123f..e33909cdd 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_magmus.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_magmus.cpp @@ -45,7 +45,7 @@ struct boss_magmusAI : public ScriptedAI uint32 m_uiWarStomp_Timer; bool Engaged; - void Reset() + void Reset() override { m_uiFieryBurst_Timer = 5000; m_uiWarStomp_Timer = 0; @@ -55,7 +55,7 @@ struct boss_magmusAI : public ScriptedAI Engaged = false; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { Engaged = true; if (m_pInstance) @@ -63,13 +63,13 @@ struct boss_magmusAI : public ScriptedAI } - void JustDied(Unit* pVictim) + void JustDied(Unit* pVictim) override { if (m_pInstance) m_pInstance->SetData(TYPE_IRON_HALL, DONE); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_tomb_of_seven.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_tomb_of_seven.cpp index 17be7d948..4ba9895b4 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_tomb_of_seven.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/boss_tomb_of_seven.cpp @@ -121,7 +121,7 @@ struct boss_doomrelAI : public ScriptedAI uint8 m_uiDwarfRound; bool m_bHasSummoned; - void Reset() + void Reset() override { m_uiShadowVolley_Timer = 10000; m_uiImmolate_Timer = 18000; @@ -133,13 +133,13 @@ struct boss_doomrelAI : public ScriptedAI m_bHasSummoned = false; } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) m_pInstance->SetData(TYPE_TOMB_OF_SEVEN, FAIL); } - void JustDied(Unit *victim) + void JustDied(Unit *victim) override { if (m_pInstance) m_pInstance->SetData(TYPE_TOMB_OF_SEVEN, DONE); @@ -147,7 +147,7 @@ struct boss_doomrelAI : public ScriptedAI //m_creature->SummonGameObject ( 169243, 1274.655640f, -283.507874f, -78.219254f, 2.365980, 0, 0, 0, 0, 0); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0)) pSummoned->AI()->AttackStart(pTarget); @@ -195,7 +195,7 @@ struct boss_doomrelAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (m_pInstance) { diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/instance_blackrock_depths.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/instance_blackrock_depths.cpp index d461b1d21..6c7614011 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/instance_blackrock_depths.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_depths/instance_blackrock_depths.cpp @@ -217,7 +217,7 @@ struct instance_blackrock_depths : ScriptedInstance } } - void OnCreatureCreate(Creature* pCreature) + void OnCreatureCreate(Creature* pCreature) override { switch (pCreature->GetEntry()) { @@ -319,7 +319,7 @@ struct instance_blackrock_depths : ScriptedInstance } } - void OnObjectCreate(GameObject* pGo) + void OnObjectCreate(GameObject* pGo) override { switch (pGo->GetEntry()) { @@ -432,7 +432,7 @@ struct instance_blackrock_depths : ScriptedInstance } } - void OnCreatureDeath(Creature* pCreature) + void OnCreatureDeath(Creature* pCreature) override { switch (pCreature->GetEntry()) { @@ -626,7 +626,7 @@ struct instance_blackrock_depths : ScriptedInstance } } - void CustomSpellCasted(uint32 spellId, Unit* caster, Unit* target) + void CustomSpellCasted(uint32 spellId, Unit* caster, Unit* target) override { sLog.outString("Spell %u caste par '%s' sur '%s'", spellId, caster->GetName(), (target) ? target->GetName() : ""); switch (spellId) @@ -714,7 +714,7 @@ struct instance_blackrock_depths : ScriptedInstance } } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) override { sLog.outDebug("Instance Blackrock Depths: SetData update (Type: %u Data %u)", uiType, uiData); @@ -944,7 +944,7 @@ struct instance_blackrock_depths : ScriptedInstance return false; } - uint32 GetData(uint32 uiType) + uint32 GetData(uint32 uiType) override { switch (uiType) { @@ -1001,7 +1001,7 @@ struct instance_blackrock_depths : ScriptedInstance return 0; } - uint64 GetData64(uint32 uiData) + uint64 GetData64(uint32 uiData) override { switch (uiData) { @@ -1089,7 +1089,7 @@ struct instance_blackrock_depths : ScriptedInstance return 0; } - void Update(uint32 uiDiff) + void Update(uint32 uiDiff) override { if (m_uiDagranTimer) { @@ -1132,12 +1132,12 @@ struct instance_blackrock_depths : ScriptedInstance } } - const char* Save() + const char* Save() override { return strInstData.c_str(); } - void Load(const char* in) + void Load(const char* in) override { if (!in) { diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/blackrock_spire.h b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/blackrock_spire.h index 1bb4f73b7..cc976be0a 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/blackrock_spire.h +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/blackrock_spire.h @@ -80,26 +80,26 @@ class instance_blackrock_spire : public ScriptedInstance { public: instance_blackrock_spire(Map* pMap); - ~instance_blackrock_spire() {} + ~instance_blackrock_spire() override {} - void Initialize(); + void Initialize() override; - void OnObjectCreate(GameObject* pGo); - void OnCreatureCreate(Creature* pCreature); + void OnObjectCreate(GameObject* pGo) override; + void OnCreatureCreate(Creature* pCreature) override; - void SetData(uint32 uiType, uint32 uiData); - void SetData64(uint32 uiType, uint64 uiData); - uint32 GetData(uint32 uiType); - uint64 GetData64(uint32 uiType); + void SetData(uint32 uiType, uint32 uiData) override; + void SetData64(uint32 uiType, uint64 uiData) override; + uint32 GetData(uint32 uiType) override; + uint64 GetData64(uint32 uiType) override; - const char* Save() { return strInstData.c_str(); } - void Load(const char* chrIn); + const char* Save() override { return strInstData.c_str(); } + void Load(const char* chrIn) override; void DoSortRoomEventMobs(); void GetIncanceratorGUIDList(std::list &lList) { lList = m_lIncanceratorGUIDList; } void GetRookeryEggGUIDList(std::list &lList) { lList = m_lRookeryEggGUIDList; } - void Update(uint32 uiDiff); + void Update(uint32 uiDiff) override; protected: uint32 m_auiEncounter[INSTANCE_BRS_MAX_ENCOUNTER]; diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_drakkisath.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_drakkisath.cpp index 64a6bcd46..b1d3b4096 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_drakkisath.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_drakkisath.cpp @@ -48,7 +48,7 @@ struct boss_drakkisathAI : public ScriptedAI uint32 m_uiRageTimer; uint32 m_uiPierceArmorTimer; - void Reset() + void Reset() override { m_uiFlameStrikeTimer = 16000; m_uiCleaveTimer = 12000; @@ -58,7 +58,7 @@ struct boss_drakkisathAI : public ScriptedAI m_uiPierceArmorTimer = 5000; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { // Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_gyth.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_gyth.cpp index 30a271ca6..4b74d5443 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_gyth.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_gyth.cpp @@ -113,7 +113,7 @@ struct boss_gythAI : public ScriptedAI std::list m_lSummonedGuids; bool bChromaticChaosCasted; - void Reset() + void Reset() override { uiDragonsTimer = 3000; uiOrcTimer = WAVE_TIMER; @@ -182,7 +182,7 @@ struct boss_gythAI : public ScriptedAI sLog.outString("[Rend] : %s", what); #endif } - void SummonedCreatureJustDied(Creature* summ) + void SummonedCreatureJustDied(Creature* summ) override { // Rend - invoque par Gyth - peut mourir apres Gyth. if (m_creature->isAlive()) @@ -238,7 +238,7 @@ struct boss_gythAI : public ScriptedAI } // NOSTALRIUS END - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (m_pInstance) { @@ -246,7 +246,7 @@ struct boss_gythAI : public ScriptedAI m_uiCombatDoorGUID = m_pInstance->GetData64(GO_GYTH_COMBAT_DOOR); } } - void AttackStart(Unit *target) + void AttackStart(Unit *target) override { // $target commence a nous attaquer. if (!m_bAggro) @@ -267,7 +267,7 @@ struct boss_gythAI : public ScriptedAI } } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { #ifdef DEBUG_ON sLog.outString("Boss GYTH JustDied"); @@ -276,7 +276,7 @@ struct boss_gythAI : public ScriptedAI m_pInstance->SetData(TYPE_GYTH, DONE); } - void EnterEvadeMode() + void EnterEvadeMode() override { #ifdef DEBUG_ON sLog.outString("Boss GYTH EnterEvadeMode"); @@ -292,7 +292,7 @@ struct boss_gythAI : public ScriptedAI } Reset(); } - void JustReachedHome() + void JustReachedHome() override { #ifdef DEBUG_ON sLog.outString("Boss GYTH JustReachedHome"); @@ -323,7 +323,7 @@ struct boss_gythAI : public ScriptedAI ++waveRemainingCount; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_bInitialized) { diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_halycon.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_halycon.cpp index c6462a4e0..842e458b7 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_halycon.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_halycon.cpp @@ -38,13 +38,13 @@ struct boss_halyconAI : public ScriptedAI uint32 MightyBlow_Timer; bool Summoned; - void Reset() + void Reset() override { CrowdPummel_Timer = 8000; MightyBlow_Timer = 14000; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) @@ -68,7 +68,7 @@ struct boss_halyconAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { //Summon Gizrul if (!Summoned) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_highlord_omokk.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_highlord_omokk.cpp index 9d0673a6c..e01300ce6 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_highlord_omokk.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_highlord_omokk.cpp @@ -47,7 +47,7 @@ struct boss_highlordomokkAI : public ScriptedAI uint32 m_uiKnockAwayTimer; uint32 m_uiSlowTimer; - void Reset() + void Reset() override { m_uiWarStompTimer = 15000; m_uiStrikeTimer = 10000; @@ -57,7 +57,7 @@ struct boss_highlordomokkAI : public ScriptedAI m_uiSlowTimer = 24000; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_mother_smolderweb.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_mother_smolderweb.cpp index bfcfb7008..f92b259a3 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_mother_smolderweb.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_mother_smolderweb.cpp @@ -40,19 +40,19 @@ struct boss_mothersmolderwebAI : public ScriptedAI uint32 m_uiCrystalizeTimer; uint32 m_uiMothersMilkTimer; - void Reset() + void Reset() override { m_uiCrystalizeTimer = 20000; m_uiMothersMilkTimer = 10000; } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) override { if (m_creature->GetHealth() <= uiDamage) DoCastSpellIfCan(m_creature, SPELL_SUMMON_SPIRE_SPIDERLING, CF_TRIGGERED); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { // Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_overlord_wyrmthalak.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_overlord_wyrmthalak.cpp index 8e0c9140a..98a68bfd3 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_overlord_wyrmthalak.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_overlord_wyrmthalak.cpp @@ -56,7 +56,7 @@ struct boss_overlordwyrmthalakAI : public ScriptedAI bool m_bPulledByPet; uint32 m_uiLeashCheckTimer; - void Reset() + void Reset() override { m_uiBlastWaveTimer = 20000; m_uiShoutTimer = 2000; @@ -68,7 +68,7 @@ struct boss_overlordwyrmthalakAI : public ScriptedAI m_uiLeashCheckTimer = 5000; } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { if (pSummoned->GetEntry() != NPC_SPIRESTONE_WARLORD && pSummoned->GetEntry() != NPC_SMOLDERTHORN_BERSERKER) return; @@ -104,7 +104,7 @@ struct boss_overlordwyrmthalakAI : public ScriptedAI EnterEvadeMode(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { // Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_pyroguard_emberseer.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_pyroguard_emberseer.cpp index f828901e7..f8dd16fe0 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_pyroguard_emberseer.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_pyroguard_emberseer.cpp @@ -194,7 +194,7 @@ struct boss_pyroguard_emberseerAI : public ScriptedAI } // END NOSTALRIUS - void Reset() + void Reset() override { m_uiFireNovaTimer = 6000; m_uiFlameBuffetTimer = 3000; @@ -207,7 +207,7 @@ struct boss_pyroguard_emberseerAI : public ScriptedAI m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_PASSIVE); } - void AttackStart(Unit *target) + void AttackStart(Unit *target) override { // $target commence a nous attaquer. // Pas de combat autorise avec le boss. @@ -225,19 +225,19 @@ struct boss_pyroguard_emberseerAI : public ScriptedAI } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (m_pInstance) m_pInstance->SetData(TYPE_EMBERSEER, IN_PROGRESS); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(TYPE_EMBERSEER, DONE); } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) m_pInstance->SetData(TYPE_EMBERSEER, FAIL); @@ -247,7 +247,7 @@ struct boss_pyroguard_emberseerAI : public ScriptedAI m_creature->CastSpell(m_creature, SPELL_SELF_CAGE, false); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_pInstance) return; @@ -344,14 +344,14 @@ struct npc_geolier_main_noireAI : public ScriptedAI bool fled; // END NOSTALRIUS - void Reset() + void Reset() override { MiseEnCage_Timer = urand(5000, 40000); Frappe_Timer = urand(2000, 12100); fled = false; } - void AttackStart(Unit *target) + void AttackStart(Unit *target) override { if (!m_pInstance) return; @@ -370,7 +370,7 @@ struct npc_geolier_main_noireAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_pInstance) return; diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_quartermaster_zigris.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_quartermaster_zigris.cpp index df7fd3a16..e579ffbcf 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_quartermaster_zigris.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_quartermaster_zigris.cpp @@ -42,14 +42,14 @@ struct boss_quatermasterzigrisAI : public ScriptedAI uint32 m_uiStunBombTimer; //uint32 HelingPotion_Timer; - void Reset() + void Reset() override { m_uiShootTimer = 1000; m_uiStunBombTimer = 16000; //HelingPotion_Timer = 25000; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { // Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_rend_blackhand.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_rend_blackhand.cpp index 591467a20..09f6edf0e 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_rend_blackhand.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_rend_blackhand.cpp @@ -49,7 +49,7 @@ struct boss_rend_blackhandAI : public ScriptedAI uint32 m_uiCloseCombatCount; uint32 m_uiWhirlWindTimer; - void Reset() + void Reset() override { m_uiMortalStrikeTimer = 1000; m_uiCleaveTimer = 4000; @@ -59,7 +59,7 @@ struct boss_rend_blackhandAI : public ScriptedAI m_uiWhirlWindTimer = 0; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { // Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_shadow_hunter_voshgajin.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_shadow_hunter_voshgajin.cpp index fc18893d3..33e43577b 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_shadow_hunter_voshgajin.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_shadow_hunter_voshgajin.cpp @@ -41,7 +41,7 @@ struct boss_shadowvoshAI : public ScriptedAI uint32 m_uiHexTimer; uint32 m_uiCleaveTimer; - void Reset() + void Reset() override { m_uiCurseOfBloodTimer = 2000; m_uiHexTimer = 8000; @@ -50,7 +50,7 @@ struct boss_shadowvoshAI : public ScriptedAI //m_creature->CastSpell(m_creature,SPELL_ICEARMOR,true); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { // Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_the_beast.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_the_beast.cpp index 32a9f411b..46ee88413 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_the_beast.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_the_beast.cpp @@ -49,7 +49,7 @@ struct boss_thebeastAI : public ScriptedAI uint32 m_uiFireballTimer; uint32 m_uiFireBlastTimer; - void Reset() + void Reset() override { m_uiFlamebreakTimer = urand(8000, 12000); //m_uiImmolateTimer = 3000; @@ -59,13 +59,13 @@ struct boss_thebeastAI : public ScriptedAI m_uiFireBlastTimer = urand(8000, 11000); } - void SpellHit(Unit* pCaster, const SpellEntry* pSpell) + void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override { if (pSpell->Effect[0] == SPELL_EFFECT_SKINNING) pCaster->CastSpell(pCaster, SPELL_SUMMON_FINKLE, true); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->HasAura(AURA_IMMOLATE)) m_creature->CastSpell(m_creature, AURA_IMMOLATE, true); diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_urok.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_urok.cpp index 29c9f5d74..42b8aabe8 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_urok.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_urok.cpp @@ -40,7 +40,7 @@ struct go_urok_challengeAI: public GameObjectAI // Fonction appellees toutes les 100ms en moyenne. // Permet de gerer les timer de pop des adds par exemple. - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 const diff) override { if (_spellTimer < diff) _spellTimer = 0; @@ -142,7 +142,7 @@ struct go_urok_challengeAI: public GameObjectAI } // Clic-droit sur le gameobject. - bool OnUse(Unit* user) + bool OnUse(Unit* user) override { if (_actived) { @@ -203,7 +203,7 @@ struct urokUnderlingAI : public ScriptedAI { timer=0; } - void Reset() + void Reset() override { timer=0; abilityReset(); @@ -211,7 +211,7 @@ struct urokUnderlingAI : public ScriptedAI virtual void abilityReset(){} uint32 timer; uint64 guidMound; - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if(GameObject* gobj=m_creature->GetMap()->GetGameObject(guidMound)) { @@ -221,7 +221,7 @@ struct urokUnderlingAI : public ScriptedAI } } } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE) return; @@ -229,7 +229,7 @@ struct urokUnderlingAI : public ScriptedAI return; HitBanner(); } - void AttackStart(Unit * unit) + void AttackStart(Unit * unit) override { if( m_creature->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) return; @@ -256,7 +256,7 @@ struct urokUnderlingAI : public ScriptedAI } return false; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) { @@ -292,12 +292,12 @@ struct urokEnforcerAI : public urokUnderlingAI { abilityReset(); } - void abilityReset() + void abilityReset() override { m_uiStrike_Timer = 1000; } uint32 m_uiStrike_Timer; - void abilityCombatUpdate(uint32 uiDiff) + void abilityCombatUpdate(uint32 uiDiff) override { if (m_uiStrike_Timer < uiDiff) { @@ -319,7 +319,7 @@ struct urokOgreMagusAI : public urokUnderlingAI { } - void abilityCombatUpdate(uint32 uiDiff) + void abilityCombatUpdate(uint32 uiDiff) override { if (!m_CreatureSpells.empty()) UpdateSpellsList(uiDiff); diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_warmaster_voone.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_warmaster_voone.cpp index 756823525..2c6d482ef 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_warmaster_voone.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/boss_warmaster_voone.cpp @@ -44,7 +44,7 @@ struct boss_warmastervooneAI : public ScriptedAI uint32 Pummel_Timer; uint32 ThrowAxe_Timer; - void Reset() + void Reset() override { Snapkick_Timer = 8000; Cleave_Timer = 14000; @@ -54,7 +54,7 @@ struct boss_warmastervooneAI : public ScriptedAI ThrowAxe_Timer = 1000; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/instance_blackrock_spire.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/instance_blackrock_spire.cpp index 489d02b39..322ab0e99 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/instance_blackrock_spire.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/instance_blackrock_spire.cpp @@ -600,7 +600,7 @@ struct go_father_flameAI: public GameObjectAI { go_father_flameAI(GameObject* pGo) : GameObjectAI(pGo) {} - bool OnUse(Unit* pUser) + bool OnUse(Unit* pUser) override { if (ScriptedInstance* pInstance = (instance_blackrock_spire*)me->GetInstanceData()) if (pInstance->GetData(TYPE_SOLAKAR) != IN_PROGRESS && pInstance->GetData(TYPE_SOLAKAR) != DONE) @@ -626,11 +626,11 @@ struct npc_solakar_triggerAI : public ScriptedAI ScriptedInstance* instance; - void Reset() + void Reset() override { } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) override { if (!instance) return; @@ -689,14 +689,14 @@ struct npc_rookery_hatcherAI : public ScriptedAI uint32 Strike_Timer; uint32 HatchRookeryEgg_Timer; - void Reset() + void Reset() override { SunderArmor_Timer = urand(8000, 12000); Strike_Timer = urand(5000, 7000); HatchRookeryEgg_Timer = urand(5000, 10000); } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance->GetData(TYPE_SOLAKAR) == SPECIAL) HatchRookeryEgg(); @@ -737,7 +737,7 @@ struct npc_rookery_hatcherAI : public ScriptedAI listRookeryEgg.clear(); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { if (pSummoned->GetEntry() == 10161) { @@ -746,7 +746,7 @@ struct npc_rookery_hatcherAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_pInstance || !m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/ubrs_trash.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/ubrs_trash.cpp index 4b1590f64..963c90f5b 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/ubrs_trash.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/ubrs_trash.cpp @@ -32,7 +32,7 @@ struct npc_blackhand_summonerAI : public ScriptedAI uint32 m_uiNovaGivreTimer; uint32 m_uiSummonTimer; - void Reset() + void Reset() override { m_uiBouleFeuTimer = 7000; m_uiNovaGivreTimer = 10000; @@ -49,13 +49,13 @@ struct npc_blackhand_summonerAI : public ScriptedAI } } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData64(TYPE_ROOM_EVENT, m_creature->GetGUID()); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim() || m_creature->IsNonMeleeSpellCasted(false)) return; @@ -126,7 +126,7 @@ struct npc_blackhand_veteranAI : public ScriptedAI uint32 m_uiFrappeTimer; bool m_bFirstChargeDone; - void Reset() + void Reset() override { m_uiChargeBouclierTimer = 0; m_uiCoupBouclierTimer = 2000; @@ -144,13 +144,13 @@ struct npc_blackhand_veteranAI : public ScriptedAI } } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData64(TYPE_ROOM_EVENT, m_creature->GetGUID()); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_broodlord_lashlayer.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_broodlord_lashlayer.cpp index 2583cc040..e354bfe33 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_broodlord_lashlayer.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_broodlord_lashlayer.cpp @@ -53,7 +53,7 @@ struct boss_broodlordAI : public ScriptedAI uint32 m_uiInCombatTimer; bool m_bMobsDesactives; - void Reset() + void Reset() override { m_uiCleaveTimer = 8000; // These times are probably wrong m_uiBlastWaveTimer = 20000; @@ -62,7 +62,7 @@ struct boss_broodlordAI : public ScriptedAI m_uiInCombatTimer = 2000; } - void Aggro(Unit* /*pWho*/) + void Aggro(Unit* /*pWho*/) override { if (m_pInstance) m_pInstance->SetData(TYPE_LASHLAYER, IN_PROGRESS); @@ -75,7 +75,7 @@ struct boss_broodlordAI : public ScriptedAI } } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { if (m_pInstance) m_pInstance->SetData(TYPE_LASHLAYER, DONE); @@ -83,7 +83,7 @@ struct boss_broodlordAI : public ScriptedAI SetMobsDesactivated(false); } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) m_pInstance->SetData(TYPE_LASHLAYER, FAIL); @@ -91,14 +91,14 @@ struct boss_broodlordAI : public ScriptedAI SetMobsDesactivated(false); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 40.0f) && m_creature->IsWithinLOSInMap(who) && !m_creature->isInCombat() && who->isInAccessablePlaceFor(m_creature) && !who->HasStealthAura()) m_creature->SetInCombatWithZone(); } - void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) + void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) override { if (pSpell->Id == SPELL_KNOCK_AWAY) m_creature->getThreatManager().modifyThreatPercent(pCaster, -50); @@ -139,7 +139,7 @@ struct boss_broodlordAI : public ScriptedAI mobsEntries.clear(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_chromaggus.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_chromaggus.cpp index a6726cd65..2a809c4ce 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_chromaggus.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_chromaggus.cpp @@ -115,7 +115,7 @@ struct boss_chromaggusAI : public ScriptedAI AfflictionGuids m_lRedAfflictionPlayerGUID; AfflictionGuids m_lChromaticPlayerGUID; - void Reset() + void Reset() override { m_uiMovetoLeverTimer = 2000; @@ -154,7 +154,7 @@ struct boss_chromaggusAI : public ScriptedAI m_vTimeLapseInfo.clear(); } - void MoveInLineOfSight(Unit *pUnit) + void MoveInLineOfSight(Unit *pUnit) override { if (!pUnit || m_creature->getVictim()) return; @@ -164,7 +164,7 @@ struct boss_chromaggusAI : public ScriptedAI AttackStart(pUnit); } - void Aggro(Unit* /*pWho*/) + void Aggro(Unit* /*pWho*/) override { if (m_pInstance) m_pInstance->SetData(TYPE_CHROMAGGUS, IN_PROGRESS); @@ -173,7 +173,7 @@ struct boss_chromaggusAI : public ScriptedAI m_creature->SetInCombatWithZone(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { if (m_pInstance) m_pInstance->SetData(TYPE_CHROMAGGUS, DONE); @@ -182,13 +182,13 @@ struct boss_chromaggusAI : public ScriptedAI m_vTimeLapseInfo.clear(); } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) m_pInstance->SetData(TYPE_CHROMAGGUS, FAIL); } - void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) + void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override { if (!pTarget) return; @@ -203,7 +203,7 @@ struct boss_chromaggusAI : public ScriptedAI } } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE) return; @@ -212,11 +212,11 @@ struct boss_chromaggusAI : public ScriptedAI { case 0: // walk to Flamegor's room on first pull of lever - m_creature->GetMotionMaster()->MovePoint(1, -7379.223f, -1002.1122f, 477.0402f, 3.7662f); + m_creature->GetMotionMaster()->MovePoint(1, -7379.223f, -1002.1122f, 477.0402f, 0, 0.0f, 3.7662f); break; case 1: // didn't find anyone! walk back to home position - m_creature->GetMotionMaster()->MovePoint(2, -7484.609385f, -1075.678101f, 477.144623f, 0.616172f); + m_creature->GetMotionMaster()->MovePoint(2, -7484.609385f, -1075.678101f, 477.144623f, 0, 0.0f, 0.616172f); break; case 2: m_creature->GetMotionMaster()->MoveTargetedHome(); @@ -224,7 +224,7 @@ struct boss_chromaggusAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->isInCombat() && !m_bEngagedOnce) { diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_ebonroc.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_ebonroc.cpp index 4a77268fc..8912a4801 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_ebonroc.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_ebonroc.cpp @@ -49,14 +49,14 @@ struct boss_ebonrocAI : public ScriptedAI uint32 m_uiWingBuffetTimer; uint32 m_uiShadowOfEbonrocTimer; - void Reset() + void Reset() override { m_uiShadowFlameTimer = 16000; // These times are probably wrong m_uiWingBuffetTimer = 30000; m_uiShadowOfEbonrocTimer = 8000; } - void Aggro(Unit* /*pWho*/) + void Aggro(Unit* /*pWho*/) override { if (m_pInstance) m_pInstance->SetData(TYPE_EBONROC, IN_PROGRESS); @@ -64,19 +64,19 @@ struct boss_ebonrocAI : public ScriptedAI m_creature->SetInCombatWithZone(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { if (m_pInstance) m_pInstance->SetData(TYPE_EBONROC, DONE); } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) m_pInstance->SetData(TYPE_EBONROC, FAIL); } - void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) + void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) override { if (pSpell->Id == SPELL_WING_BUFFET) { @@ -87,7 +87,7 @@ struct boss_ebonrocAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_firemaw.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_firemaw.cpp index 736dd5bb6..70bb6ecc7 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_firemaw.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_firemaw.cpp @@ -49,14 +49,14 @@ struct boss_firemawAI : public ScriptedAI uint32 m_uiWingBuffetTimer; uint32 m_uiFlameBuffetTimer; - void Reset() + void Reset() override { m_uiShadowFlameTimer = 16000; m_uiWingBuffetTimer = 30000; m_uiFlameBuffetTimer = 2000; } - void Aggro(Unit* /*pWho*/) + void Aggro(Unit* /*pWho*/) override { if (m_pInstance) m_pInstance->SetData(TYPE_FIREMAW, IN_PROGRESS); @@ -64,19 +64,19 @@ struct boss_firemawAI : public ScriptedAI m_creature->SetInCombatWithZone(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { if (m_pInstance) m_pInstance->SetData(TYPE_FIREMAW, DONE); } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) m_pInstance->SetData(TYPE_FIREMAW, FAIL); } - void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) + void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) override { if (pSpell->Id == SPELL_WING_BUFFET) { @@ -87,7 +87,7 @@ struct boss_firemawAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_flamegor.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_flamegor.cpp index 3b200630c..5c93fde1d 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_flamegor.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_flamegor.cpp @@ -50,14 +50,14 @@ struct boss_flamegorAI : public ScriptedAI uint32 m_uiWingBuffetTimer; uint32 m_uiFrenzyTimer; - void Reset() + void Reset() override { m_uiShadowFlameTimer = 16000; // These times are probably wrong m_uiWingBuffetTimer = 30000; m_uiFrenzyTimer = 10000; } - void Aggro(Unit* /*pWho*/) + void Aggro(Unit* /*pWho*/) override { if (m_pInstance) m_pInstance->SetData(TYPE_FLAMEGOR, IN_PROGRESS); @@ -65,19 +65,19 @@ struct boss_flamegorAI : public ScriptedAI m_creature->SetInCombatWithZone(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { if (m_pInstance) m_pInstance->SetData(TYPE_FLAMEGOR, DONE); } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) m_pInstance->SetData(TYPE_FLAMEGOR, FAIL); } - void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) + void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) override { if (pSpell->Id == SPELL_WING_BUFFET) { @@ -88,7 +88,7 @@ struct boss_flamegorAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_razorgore.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_razorgore.cpp index 90fe2726a..850ad123f 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_razorgore.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_razorgore.cpp @@ -104,7 +104,7 @@ struct boss_razorgoreAI : public ScriptedAI uint32 m_uiEvadeTroopsTimer; - void Reset() + void Reset() override { SetCombatMovement(true); m_uiCleaveTimer = 9000; // These times are probably wrong @@ -117,7 +117,7 @@ struct boss_razorgoreAI : public ScriptedAI m_uiEvadeTroopsTimer = 5000; } - void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) + void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override { if (!pTarget) return; @@ -126,7 +126,7 @@ struct boss_razorgoreAI : public ScriptedAI m_creature->getThreatManager().modifyThreatPercent(pTarget, -30); } - void Aggro(Unit* /*pWho*/) + void Aggro(Unit* /*pWho*/) override { if (!m_pInstance) return; @@ -157,7 +157,7 @@ struct boss_razorgoreAI : public ScriptedAI SituationInitiale(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { DEBUG_RAZOR("Razor JustDied"); if (m_pInstance) @@ -171,7 +171,7 @@ struct boss_razorgoreAI : public ScriptedAI MortPhaseUn(); } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) m_pInstance->SetData(TYPE_RAZORGORE, FAIL); @@ -251,7 +251,7 @@ struct boss_razorgoreAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_creature->hasUnitState(UNIT_STAT_POSSESSED)) { @@ -344,7 +344,7 @@ struct boss_razorgoreAI : public ScriptedAI DoMeleeAttackIfReady(); } - void GetAIInformation(ChatHandler& handler) + void GetAIInformation(ChatHandler& handler) override { handler.PSendSysMessage("* CombatMovement : %s", IsCombatMovementEnabled() ? "OUI" : "NON"); } @@ -371,7 +371,7 @@ struct trigger_orb_of_commandAI : public ScriptedAI bool m_uiCombatStarted; ObjectGuid m_uiPossesseurGuid; - void Reset() + void Reset() override { m_uiPopTimer = 45000; // Timer confirmed by BigWigs m_uiCheckTimer = 5000; @@ -559,7 +559,7 @@ struct trigger_orb_of_commandAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_pInstance) return; diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_vaelastrasz.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_vaelastrasz.cpp index 2ab5c552d..270d91f50 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_vaelastrasz.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/boss_vaelastrasz.cpp @@ -131,7 +131,7 @@ struct boss_vaelAI : public ScriptedAI ObjectGuid m_playerGuid; ObjectGuid m_nefariusGuid; - void Reset() + void Reset() override { m_uiSpeechTimer = 0; m_uiSpeechNum = 0; @@ -181,7 +181,7 @@ struct boss_vaelAI : public ScriptedAI } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { if (!pVictim || pVictim->GetTypeId() != TYPEID_PLAYER) return; @@ -192,7 +192,7 @@ struct boss_vaelAI : public ScriptedAI DoScriptText(SAY_KILLTARGET, m_creature, pVictim); } - void Aggro(Unit* /*pWho*/) + void Aggro(Unit* /*pWho*/) override { if (!m_bCastedEssenceOfTheRed) { @@ -211,14 +211,14 @@ struct boss_vaelAI : public ScriptedAI } } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { m_creature->SetRespawnDelay(604800); // 7 j. 604800 if (m_pInstance) m_pInstance->SetData(TYPE_VAELASTRASZ, DONE); } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) m_pInstance->SetData(TYPE_VAELASTRASZ, FAIL); @@ -228,7 +228,7 @@ struct boss_vaelAI : public ScriptedAI m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER | UNIT_NPC_FLAG_GOSSIP); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_pInstance) return; @@ -545,7 +545,7 @@ struct npc_death_talon_CaptainAI : public ScriptedAI uint32 m_uiCommandingShoutTimer; uint32 m_uiCleaveTimer; - void Reset() + void Reset() override { m_uiMarkDetonationTimer = 10000; m_uiMarkFlamesTimer = 6000; @@ -555,7 +555,7 @@ struct npc_death_talon_CaptainAI : public ScriptedAI SetAuraFlames(false); } - void MoveInLineOfSight(Unit *pUnit) + void MoveInLineOfSight(Unit *pUnit) override { if (!pUnit || m_creature->getVictim()) return; @@ -565,7 +565,7 @@ struct npc_death_talon_CaptainAI : public ScriptedAI AttackStart(pUnit); } - void Aggro(Unit* /*pWho*/) + void Aggro(Unit* /*pWho*/) override { if (!m_creature->HasAura(SPELL_AURA_FLAMES)) m_creature->AddAura(SPELL_AURA_FLAMES, ADD_AURA_PERMANENT); @@ -573,7 +573,7 @@ struct npc_death_talon_CaptainAI : public ScriptedAI DoCastSpellIfCan(m_creature, SPELL_COMMANDING_SHOUT, CF_TRIGGERED); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { SetAuraFlames(false); } @@ -605,7 +605,7 @@ struct npc_death_talon_CaptainAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -685,14 +685,14 @@ struct npc_death_talon_SeetherAI : public ScriptedAI uint32 m_uiFrenzyTimer; bool m_bEngaged; - void Reset() + void Reset() override { m_uiFlameBuffetTimer = urand(5000, 10000); m_uiFrenzyTimer = 15000; m_bEngaged = false; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/instance_blackwing_lair.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/instance_blackwing_lair.cpp index 6cdeba1c4..d1405c38e 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/instance_blackwing_lair.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/blackwing_lair/instance_blackwing_lair.cpp @@ -143,7 +143,6 @@ public: blackwing_technicians_helper(ScriptedInstance *pInstance) : m_bUpdated(false), m_uiTechniciansUpdate(0), - m_uiTechniciansInFight(0), m_pInstance(pInstance) { } @@ -240,7 +239,6 @@ public: private: bool m_bUpdated; uint32 m_uiTechniciansUpdate; - uint32 m_uiTechniciansInFight; std::vector m_vTechniciansGuid; std::map m_mThreatGuid; ScriptedInstance* const m_pInstance; @@ -260,7 +258,7 @@ struct instance_blackwing_lair : public ScriptedInstance std::list m_lVaelGobs; blackwing_technicians_helper m_hBlackwingTechnicians; - void Initialize() + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); memset(&m_auiData, 0, sizeof(m_auiData)); @@ -283,7 +281,7 @@ struct instance_blackwing_lair : public ScriptedInstance return false; } - void OnObjectCreate(GameObject* pGo) + void OnObjectCreate(GameObject* pGo) override { switch (pGo->GetEntry()) { @@ -334,7 +332,7 @@ struct instance_blackwing_lair : public ScriptedInstance } } - void OnCreatureEnterCombat(Creature* pCreature) + void OnCreatureEnterCombat(Creature* pCreature) override { switch (pCreature->GetEntry()) { @@ -358,7 +356,7 @@ struct instance_blackwing_lair : public ScriptedInstance } } - void OnCreatureEvade(Creature* pCreature) + void OnCreatureEvade(Creature* pCreature) override { switch (pCreature->GetEntry()) { @@ -377,7 +375,7 @@ struct instance_blackwing_lair : public ScriptedInstance } } - void OnCreatureRespawn(Creature* pCreature) + void OnCreatureRespawn(Creature* pCreature) override { switch (pCreature->GetEntry()) { @@ -464,7 +462,7 @@ struct instance_blackwing_lair : public ScriptedInstance } } - void OnCreatureDeath(Creature *who) + void OnCreatureDeath(Creature *who) override { switch (who->GetEntry()) { @@ -478,7 +476,7 @@ struct instance_blackwing_lair : public ScriptedInstance } } - void OnCreatureCreate(Creature* pCreature) + void OnCreatureCreate(Creature* pCreature) override { switch (pCreature->GetEntry()) { @@ -606,14 +604,14 @@ struct instance_blackwing_lair : public ScriptedInstance m_hBlackwingTechnicians.RemovePotentialVictim(player->GetObjectGuid()); } - uint64 GetData64(uint32 data) + uint64 GetData64(uint32 data) override { if (data < MAX_DATAS) return m_auiData[data]; return 0; } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) override { switch (uiType) { @@ -806,7 +804,7 @@ struct instance_blackwing_lair : public ScriptedInstance } } - bool CheckConditionCriteriaMeet(Player const* player, uint32 map_id, WorldObject const* source, uint32 instance_condition_id) const + bool CheckConditionCriteriaMeet(Player const* player, uint32 map_id, WorldObject const* source, uint32 instance_condition_id) const override { ObjectGuid scepterChampion = m_auiData[DATA_SCEPTER_CHAMPION]; @@ -832,19 +830,19 @@ struct instance_blackwing_lair : public ScriptedInstance } - const char* Save() + const char* Save() override { return strInstData.c_str(); } - uint32 GetData(uint32 uiType) + uint32 GetData(uint32 uiType) override { if (uiType < MAX_ENCOUNTER) return (m_auiEncounter[uiType]); return 0; } - void Load(const char* chrIn) + void Load(const char* chrIn) override { if (!chrIn) { @@ -926,7 +924,7 @@ struct go_oeuf_razAI: public GameObjectAI { go_oeuf_razAI(GameObject* pGo) : GameObjectAI(pGo) {} - bool OnUse(Unit* pUser) + bool OnUse(Unit* pUser) override { if (!pUser) return true; @@ -982,7 +980,7 @@ struct go_engin_suppressionAI: public GameObjectAI uint32 m_uiCheckTimer; bool m_bActive; - bool OnUse(Unit* pUser) + bool OnUse(Unit* pUser) override { if (pUser->IsWithinDistInMap(me, 5.0f)) { @@ -1016,7 +1014,7 @@ struct go_engin_suppressionAI: public GameObjectAI m_bActive = true; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_uiCheckTimer <= uiDiff) { @@ -1118,20 +1116,20 @@ struct npc_death_talonAI : public ScriptedAI uint32 m_uiSchoolSensibility; bool m_bIsOverSeer; - void Reset() + void Reset() override { m_uiCleaveTimer = urand(5000, 9000); m_uiWarStompTimer = 8000; m_uiFireBlastTimer = 8000; } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { m_uiBroodPower = RandomPower(); m_uiSchoolSensibility = RandomSensibility(); } - void Aggro(Unit* /*pWho*/) + void Aggro(Unit* /*pWho*/) override { // aggro Master Elementalist with the pull if (!m_bIsOverSeer) @@ -1174,7 +1172,7 @@ struct npc_death_talonAI : public ScriptedAI return (0); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_bIsOverSeer && !m_creature->HasAura(m_uiBroodPower)) m_creature->AddAura(m_uiBroodPower); @@ -1253,7 +1251,7 @@ struct npc_blackwing_technicianAI : public ScriptedAI bool m_bAdded; blackwing_technicians_helper *m_pTechnicianHelper; - void Reset() + void Reset() override { if (m_pTechnicianHelper && m_bAdded) { @@ -1266,13 +1264,13 @@ struct npc_blackwing_technicianAI : public ScriptedAI m_uiEmoteTimer = urand(0, 1) ? 1000 : 3000; } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* pWho) override { if (!m_bVaelGob) ScriptedAI::MoveInLineOfSight(pWho); } - void Aggro(Unit* who) + void Aggro(Unit* who) override { if (m_pTechnicianHelper && !m_bAdded) { @@ -1282,7 +1280,7 @@ struct npc_blackwing_technicianAI : public ScriptedAI ScriptedAI::Aggro(who); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) override { if (m_pTechnicianHelper && m_bAdded) { @@ -1292,7 +1290,7 @@ struct npc_blackwing_technicianAI : public ScriptedAI ScriptedAI::JustDied(killer); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_bVaelGob && m_creature->GetPositionZ() >= 430.0f) m_creature->DeleteLater(); @@ -1367,7 +1365,7 @@ struct CorruptedWhelpAI : public ScriptedAI } - void Reset() + void Reset() override { } @@ -1378,7 +1376,7 @@ struct CorruptedWhelpAI : public ScriptedAI } */ - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/burning_steppes/burning_steppes.cpp b/src/scripts/eastern_kingdoms/burning_steppes/burning_steppes.cpp index b3146bb9c..65fb6a3e9 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/burning_steppes.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/burning_steppes.cpp @@ -38,9 +38,9 @@ struct npc_ragged_johnAI : public ScriptedAI Reset(); } - void Reset() {} + void Reset() override {} - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit *who) override { if (who->HasAura(16468, EFFECT_INDEX_0)) { @@ -556,7 +556,7 @@ struct npc_klinfranAI : public ScriptedAI uint32 m_uiDemonic_Frenzy_Timer; uint32 m_uiDespawn_Timer; - void Reset() + void Reset() override { switch (m_creature->GetEntry()) { @@ -608,7 +608,7 @@ struct npc_klinfranAI : public ScriptedAI } /** Klinfran the Crazed */ - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (pWho->getClass() == CLASS_HUNTER && (m_hunterGuid.IsEmpty() || m_hunterGuid == pWho->GetObjectGuid())/*&& pWho->GetQuestStatus(QUEST_STAVE_OF_THE_ANCIENTS) == QUEST_STATUS_INCOMPLETE*/) { @@ -618,7 +618,7 @@ struct npc_klinfranAI : public ScriptedAI DemonDespawn(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { m_creature->SetHomePosition(-8318.19f, -993.662f, 176.956f, 5.65024f); @@ -673,7 +673,7 @@ struct npc_klinfranAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { /** Franklin the Friendly */ if (m_bTransform) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_baron_geddon.cpp b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_baron_geddon.cpp index c6b345dad..049c284d2 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_baron_geddon.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_baron_geddon.cpp @@ -51,7 +51,7 @@ struct boss_baron_geddonAI : public ScriptedAI ScriptedInstance* m_pInstance; - void Reset() + void Reset() override { m_uiIgniteManaTimer = urand(10000, 15000); m_uiLivingBombTimer = urand(15000, 20000); @@ -66,20 +66,20 @@ struct boss_baron_geddonAI : public ScriptedAI m_creature->clearUnitState(UNIT_STAT_ROOT); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (m_pInstance) m_pInstance->SetData(TYPE_GEDDON, IN_PROGRESS); m_creature->SetInCombatWithZone(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(TYPE_GEDDON, DONE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_gehennas.cpp b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_gehennas.cpp index 8a08140f4..a0124c7f2 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_gehennas.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_gehennas.cpp @@ -47,7 +47,7 @@ struct boss_gehennasAI : public ScriptedAI ScriptedInstance* m_pInstance; - void Reset() + void Reset() override { m_uiGehennasCurseTimer = urand(5 * IN_MILLISECONDS, 10 * IN_MILLISECONDS); m_uiRainOfFireTimer = urand(6 * IN_MILLISECONDS, 12 * IN_MILLISECONDS); @@ -58,20 +58,20 @@ struct boss_gehennasAI : public ScriptedAI m_pInstance->SetData(TYPE_GEHENNAS, NOT_STARTED); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (m_pInstance) m_pInstance->SetData(TYPE_GEHENNAS, IN_PROGRESS); m_creature->SetInCombatWithZone(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(TYPE_GEHENNAS, DONE); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_golemagg.cpp b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_golemagg.cpp index 06cfb029e..4a46d13e1 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_golemagg.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_golemagg.cpp @@ -57,7 +57,7 @@ struct boss_golemaggAI : public ScriptedAI uint32 TickTimer; bool m_bEnraged; - void Reset() + void Reset() override { m_uiPyroblastTimer = 7 * IN_MILLISECONDS; // These timers are probably wrong m_uiEarthquakeTimer = 3 * IN_MILLISECONDS; @@ -83,19 +83,19 @@ struct boss_golemaggAI : public ScriptedAI // m_creature->CastSpell(m_creature, SPELL_MAGMASPLASH, true); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (m_pInstance) m_pInstance->SetData(TYPE_GOLEMAGG, IN_PROGRESS); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(TYPE_GOLEMAGG, DONE); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -155,13 +155,13 @@ struct mob_core_ragerAI : public ScriptedAI uint32 m_uiMangleTimer; uint32 TickTimer; - void Reset() + void Reset() override { TickTimer = 1000; m_uiMangleTimer = 7 * IN_MILLISECONDS; // These times are probably wrong } - void DamageTaken(Unit* pDoneBy, uint32& uiDamage) + void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override { if (m_pInstance) { @@ -181,7 +181,7 @@ struct mob_core_ragerAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_magmadar.cpp b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_magmadar.cpp index 663aeafa0..efc954f8d 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_magmadar.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_magmadar.cpp @@ -64,7 +64,7 @@ struct boss_magmadarAI : public ScriptedAI ScriptedInstance* m_pInstance; - void Reset() + void Reset() override { m_uiFrenzyTimer = 15000; m_uiPanicTimer = 10000; @@ -81,19 +81,19 @@ struct boss_magmadarAI : public ScriptedAI m_pInstance->SetData(TYPE_MAGMADAR, NOT_STARTED); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (m_pInstance) m_pInstance->SetData(TYPE_MAGMADAR, IN_PROGRESS); } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { if (m_pInstance) m_pInstance->SetData(TYPE_MAGMADAR, DONE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -197,7 +197,7 @@ struct boss_magmadarAI : public ScriptedAI DoMeleeAttackIfReady(); } - void UpdateAI_corpse(const uint32 diff) + void UpdateAI_corpse(const uint32 diff) override { // continue activating Lava Bomb triggers while dead until they've all despawned if (m_uiLavaBombTriggerTimer) diff --git a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_majordomo_executus.cpp b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_majordomo_executus.cpp index 707bc2206..cbc5262d2 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_majordomo_executus.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_majordomo_executus.cpp @@ -100,7 +100,7 @@ struct boss_majordomoAI : public ScriptedAI uint32 DialogRagnarosTimer; bool RagnarosEventStart; - void Reset() + void Reset() override { m_creature->SetDefaultMovementType(IDLE_MOTION_TYPE); Reflection_Timer = 30000; @@ -130,7 +130,7 @@ struct boss_majordomoAI : public ScriptedAI RagnarosEventStart = false; } - void SummonedCreatureJustDied(Creature* pSummoned) + void SummonedCreatureJustDied(Creature* pSummoned) override { if (AddVivant > 0) AddVivant--; @@ -198,13 +198,13 @@ struct boss_majordomoAI : public ScriptedAI } } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) override { if (m_creature->getFaction() != 35) DoScriptText(SAY_SLAY, m_creature); } - void Aggro(Unit *who) + void Aggro(Unit *who) override { if (m_creature->getFaction() != 35) DoScriptText(SAY_AGGRO, m_creature); @@ -216,7 +216,7 @@ struct boss_majordomoAI : public ScriptedAI } } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE) return; @@ -319,7 +319,7 @@ struct boss_majordomoAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (m_creature->getFaction() != 35 && AddSpawn == false) { diff --git a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_shazzrah.cpp b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_shazzrah.cpp index 3eed77deb..ad98fc01b 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_shazzrah.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_shazzrah.cpp @@ -49,7 +49,7 @@ struct boss_shazzrahAI : public ScriptedAI ScriptedInstance* m_pInstance; - void Reset() + void Reset() override { ArcaneExplosion_Timer = 2000; ShazzrahCurse_Timer = 10000; @@ -61,19 +61,19 @@ struct boss_shazzrahAI : public ScriptedAI m_pInstance->SetData(TYPE_SHAZZRAH, NOT_STARTED); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (m_pInstance) m_pInstance->SetData(TYPE_SHAZZRAH, IN_PROGRESS); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(TYPE_SHAZZRAH, DONE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_sulfuron_harbinger.cpp b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_sulfuron_harbinger.cpp index cbdea8def..62cd7127e 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_sulfuron_harbinger.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_sulfuron_harbinger.cpp @@ -49,7 +49,7 @@ struct boss_sulfuronAI : public ScriptedAI uint32 Flamespear_Timer; ScriptedInstance* m_pInstance; - void Reset() + void Reset() override { Darkstrike_Timer = 10000; //These times are probably wrong DemoralizingShout_Timer = 15000; @@ -61,20 +61,20 @@ struct boss_sulfuronAI : public ScriptedAI m_pInstance->SetData(TYPE_SULFURON, NOT_STARTED); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (m_pInstance) m_pInstance->SetData(TYPE_SULFURON, IN_PROGRESS); m_creature->SetInCombatWithZone(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(TYPE_SULFURON, DONE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/instance_molten_core.cpp b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/instance_molten_core.cpp index f5622338d..2cf34854a 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/instance_molten_core.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/instance_molten_core.cpp @@ -456,7 +456,6 @@ struct instance_molten_core : ScriptedInstance if (GOUseGuidList[i]) { GameObject* Rune = instance->GetGameObject(GOUseGuidList[i]); - bool End = true; switch (Rune->GetEntry()) { case 176951: //Sulfuron @@ -546,6 +545,7 @@ struct instance_molten_core : ScriptedInstance for (int i = 0; i < INSTANCE_MC_MAX_ENCOUNTER; i++) SetData(i, m_auiEncounter[i]); + /* uint64 GuidRunes[7] = { m_uiRuneKoroGUID, @@ -556,7 +556,7 @@ struct instance_molten_core : ScriptedInstance m_uiRuneKressGUID, m_uiRuneMohnGUID }; - + */ for (int i = 0; i < 7; i++) SetData((TypeRuneActive0 + 16), RuneActive[i]); diff --git a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/molten_core.cpp b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/molten_core.cpp index fba65e3cc..50b8ea51c 100644 --- a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/molten_core.cpp +++ b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/molten_core.cpp @@ -54,7 +54,7 @@ struct FirewalkerAI : public ScriptedAI uint32 m_uiInciteFlames_Timer; uint32 m_uiNbBlossom; - void Reset() + void Reset() override { m_uiFireBlossomCasting_Timer = 6000; m_uiFireBlossom_Timer = 0; @@ -63,12 +63,12 @@ struct FirewalkerAI : public ScriptedAI m_uiNbBlossom = 0; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -150,7 +150,7 @@ struct mob_ancient_core_houndAI : public ScriptedAI ScriptedInstance* m_pInstance; - void Reset() + void Reset() override { switch (urand(0, 5)) { @@ -180,7 +180,7 @@ struct mob_ancient_core_houndAI : public ScriptedAI m_creature->SetNoCallAssistance(true); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance && m_pInstance->GetData(TYPE_MAGMADAR) == DONE) { @@ -207,7 +207,7 @@ struct mob_ancient_core_houndAI : public ScriptedAI } */ - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -492,12 +492,12 @@ struct mob_lava_surgerAI : public ScriptedAI uint32 m_uiSurgeTimer; ScriptedInstance* m_pInstance; - void Reset() + void Reset() override { m_uiSurgeTimer = urand(1000, 2000); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance && m_pInstance->GetData(TYPE_GARR) == DONE) { @@ -506,7 +506,7 @@ struct mob_lava_surgerAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/dun_morogh/gnomeregan/boss_thermaplugg.cpp b/src/scripts/eastern_kingdoms/dun_morogh/gnomeregan/boss_thermaplugg.cpp index 75b522245..159457ddb 100644 --- a/src/scripts/eastern_kingdoms/dun_morogh/gnomeregan/boss_thermaplugg.cpp +++ b/src/scripts/eastern_kingdoms/dun_morogh/gnomeregan/boss_thermaplugg.cpp @@ -62,7 +62,7 @@ struct boss_thermapluggAI : public ScriptedAI std::list m_lSummonedBombGUIDs; std::list m_lLandedBombGUIDs; - void Reset() + void Reset() override { m_uiKnockAwayTimer = urand(17000, 20000); m_uiActivateBombTimer = urand(10000, 15000); @@ -73,12 +73,12 @@ struct boss_thermapluggAI : public ScriptedAI m_lLandedBombGUIDs.clear(); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { DoScriptText(SAY_SLAY, m_creature); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(TYPE_THERMAPLUGG, DONE); @@ -86,7 +86,7 @@ struct boss_thermapluggAI : public ScriptedAI m_lSummonedBombGUIDs.clear(); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { DoScriptText(SAY_AGGRO, m_creature); @@ -101,7 +101,7 @@ struct boss_thermapluggAI : public ScriptedAI m_afSpawnPos[2] = m_creature->GetPositionZ(); } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) m_pInstance->SetData(TYPE_THERMAPLUGG, FAIL); @@ -115,7 +115,7 @@ struct boss_thermapluggAI : public ScriptedAI m_lSummonedBombGUIDs.clear(); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { if (pSummoned->GetEntry() == NPC_WALKING_BOMB) { @@ -130,18 +130,18 @@ struct boss_thermapluggAI : public ScriptedAI } } - void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) + void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override { if (pSummoned->GetEntry() == NPC_WALKING_BOMB && uiMotionType == POINT_MOTION_TYPE && uiPointId == 1) m_lLandedBombGUIDs.push_back(pSummoned->GetGUID()); } - void SummonedCreatureDespawn(Creature* pSummoned) + void SummonedCreatureDespawn(Creature* pSummoned) override { m_lSummonedBombGUIDs.remove(pSummoned->GetGUID()); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/dun_morogh/gnomeregan/gnomeregan.cpp b/src/scripts/eastern_kingdoms/dun_morogh/gnomeregan/gnomeregan.cpp index 41b611c96..fca0a7e19 100644 --- a/src/scripts/eastern_kingdoms/dun_morogh/gnomeregan/gnomeregan.cpp +++ b/src/scripts/eastern_kingdoms/dun_morogh/gnomeregan/gnomeregan.cpp @@ -678,7 +678,7 @@ struct npc_kernobeeAI : public FollowerAI void Reset() override {} - void UpdateFollowerAI(const uint32 uiDiff) + void UpdateFollowerAI(const uint32 uiDiff) override { FollowerAI::UpdateFollowerAI(uiDiff); // Do combat handling if (nextStep == 5) //HasFollowState(STATE_FOLLOW_COMPLETE) @@ -820,7 +820,7 @@ struct npc_kernobeeAI : public FollowerAI } } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { FollowerAI::JustDied(pKiller); QuestReset(); diff --git a/src/scripts/eastern_kingdoms/dun_morogh/gnomeregan/gnomeregan.h b/src/scripts/eastern_kingdoms/dun_morogh/gnomeregan/gnomeregan.h index bf9abbe27..e1eb25b37 100644 --- a/src/scripts/eastern_kingdoms/dun_morogh/gnomeregan/gnomeregan.h +++ b/src/scripts/eastern_kingdoms/dun_morogh/gnomeregan/gnomeregan.h @@ -56,23 +56,23 @@ class instance_gnomeregan : public ScriptedInstance { public: instance_gnomeregan(Map* pMap); - ~instance_gnomeregan() {} + ~instance_gnomeregan() override {} - void Initialize(); + void Initialize() override; - void OnCreatureCreate(Creature* pCreature); - void OnObjectCreate(GameObject* pGo); + void OnCreatureCreate(Creature* pCreature) override; + void OnObjectCreate(GameObject* pGo) override; - void SetData(uint32 uiType, uint32 uiData); - uint32 GetData(uint32 uiType); - uint64 GetData64(uint32 uiData); + void SetData(uint32 uiType, uint32 uiData) override; + uint32 GetData(uint32 uiType) override; + uint64 GetData64(uint32 uiData) override; sBombFace* GetBombFaces(); void DoActivateBombFace(uint8 uiIndex); void DoDeactivateBombFace(uint8 uiIndex); - const char* Save() { return strInstData.c_str(); } - void Load(const char* chrIn); + const char* Save() override { return strInstData.c_str(); } + void Load(const char* chrIn) override; protected: uint32 m_auiEncounter[INSTANCE_GNOMEREGAN_MAX_ENCOUNTER]; diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/eastern_plaguelands.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/eastern_plaguelands.cpp index 32e7c61e5..5d50e8cfd 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/eastern_plaguelands.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/eastern_plaguelands.cpp @@ -43,7 +43,7 @@ struct npc_darrowshire_spiritAI : public ScriptedAI Reset(); } - void Reset() + void Reset() override { DoCastSpellIfCan(m_creature, SPELL_SPIRIT_SPAWNIN); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -214,7 +214,7 @@ struct npc_eris_havenfireAI : public ScriptedAI return me->GetMap()->GetPlayer(JoueurGUID); } - void Reset() + void Reset() override { Vague = 0; VillageoisMorts = 0; @@ -234,12 +234,12 @@ struct npc_eris_havenfireAI : public ScriptedAI VillageoisGUIDs[i] = 0; } - void AttackedBy(Unit* Attacker) + void AttackedBy(Unit* Attacker) override { return; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) override { if ((who->GetTypeId() == TYPEID_PLAYER || who->IsPet()) && CleanerSpawn == false && BeginQuete == true) { @@ -324,17 +324,9 @@ struct npc_eris_havenfireAI : public ScriptedAI mobsEntries.clear(); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) override { - float X = 0.0f; - float Y = 0.0f; - float Z = 0.0f; int Var = 0; - int var = 0; - uint64 GUIDs[50]; - - for (int i = 0; i < 50; i++) - GUIDs[i] = 0; switch (summoned->GetEntry()) { @@ -368,7 +360,7 @@ struct npc_eris_havenfireAI : public ScriptedAI } } - void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) + void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override { if (uiMotionType != POINT_MOTION_TYPE || !pSummoned) return; @@ -407,7 +399,7 @@ struct npc_eris_havenfireAI : public ScriptedAI } } - void SummonedCreatureJustDied(Creature* pSummoned) + void SummonedCreatureJustDied(Creature* pSummoned) override { if (!pSummoned) return; @@ -621,7 +613,7 @@ struct npc_eris_havenfireAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (BeginQuete == false || CleanerSpawn == true) return; @@ -744,7 +736,7 @@ struct npc_eris_havenfire_peasantAI : public ScriptedAI uint32 m_uiSayPeasantTimer; - void Reset() + void Reset() override { if (X == 0.0f && Y == 0.0f && Z == 0.0f) m_creature->GetRandomPoint(ErisHavenfireEvent[PaysantsDest].X, ErisHavenfireEvent[PaysantsDest].Y, ErisHavenfireEvent[PaysantsDest].Z, 5.0f, X, Y, Z); @@ -760,18 +752,18 @@ struct npc_eris_havenfire_peasantAI : public ScriptedAI m_uiSayPeasantTimer = urand(10000, 30000); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) override { } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit *done_by, uint32 &damage) override { if (done_by->GetEntry() == NPC_ARCHER) damage = urand(80, 105); } - void SpellHit(Unit* pCaster, const SpellEntry* pSpell) + void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override { if (pSpell->Id == SPELL_TIR_FLECHE) { @@ -800,11 +792,11 @@ struct npc_eris_havenfire_peasantAI : public ScriptedAI } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) override { } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE) return; @@ -820,7 +812,7 @@ struct npc_eris_havenfire_peasantAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (DeplacementRequis == true) { @@ -879,7 +871,7 @@ struct npc_demetriaAI : public ScriptedAI Reset(); } uint64 guidScarletTrooper[9]; - void MovementInform(uint32 movementType, uint32 moveId) + void MovementInform(uint32 movementType, uint32 moveId) override { if (movementType != WAYPOINT_MOTION_TYPE) return; @@ -912,7 +904,7 @@ struct npc_demetriaAI : public ScriptedAI m_creature->ForcedDespawn(); } } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { DespawnTroopers(); } @@ -933,7 +925,7 @@ struct npc_demetriaAI : public ScriptedAI uint32 Resurrect_Timer; uint8 PsychicScream_HealthCheck; - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (Resurrect_Timer < diff) { @@ -1010,7 +1002,7 @@ struct npc_demetriaAI : public ScriptedAI } DoMeleeAttackIfReady(); } - void Reset() + void Reset() override { MindBlast_Timer = 3000; ShadowWordPain_Timer = 9000; @@ -1141,7 +1133,7 @@ struct npc_darrowshire_triggerAI : public ScriptedAI ObjectGuid davilGuid; ObjectGuid horgusGuid; - void Reset() + void Reset() override { // Changement de faction nécessaire pour permettre l'aggro à vue Map::PlayerList const &pl = m_creature->GetMap()->GetPlayers(); @@ -1175,7 +1167,7 @@ struct npc_darrowshire_triggerAI : public ScriptedAI bool _cleanupDone; bool _initialized; - void OnRemoveFromWorld() + void OnRemoveFromWorld() override { if (_cleanupDone || !_initialized) return; @@ -1209,7 +1201,7 @@ struct npc_darrowshire_triggerAI : public ScriptedAI m_creature->DeleteLater(); } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) override { if (!summoned) return; @@ -1249,7 +1241,7 @@ struct npc_darrowshire_triggerAI : public ScriptedAI } } - void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) + void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override { if (uiMotionType != POINT_MOTION_TYPE || !pSummoned) return; @@ -1294,7 +1286,7 @@ struct npc_darrowshire_triggerAI : public ScriptedAI } } - void SummonedCreatureJustDied(Creature* pSummoned) + void SummonedCreatureJustDied(Creature* pSummoned) override { if (!pSummoned) return; @@ -1345,7 +1337,7 @@ struct npc_darrowshire_triggerAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!_initialized) { @@ -1689,7 +1681,7 @@ struct npc_joseph_redpathAI : public ScriptedAI uint32 EventStep; uint32 EventTimer; - void Reset() + void Reset() override { } @@ -1703,7 +1695,7 @@ struct npc_joseph_redpathAI : public ScriptedAI } } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE) return; @@ -1750,7 +1742,7 @@ struct npc_joseph_redpathAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (EventTimer && EventTimer <= uiDiff) { diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_anubrekhan.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_anubrekhan.cpp index 7a7d14c95..0762956c9 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_anubrekhan.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_anubrekhan.cpp @@ -229,7 +229,7 @@ struct boss_anubrekhanAI : public ScriptedAI deadCryptGuards.push_back(pSummoned->GetObjectGuid()); } - void Reset() + void Reset() override { m_uiImpaleTimer = IMPALE_CD(); m_uiLocustSwarmTimer = LOCUST_SWARM_CD(true); @@ -239,7 +239,6 @@ struct boss_anubrekhanAI : public ScriptedAI std::list scarabs; GetCreatureListWithEntryInGrid(scarabs, m_creature, MOB_CORPSE_SCARAB, 300.0f); - int count = 0; for (auto it = scarabs.begin(); it != scarabs.end();) { if (scarabs.size() < 31) @@ -284,7 +283,7 @@ struct boss_anubrekhanAI : public ScriptedAI CheckSpawnInitialCryptGuards(); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { // Scarabs are summoned by instance script when a player dies. // See instance_naxxramas::OnPlayerDeath(Player*) @@ -304,7 +303,7 @@ struct boss_anubrekhanAI : public ScriptedAI } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (!m_pInstance) return; @@ -322,13 +321,13 @@ struct boss_anubrekhanAI : public ScriptedAI DoScriptText(SAY_AGGRO3 + urand(0, 2), m_creature); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(TYPE_ANUB_REKHAN, DONE); } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* pWho) override { if (pWho->GetTypeId() == TYPEID_PLAYER && !m_creature->isInCombat() @@ -384,7 +383,7 @@ struct boss_anubrekhanAI : public ScriptedAI return false; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -501,7 +500,7 @@ struct mob_cryptguardsAI : public ScriptedAI cleaveTimer = CRYPTGUARD_CLEAVE_CD; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { // Make sure anub is pulled too. Anub will take care of pulling the other crypt-guard @@ -570,7 +569,7 @@ struct anub_doorAI : public GameObjectAI sLog.outError("anub_doorAI could not find instanceData"); } - bool OnUse(Unit* user) + bool OnUse(Unit* user) override { if (haveDoneIntro) return false; diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_faerlina.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_faerlina.cpp index f831266fc..cefb1330c 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_faerlina.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_faerlina.cpp @@ -95,7 +95,7 @@ struct boss_faerlinaAI : public ScriptedAI ObjectGuid followers[2] = { 0,0 }; ObjectGuid worshippers[4] = { 0,0,0,0 }; - void Reset() + void Reset() override { m_uiPoisonBoltVolleyTimer = INITIAL_POISONBOLT_VOLLEY_CD; m_uiRainOfFireTimer = RAINOFFIRE_INITIAL_CD; @@ -194,7 +194,7 @@ struct boss_faerlinaAI : public ScriptedAI CheckRespawnAdds(); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { DoScriptText(SAY_PULL, m_creature); @@ -212,7 +212,7 @@ struct boss_faerlinaAI : public ScriptedAI } } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* pWho) override { //todo aggro range if (m_creature->IsWithinDistInMap(pWho, 60.0f)) @@ -222,7 +222,7 @@ struct boss_faerlinaAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(pWho); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { if (pVictim->GetTypeId() != TYPEID_PLAYER) return; @@ -230,7 +230,7 @@ struct boss_faerlinaAI : public ScriptedAI DoScriptText(urand(0, 1) ? SAY_SLAY1 : SAY_SLAY2, m_creature); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { DoScriptText(SAY_DEATH, m_creature); @@ -238,7 +238,7 @@ struct boss_faerlinaAI : public ScriptedAI m_pInstance->SetData(TYPE_FAERLINA, DONE); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -323,7 +323,7 @@ struct mob_faerlina_rp : public ScriptedAI Reset(); } - void Reset() + void Reset() override { events.Reset(); events.ScheduleEvent(EVENT_KNEEL, Seconds(urand(5, 10))); diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_four_horsemen.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_four_horsemen.cpp index ec6f070d3..93abda85c 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_four_horsemen.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_four_horsemen.cpp @@ -209,7 +209,7 @@ struct boss_four_horsemen_shared : public ScriptedAI } } - void AttackStart(Unit* pWho) + void AttackStart(Unit* pWho) override { if (!m_bIsSpirit) ScriptedAI::AttackStart(pWho); @@ -394,7 +394,7 @@ struct boss_lady_blaumeuxAI : public boss_four_horsemen_shared Reset(); } - void Reset() + void Reset() override { boss_four_horsemen_shared::Reset(); if (m_bIsSpirit) @@ -406,7 +406,7 @@ struct boss_lady_blaumeuxAI : public boss_four_horsemen_shared } } - void Aggro(Unit *who) + void Aggro(Unit *who) override { if (m_bIsSpirit) return; @@ -417,7 +417,7 @@ struct boss_lady_blaumeuxAI : public boss_four_horsemen_shared m_events.ScheduleEvent(EVENT_BOSS_ABILITY, Seconds(12)); } - void KilledUnit(Unit* Victim) + void KilledUnit(Unit* Victim) override { // Not sure about that if (m_bIsSpirit) @@ -430,7 +430,7 @@ struct boss_lady_blaumeuxAI : public boss_four_horsemen_shared } } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { if (m_bIsSpirit) return; @@ -439,12 +439,12 @@ struct boss_lady_blaumeuxAI : public boss_four_horsemen_shared DoScriptText(SAY_BLAU_DEATH, m_creature); } - void SpellHitTarget(Unit *pTarget, const SpellEntry *pSpell) + void SpellHitTarget(Unit *pTarget, const SpellEntry *pSpell) override { boss_four_horsemen_shared::SpellHitTarget(pTarget, pSpell); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { AggroRadius(uiDiff); if (!m_bIsSpirit && (!m_creature->SelectHostileTarget() || !m_creature->getVictim())) @@ -502,7 +502,7 @@ struct boss_highlord_mograineAI : public boss_four_horsemen_shared Reset(); } - void Reset() + void Reset() override { boss_four_horsemen_shared::Reset(); if (m_bIsSpirit) @@ -517,7 +517,7 @@ struct boss_highlord_mograineAI : public boss_four_horsemen_shared specialSayCooldown = 12000; } uint32 specialSayCooldown; - void Aggro(Unit *who) + void Aggro(Unit *who) override { if (m_bIsSpirit) return; @@ -528,7 +528,7 @@ struct boss_highlord_mograineAI : public boss_four_horsemen_shared m_creature->CastSpell(m_creature, SPELL_RIGHTEOUS_FIRE, true); } - void KilledUnit(Unit* Victim) + void KilledUnit(Unit* Victim) override { // He is used for SM event too, sooo if (m_creature->GetMapId() != 533) @@ -545,7 +545,7 @@ struct boss_highlord_mograineAI : public boss_four_horsemen_shared } } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { if (m_bIsSpirit) return; @@ -554,7 +554,7 @@ struct boss_highlord_mograineAI : public boss_four_horsemen_shared DoScriptText(SAY_MOG_DEATH, m_creature); } - void SpellHitTarget(Unit *pTarget, const SpellEntry *pSpell) + void SpellHitTarget(Unit *pTarget, const SpellEntry *pSpell) override { boss_four_horsemen_shared::SpellHitTarget(pTarget, pSpell); if (pSpell->Id == 28882 && specialSayCooldown == 0) // Righteous Fire @@ -564,7 +564,7 @@ struct boss_highlord_mograineAI : public boss_four_horsemen_shared } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { AggroRadius(uiDiff); @@ -601,7 +601,7 @@ struct boss_thane_korthazzAI : public boss_four_horsemen_shared Reset(); } - void Reset() + void Reset() override { boss_four_horsemen_shared::Reset(); if (m_bIsSpirit) @@ -613,7 +613,7 @@ struct boss_thane_korthazzAI : public boss_four_horsemen_shared } } - void Aggro(Unit *who) + void Aggro(Unit *who) override { if (m_bIsSpirit) return; @@ -625,7 +625,7 @@ struct boss_thane_korthazzAI : public boss_four_horsemen_shared m_events.ScheduleEvent(EVENT_BOSS_ABILITY, Seconds(30)); } - void KilledUnit(Unit* Victim) + void KilledUnit(Unit* Victim) override { // Not sure about it if (m_bIsSpirit) @@ -638,7 +638,7 @@ struct boss_thane_korthazzAI : public boss_four_horsemen_shared } } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { if (m_bIsSpirit) return; @@ -647,12 +647,12 @@ struct boss_thane_korthazzAI : public boss_four_horsemen_shared DoScriptText(SAY_KORT_DEATH, m_creature); } - void SpellHitTarget(Unit *pTarget, const SpellEntry *pSpell) + void SpellHitTarget(Unit *pTarget, const SpellEntry *pSpell) override { boss_four_horsemen_shared::SpellHitTarget(pTarget, pSpell); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { AggroRadius(uiDiff); @@ -702,7 +702,7 @@ struct boss_sir_zeliekAI : public boss_four_horsemen_shared Reset(); } - void Reset() + void Reset() override { boss_four_horsemen_shared::Reset(); if (m_bIsSpirit) @@ -714,7 +714,7 @@ struct boss_sir_zeliekAI : public boss_four_horsemen_shared } } - void Aggro(Unit *who) + void Aggro(Unit *who) override { if (m_bIsSpirit) return; @@ -723,7 +723,7 @@ struct boss_sir_zeliekAI : public boss_four_horsemen_shared m_events.ScheduleEvent(EVENT_BOSS_ABILITY, Seconds(12)); } - void KilledUnit(Unit* Victim) + void KilledUnit(Unit* Victim) override { // Not sure about it if (m_bIsSpirit) @@ -745,12 +745,12 @@ struct boss_sir_zeliekAI : public boss_four_horsemen_shared DoScriptText(SAY_ZELI_DEATH, m_creature); } - void SpellHitTarget(Unit *pTarget, const SpellEntry *pSpell) + void SpellHitTarget(Unit *pTarget, const SpellEntry *pSpell) override { boss_four_horsemen_shared::SpellHitTarget(pTarget, pSpell); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { AggroRadius(uiDiff); diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_gluth.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_gluth.cpp index 0b143c6b2..fa62a4a6b 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_gluth.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_gluth.cpp @@ -90,7 +90,7 @@ struct boss_gluthAI : public ScriptedAI uint32 five_percent; - void Reset() + void Reset() override { m_events.Reset(); diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_gothik.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_gothik.cpp index 28c88fe71..50b52f92b 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_gothik.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_gothik.cpp @@ -99,7 +99,7 @@ struct boss_gothikAI : public ScriptedAI bool m_bRightSide; bool m_bJustTeleported; - void Reset() + void Reset() override { m_uiPhase = PHASE_SPEECH; @@ -130,7 +130,7 @@ struct boss_gothikAI : public ScriptedAI m_creature->SetCasterChaseDistance(40); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); @@ -164,13 +164,13 @@ struct boss_gothikAI : public ScriptedAI m_creature->NearTeleportTo(x, y, z, o); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { if (pVictim->GetTypeId() == TYPEID_PLAYER) DoScriptText(SAY_KILL, m_creature); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { DoScriptText(SAY_DEATH, m_creature); OpenTheGate(); @@ -178,7 +178,7 @@ struct boss_gothikAI : public ScriptedAI m_pInstance->SetData(TYPE_GOTHIK, DONE); } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) m_pInstance->SetData(TYPE_GOTHIK, FAIL); @@ -268,7 +268,7 @@ struct boss_gothikAI : public ScriptedAI } } - void SummonedCreatureJustDied(Creature* pSummoned) + void SummonedCreatureJustDied(Creature* pSummoned) override { if (!m_pInstance) return; @@ -362,7 +362,7 @@ struct boss_gothikAI : public ScriptedAI return (num_left < 1 || num_right < 1); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if(!m_creature->HasAura(SPELL_IMMUNE_ALL)) { @@ -487,7 +487,7 @@ struct boss_gothikAI : public ScriptedAI if (Unit* victim = m_creature->getVictim()) { bool unitIsRight = m_pInstance->IsInRightSideGothArea(victim); - if (m_bRightSide && !unitIsRight || !m_bRightSide && unitIsRight) + if ((m_bRightSide && !unitIsRight) || (!m_bRightSide && unitIsRight)) { m_creature->getThreatManager().modifyThreatPercent(victim, -100); m_creature->SelectHostileTarget(); @@ -685,7 +685,7 @@ struct gothikTriggerAI : public ScriptedAI { } - void Reset() + void Reset() override { m_creature->SetRespawnRadius(0.01f); m_creature->SetDefaultMovementType(RANDOM_MOTION_TYPE); @@ -694,7 +694,7 @@ struct gothikTriggerAI : public ScriptedAI void MoveInLineOfSight(Unit*) override {} void Aggro(Unit*) override {} void AttackStart(Unit*) override {} - void UpdateAI(const uint32 diff) {} + void UpdateAI(const uint32 diff) override {} }; CreatureAI* GetAI_GothikTrigger(Creature* pCreature) diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_grobbulus.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_grobbulus.cpp index e3416ed9f..0438e5e91 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_grobbulus.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_grobbulus.cpp @@ -246,8 +246,8 @@ struct grob_poison_cloud : public ScriptedAI untilDespawn = 70000; } - void AttackStart(Unit* /*pWho*/) { } - void MoveInLineOfSight(Unit* /*pWho*/) { } + void AttackStart(Unit* /*pWho*/) override { } + void MoveInLineOfSight(Unit* /*pWho*/) override { } void UpdateAI(const uint32 uiDiff) override { diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_heigan.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_heigan.cpp index 5ca603463..1ec8df588 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_heigan.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_heigan.cpp @@ -82,14 +82,14 @@ enum Phases }; -static const uint32 firstEruptionDBGUID = 533048; +//static const uint32 firstEruptionDBGUID = 533048; static const uint8 numSections = 4; -static const uint8 numEruptions[numSections] = { // count of sequential GO DBGUIDs in the respective section of the room +/*static const uint8 numEruptions[numSections] = { // count of sequential GO DBGUIDs in the respective section of the room 15, 25, 23, 13 -}; +};*/ // in tunnel static constexpr float safespotFissures[3][3] = @@ -130,7 +130,7 @@ struct boss_heiganAI : public ScriptedAI uint32 killCooldown; std::vector portedPlayersThisPhase; - void Reset() + void Reset() override { portedPlayersThisPhase.clear(); @@ -139,7 +139,7 @@ struct boss_heiganAI : public ScriptedAI currentPhase = PHASE_FIGHT; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); @@ -191,13 +191,13 @@ struct boss_heiganAI : public ScriptedAI ScriptedAI::AttackStart(pWho); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { if(!killCooldown) DoScriptText(SAY_SLAY, m_creature); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { DoScriptText(SAY_DEATH, m_creature); @@ -209,7 +209,7 @@ struct boss_heiganAI : public ScriptedAI } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) { @@ -438,7 +438,7 @@ struct boss_heiganAI : public ScriptedAI m_events.Repeat(Seconds(1)); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { // This will avoid him running off the platform during dance phase. if (currentPhase == PHASE_FIGHT) @@ -512,8 +512,8 @@ struct mob_plague_cloudAI : public ScriptedAI m_creature->SetRooted(true); } - void AttackStart(Unit*) { } - void MoveInLineOfSight(Unit*) { } + void AttackStart(Unit*) override { } + void MoveInLineOfSight(Unit*) override { } void UpdateAI(const uint32) override { } }; diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_kelthuzad.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_kelthuzad.cpp index 974591898..383931186 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_kelthuzad.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_kelthuzad.cpp @@ -63,10 +63,6 @@ enum SPELL_DISPELL_SHACKLES = 28471, // not used, doing it "manually" }; -static float M_F_ANGLE = 0.2f; // to adjust for map rotation -static float M_F_HEIGHT = 2.0f; // adjust for height difference -static float M_F_RANGE = 55.0f; // ~ range from center of chamber to center of alcove -static float centerCoord[3] = { 3716.379883f, -5106.779785f, 141.289993f }; enum AddSpells { // guardian of icecrown @@ -234,7 +230,7 @@ struct kt_p1AddAI : public ScriptedAI hasAggroed = false; } bool hasAggroed; - virtual void Reset() = 0; + void Reset() override = 0; void ActualAttack(Unit* target) { m_creature->AddThreat(target, 300.0f); @@ -301,7 +297,7 @@ struct boss_kelthuzadAI : public ScriptedAI uint32 timeSinceLastAEFrostBolt; uint32 killSayTimer; - void Reset() + void Reset() override { m_creature->SetHealth(m_creature->GetMaxHealth()); events.Reset(); @@ -341,7 +337,7 @@ struct boss_kelthuzadAI : public ScriptedAI } } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { if (!killSayTimer) { @@ -350,7 +346,7 @@ struct boss_kelthuzadAI : public ScriptedAI } } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { DoScriptText(SAY_DEATH, m_creature); if (m_pInstance) @@ -379,7 +375,7 @@ struct boss_kelthuzadAI : public ScriptedAI m_creature->SetInCombatWithZone(); } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) { @@ -528,9 +524,6 @@ struct boss_kelthuzadAI : public ScriptedAI { if (numSkeletons < 120) { - - float t = 3.0f / 150.0f * (p1Timer / 1000.0f - 150.0f); - uint32 repeat_next = std::max(uint32(t * 1000 + 2000), uint32(2000)); if (SpawnAndSendP1Creature(NPC_SOLDIER_FROZEN)) { uint32 repeat_next = std::max(uint32(3750 - 25 * numSkeletons), uint32(2000)); @@ -786,7 +779,7 @@ struct boss_kelthuzadAI : public ScriptedAI DoMeleeAttackIfReady(); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_pInstance) return; diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_loatheb.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_loatheb.cpp index 4cb6bdec1..8b59b1861 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_loatheb.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_loatheb.cpp @@ -115,7 +115,7 @@ struct mob_rottingMaggotAI : public ScriptedAI m_creature->GetPosition(aggroPossition); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -183,7 +183,7 @@ struct mob_eyeStalkAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { m_creature->SetNoCallAssistance(true); timeSinceSpawn += std::min(uiDiff, std::numeric_limits::max() - timeSinceSpawn); @@ -248,13 +248,13 @@ struct boss_loathebAI : public ScriptedAI std::vector availableEyeLocs; EyeStalkInfo eyeStalks[MAX_STALKS_UP]; - void Reset() + void Reset() override { events.Reset(); numDooms = 0; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { numDooms = 0; events.ScheduleEvent(EVENT_SUMMON_SPORE, Seconds(13)); @@ -266,13 +266,13 @@ struct boss_loathebAI : public ScriptedAI m_pInstance->SetData(TYPE_LOATHEB, IN_PROGRESS); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(TYPE_LOATHEB, DONE); } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) m_pInstance->SetData(TYPE_LOATHEB, FAIL); @@ -378,7 +378,7 @@ struct boss_loathebAI : public ScriptedAI } } - virtual void SummonedCreatureJustDied(Creature* pCreature) + void SummonedCreatureJustDied(Creature* pCreature) override { if (pCreature->GetEntry() == NPC_EyeStalk) { @@ -403,7 +403,7 @@ struct boss_loathebAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { WhackAStalk(uiDiff); diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_maexxna.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_maexxna.cpp index 66b54d415..f62a77576 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_maexxna.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_maexxna.cpp @@ -182,7 +182,7 @@ struct boss_maexxnaAI : public ScriptedAI {3493.35f, -3834.06f, 318.71f} }; - void Reset() + void Reset() override { m_uiWebWrapTimer = WebWrapCooldown(true); m_uiWebSprayTimer = WebSprayCooldown(true); @@ -194,13 +194,13 @@ struct boss_maexxnaAI : public ScriptedAI wraps2.clear(); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (m_pInstance) m_pInstance->SetData(TYPE_MAEXXNA, IN_PROGRESS); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(TYPE_MAEXXNA, DONE); @@ -280,7 +280,6 @@ struct boss_maexxnaAI : public ScriptedAI float dx = pTarget->GetPositionX() - wepWrapLoc[i][0]; float dy = pTarget->GetPositionY() - wepWrapLoc[i][1]; float dist = sqrt((dx * dx) + (dy * dy)); - const float distXY = (dist > 0 ? dist : 0); float yDist = wepWrapLoc[i][2] - pTarget->GetPositionZ(); // todo: to avoid ever hitting the overhanging ceiling we would need to adjust the horizontal @@ -364,7 +363,7 @@ struct boss_maexxnaAI : public ScriptedAI wraps.clear(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_noth.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_noth.cpp index f7383790c..10a7863bf 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_noth.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_noth.cpp @@ -88,14 +88,6 @@ static const uint8 g1_start = 0, g1_size = 4; static const uint8 g2_start = 4, g2_size = 4; static const uint8 g3_start = 8, g3_size = 2; -static const uint32 GuardianSpells[4] = -{ - SPELL_SUM_GUARD_NE, - SPELL_SUM_GUARD_NW, - SPELL_SUM_GUARD_SW1, - SPELL_SUM_GUARD_SW2, -}; - enum eScriptText { SAY_AGGRO1 = -1533075, @@ -146,7 +138,7 @@ struct boss_nothAI : public ScriptedAI uint32 killSayCooldown; EventMap m_events; bool isOnBalc; - void Reset() + void Reset() override { isOnBalc = false; phaseCounter = 0; @@ -167,7 +159,7 @@ struct boss_nothAI : public ScriptedAI } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); @@ -362,17 +354,17 @@ struct boss_nothAI : public ScriptedAI } } - virtual void SummonedCreatureJustDied(Creature* unit) + void SummonedCreatureJustDied(Creature* unit) override { unit->ForcedDespawn(3000); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { pSummoned->SetInCombatWithZone(); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { if (!killSayCooldown) { @@ -381,7 +373,7 @@ struct boss_nothAI : public ScriptedAI } } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { DoScriptText(SAY_DEATH, m_creature); @@ -389,7 +381,7 @@ struct boss_nothAI : public ScriptedAI m_pInstance->SetData(TYPE_NOTH, DONE); } - void AttackStart(Unit* pWho) + void AttackStart(Unit* pWho) override { if (!isOnBalc) ScriptedAI::AttackStart(pWho); @@ -399,7 +391,7 @@ struct boss_nothAI : public ScriptedAI if (isOnBalc && uiDamage > 0) uiDamage = 0; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!isOnBalc) { diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_patchwerk.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_patchwerk.cpp index 117862cd4..ff441ce55 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_patchwerk.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_patchwerk.cpp @@ -73,7 +73,7 @@ struct boss_patchwerkAI : public ScriptedAI bool m_bBerserk; ObjectGuid previousTarget; - void Reset() + void Reset() override { m_events.Reset(); m_bEnraged = false; @@ -81,7 +81,7 @@ struct boss_patchwerkAI : public ScriptedAI previousTarget = 0; } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { if (urand(0, 4)) return; @@ -89,7 +89,7 @@ struct boss_patchwerkAI : public ScriptedAI DoScriptText(SAY_SLAY, m_creature); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { DoScriptText(SAY_DEATH, m_creature); @@ -103,7 +103,7 @@ struct boss_patchwerkAI : public ScriptedAI m_pInstance->SetData(TYPE_PATCHWERK, FAIL); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { DoScriptText(urand(0, 1) ? SAY_AGGRO1 : SAY_AGGRO2, m_creature); @@ -224,7 +224,7 @@ struct boss_patchwerkAI : public ScriptedAI return false; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!CustomGetTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_razuvious.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_razuvious.cpp index 55d7a2d8d..609fbe6f2 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_razuvious.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_razuvious.cpp @@ -82,7 +82,7 @@ struct mob_deathknightUnderstudyAI : public ScriptedAI uint32 attackTimer; bool runAttack; - void Reset() + void Reset() override { m_creature->HandleEmote(EMOTE_STATE_READY1H); attackTimer = urand(5000, 10000); @@ -131,7 +131,7 @@ struct boss_razuviousAI : public ScriptedAI EventMap rpEvents; ObjectGuid rpBuddy; - void Reset() + void Reset() override { events.Reset(); } @@ -194,14 +194,14 @@ struct boss_razuviousAI : public ScriptedAI RespawnAdds(); } - void KilledUnit(Unit* Victim) + void KilledUnit(Unit* Victim) override { if (urand(0, 3)) return; DoScriptText(urand(SAY_SLAY2, SAY_SLAY1), m_creature); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { DoScriptText(SAY_DEATH, m_creature); DoCastSpellIfCan(m_creature, SPELL_HOPELESS, CF_TRIGGERED); @@ -209,7 +209,7 @@ struct boss_razuviousAI : public ScriptedAI m_pInstance->SetData(TYPE_RAZUVIOUS, DONE); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { DoScriptText(urand(SAY_AGGRO3, SAY_AGGRO1), m_creature); @@ -306,7 +306,7 @@ struct boss_razuviousAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->isInCombat()) UpdateRP(uiDiff); diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_sapphiron.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_sapphiron.cpp index 3c8e3b6bb..11c026b9e 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_sapphiron.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_sapphiron.cpp @@ -146,7 +146,7 @@ struct boss_sapphironAI : public ScriptedAI uint32 m_forceTargetUpdateTimer; uint32 m_TargetNotReachableTimer; - void Reset() + void Reset() override { pullCheckTimer = 0; phase = PHASE_GROUND; @@ -216,7 +216,7 @@ struct boss_sapphironAI : public ScriptedAI } } - void AttackStart(Unit* who) + void AttackStart(Unit* who) override { if (phase != PHASE_GROUND) return; @@ -309,7 +309,7 @@ struct boss_sapphironAI : public ScriptedAI } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (phase != PHASE_GROUND) return; @@ -323,7 +323,7 @@ struct boss_sapphironAI : public ScriptedAI events.ScheduleEvent(EVENT_CLEAVE, Seconds(5)); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { m_creature->CastSpell(m_creature, SPELL_SAPPHIRON_DIES, true); UnSummonWingBuffet(); @@ -695,7 +695,7 @@ struct npc_sapphiron_blizzardAI : public ScriptedAI { } - void AttackStart(Unit*) + void AttackStart(Unit*) override { return; } @@ -705,7 +705,7 @@ struct npc_sapphiron_blizzardAI : public ScriptedAI return; } - void Aggro(Unit*) + void Aggro(Unit*) override { return; } diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_thaddius.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_thaddius.cpp index 531ca92bd..96652bf5a 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_thaddius.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/boss_thaddius.cpp @@ -134,7 +134,7 @@ enum thaddiusEvents -static constexpr uint32 ADDS_RESPAWN_TIMER = 5000; // adds respawn after 5 sec if not both area killed in that window. +//static constexpr uint32 ADDS_RESPAWN_TIMER = 5000; // adds respawn after 5 sec if not both area killed in that window. static constexpr uint32 ENRAGE_TIMER = 1000 * 60 * 5; // 5 min enrage once p2 starts diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/instance_naxxramas.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/instance_naxxramas.cpp index 390d1cfd1..1a54a54e8 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/instance_naxxramas.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/instance_naxxramas.cpp @@ -894,7 +894,6 @@ void instance_naxxramas::SetData(uint32 uiType, uint32 uiData) { if (Player* pPlayer = i->getSource()) { - uint32 current_reputation_rank1 = pPlayer->GetReputationMgr().GetRank(factionEntry); pPlayer->GetReputationMgr().ModifyReputation(factionEntry, 100); } } @@ -1543,7 +1542,7 @@ struct mob_naxxramasGarboyleAI : public ScriptedAI goStoneform(); } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* pWho) override { if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE)) { @@ -1562,7 +1561,7 @@ struct mob_naxxramasGarboyleAI : public ScriptedAI } } - void Aggro(Unit*) + void Aggro(Unit*) override { if (m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE)) { @@ -1570,7 +1569,7 @@ struct mob_naxxramasGarboyleAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -1629,12 +1628,12 @@ struct mob_naxxramasPlagueSlimeAI : public ScriptedAI ChangeColor(); } - void Aggro(Unit*) + void Aggro(Unit*) override { m_creature->CallForHelp(10.0f); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -1665,8 +1664,8 @@ struct mob_toxic_tunnelAI : public ScriptedAI _evadeTimer = 0; } - void AttackStart(Unit*) { } - void MoveInLineOfSight(Unit*) { } + void AttackStart(Unit*) override { } + void MoveInLineOfSight(Unit*) override { } void EnterCombat(Unit*) override { @@ -1735,7 +1734,7 @@ struct mob_dark_touched_warriorAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -1783,16 +1782,16 @@ bool GossipHello_npc_ArchmageTarsis(Player* pPlayer, Creature* pCreature) return false; } -static constexpr char* tailorText = "I am a master tailor, Omarion"; -static constexpr char* blacksmithText = "I am a master blacksmith, Omarion"; -static constexpr char* leatherworkerText = "I am a master leatherworker, Omarion"; -static constexpr char* nocraftText = "Omarion, I am not a craftsman. Can you still help me?"; -static constexpr char* close_nocrafter = "Thank you, Omarion. You have taken a fatal blow for the team on this day."; -static constexpr char* close_crafter = "I need to go. Evil stirs. Die well, Omarion."; - enum OmarionMisc { QUEST_OMARIONS_HANDBOOK = 9233, + BC_TAILOR_TEXT = 12251, // I am a master tailor, Omarion. + BC_BLACKSMITH_TEXT = 12269, // I am a master blacksmith, Omarion. + BC_LEATHERWORKER_TEXT = 12257, // I am a master leatherworker, Omarion. + BC_NO_CRAFT_TEXT = 12279, // Omarion, I am not a craftsman. Can you still help me? + BC_CLOSE_NO_CRAFTER = 12281, // Thank you, Omarion. You have taken a fatal blow for the team on this day. + BC_CLOSE_CRAFTER = 12270, // I need to go. Evil stirs. Die well, Omarion. + GOSSIP_MENU_INTRO = 8507, GOSSIP_MENU_CRAFTER = 8508, GOSSIP_MENU_NOCRAFT = 8516, @@ -1878,7 +1877,7 @@ bool GossipSelect_npc_MasterCraftsmanOmarion(Player* pPlayer, Creature* pCreatur pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Glacial Vest" , GOSSIP_SELECT_TAILOR, GOSSIP_SELECT_GLACIAL_CHEST); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Glacial Cloak", GOSSIP_SELECT_TAILOR, GOSSIP_SELECT_GLACIAL_CLOAK); } - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, close_crafter, GOSSIP_SELECT_TAILOR, GOSSIP_CLOSE); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, BC_CLOSE_CRAFTER, GOSSIP_SELECT_TAILOR, GOSSIP_CLOSE); pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_CRAFTER, pCreature->GetGUID()); return true; case GOSSIP_SELECT_BS: @@ -1891,7 +1890,7 @@ bool GossipSelect_npc_MasterCraftsmanOmarion(Player* pPlayer, Creature* pCreatur { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Icebane Breastplate", GOSSIP_SELECT_BS, GOSSIP_SELECT_ICEBANE_CHEST); } - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, close_crafter, GOSSIP_SELECT_BS, GOSSIP_CLOSE); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, BC_CLOSE_CRAFTER, GOSSIP_SELECT_BS, GOSSIP_CLOSE); pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_CRAFTER, pCreature->GetGUID()); return true; case GOSSIP_SELECT_LW: @@ -1908,14 +1907,14 @@ bool GossipSelect_npc_MasterCraftsmanOmarion(Player* pPlayer, Creature* pCreatur pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Polar Tunic", GOSSIP_SELECT_LW, GOSSIP_SELECT_POLAR_CHEST); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Icy Scale Breastplate", GOSSIP_SELECT_LW, GOSSIP_SELECT_ICYSCALE_CHEST); } - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, close_crafter, GOSSIP_SELECT_LW, GOSSIP_CLOSE); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, BC_CLOSE_CRAFTER, GOSSIP_SELECT_LW, GOSSIP_CLOSE); pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_CRAFTER, pCreature->GetGUID()); return true; case GOSSIP_SELECT_NOCRAFT: { if (argentDawnRep >= BOOK_REQ_RANK) { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, close_nocrafter, GOSSIP_SENDER_MAIN, GOSSIP_CLOSE); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, BC_CLOSE_NO_CRAFTER, GOSSIP_SENDER_MAIN, GOSSIP_CLOSE); pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_NOCRAFT, pCreature->GetGUID()); if (!pPlayer->HasItemCount(22719, 1, true)) { @@ -1998,7 +1997,7 @@ bool GossipSelect_npc_MasterCraftsmanOmarion(Player* pPlayer, Creature* pCreatur } } - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, close_crafter, uiSender, GOSSIP_CLOSE); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, BC_CLOSE_CRAFTER, uiSender, GOSSIP_CLOSE); pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_CRAFTER, pCreature->GetGUID()); return true; } @@ -2010,13 +2009,13 @@ bool GossipHello_npc_MasterCraftsmanOmarion(Player* pPlayer, Creature* pCreature uint32 leatherworkSkill = pPlayer->GetSkillValue(SKILL_LEATHERWORKING); if(tailorSkill >= 225) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, tailorText, GOSSIP_SELECT_TAILOR, GOSSIP_SELECT_TAILOR); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, BC_TAILOR_TEXT, GOSSIP_SELECT_TAILOR, GOSSIP_SELECT_TAILOR); if(blacksmithSkill >= 225) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, blacksmithText, GOSSIP_SELECT_BS, GOSSIP_SELECT_BS); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, BC_BLACKSMITH_TEXT, GOSSIP_SELECT_BS, GOSSIP_SELECT_BS); if(leatherworkSkill >= 225) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, leatherworkerText, GOSSIP_SELECT_LW, GOSSIP_SELECT_LW); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, BC_LEATHERWORKER_TEXT, GOSSIP_SELECT_LW, GOSSIP_SELECT_LW); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, nocraftText, GOSSIP_SENDER_MAIN, GOSSIP_SELECT_NOCRAFT); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, BC_NO_CRAFT_TEXT, GOSSIP_SENDER_MAIN, GOSSIP_SELECT_NOCRAFT); pPlayer->SEND_GOSSIP_MENU(GOSSIP_MENU_INTRO, pCreature->GetGUID()); pCreature->HandleEmote(EMOTE_ONESHOT_LAUGH); diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/naxxramas.h b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/naxxramas.h index f5a932040..78ebf0ed3 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/naxxramas.h +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/naxxramas/naxxramas.h @@ -298,9 +298,9 @@ class instance_naxxramas : public ScriptedInstance { public: instance_naxxramas(Map* pMap); - ~instance_naxxramas() {} + ~instance_naxxramas() override {} - void Initialize(); + void Initialize() override; bool IsEncounterInProgress() const override; @@ -308,14 +308,14 @@ public: void OnObjectCreate(GameObject* pGo) override; void OnCreatureRespawn(Creature * pCreature) override; - void SetData(uint32 uiType, uint32 uiData); - uint32 GetData(uint32 uiType); - uint64 GetData64(uint32 uiData); + void SetData(uint32 uiType, uint32 uiData) override; + uint32 GetData(uint32 uiType) override; + uint64 GetData64(uint32 uiData) override; uint64 GetGOUuid(NaxxGOs which); - const char* Save() { return strInstData.c_str(); } - void Load(const char* chrIn); + const char* Save() override { return strInstData.c_str(); } + void Load (const char* chrIn) override; // goth void SetGothTriggers(); diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_baroness_anastari.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_baroness_anastari.cpp index 6a8add284..c2064b771 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_baroness_anastari.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_baroness_anastari.cpp @@ -61,7 +61,7 @@ struct boss_baroness_anastariAI : public ScriptedAI SpawnLocations old_Position; float PlayerHealth; - void Reset() + void Reset() override { BansheeWail_Timer = 1000; BansheeCurse_Timer = 11000; @@ -90,7 +90,7 @@ struct boss_baroness_anastariAI : public ScriptedAI old_Position.z = m_creature->GetPositionZ(); } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { if (m_pInstance) m_pInstance->SetData(TYPE_BARONESS, DONE); @@ -102,13 +102,13 @@ struct boss_baroness_anastariAI : public ScriptedAI if (Unit* pTarget = m_creature->GetMap()->GetUnit(PlayerGuids[i])) pTarget->RestoreFaction(); } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit *done_by, uint32 &damage) override { if (Possessed) damage = 0; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_cannon_master_willey.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_cannon_master_willey.cpp index e5a91c1a9..a90804629 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_cannon_master_willey.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_cannon_master_willey.cpp @@ -107,7 +107,7 @@ struct boss_cannon_master_willeyAI : public ScriptedAI uint32 m_uiShootTimer; uint32 m_uiSummonRiflemanTimer; - void Reset() + void Reset() override { ToggleGate(OPEN); @@ -125,7 +125,7 @@ struct boss_cannon_master_willeyAI : public ScriptedAI ToggleGate(CLOSED); } - void JustDied(Unit* Victim) + void JustDied(Unit* Victim) override { ToggleGate(OPEN); } diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_dathrohan_balnazzar.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_dathrohan_balnazzar.cpp index 6b65fafd0..fd3389cef 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_dathrohan_balnazzar.cpp @@ -119,7 +119,7 @@ struct boss_dathrohan_balnazzarAI : public ScriptedAI uint64 SleepPlayerGuid; float SleepPlayerAggro; - void Reset() + void Reset() override { m_uiCrusadersHammer_Timer = 8000; m_uiCrusaderStrike_Timer = 12000; @@ -142,7 +142,7 @@ struct boss_dathrohan_balnazzarAI : public ScriptedAI } - void JustDied(Unit* Victim) + void JustDied(Unit* Victim) override { m_creature->MonsterSay("Damn you mortals! All my plans of revenge, all my hate... all burned to ash..."); @@ -166,12 +166,12 @@ struct boss_dathrohan_balnazzarAI : public ScriptedAI } } - void Aggro(Unit* /*pWho*/) + void Aggro(Unit* /*pWho*/) override { m_creature->MonsterYell("Today you have unmade what took me years to create! For this you shall all die by my hand!"); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_magistrate_barthilas.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_magistrate_barthilas.cpp index 21ac41c92..2906e41b5 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_magistrate_barthilas.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_magistrate_barthilas.cpp @@ -29,7 +29,7 @@ struct boss_magistrate_barthilasAI : public ScriptedAI uint32 m_mvt_timer; char m_mvt_id; - void Reset() + void Reset() override { DrainingBlow_Timer = 16000; CrowdPummel_Timer = 12000; @@ -45,7 +45,7 @@ struct boss_magistrate_barthilasAI : public ScriptedAI m_creature->SetDisplayId(MODEL_HUMAN); } - void ReceiveEmote(Player* pPlayer, uint32 emote) + void ReceiveEmote(Player* pPlayer, uint32 emote) override { if (emote == 1000 && m_mvt_id == 0) { @@ -67,7 +67,7 @@ struct boss_magistrate_barthilasAI : public ScriptedAI } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit *who) override { if (who->GetTypeId() == TYPEID_PLAYER && m_creature->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE) && m_creature->IsWithinDistInMap(who, 10.0f)) { @@ -76,12 +76,12 @@ struct boss_magistrate_barthilasAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { m_creature->SetDisplayId(MODEL_HUMAN); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (m_mvt_id > 0) { diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_maleki_the_pallid.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_maleki_the_pallid.cpp index a56339bd3..8f64ec4bb 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_maleki_the_pallid.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_maleki_the_pallid.cpp @@ -48,7 +48,7 @@ struct boss_maleki_the_pallidAI : public ScriptedAI bool NeedMoveCloser; - void Reset() + void Reset() override { Frostbolt_Timer = 1000; IceTomb_Timer = 12000; @@ -60,7 +60,7 @@ struct boss_maleki_the_pallidAI : public ScriptedAI NeedMoveCloser = false; } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { if (m_pInstance) m_pInstance->SetData(TYPE_PALLID, DONE); @@ -71,7 +71,7 @@ struct boss_maleki_the_pallidAI : public ScriptedAI return (((float)m_creature->GetPower(POWER_MANA) / (float)m_creature->GetMaxPower(POWER_MANA)) * 100); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_nerubenkan.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_nerubenkan.cpp index ac13ba493..9215e122b 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_nerubenkan.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_nerubenkan.cpp @@ -47,7 +47,7 @@ struct boss_nerubenkanAI : public ScriptedAI float WebbedPlayerAggro; - void Reset() + void Reset() override { EncasingWebs_Timer = 7000; PierceArmor_Timer = 15000; @@ -89,13 +89,13 @@ struct boss_nerubenkanAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { if (m_pInstance) m_pInstance->SetData(TYPE_NERUB, DONE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_order_of_silver_hand.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_order_of_silver_hand.cpp index 78c43855e..69ee1aef7 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_order_of_silver_hand.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_order_of_silver_hand.cpp @@ -54,7 +54,7 @@ struct boss_silver_hand_bossesAI : public ScriptedAI uint32 HolyLight_Timer; uint32 DivineShield_Timer; - void Reset() + void Reset() override { HolyLight_Timer = 20000; DivineShield_Timer = 20000; @@ -82,7 +82,7 @@ struct boss_silver_hand_bossesAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { if (m_pInstance) { @@ -109,7 +109,7 @@ struct boss_silver_hand_bossesAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_postmaster_malown.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_postmaster_malown.cpp index d9b6af317..de6abf5d3 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_postmaster_malown.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_postmaster_malown.cpp @@ -49,7 +49,7 @@ struct boss_postmaster_malownAI : public ScriptedAI uint32 CallOfTheGrave_Timer; bool HasYelled; - void Reset() + void Reset() override { WailingDead_Timer = 19000; //lasts 6 sec Backhand_Timer = 8000; //2 sec stun @@ -59,19 +59,19 @@ struct boss_postmaster_malownAI : public ScriptedAI HasYelled = false; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { DoScriptText(SAY_AGGRO, m_creature); ScriptedAI::Aggro(pWho); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { DoScriptText(SAY_KILLED, m_creature); ScriptedAI::KilledUnit(pVictim); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_ramstein_the_gorger.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_ramstein_the_gorger.cpp index d6083c724..b1329b6f4 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_ramstein_the_gorger.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_ramstein_the_gorger.cpp @@ -44,7 +44,7 @@ struct boss_ramstein_the_gorgerAI : public ScriptedAI uint32 Knockout_Timer; bool Engaged; - void Reset() + void Reset() override { Trample_Timer = 3000; Knockout_Timer = 12000; @@ -53,14 +53,14 @@ struct boss_ramstein_the_gorgerAI : public ScriptedAI Engaged = false; } - void Aggro(Unit *who) + void Aggro(Unit *who) override { Engaged = true; if (m_pInstance) m_pInstance->SetData(TYPE_RAMSTEIN, IN_PROGRESS); } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { for (uint8 i = 0; i < 25; ++i) { @@ -75,7 +75,7 @@ struct boss_ramstein_the_gorgerAI : public ScriptedAI m_pInstance->SetData(TYPE_RAMSTEIN, DONE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_timmy_the_cruel.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_timmy_the_cruel.cpp index 3369a300f..28829de24 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_timmy_the_cruel.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/boss_timmy_the_cruel.cpp @@ -39,12 +39,12 @@ struct boss_timmy_the_cruelAI : public ScriptedAI uint32 m_uiRavenousClawTimer; - void Reset() + void Reset() override { m_uiRavenousClawTimer = 7000; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { // Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) @@ -65,7 +65,7 @@ struct boss_timmy_the_cruelAI : public ScriptedAI DoMeleeAttackIfReady(); } - void CorpseRemoved(uint32 &respawnDelay) + void CorpseRemoved(uint32 &respawnDelay) override { m_creature->DeleteLater(); } @@ -92,14 +92,14 @@ struct npc_crimson_guardsmanAI : public ScriptedAI uint32 m_uiShieldBashTimer; uint32 m_uiShieldChargeTimer; - void Reset() + void Reset() override { m_uiDisarmTimer = 6000; m_uiShieldBashTimer = 4000; m_uiShieldChargeTimer = 1000; } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_bIsTimmySpawner) { @@ -119,7 +119,7 @@ struct npc_crimson_guardsmanAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { // Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/instance_stratholme.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/instance_stratholme.cpp index 11b40defb..79b30d42e 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/instance_stratholme.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/instance_stratholme.cpp @@ -129,7 +129,7 @@ struct instance_stratholme : public ScriptedInstance uint32 m_uiYsidaReward_Timer; uint32 m_uiPostboxesUsed; - void Initialize() + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -184,7 +184,7 @@ struct instance_stratholme : public ScriptedInstance m_uiPostboxesUsed = 0; } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < STRAT_MAX_ENCOUNTER; i++) if (m_auiEncounter[i] == IN_PROGRESS) @@ -236,7 +236,7 @@ struct instance_stratholme : public ScriptedInstance } } - void OnCreatureCreate(Creature* pCreature) + void OnCreatureCreate(Creature* pCreature) override { switch (pCreature->GetEntry()) { @@ -280,7 +280,7 @@ struct instance_stratholme : public ScriptedInstance npc_placeEcarlateGUID.insert(pCreature->GetGUID()); } - void OnGameObjectCreate(GameObject* pGo) + void OnGameObjectCreate(GameObject* pGo) override { switch (pGo->GetEntry()) { @@ -348,7 +348,7 @@ struct instance_stratholme : public ScriptedInstance } } - void OnCreatureDeath(Creature *who) + void OnCreatureDeath(Creature *who) override { switch (who->GetEntry()) { @@ -363,7 +363,7 @@ struct instance_stratholme : public ScriptedInstance } } - uint32 GetData(uint32 uiType) + uint32 GetData(uint32 uiType) override { switch (uiType) { @@ -377,7 +377,7 @@ struct instance_stratholme : public ScriptedInstance return 0; } - uint64 GetData64(uint32 uiData) + uint64 GetData64(uint32 uiData) override { switch (uiData) { @@ -395,7 +395,7 @@ struct instance_stratholme : public ScriptedInstance return 0; } - void SetData64(uint32 uiType, uint64 uiData) + void SetData64(uint32 uiType, uint64 uiData) override { switch (uiType) { @@ -404,7 +404,7 @@ struct instance_stratholme : public ScriptedInstance break; } } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) override { switch (uiType) { @@ -660,12 +660,12 @@ struct instance_stratholme : public ScriptedInstance /** Load / save system */ std::string strInstData; - const char* Save() + const char* Save() override { return strInstData.c_str(); } - void Load(const char* chrIn) + void Load(const char* chrIn) override { if (!chrIn) return; @@ -683,14 +683,14 @@ struct instance_stratholme : public ScriptedInstance bool JoueurDansPiegeRat1() { - float x1 = 3907.45f; - float y1 = -3550.41f; + //float x1 = 3907.45f; + //float y1 = -3550.41f; float x2 = 3909.34f; float y2 = -3540.14f; float x3 = 3930.1f; float y3 = -3554.4f; - float x4 = 3931.9f; - float y4 = -3544.6f; + //float x4 = 3931.9f; + //float y4 = -3544.6f; Map::PlayerList const &listeJoueur = instance->GetPlayers(); for (Map::PlayerList::const_iterator itr = listeJoueur.begin(); itr != listeJoueur.end(); ++itr) @@ -758,7 +758,7 @@ struct instance_stratholme : public ScriptedInstance } } - void Update(uint32 uiDiff) + void Update(uint32 uiDiff) override { if (m_uiBaronRun_Timer) { diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/stratholme.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/stratholme.cpp index 217f8f187..c2c19ae15 100644 --- a/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/stratholme.cpp +++ b/src/scripts/eastern_kingdoms/eastern_plaguelands/stratholme/stratholme.cpp @@ -109,7 +109,7 @@ struct mob_freed_soulAI : public ScriptedAI Reset(); } - void Reset() + void Reset() override { switch (urand(0, 3)) { @@ -155,14 +155,14 @@ struct mob_restless_soulAI : public ScriptedAI uint32 Die_Timer; bool Tagged; - void Reset() + void Reset() override { Tagger = 0; Die_Timer = 5000; Tagged = false; } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit *caster, const SpellEntry *spell) override { if (caster->GetTypeId() == TYPEID_PLAYER) { @@ -174,20 +174,20 @@ struct mob_restless_soulAI : public ScriptedAI } } - void JustSummoned(Creature *summoned) + void JustSummoned(Creature *summoned) override { summoned->CastSpell(summoned, SPELL_SOUL_FREED, false); if (Unit* temp = m_creature->GetMap()->GetUnit(Tagger)) summoned->GetMotionMaster()->MoveFollow(temp, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE); } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { if (Tagged) m_creature->SummonCreature(ENTRY_FREED, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 300000); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (Tagged) { @@ -230,20 +230,20 @@ struct mobs_spectral_ghostly_citizenAI : public ScriptedAI bool Tagged; bool hasEvadedOnce; - void Reset() + void Reset() override { Die_Timer = 5000; cast_Haunting = 20000; Tagged = false; } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit *caster, const SpellEntry *spell) override { if (!Tagged && spell->Id == SPELL_EGAN_BLASTER) Tagged = true; } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { if (Tagged) { @@ -260,7 +260,7 @@ struct mobs_spectral_ghostly_citizenAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (Tagged) { @@ -282,7 +282,7 @@ struct mobs_spectral_ghostly_citizenAI : public ScriptedAI DoMeleeAttackIfReady(); } - void ReceiveEmote(Player* pPlayer, uint32 emote) + void ReceiveEmote(Player* pPlayer, uint32 emote) override { switch (emote) { @@ -336,9 +336,9 @@ struct mobs_cristal_zugguratAI : public ScriptedAI uint32 uiUpdateTimer; std::list acolyte; - void Reset() {} + void Reset() override {} - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { if (Creature* pop = m_creature->SummonCreature(10399, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ() - 100, 0, TEMPSUMMON_TIMED_DESPAWN, 1)) { @@ -352,7 +352,7 @@ struct mobs_cristal_zugguratAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->isAlive() || !m_pInstance) return; @@ -417,14 +417,14 @@ struct AI_mobs_rat_pestifere : public ScriptedAI float m_yOrigine; float m_zOrigine; - void Reset() + void Reset() override { m_idRat = 0; m_mvt_id = 0; m_mvt_timer = 0; } - void ReceiveEmote(Player* pPlayer, uint32 emote) + void ReceiveEmote(Player* pPlayer, uint32 emote) override { if (emote < 1000) return; @@ -464,7 +464,7 @@ struct AI_mobs_rat_pestifere : public ScriptedAI m_mvt_id++; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (m_mvt_timer < diff && m_idRat > 0) { @@ -673,7 +673,7 @@ struct npc_auriusAI : public ScriptedAI uint32 ui_entry; bool bIsFakeDead; - void Reset() + void Reset() override { if (!m_pInstance) return; @@ -705,7 +705,7 @@ struct npc_auriusAI : public ScriptedAI } } - void DamageTaken(Unit* pDoneBy, uint32& uiDamage) + void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override { if (uiDamage >= m_creature->GetHealth()) { @@ -727,7 +727,7 @@ struct npc_auriusAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { switch (ui_entry) { @@ -831,14 +831,14 @@ struct npc_couloir_trigger1AI : public ScriptedAI bool CorridorEnded; bool ScourgeStarted; - void Reset() + void Reset() override { CorridorEnded = false; ScourgeStarted = false; m_uiScourgeTimer = urand(10*MINUTE*IN_MILLISECONDS, 20*MINUTE*IN_MILLISECONDS); } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 5.0f) && !CorridorEnded) { @@ -854,13 +854,13 @@ struct npc_couloir_trigger1AI : public ScriptedAI } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { if (pSummoned->GetEntry() == NPC_BERSERK || pSummoned->GetEntry() == NPC_GUARDIAN) pSummoned->SetInCombatWithZone(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (ScourgeStarted) { @@ -916,12 +916,12 @@ struct npc_couloir_trigger2AI : public ScriptedAI bool CorridorEnded; - void Reset() + void Reset() override { CorridorEnded = false; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 5.0f) && !CorridorEnded) { @@ -951,12 +951,12 @@ struct npc_couloir_trigger3AI : public ScriptedAI bool CorridorEnded; - void Reset() + void Reset() override { CorridorEnded = false; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 5.0f) && !CorridorEnded) { @@ -989,24 +989,24 @@ struct npc_Scourge_TriggerAI : public ScriptedAI uint32 m_uiScourgeTimer; bool ScourgeStarted; - void Reset() + void Reset() override { m_uiScourgeTimer = urand(10*MINUTE*IN_MILLISECONDS, 20*MINUTE*IN_MILLISECONDS); // 15 - 30 mn urand(1000000, 1800000); ScourgeStarted = false; } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 5.0f) && !ScourgeStarted) ScourgeStarted = true; } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { pSummoned->SetInCombatWithZone(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (ScourgeStarted) { @@ -1062,7 +1062,7 @@ struct go_supply_crateAI: public GameObjectAI { go_supply_crateAI(GameObject* pGo) : GameObjectAI(pGo) {} - bool OnUse(Unit* pUser) + bool OnUse(Unit* pUser) override { uint32 maxplagued = urand(1, 4); @@ -1109,11 +1109,11 @@ struct npc_piege_grille1AI : public ScriptedAI Reset(); } - void Reset() + void Reset() override { } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 4.0f)) { @@ -1166,11 +1166,11 @@ struct npc_piege_grille2AI : public ScriptedAI Reset(); } - void Reset() + void Reset() override { } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) override { if (who->GetTypeId() == TYPEID_PLAYER && m_creature->IsWithinDistInMap(who, 3.0f)) { diff --git a/src/scripts/eastern_kingdoms/elwynn_forest/elwynn_forest.cpp b/src/scripts/eastern_kingdoms/elwynn_forest/elwynn_forest.cpp index 1b7f81170..dc644c369 100644 --- a/src/scripts/eastern_kingdoms/elwynn_forest/elwynn_forest.cpp +++ b/src/scripts/eastern_kingdoms/elwynn_forest/elwynn_forest.cpp @@ -43,7 +43,7 @@ struct npc_henze_faulkAI : public ScriptedAI Reset(); } - void Reset() + void Reset() override { lifeTimer = 120000; m_creature->SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD); @@ -51,9 +51,9 @@ struct npc_henze_faulkAI : public ScriptedAI spellHit = false; } - void MoveInLineOfSight(Unit *who) { } + void MoveInLineOfSight(Unit *who) override { } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (m_creature->IsStandingUp()) { @@ -64,7 +64,7 @@ struct npc_henze_faulkAI : public ScriptedAI } } - void SpellHit(Unit *Hitter, const SpellEntry *Spellkind) + void SpellHit(Unit *Hitter, const SpellEntry *Spellkind) override { if (Spellkind->Id == 8593 && !spellHit) { @@ -101,7 +101,7 @@ struct go_marshal_haggards_chestAI: public GameObjectAI uint32 timer; bool state;//0 = usual, can launch. //1 = in use, cannot launch - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (state) { diff --git a/src/scripts/eastern_kingdoms/hillsbrad_foothills/hillsbrad_foothills.cpp b/src/scripts/eastern_kingdoms/hillsbrad_foothills/hillsbrad_foothills.cpp index 5387715e3..6bf18983b 100644 --- a/src/scripts/eastern_kingdoms/hillsbrad_foothills/hillsbrad_foothills.cpp +++ b/src/scripts/eastern_kingdoms/hillsbrad_foothills/hillsbrad_foothills.cpp @@ -65,7 +65,7 @@ struct go_dusty_rugAI: public GameObjectAI GuidList Farmers; uint8 step;//0 = usual, nothing giong on // 1+ event going on - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (step) { diff --git a/src/scripts/eastern_kingdoms/hinterlands/hinterlands.cpp b/src/scripts/eastern_kingdoms/hinterlands/hinterlands.cpp index d9dec33d6..8813194e9 100644 --- a/src/scripts/eastern_kingdoms/hinterlands/hinterlands.cpp +++ b/src/scripts/eastern_kingdoms/hinterlands/hinterlands.cpp @@ -79,13 +79,13 @@ struct npc_rinjiAI : public npc_escortAI uint32 m_uiPostEventTimer; int m_iSpawnId; - void Reset() + void Reset() override { m_uiPostEventCount = 0; m_uiPostEventTimer = 3000; } - void JustRespawned() + void JustRespawned() override { m_bIsByOutrunner = false; m_iSpawnId = 0; @@ -93,7 +93,7 @@ struct npc_rinjiAI : public npc_escortAI npc_escortAI::JustRespawned(); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -128,13 +128,13 @@ struct npc_rinjiAI : public npc_escortAI } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { pSummoned->SetWalk(false); pSummoned->GetMotionMaster()->MovePoint(0, m_afAmbushMoveTo[m_iSpawnId].m_fX, m_afAmbushMoveTo[m_iSpawnId].m_fY, m_afAmbushMoveTo[m_iSpawnId].m_fZ); } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { Player* pPlayer = GetPlayerForEscort(); @@ -161,7 +161,7 @@ struct npc_rinjiAI : public npc_escortAI } } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { //Check if we have a current target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) @@ -239,7 +239,7 @@ struct go_lards_picnic_basketAI: public GameObjectAI uint32 timer; bool state;//0 = usual, can launch. //1 = in use, cannot launch - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (state) { diff --git a/src/scripts/eastern_kingdoms/loch_modan/loch_modan.cpp b/src/scripts/eastern_kingdoms/loch_modan/loch_modan.cpp index 37082f3fd..e8abc6efc 100644 --- a/src/scripts/eastern_kingdoms/loch_modan/loch_modan.cpp +++ b/src/scripts/eastern_kingdoms/loch_modan/loch_modan.cpp @@ -63,13 +63,13 @@ struct npc_miranAI: public npc_escortAI uint8 m_uiDwarves; - void Reset() + void Reset() override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) m_uiDwarves = 0; } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { switch (uiPointId) { @@ -86,7 +86,7 @@ struct npc_miranAI: public npc_escortAI } } - void SummonedCreatureJustDied(Creature* pSummoned) + void SummonedCreatureJustDied(Creature* pSummoned) override { if (pSummoned->GetEntry() == NPC_DARK_IRON_DWARF) { @@ -96,7 +96,7 @@ struct npc_miranAI: public npc_escortAI } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { if (pSummoned->GetEntry() == NPC_DARK_IRON_DWARF) { @@ -166,17 +166,17 @@ struct npc_saeanAI : public ScriptedAI m_eventStarted = false; } - void Reset() { } + void Reset() override { } // called when Saean summons his guards - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { // optimization: safely assume, that m_numSummonedAmbushers don't go outside range m_darkIronAmbusher[m_numSummonedAmbushers] = pSummoned; ++m_numSummonedAmbushers; } - void JustDied(Unit* pVictim) + void JustDied(Unit* pVictim) override { // It is safe to forget about ambushers, they will despawn automatically. for (ptrdiff_t i = 0; i < 2; ++i) diff --git a/src/scripts/eastern_kingdoms/silverpine_forest/silverpine_forest.cpp b/src/scripts/eastern_kingdoms/silverpine_forest/silverpine_forest.cpp index ed8906abb..83979e048 100644 --- a/src/scripts/eastern_kingdoms/silverpine_forest/silverpine_forest.cpp +++ b/src/scripts/eastern_kingdoms/silverpine_forest/silverpine_forest.cpp @@ -40,12 +40,12 @@ struct npc_astor_hadrenAI : public ScriptedAI Reset(); } - void Reset() + void Reset() override { m_creature->setFaction(68); } - void JustDied(Unit *who) + void JustDied(Unit *who) override { m_creature->setFaction(68); } @@ -120,7 +120,7 @@ struct npc_deathstalker_erlandAI : public npc_escortAI uint64 uiRaneGUID; uint64 uiQuinnGUID; - void MoveInLineOfSight(Unit* pUnit) + void MoveInLineOfSight(Unit* pUnit) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -139,7 +139,7 @@ struct npc_deathstalker_erlandAI : public npc_escortAI npc_escortAI::MoveInLineOfSight(pUnit); } - void WaypointReached(uint32 i) + void WaypointReached(uint32 i) override { Player* pPlayer = GetPlayerForEscort(); @@ -178,7 +178,7 @@ struct npc_deathstalker_erlandAI : public npc_escortAI } } - void Reset() + void Reset() override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -187,7 +187,7 @@ struct npc_deathstalker_erlandAI : public npc_escortAI } } - void Aggro(Unit* who) + void Aggro(Unit* who) override { switch (urand(0, 2)) { @@ -552,7 +552,7 @@ struct npc_human_worgenAI : public ScriptedAI { return m_creature->GetEntry() == m_uiWorgenEntry; } - void Reset() + void Reset() override { m_bIsInDefenseStance = false; m_uiShieldBlock_Timer = 3000; @@ -567,7 +567,7 @@ struct npc_human_worgenAI : public ScriptedAI #endif } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { time_t rawtime; time(&rawtime); diff --git a/src/scripts/eastern_kingdoms/stormwind_city/quest_stormwind_rendezvous.cpp b/src/scripts/eastern_kingdoms/stormwind_city/quest_stormwind_rendezvous.cpp index c1611dae6..a6d903618 100644 --- a/src/scripts/eastern_kingdoms/stormwind_city/quest_stormwind_rendezvous.cpp +++ b/src/scripts/eastern_kingdoms/stormwind_city/quest_stormwind_rendezvous.cpp @@ -746,7 +746,7 @@ void npc_reginald_windsorAI::UpdateAI(const uint32 uiDiff) if (!CombatJustEnded) { Bolvar->SetWalk(true); - Bolvar->GetMotionMaster()->MovePoint(0, -8447.39f, 335.35f, 121.747f, 1.29f); + Bolvar->GetMotionMaster()->MovePoint(0, -8447.39f, 335.35f, 121.747f, 0, 0, 1.29f); CombatJustEnded = true; Timer = 5000; Tick = 68; diff --git a/src/scripts/eastern_kingdoms/stormwind_city/stormwind_city.cpp b/src/scripts/eastern_kingdoms/stormwind_city/stormwind_city.cpp index 55de24b6e..d9bf5d6c6 100644 --- a/src/scripts/eastern_kingdoms/stormwind_city/stormwind_city.cpp +++ b/src/scripts/eastern_kingdoms/stormwind_city/stormwind_city.cpp @@ -50,13 +50,13 @@ struct npc_bartlebyAI : public ScriptedAI uint32 m_uiNormalFaction; - void Reset() + void Reset() override { if (m_creature->getFaction() != m_uiNormalFaction) m_creature->setFaction(m_uiNormalFaction); } - void AttackedBy(Unit* pAttacker) + void AttackedBy(Unit* pAttacker) override { if (!pAttacker || m_creature->getVictim() || m_creature->IsFriendlyTo(pAttacker)) return; @@ -64,7 +64,7 @@ struct npc_bartlebyAI : public ScriptedAI AttackStart(pAttacker); } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) override { if (!pDoneBy) return; @@ -168,7 +168,7 @@ struct npc_dashel_stonefistAI : public ScriptedAI } // Prevent Reset() call after Dashel has been defeated. - void AttackedBy(Unit* pAttacker) + void AttackedBy(Unit* pAttacker) override { if (!pAttacker || m_creature->getVictim() || m_creature->IsFriendlyTo(pAttacker)) return; @@ -176,7 +176,7 @@ struct npc_dashel_stonefistAI : public ScriptedAI AttackStart(pAttacker); } - void Reset() + void Reset() override { if (m_questFightStarted) { @@ -212,7 +212,7 @@ struct npc_dashel_stonefistAI : public ScriptedAI m_playerGuid.Clear(); } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) override { if (m_questFightStarted) { @@ -256,7 +256,7 @@ struct npc_dashel_stonefistAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { switch (m_eventPhase) { @@ -377,7 +377,7 @@ struct npc_dashel_stonefistAI : public ScriptedAI } } - void JustDied(Unit* pUnit) + void JustDied(Unit* pUnit) override { // case: something weird happened, killed by GM command, etc. if (m_dialogStarted || m_questFightStarted) @@ -568,7 +568,7 @@ struct npc_tyrionAI : public ScriptedAI bool m_IsEventRunning; - void GetAIInformation(ChatHandler& reader) + void GetAIInformation(ChatHandler& reader) override { ScriptedAI::GetAIInformation(reader); reader.PSendSysMessage("TYRION: Event running: [%s]", m_IsEventRunning ? "YES" : "NO"); @@ -614,7 +614,7 @@ struct npc_lord_gregor_lescovarAI : public npc_escortAI ObjectGuid m_guidTyrion; ObjectGuid m_guidPriestress; - void Reset() + void Reset() override { if (HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -623,7 +623,7 @@ struct npc_lord_gregor_lescovarAI : public npc_escortAI m_uiEventPhase = 0; } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { if (m_creature->getFaction() == FACTION_ENEMYY) m_creature->setFaction(FACTION_NORMAL_LESCOVAR); @@ -653,7 +653,7 @@ struct npc_lord_gregor_lescovarAI : public npc_escortAI } } - void SummonedCreatureJustDied(Creature* pSummoned) + void SummonedCreatureJustDied(Creature* pSummoned) override { if (pSummoned->GetEntry() != NPC_MARZON_THE_SILENT_BLADE) return; @@ -682,7 +682,7 @@ struct npc_lord_gregor_lescovarAI : public npc_escortAI } } - void Aggro(Unit* pAttacker) + void Aggro(Unit* pAttacker) override { if (Creature* pMarzon = m_creature->GetMap()->GetCreature(m_guidMarzon)) { @@ -693,7 +693,7 @@ struct npc_lord_gregor_lescovarAI : public npc_escortAI m_uiEventPhase = 13; } - void SummonedCreatureDespawn(Creature* pSummoned) + void SummonedCreatureDespawn(Creature* pSummoned) override { if (pSummoned->GetEntry() != NPC_MARZON_THE_SILENT_BLADE) return; @@ -722,7 +722,7 @@ struct npc_lord_gregor_lescovarAI : public npc_escortAI } - void WaypointReached(uint32 uiPoint) + void WaypointReached(uint32 uiPoint) override { Player* pPlayer = GetPlayerForEscort(); if (!pPlayer) @@ -783,7 +783,7 @@ struct npc_lord_gregor_lescovarAI : public npc_escortAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_uiEventTimer) { @@ -942,7 +942,7 @@ struct npc_tyrion_spybotAI : public npc_escortAI uint8 m_uiEventPhase; float m_fDefaultScaleSize; - void Reset() + void Reset() override { if (HasEscortState(STATE_ESCORT_ESCORTING)) @@ -964,7 +964,7 @@ struct npc_tyrion_spybotAI : public npc_escortAI } } - void Aggro(Unit* pAttacker) {} + void Aggro(Unit* pAttacker) override {} bool AreCreaturesRequiredForQuestPresent(float fMaxSearchRange = 40.0f) @@ -1039,7 +1039,7 @@ struct npc_tyrion_spybotAI : public npc_escortAI return true; } - void WaypointReached(uint32 uiPoint) + void WaypointReached(uint32 uiPoint) override { if (!AreCreaturesRequiredForQuestPresent()) return; @@ -1095,7 +1095,7 @@ struct npc_tyrion_spybotAI : public npc_escortAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_uiEventTimer) @@ -1244,12 +1244,12 @@ struct npc_master_woodAI : public ScriptedAI uint32 m_uiRudeCount; - void Reset() + void Reset() override { m_uiRudeCount = 0; } - void ReceiveEmote(Player* pPlayer, uint32 emote) + void ReceiveEmote(Player* pPlayer, uint32 emote) override { if (pPlayer && (pPlayer->GetTeam() == ALLIANCE) && !m_creature->isInCombat() && m_creature->IsWithinLOSInMap(pPlayer)) { diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale/stranglethorn_vale.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale/stranglethorn_vale.cpp index 09fe397a1..046a4ffc6 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale/stranglethorn_vale.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale/stranglethorn_vale.cpp @@ -42,13 +42,13 @@ struct mob_yennikuAI : public ScriptedAI uint32 Reset_Timer; bool bReset; - void Reset() + void Reset() override { Reset_Timer = 0; m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit *caster, const SpellEntry *spell) override { if (caster->GetTypeId() == TYPEID_PLAYER) { @@ -67,18 +67,21 @@ struct mob_yennikuAI : public ScriptedAI return; } - void Aggro(Unit *who) {} + void Aggro(Unit *who) override {} - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (bReset) + { if (Reset_Timer < diff) { EnterEvadeMode(); bReset = false; m_creature->setFaction(28); //troll, bloodscalp } - else Reset_Timer -= diff; + else + Reset_Timer -= diff; + } //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) @@ -101,13 +104,13 @@ struct mob_assistant_kryll : public ScriptedAI uint32 Speach_Timer; - void Reset() + void Reset() override { Speach_Timer = 360000; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (Speach_Timer < diff) { @@ -141,7 +144,7 @@ struct go_transpolyporterAI: public GameObjectAI go_transpolyporterAI(GameObject* pGo) : GameObjectAI(pGo) {} - bool OnUse(Unit* user) + bool OnUse(Unit* user) override { if (user && user->IsPlayer()) { @@ -200,7 +203,7 @@ struct npc_molthorAI : public npc_escortAI m_uiPhase = 0; } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { if (uiPointId == 7) { diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_arlokk.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_arlokk.cpp index 5ff005163..8010e2262 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_arlokk.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_arlokk.cpp @@ -103,7 +103,7 @@ struct boss_arlokkAI : public ScriptedAI bool m_bIsVanished; ObjectGuid m_doorGuid; - void Reset() + void Reset() override { m_uiShadowWordPain_Timer = 8000; m_uiGouge_Timer = 14000; @@ -130,7 +130,7 @@ struct boss_arlokkAI : public ScriptedAI m_creature->SetFloatValue(OBJECT_FIELD_SCALE_X, 1.0f); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { DoScriptText(SAY_AGGRO, m_creature); m_creature->SetInCombatWithZone(); @@ -138,7 +138,7 @@ struct boss_arlokkAI : public ScriptedAI door->UseDoorOrButton(); } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) if (m_pInstance->GetData(TYPE_ARLOKK) != DONE) @@ -152,7 +152,7 @@ struct boss_arlokkAI : public ScriptedAI m_creature->ForcedDespawn(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { DoScriptText(SAY_DEATH, m_creature); @@ -179,7 +179,7 @@ struct boss_arlokkAI : public ScriptedAI DoSummonSinglePhanter(-11532.9970f, -1606.4840f, 41.2979f, pUnit); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { if (Unit* pUnit = m_creature->GetMap()->GetUnit(m_uiMarkedGUID)) { @@ -201,7 +201,7 @@ struct boss_arlokkAI : public ScriptedAI EnterEvadeMode(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -394,20 +394,20 @@ struct mob_prowlerAI : public ScriptedAI return CAST_AI(boss_arlokkAI, pArlokk->AI()); return nullptr; } - void Reset() + void Reset() override { DoCast(m_creature, 22766); m_uiThrash_Timer = urand(5000, 9000); m_uiUpdateTarget_Timer = 2000; } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { if (boss_arlokkAI* pArlokkAI = GetArlokkAI()) pArlokkAI->m_uiSummonCount--; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_uiUpdateTarget_Timer <= uiDiff) { diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_gahzranka.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_gahzranka.cpp index 1b9fa34af..91f0d2b32 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_gahzranka.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_gahzranka.cpp @@ -56,7 +56,7 @@ struct boss_gahzrankaAI : public ScriptedAI uint32 MassiveGeyser_Timer; uint32 Slam_Timer; - void Reset() + void Reset() override { Frostbreath_Timer = 8000; MassiveGeyser_Timer = 25000; @@ -65,18 +65,18 @@ struct boss_gahzrankaAI : public ScriptedAI if (m_pInstance && m_pInstance->GetData(TYPE_GAHZRANKA) != DONE) m_pInstance->SetData(TYPE_GAHZRANKA, NOT_STARTED); } - void Aggro(Unit *who) + void Aggro(Unit *who) override { if (m_pInstance) m_pInstance->SetData(TYPE_GAHZRANKA, IN_PROGRESS); } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { if (m_pInstance) m_pInstance->SetData(TYPE_GAHZRANKA, DONE); } - void JustRespawned() + void JustRespawned() override { CheckSpawnStatus(); } @@ -93,21 +93,21 @@ struct boss_gahzrankaAI : public ScriptedAI } else { - m_creature->GetMotionMaster()->MovePoint(0, -11709.3476f, -1749.965f, 8.733f, 5.3478f); + m_creature->GetMotionMaster()->MovePoint(0, -11709.3476f, -1749.965f, 8.733f, 0, 0, 5.3478f); m_creature->SetHomePosition(-11688.95f, -1777.21f, 12.593f, 5.81f); } } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE) return; if (uiPointId == 0) // move to the Beach - m_creature->GetMotionMaster()->MovePoint(1, -11688.95f, -1777.21f, 12.593f, 5.81f); + m_creature->GetMotionMaster()->MovePoint(1, -11688.95f, -1777.21f, 12.593f, 0, 0, 5.81f); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_grilek.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_grilek.cpp index 5715631ea..18997ca4c 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_grilek.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_grilek.cpp @@ -37,13 +37,13 @@ struct boss_grilekAI : public ScriptedAI uint32 Avartar_Timer; uint32 GroundTremor_Timer; - void Reset() + void Reset() override { Avartar_Timer = urand(15000, 25000); GroundTremor_Timer = urand(8000, 16000); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_hakkar.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_hakkar.cpp index b68774191..8de0dc8b5 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_hakkar.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_hakkar.cpp @@ -95,7 +95,7 @@ struct boss_hakkarAI : public ScriptedAI bool Enraged; - void Reset() + void Reset() override { BloodSiphon_Timer = 90000; CorruptedBlood_Timer = 15000; @@ -117,7 +117,7 @@ struct boss_hakkarAI : public ScriptedAI m_pInstance->SetData(TYPE_HAKKAR, NOT_STARTED); } - void Aggro(Unit *who) + void Aggro(Unit *who) override { if (m_pInstance) m_pInstance->SetData(TYPE_HAKKAR, IN_PROGRESS); @@ -126,13 +126,13 @@ struct boss_hakkarAI : public ScriptedAI ScriptedAI::Aggro(who); } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { if (m_pInstance) m_pInstance->SetData(TYPE_HAKKAR, DONE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_pInstance || !m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_hazzarah.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_hazzarah.cpp index 62d4673e1..2cf5f3af5 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_hazzarah.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_hazzarah.cpp @@ -38,14 +38,14 @@ struct boss_hazzarahAI : public ScriptedAI uint32 Sleep_Timer; uint32 Illusions_Timer; - void Reset() + void Reset() override { ManaBurn_Timer = urand(4000, 10000); Sleep_Timer = urand(10000, 18000); Illusions_Timer = urand(10000, 18000); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_jeklik.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_jeklik.cpp index e0cfef854..eaf27d153 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_jeklik.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_jeklik.cpp @@ -81,7 +81,7 @@ struct boss_jeklikAI : public ScriptedAI bool PhaseTwo; - void Reset() + void Reset() override { SpawnBats_Timer = 40000; @@ -108,13 +108,13 @@ struct boss_jeklikAI : public ScriptedAI m_creature->SetObjectScale(1.5f); } - void JustReachedHome() + void JustReachedHome() override { m_creature->CastSpell(m_creature, SPELL_GREENCHANNELING, false); m_creature->SetObjectScale(1.0f); } - void Aggro(Unit *who) + void Aggro(Unit *who) override { m_creature->addUnitState(UNIT_STAT_IGNORE_PATHFINDING); DoScriptText(SAY_AGGRO, m_creature); @@ -127,7 +127,7 @@ struct boss_jeklikAI : public ScriptedAI ScriptedAI::Aggro(who); } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { DoScriptText(SAY_DEATH, m_creature); @@ -144,7 +144,7 @@ struct boss_jeklikAI : public ScriptedAI m_creature->NearTeleportTo(x, y, z, o); } - void UpdateAI(const uint32 lastDiff) + void UpdateAI(const uint32 lastDiff) override { if (!m_pInstance || !m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -400,16 +400,16 @@ struct mob_batriderAI : public ScriptedAI uint32 Bomb_Timer; - void Reset() + void Reset() override { Bomb_Timer = 2000; } - void AttackStart(Unit *pWho) + void AttackStart(Unit *pWho) override { } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* pWho) override { } @@ -432,14 +432,14 @@ struct mob_batriderAI : public ScriptedAI } // Called when spell hits creature's target - virtual void SpellHitTarget(Unit* target, const SpellEntry* spell) + void SpellHitTarget(Unit* target, const SpellEntry* spell) override { // Trigger bomb AoE on the ground if (target && spell && spell->Id == SPELL_THROW_LIQUID_FIRE) m_creature->CastSpell(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), SPELL_BOMB, false); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_pInstance) return; @@ -494,7 +494,7 @@ struct npc_guru_bat_riderAI : public ScriptedAI uint32 InfectedBite_Timer; uint32 Thrash_Timer; - void Reset() + void Reset() override { GoingToExplose = false; Despawn_Timer = 0; @@ -503,13 +503,13 @@ struct npc_guru_bat_riderAI : public ScriptedAI Thrash_Timer = 6000; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->CastSpell(m_creature, SPELL_DEMORALIZING_SHOUT, false); ScriptedAI::Aggro(pWho); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_jindo.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_jindo.cpp index 7aa0c244a..310ec30cc 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_jindo.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_jindo.cpp @@ -90,12 +90,12 @@ struct boss_jindoAI : public ScriptedAI while (Creature* Crea = m_creature->FindNearestCreature(NPC_BRAINWASH_TOTEM, 150.0f)) Crea->DisappearAndDie(); } - void JustSummoned(Creature* c) + void JustSummoned(Creature* c) override { summonedCreatures.push_back(c->GetObjectGuid()); ScriptedAI::JustSummoned(c); } - void Reset() + void Reset() override { BrainWashTotem_Timer = 22000; HealingWard_Timer = 12000; @@ -116,7 +116,7 @@ struct boss_jindoAI : public ScriptedAI m_pInstance->SetData(TYPE_JINDO, NOT_STARTED); } - void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) + void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) override { if (pSpell->Id == SPELL_HEX) { @@ -130,14 +130,14 @@ struct boss_jindoAI : public ScriptedAI } } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { DespawnAllSummons(); if (m_pInstance) m_pInstance->SetData(TYPE_JINDO, DONE); } - void Aggro(Unit *who) + void Aggro(Unit *who) override { DoScriptText(SAY_AGGRO, m_creature); if (m_pInstance) @@ -151,7 +151,7 @@ struct boss_jindoAI : public ScriptedAI Skeleton->AI()->AttackStart(initialTarget); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -299,19 +299,19 @@ struct mob_shade_of_jindoAI : public ScriptedAI uint32 ShadowShock_Timer; - void Reset() + void Reset() override { ShadowShock_Timer = 1000; m_creature->AddAura(SPELL_INVISIBLE, ADD_AURA_PERMANENT); } - void DamageTaken(Unit *done_by, uint32 &damage) + void DamageTaken(Unit *done_by, uint32 &damage) override { if (done_by && !done_by->HasAura(SPELL_DELUSIONS_OF_JINDO)) damage = 0; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -345,7 +345,7 @@ struct mob_brain_wash_totemAI : public ScriptedAI uint64 PlayerMCGuid; uint32 CheckTimer; - void Reset() + void Reset() override { PlayerMCGuid = 0; CheckTimer = 0; @@ -355,7 +355,7 @@ struct mob_brain_wash_totemAI : public ScriptedAI SetCombatMovement(false); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim() || !m_pInstance) { diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_mandokir.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_mandokir.cpp index ed7f62327..ff7f517f9 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_mandokir.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_mandokir.cpp @@ -157,7 +157,7 @@ struct boss_mandokirAI : public ScriptedAI std::vector m_lSpirits; - void Reset() + void Reset() override { m_uiGlobalCooldown = 0; @@ -196,7 +196,7 @@ struct boss_mandokirAI : public ScriptedAI CheckVilebranchState(true); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { if (pVictim->GetTypeId() == TYPEID_PLAYER) { @@ -222,7 +222,7 @@ struct boss_mandokirAI : public ScriptedAI } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { DoScriptText(SAY_AGGRO, m_creature); @@ -368,7 +368,7 @@ struct boss_mandokirAI : public ScriptedAI } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { if (!m_creature->getVictim()) return; @@ -377,7 +377,7 @@ struct boss_mandokirAI : public ScriptedAI pSummoned->AI()->AttackStart(m_creature->getVictim()); } - void MoveInLineOfSight(Unit *pWho) + void MoveInLineOfSight(Unit *pWho) override { if (m_creature->getVictim()) return; @@ -389,7 +389,7 @@ struct boss_mandokirAI : public ScriptedAI AttackStart(pWho); } - void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) + void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override { if (pSpell->Id == SPELL_WATCH) { @@ -402,7 +402,7 @@ struct boss_mandokirAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_VilebranchDead) CheckVilebranchState(); @@ -649,20 +649,20 @@ struct mob_ohganAI : public ScriptedAI uint32 Thrash_Timer; uint32 Execute_Timer; - void Reset() + void Reset() override { SunderArmor_Timer = 5000; Thrash_Timer = urand(5000, 9000); Execute_Timer = 1000; } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(TYPE_OHGAN, DONE); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { if (pVictim->GetTypeId() == TYPEID_PLAYER) if (m_creature->isInCombat()) @@ -670,7 +670,7 @@ struct mob_ohganAI : public ScriptedAI pMandokir->AI()->KilledUnit(pVictim); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -738,20 +738,20 @@ struct mob_chainedSpiritsAI : public ScriptedAI uint64 m_uiTargetRezGUID; uint32 m_uiRezTimer; - void Reset() + void Reset() override { m_uiRezTimer = 0; } // Ready to revive someone ? - uint32 GetData(uint32) + uint32 GetData(uint32) override { if (m_uiTargetRezGUID) return 0; return 1; } - void SpellHitTarget(Unit* pDead, const SpellEntry* pSpell) + void SpellHitTarget(Unit* pDead, const SpellEntry* pSpell) override { if (!pSpell) { @@ -764,13 +764,13 @@ struct mob_chainedSpiritsAI : public ScriptedAI m_creature->DeleteLater(); } - void MovementInform(uint32 mvtType, uint32 moveId) + void MovementInform(uint32 mvtType, uint32 moveId) override { if (mvtType == POINT_MOTION_TYPE && moveId == 1) if (Player* pPlayer = m_creature->GetMap()->GetPlayer(m_uiTargetRezGUID)) m_uiRezTimer = 2500; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (m_uiRezTimer) { @@ -802,16 +802,16 @@ struct mob_vilebrancheAI : public ScriptedAI Reset(); } - void Reset() + void Reset() override { } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { // } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_marli.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_marli.cpp index d3c087b69..2de726f02 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_marli.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_marli.cpp @@ -79,7 +79,7 @@ struct boss_marliAI : public ScriptedAI uint32 m_uiDefaultModel; - void Reset() + void Reset() override { m_uiPoisonVolley_Timer = 15000; m_uiSpawnSpider_Timer = 20000; @@ -130,7 +130,7 @@ struct boss_marliAI : public ScriptedAI m_creature->ResetStats(); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { DoScriptText(SAY_AGGRO, m_creature); @@ -174,7 +174,7 @@ struct boss_marliAI : public ScriptedAI return nullptr; } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { if (pSummoned->GetEntry() == NPC_SPAWN_OF_MARLI) { @@ -183,7 +183,7 @@ struct boss_marliAI : public ScriptedAI } } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { DoScriptText(SAY_DEATH, m_creature); @@ -191,7 +191,7 @@ struct boss_marliAI : public ScriptedAI m_pInstance->SetData(TYPE_MARLI, DONE); } - void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) + void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) override { if (!pCaster) return; @@ -205,7 +205,7 @@ struct boss_marliAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -371,12 +371,12 @@ struct mob_spawn_of_marliAI : public ScriptedAI ScriptedInstance* m_pInstance; uint32 m_uiLevelUp_Timer; - void Reset() + void Reset() override { m_uiLevelUp_Timer = 3000; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_renataki.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_renataki.cpp index 93340d85e..89fb81526 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_renataki.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_renataki.cpp @@ -50,7 +50,7 @@ struct boss_renatakiAI : public ScriptedAI bool Invisible; bool Light; - void Reset() + void Reset() override { TickTimer = 1000; Invisible_Timer = urand(28000, 32000); @@ -65,12 +65,12 @@ struct boss_renatakiAI : public ScriptedAI m_creature->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO + 1, 3); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { LeaveVanish(); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!Light) { diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_thekal.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_thekal.cpp index 6ea1d856e..ae9f65b3c 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_thekal.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_thekal.cpp @@ -72,7 +72,7 @@ public: { ASSERT(_charger); } - bool Process(Unit* unit) + bool Process(Unit* unit) override { ASSERT(unit); @@ -107,28 +107,26 @@ void DoRessurectUnit(Unit* pUnit, Unit* pVictim); struct zg_rez_add : public ScriptedAI { zg_rez_add(Creature* pCreature, uint32 instMobType) : ScriptedAI(pCreature), - m_uiInstMobType(instMobType), m_uiRezzeurGUID(0), m_uiRessurectTimer(0) + m_uiInstMobType(instMobType), m_uiRessurectTimer(0), m_uiRezzeurGUID(0), m_reallyDead(false), m_justRevived(false) { m_pInstance = (instance_zulgurub*)pCreature->GetInstanceData(); - _realyDead = false; - _justRevived = false; } void SetRealyDead(bool value) { - _realyDead = value; + m_reallyDead = value; } - bool CanBeLooted() const + bool CanBeLooted() const override { - return _realyDead; + return m_reallyDead; } - void Aggro(Unit *who) + void Aggro(Unit *who) override { if (m_pInstance) m_pInstance->SetData(m_uiInstMobType, IN_PROGRESS); ScriptedAI::Aggro(who); } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { DoScriptText(EMOTE_DIES, m_creature); Unit* pRezzer = nullptr; @@ -192,7 +190,7 @@ struct zg_rez_add : public ScriptedAI m_uiRessurectTimer -= uiDiff; return true; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) override { if (!m_pInstance) return; @@ -208,15 +206,15 @@ struct zg_rez_add : public ScriptedAI pLorkhan->AI()->AttackStart(who); ScriptedAI::EnterCombat(who); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { - if (_justRevived) + if (m_justRevived) { m_creature->SendSpellGo(m_creature, 20770); - _justRevived = false; + m_justRevived = false; } } - void Reset() + void Reset() override { if (m_pInstance) m_pInstance->SetData(m_uiInstMobType, NOT_STARTED); @@ -226,8 +224,8 @@ struct zg_rez_add : public ScriptedAI instance_zulgurub* m_pInstance; uint32 m_uiRessurectTimer; uint64 m_uiRezzeurGUID; - bool _realyDead; - bool _justRevived; + bool m_reallyDead; + bool m_justRevived; }; void DoRessurectUnit(Unit* unit, Unit* victim) @@ -283,7 +281,7 @@ struct boss_thekalAI : public zg_rez_add bool Enraged; bool PhaseTwo; - void GetAIInformation(ChatHandler& handler) + void GetAIInformation(ChatHandler& handler) override { handler.SendSysMessage("DEBUG -- THEKAL"); handler.PSendSysMessage("Can be looted : [%s]", CanBeLooted() ? "YES" : "NO"); @@ -292,7 +290,7 @@ struct boss_thekalAI : public zg_rez_add handler.PSendSysMessage("[%u:%u:%u:%u:%u:%u:%u:%u]", MortalCleave_Timer, Silence_Timer, Frenzy_Timer, ForcePunch_Timer, Charge_Timer, Enrage_Timer, CheckTigers_Timer, NoTargetReset_Timer); } - void Reset() + void Reset() override { m_creature->ResetStats(); @@ -313,7 +311,7 @@ struct boss_thekalAI : public zg_rez_add zg_rez_add::Reset(); } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { // Si reelement mort ... if (PhaseTwo) @@ -344,7 +342,7 @@ struct boss_thekalAI : public zg_rez_add zg_rez_add::JustDied(Killer); } } - void UpdateAI_corpse(const uint32 uiDiff) + void UpdateAI_corpse(const uint32 uiDiff) override { if (PhaseTwo || !m_pInstance) return; // La c'est vraiment fini. @@ -362,19 +360,19 @@ struct boss_thekalAI : public zg_rez_add } - void JustRespawned() + void JustRespawned() override { // Pour ne pas appeller ScriptedAI::JustRespawned qui appelle "Reset()" } - void EnterEvadeMode() + void EnterEvadeMode() override { SetRealyDead(false); Reset(); zg_rez_add::EnterEvadeMode(); } - void Aggro(Unit *who) + void Aggro(Unit *who) override { if (m_pInstance) m_pInstance->SetData(TYPE_THEKAL, IN_PROGRESS); @@ -415,7 +413,7 @@ struct boss_thekalAI : public zg_rez_add } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->isAlive()) return; @@ -544,7 +542,7 @@ struct mob_zealot_lorkhanAI : public zg_rez_add uint64 uiRezzeurGUID; bool bRealyDead; - void Reset() + void Reset() override { Shield_Timer = 1000; BloodLust_Timer = 16000; @@ -559,18 +557,18 @@ struct mob_zealot_lorkhanAI : public zg_rez_add zg_rez_add::Reset(); } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { zg_rez_add::JustDied(Killer); } - void UpdateAI_corpse(const uint32 uiDiff) + void UpdateAI_corpse(const uint32 uiDiff) override { if (!zg_rez_add::HandleWaitRez(uiDiff)) zg_rez_add::SetRealyDead(true); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { zg_rez_add::UpdateAI(diff); if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) @@ -641,7 +639,7 @@ struct mob_zealot_zathAI : public zg_rez_add uint64 uiRezzeurGUID; bool bRealyDead; - void Reset() + void Reset() override { SweepingStrikes_Timer = 13000; SinisterStrike_Timer = 8000; @@ -657,18 +655,18 @@ struct mob_zealot_zathAI : public zg_rez_add zg_rez_add::Reset(); } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { zg_rez_add::JustDied(Killer); } - void UpdateAI_corpse(const uint32 uiDiff) + void UpdateAI_corpse(const uint32 uiDiff) override { if (!zg_rez_add::HandleWaitRez(uiDiff)) zg_rez_add::SetRealyDead(true); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { zg_rez_add::UpdateAI(diff); if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_venoxis.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_venoxis.cpp index a8965ccee..a98bc6160 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_venoxis.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_venoxis.cpp @@ -88,7 +88,7 @@ struct boss_venoxisAI : public ScriptedAI float m_fDefaultSize; - void Reset() + void Reset() override { m_uiHolyFire_Timer = 10000; m_uiHolyWrath_Timer = 30000; @@ -117,13 +117,13 @@ struct boss_venoxisAI : public ScriptedAI } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (m_pInstance) m_pInstance->SetData(TYPE_VENOXIS, IN_PROGRESS); } - void EnterEvadeMode() + void EnterEvadeMode() override { // Despawn snakes immediately when we're running home. std::list cobras; @@ -134,7 +134,7 @@ struct boss_venoxisAI : public ScriptedAI ScriptedAI::EnterEvadeMode(); } - void JustReachedHome() + void JustReachedHome() override { // Respawn snakes std::list cobras; @@ -154,7 +154,7 @@ struct boss_venoxisAI : public ScriptedAI m_pInstance->SetData(TYPE_VENOXIS, NOT_STARTED); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { DoScriptText(SAY_DEATH, m_creature); m_creature->CastSpell(m_creature, SPELL_POISON_CLOUD, true); @@ -165,7 +165,7 @@ struct boss_venoxisAI : public ScriptedAI m_pInstance->SetData(TYPE_VENOXIS, DONE); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_wushoolay.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_wushoolay.cpp index cb2b957fc..dd9694e5e 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_wushoolay.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/boss_wushoolay.cpp @@ -37,13 +37,13 @@ struct boss_wushoolayAI : public ScriptedAI uint32 LightningCloud_Timer; uint32 LightningWave_Timer; - void Reset() + void Reset() override { LightningCloud_Timer = urand(5000, 10000); LightningWave_Timer = urand(8000, 16000); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/instance_zulgurub.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/instance_zulgurub.cpp index 1eb884c6e..7742486a0 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/instance_zulgurub.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/instance_zulgurub.cpp @@ -370,7 +370,7 @@ struct npc_brazierAI: public ScriptedAI uint32 Timer; uint32 Var; - void Reset() + void Reset() override { Timer = 0; Var = 0; @@ -397,7 +397,7 @@ struct npc_brazierAI: public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (Var > 24) m_creature->ForcedDespawn(); diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/zulgurub.h b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/zulgurub.h index d993bed97..0a7808851 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/zulgurub.h +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/zulgurub.h @@ -50,19 +50,19 @@ class instance_zulgurub : public ScriptedInstance public: instance_zulgurub(Map* pMap) : ScriptedInstance(pMap), m_randomBossSpawned(false) {Initialize();}; - void Initialize(); - void Create(); + void Initialize() override; + void Create() override; bool IsEncounterInProgress() const override; - void OnCreatureCreate(Creature* pCreature); - void OnCreatureDeath(Creature * pCreature); - void SetData(uint32 uiType, uint32 uiData); - const char* Save(); - void Load(const char* chrIn); + void OnCreatureCreate(Creature* pCreature) override; + void OnCreatureDeath(Creature * pCreature) override; + void SetData(uint32 uiType, uint32 uiData) override; + const char* Save() override; + void Load(const char* chrIn) override; void HandleLoadCreature(uint32 dataType, uint64 &storeGuid, Creature* pCrea); // Nostalrius - uint32 GetData(uint32 uiType); - uint64 GetData64(uint32 uiData); + uint32 GetData(uint32 uiType) override; + uint64 GetData64(uint32 uiData) override; // each time High Priest dies lower Hakkar's HP void LowerHakkarHitPoints(); diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/zulgurub_trash.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/zulgurub_trash.cpp index 7232b4e41..e36924de2 100644 --- a/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/zulgurub_trash.cpp +++ b/src/scripts/eastern_kingdoms/stranglethorn_vale/zulgurub/zulgurub_trash.cpp @@ -23,19 +23,19 @@ struct GurubashiAxeThrowerAI : public ScriptedAI uint32 m_uiAxeFlurry_Timer; bool m_bEnrage; - void Reset() + void Reset() override { m_uiAxeFlurry_Timer = 10000; m_uiThrow_Timer = 5000; m_bEnrage = false; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -97,7 +97,7 @@ struct GurubashiBerserkerAI : public ScriptedAI uint32 m_uiFear_Timer; bool m_bEnrage; - void Reset() + void Reset() override { m_uiKnockBack_Timer = 10000; m_uiThunderClap_Timer = 5000; @@ -105,12 +105,12 @@ struct GurubashiBerserkerAI : public ScriptedAI m_bEnrage = false; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -189,7 +189,7 @@ struct npc_hakkari_doctor : public ScriptedAI uint32 m_uiCrapaudsLiberationTimer; uint32 m_uiOrionOmbreTimer; - void Reset() + void Reset() override { m_uiMaleficeTimer = 5000; m_uiCrapaudsTimer = 15000; @@ -197,7 +197,7 @@ struct npc_hakkari_doctor : public ScriptedAI m_uiOrionOmbreTimer = 4000; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -251,7 +251,7 @@ struct npc_hakkari_doctor : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { m_creature->SummonCreatureAndAttack(15009, pKiller); } @@ -272,11 +272,11 @@ struct npc_esprit_vaudou : public ScriptedAI Reset(); } - void Reset() + void Reset() override { } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (Unit* pVictim = m_creature->getVictim()) { @@ -306,13 +306,13 @@ struct npc_fils_hakkar : public ScriptedAI uint32 m_uiKnockDownTimer; uint32 m_uiTrashTimer; - void Reset() + void Reset() override { m_uiKnockDownTimer = 10000; m_uiTrashTimer = 5000; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -336,7 +336,7 @@ struct npc_fils_hakkar : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { m_creature->CastSpell(m_creature, 24320, true);//24840 } @@ -354,7 +354,7 @@ struct go_pile_dechetsAI: public GameObjectAI bool Actif; GameObject * const m_pGo; - bool OnUse(Unit* pUser) + bool OnUse(Unit* pUser) override { if (pUser->IsWithinDistInMap(m_pGo, 5.0f) && !Actif && (urand(0, 2))) { diff --git a/src/scripts/eastern_kingdoms/swamp_of_sorrows/sunken_temple/instance_sunken_temple.cpp b/src/scripts/eastern_kingdoms/swamp_of_sorrows/sunken_temple/instance_sunken_temple.cpp index f4409c0cc..2a16352f9 100644 --- a/src/scripts/eastern_kingdoms/swamp_of_sorrows/sunken_temple/instance_sunken_temple.cpp +++ b/src/scripts/eastern_kingdoms/swamp_of_sorrows/sunken_temple/instance_sunken_temple.cpp @@ -73,7 +73,7 @@ struct instance_sunken_temple : public ScriptedInstance uint64 m_luiBigLightGUIDs[6]; uint64 m_luiCircleGUIDs[8]; - void Initialize() + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); memset(&m_luiProtectorGUIDs, 0, sizeof(m_luiProtectorGUIDs)); @@ -185,11 +185,10 @@ struct instance_sunken_temple : public ScriptedInstance } } - void OnObjectCreate(GameObject* pGo) + void OnObjectCreate(GameObject* pGo) override { - int var = 0; - int Var = 0; - int varr = 0; + int countCircle = 0; + int countLight = 0; switch (pGo->GetEntry()) { case GO_JAMMALAN_BARRIER: @@ -228,17 +227,17 @@ struct instance_sunken_temple : public ScriptedInstance for (int i = 0; i < 6; i++) { if (m_luiBigLightGUIDs[i] != 0 && m_luiBigLightGUIDs[i] != pGo->GetGUID()) - ++Var; + ++countLight; } - m_luiBigLightGUIDs[Var] = pGo->GetGUID(); + m_luiBigLightGUIDs[countLight] = pGo->GetGUID(); break; case GO_EVIL_CIRCLE: for (int i = 0; i < 8; i++) { if (m_luiCircleGUIDs[i] != 0 && m_luiCircleGUIDs[i] != pGo->GetGUID()) - ++var; + ++countCircle; } - m_luiCircleGUIDs[var] = pGo->GetGUID(); + m_luiCircleGUIDs[countCircle] = pGo->GetGUID(); break; case GO_ETERNAL_FLAME_1: @@ -258,7 +257,7 @@ struct instance_sunken_temple : public ScriptedInstance } } - void OnCreatureCreate(Creature* pCreature) + void OnCreatureCreate(Creature* pCreature) override { switch (pCreature->GetEntry()) { @@ -328,7 +327,7 @@ struct instance_sunken_temple : public ScriptedInstance } } - void OnCreatureEnterCombat(Creature* pCreature) + void OnCreatureEnterCombat(Creature* pCreature) override { switch (pCreature->GetEntry()) { @@ -355,7 +354,7 @@ struct instance_sunken_temple : public ScriptedInstance } } - void OnCreatureDeath(Creature *pCreature) + void OnCreatureDeath(Creature *pCreature) override { if (m_uiShadeHakkarGUID && (pCreature->GetEntry() == NPC_HAKKARI_MINION || pCreature->GetEntry() == NPC_BLOODKEEPER)) { @@ -370,7 +369,7 @@ struct instance_sunken_temple : public ScriptedInstance } } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) override { switch (uiType) { @@ -629,7 +628,7 @@ struct instance_sunken_temple : public ScriptedInstance } } - void SetData64(uint32 uiType, uint64 uiData) + void SetData64(uint32 uiType, uint64 uiData) override { switch (uiType) { @@ -663,12 +662,12 @@ struct instance_sunken_temple : public ScriptedInstance } } - const char* Save() + const char* Save() override { return strInstData.c_str(); } - uint32 GetData(uint32 uiType) + uint32 GetData(uint32 uiType) override { switch (uiType) { @@ -689,7 +688,7 @@ struct instance_sunken_temple : public ScriptedInstance } } - uint64 GetData64(uint32 uiType) + uint64 GetData64(uint32 uiType) override { switch (uiType) { @@ -711,7 +710,7 @@ struct instance_sunken_temple : public ScriptedInstance return 0; } - void Update(uint32 uiDiff) + void Update(uint32 uiDiff) override { if (RemoveTimer < uiDiff) { @@ -722,7 +721,7 @@ struct instance_sunken_temple : public ScriptedInstance RemoveTimer -= uiDiff; } - void Load(const char* chrIn) + void Load(const char* chrIn) override { if (!chrIn) { diff --git a/src/scripts/eastern_kingdoms/swamp_of_sorrows/sunken_temple/sunken_temple.cpp b/src/scripts/eastern_kingdoms/swamp_of_sorrows/sunken_temple/sunken_temple.cpp index 9ed28a75b..09898f893 100644 --- a/src/scripts/eastern_kingdoms/swamp_of_sorrows/sunken_temple/sunken_temple.cpp +++ b/src/scripts/eastern_kingdoms/swamp_of_sorrows/sunken_temple/sunken_temple.cpp @@ -80,9 +80,9 @@ struct npc_malfurionAI : public ScriptedAI uint32 m_uiSpeech; bool m_inDungeon; - void Reset() {} + void Reset() override {} - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { // We are in Sunken Temple if (m_inDungeon) @@ -178,7 +178,7 @@ struct go_eternal_flameAI: public GameObjectAI { go_eternal_flameAI(GameObject* pGo) : GameObjectAI(pGo) {} - bool OnUse(Unit* pUser) + bool OnUse(Unit* pUser) override { if (me->GetGoState() == GO_STATE_ACTIVE) // already used - script handler calls twice return true; @@ -589,7 +589,7 @@ struct go_atalai_lightAI: public GameObjectAI { go_atalai_lightAI(GameObject* pGo) : GameObjectAI(pGo) {} - bool OnUse(Unit* pUser) + bool OnUse(Unit* pUser) override { ScriptedInstance* pInstance = (ScriptedInstance*)me->GetInstanceData(); diff --git a/src/scripts/eastern_kingdoms/swamp_of_sorrows/sunken_temple/sunken_temple.h b/src/scripts/eastern_kingdoms/swamp_of_sorrows/sunken_temple/sunken_temple.h index b0e7ab12f..15342b0d9 100644 --- a/src/scripts/eastern_kingdoms/swamp_of_sorrows/sunken_temple/sunken_temple.h +++ b/src/scripts/eastern_kingdoms/swamp_of_sorrows/sunken_temple/sunken_temple.h @@ -139,11 +139,11 @@ struct npc_shade_hakkarAI : public ScriptedAI bool FirstPop; uint32 eventSpawns[SHADE_SPAWN_TYPES]; - void Reset(); - void Aggro(Unit *pWho); - void JustSummoned(Creature *m_creature); - void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId); - void UpdateAI(const uint32 uiDiff); + void Reset() override; + void Aggro(Unit *pWho) override; + void JustSummoned(Creature *m_creature) override; + void SummonedMovementInform(Creature* pSummoned, uint32 uiMotionType, uint32 uiPointId) override; + void UpdateAI(const uint32 uiDiff) override; void SummonJustDied(Creature *m_pcreature); void UpdateBrazierState(GameObject *go, bool used); diff --git a/src/scripts/eastern_kingdoms/swamp_of_sorrows/swamp_of_sorrows.cpp b/src/scripts/eastern_kingdoms/swamp_of_sorrows/swamp_of_sorrows.cpp index 8684c1f8b..1d38d1bfd 100644 --- a/src/scripts/eastern_kingdoms/swamp_of_sorrows/swamp_of_sorrows.cpp +++ b/src/scripts/eastern_kingdoms/swamp_of_sorrows/swamp_of_sorrows.cpp @@ -57,18 +57,18 @@ struct npc_galen_goodwardAI : public npc_escortAI uint64 m_uiGalensCageGUID; uint32 m_uiPeriodicSay; - void Reset() + void Reset() override { m_uiPeriodicSay = 6000; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) DoScriptText(urand(0, 1) ? SAY_ATTACKED_1 : SAY_ATTACKED_2, m_creature, pWho); } - void WaypointStart(uint32 uiPointId) + void WaypointStart(uint32 uiPointId) override { switch (uiPointId) { @@ -92,7 +92,7 @@ struct npc_galen_goodwardAI : public npc_escortAI } } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { switch (uiPointId) { @@ -113,7 +113,7 @@ struct npc_galen_goodwardAI : public npc_escortAI } } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { if (m_uiPeriodicSay < uiDiff) diff --git a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_arcanist_doan.cpp b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_arcanist_doan.cpp index 78a977d4f..0fa224415 100644 --- a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_arcanist_doan.cpp +++ b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_arcanist_doan.cpp @@ -48,7 +48,7 @@ struct boss_arcanist_doanAI : public ScriptedAI bool bCanDetonate; bool bShielded; - void Reset() + void Reset() override { Polymorph_Timer = 20000; AoESilence_Timer = 15000; @@ -57,12 +57,12 @@ struct boss_arcanist_doanAI : public ScriptedAI bShielded = false; } - void Aggro(Unit *who) + void Aggro(Unit *who) override { DoScriptText(SAY_AGGRO, m_creature); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_azshir_the_sleepless.cpp b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_azshir_the_sleepless.cpp index 25bdb3fc8..d5bca339b 100644 --- a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_azshir_the_sleepless.cpp +++ b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_azshir_the_sleepless.cpp @@ -38,14 +38,14 @@ struct boss_azshir_the_sleeplessAI : public ScriptedAI uint32 CallOftheGrave_Timer; uint32 Terrify_Timer; - void Reset() + void Reset() override { SoulSiphon_Timer = 1; CallOftheGrave_Timer = 30000; Terrify_Timer = 20000; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_bloodmage_thalnos.cpp b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_bloodmage_thalnos.cpp index d7d59eb69..1ed488139 100644 --- a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_bloodmage_thalnos.cpp +++ b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_bloodmage_thalnos.cpp @@ -48,7 +48,7 @@ struct boss_bloodmage_thalnosAI : public ScriptedAI uint32 FlameSpike_Timer; uint32 FireNova_Timer; - void Reset() + void Reset() override { HpYell = false; FlameShock_Timer = 10000; @@ -57,17 +57,17 @@ struct boss_bloodmage_thalnosAI : public ScriptedAI FireNova_Timer = 40000; } - void Aggro(Unit *who) + void Aggro(Unit *who) override { DoScriptText(SAY_AGGRO, m_creature); } - void KilledUnit(Unit* Victim) + void KilledUnit(Unit* Victim) override { DoScriptText(SAY_KILL, m_creature); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_headless_horseman.cpp b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_headless_horseman.cpp index 47a054cd3..6448407ad 100644 --- a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_headless_horseman.cpp +++ b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_headless_horseman.cpp @@ -49,26 +49,26 @@ struct boss_headless_horsemanAI : public ScriptedAI Reset(); } - void Reset() + void Reset() override { } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { DoScriptText(SAY_SLAY, m_creature); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { DoScriptText(SAY_DEATH, m_creature); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp index 3b11c8c93..b2d656e08 100644 --- a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp @@ -49,7 +49,7 @@ struct boss_high_inquisitor_fairbanksAI : public ScriptedAI bool PowerWordShield; bool bAshbringer; - void Reset() + void Reset() override { CurseOfBlood_Timer = 10000; DispelMagic_Timer = 30000; @@ -73,7 +73,7 @@ struct boss_high_inquisitor_fairbanksAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_houndmaster_loksey.cpp b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_houndmaster_loksey.cpp index 1e28a8862..9cf382f4e 100644 --- a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_houndmaster_loksey.cpp +++ b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_houndmaster_loksey.cpp @@ -39,18 +39,18 @@ struct boss_houndmaster_lokseyAI : public ScriptedAI uint32 BloodLust_Timer; - void Reset() + void Reset() override { BloodLust_Timer = 20000; } - void Aggro(Unit *who) + void Aggro(Unit *who) override { DoScriptText(SAY_AGGRO, m_creature); DoCastSpellIfCan(m_creature, SPELL_SUMMONSCARLETHOUND); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_interrogator_vishas.cpp b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_interrogator_vishas.cpp index 219000a54..64afb9899 100644 --- a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_interrogator_vishas.cpp +++ b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_interrogator_vishas.cpp @@ -49,24 +49,24 @@ struct boss_interrogator_vishasAI : public ScriptedAI bool Yell60; uint32 ShadowWordPain_Timer; - void Reset() + void Reset() override { Yell30 = false; Yell60 = false; ShadowWordPain_Timer = 5000; } - void Aggro(Unit *who) + void Aggro(Unit *who) override { DoScriptText(SAY_AGGRO, m_creature); } - void KilledUnit(Unit* Victim) + void KilledUnit(Unit* Victim) override { DoScriptText(SAY_KILL, m_creature); } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { if (!m_pInstance) return; @@ -76,7 +76,7 @@ struct boss_interrogator_vishasAI : public ScriptedAI DoScriptText(SAY_TRIGGER_VORREL, vorrel); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_mograine_and_whitemane.cpp b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_mograine_and_whitemane.cpp index 3fb20b5bf..3807451d7 100644 --- a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_mograine_and_whitemane.cpp +++ b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_mograine_and_whitemane.cpp @@ -78,7 +78,7 @@ struct boss_scarlet_commander_mograineAI : public ScriptedAI bool m_bHeal; bool m_bFakeDeath; - void Reset() + void Reset() override { m_uiCrusaderStrike_Timer = 10000; m_uiHammerOfJustice_Timer = 15000; @@ -106,7 +106,7 @@ struct boss_scarlet_commander_mograineAI : public ScriptedAI // } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { DoScriptText(SAY_MO_AGGRO, m_creature); DoCastSpellIfCan(m_creature, SPELL_RETRIBUTIONAURA); @@ -129,7 +129,7 @@ struct boss_scarlet_commander_mograineAI : public ScriptedAI } } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { DoScriptText(SAY_MO_KILL, m_creature); } @@ -159,7 +159,7 @@ struct boss_scarlet_commander_mograineAI : public ScriptedAI return; } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) override { if (uiDamage < m_creature->GetHealth()) return; @@ -198,7 +198,7 @@ struct boss_scarlet_commander_mograineAI : public ScriptedAI } } - void SpellHit(Unit* pWho, const SpellEntry* pSpell) + void SpellHit(Unit* pWho, const SpellEntry* pSpell) override { //When hit with ressurection stop fake death and say text if (pSpell->Id == SPELL_SCARLETRESURRECTION) @@ -215,7 +215,7 @@ struct boss_scarlet_commander_mograineAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -289,7 +289,7 @@ struct boss_high_inquisitor_whitemaneAI : public ScriptedAI bool m_bCanResurrect; bool m_bStopAttack; - void Reset() + void Reset() override { m_uiWait_Timer = 7000; m_uiHeal_Timer = 10000; @@ -312,7 +312,7 @@ struct boss_high_inquisitor_whitemaneAI : public ScriptedAI } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) { @@ -322,12 +322,12 @@ struct boss_high_inquisitor_whitemaneAI : public ScriptedAI ScriptedAI::JustReachedHome(); } - void MoveInLineOfSight() + void MoveInLineOfSight(Unit*) override { //This needs to be empty because Whitemane should NOT aggro while fighting Mograine. Mograine will give us a target. } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) override { if (uiDamage < m_creature->GetHealth()) return; @@ -340,7 +340,7 @@ struct boss_high_inquisitor_whitemaneAI : public ScriptedAI ScriptedAI::DamageTaken(pDoneBy, uiDamage); } - void AttackStart(Unit* pWho) + void AttackStart(Unit* pWho) override { if (m_pInstance && (m_pInstance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == NOT_STARTED || m_pInstance->GetData(TYPE_MOGRAINE_AND_WHITE_EVENT) == FAIL)) return; @@ -351,17 +351,17 @@ struct boss_high_inquisitor_whitemaneAI : public ScriptedAI ScriptedAI::AttackStart(pWho); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { DoScriptText(SAY_WH_INTRO, m_creature); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { DoScriptText(SAY_WH_KILL, m_creature); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) { @@ -373,7 +373,7 @@ struct boss_high_inquisitor_whitemaneAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if ((!m_creature->SelectHostileTarget() || !m_creature->getVictim()) && !m_bStopAttack) return; @@ -476,7 +476,7 @@ struct boss_high_inquisitor_whitemaneAI : public ScriptedAI DoMeleeAttackIfReady(); } - void MovementInform(uint32 MovementType, uint32 id) + void MovementInform(uint32 MovementType, uint32 id) override { if (MovementType == POINT_MOTION_TYPE && id == 1) m_creature->SetInCombatWithZone(); diff --git a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_scorn.cpp b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_scorn.cpp index 91687ddea..3f75fb968 100644 --- a/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_scorn.cpp +++ b/src/scripts/eastern_kingdoms/tirisfal_glades/scarlet_monastery/boss_scorn.cpp @@ -61,7 +61,7 @@ struct boss_scornAI : public ScriptedAI uint32 FrostNova_Timer; uint32 LastWayPoint; - void Reset() + void Reset() override { LichSlap_Timer = 45000; FrostboltVolley_Timer = 30000; @@ -69,7 +69,7 @@ struct boss_scornAI : public ScriptedAI FrostNova_Timer = 30000; m_creature->GetMotionMaster()->MovePoint(LastWayPoint, ronde[LastWayPoint].x, ronde[LastWayPoint].y, ronde[LastWayPoint].z); } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (!m_creature->getVictim()) { @@ -82,7 +82,7 @@ struct boss_scornAI : public ScriptedAI if (uiPointId >= 0 && uiPointId < 10) LastWayPoint = uiPointId; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp b/src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp index 2a3536930..aa6049452 100644 --- a/src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp +++ b/src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp @@ -86,7 +86,7 @@ struct boss_archaedasAI : public ScriptedAI return !unit->IsWithinDist2d(spawnX, spawnY, 38.0f); } - void Reset() + void Reset() override { uiTremorTimer = 60000; iAwakenTimer = 0; @@ -99,7 +99,7 @@ struct boss_archaedasAI : public ScriptedAI m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void SpellHit(Unit* /*caster*/, const SpellEntry* spell) + void SpellHit(Unit* /*caster*/, const SpellEntry* spell) override { // Being woken up from the altar, start the awaken sequence if (spell->Id == SPELL_ARCHAEDAS_AWAKEN && !bWakingUp) @@ -110,19 +110,19 @@ struct boss_archaedasAI : public ScriptedAI } } - void KilledUnit(Unit* /*victim*/) + void KilledUnit(Unit* /*victim*/) override { DoScriptText(SAY_SLAY, m_creature); } // He goes back to his spawn point after reset, stone him after. - void JustReachedHome() + void JustReachedHome() override { Reset(); instance->SetData(ULDAMAN_ENCOUNTER_ARCHAEDAS, NOT_STARTED); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (bJustCreated) { @@ -221,7 +221,7 @@ struct boss_archaedasAI : public ScriptedAI DoMeleeAttackIfReady(); } - void EnterEvadeMode() + void EnterEvadeMode() override { if (Unit* target = me->SelectNearestHostileUnitInAggroRange(true)) { @@ -236,7 +236,7 @@ struct boss_archaedasAI : public ScriptedAI ScriptedAI::EnterEvadeMode(); } - void JustDied(Unit* /*killer*/) + void JustDied(Unit* /*killer*/) override { if (instance) { @@ -275,7 +275,7 @@ struct mob_archaedas_minionsAI : public ScriptedAI bool bAwake; ScriptedInstance* instance; - void Reset() + void Reset() override { uiArcing_Timer = 3000; uiTrample_Timer = urand(4000, 10000); @@ -287,7 +287,7 @@ struct mob_archaedas_minionsAI : public ScriptedAI bAwake = false; } - void EnterEvadeMode() + void EnterEvadeMode() override { Unit* target = me->SelectNearestHostileUnitInAggroRange(true); if (!target) @@ -303,7 +303,7 @@ struct mob_archaedas_minionsAI : public ScriptedAI } } - void EnterCombat() + void JoinCombat() { instance->SetData64(1, me->GetGUID()); // unfreeze bAwake = true; @@ -313,7 +313,7 @@ struct mob_archaedas_minionsAI : public ScriptedAI } } - void SpellHit(Unit* /*caster*/, const SpellEntry* spell) + void SpellHit(Unit* /*caster*/, const SpellEntry* spell) override { // time to wake up, start animation if (spell->Id == SPELL_AWAKEN_EARTHEN_DWARF @@ -326,11 +326,11 @@ struct mob_archaedas_minionsAI : public ScriptedAI else if (spell->Id == SPELL_AWAKEN_VAULT_WARDER) { bWakeSpellHit = true; - EnterCombat(); + JoinCombat(); } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) override { if (bAwake) { @@ -338,7 +338,7 @@ struct mob_archaedas_minionsAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (instance->GetData(ULDAMAN_ENCOUNTER_ARCHAEDAS) != IN_PROGRESS) { @@ -361,7 +361,7 @@ struct mob_archaedas_minionsAI : public ScriptedAI bWakingUp = false; // Wake him only if Archaedas is in combat if (instance->GetData(ULDAMAN_ENCOUNTER_ARCHAEDAS) == IN_PROGRESS) - EnterCombat(); + JoinCombat(); uiAwakenTimer = 4000; return; // dont want to continue until we finish the AttackStart method } diff --git a/src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp b/src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp index 2e2386abe..d4b147245 100644 --- a/src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp +++ b/src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp @@ -45,19 +45,19 @@ struct boss_ironayaAI : public ScriptedAI bool hasCastedKnockaway; bool hasMoved; - void Reset() + void Reset() override { hasCastedKnockaway = false; hasCastedWstomp = false; } - void Aggro(Unit *who) + void Aggro(Unit *who) override { DoScriptText(SAY_AGGRO, m_creature); m_creature->SetInCombatWithZone(); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (m_creature->getFaction() == FACTION_AWAKE && !hasMoved) { diff --git a/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp b/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp index 615ac5991..efcf5d30f 100644 --- a/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp +++ b/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp @@ -55,7 +55,7 @@ struct instance_uldaman : public ScriptedInstance std::vector vEarthenGuardian; std::vector vArchaedasWallMinions; //Minions lined up around the wall - void Initialize() + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); uiArchaedasGUID = 0; @@ -75,7 +75,7 @@ struct instance_uldaman : public ScriptedInstance vEarthenGuardian.reserve(6); } - bool IsEncounterInProgress() const + bool IsEncounterInProgress() const override { for (uint8 i = 0; i < ULDAMAN_MAX_ENCOUNTER; ++i) { @@ -89,7 +89,7 @@ struct instance_uldaman : public ScriptedInstance } - void OnCreatureCreate(Creature* pCreature) + void OnCreatureCreate(Creature* pCreature) override { switch (pCreature->GetEntry()) { @@ -137,7 +137,7 @@ struct instance_uldaman : public ScriptedInstance } } - void OnObjectCreate(GameObject* pGo) + void OnObjectCreate(GameObject* pGo) override { //sLog.outError("%s %u",pGo->GetNameForLocaleIdx(0),pGo->GetEntry()); switch (pGo->GetEntry()) @@ -225,7 +225,7 @@ struct instance_uldaman : public ScriptedInstance target->RemoveCorpse(); } - void SetData64(uint32 type, uint64 data) + void SetData64(uint32 type, uint64 data) override { // Ironaya's waker if (type == 0) @@ -250,7 +250,7 @@ struct instance_uldaman : public ScriptedInstance } } - uint64 GetData64(uint32 uiData) + uint64 GetData64(uint32 uiData) override { if (uiData == 0) return uiWhoWokeIronayaGUID; if (uiData == 1) return vVaultWarder[0]; // VaultWarder1 @@ -268,7 +268,7 @@ struct instance_uldaman : public ScriptedInstance return 0; } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) override { switch (uiType) { @@ -525,7 +525,7 @@ struct instance_uldaman : public ScriptedInstance OUT_LOAD_INST_DATA_COMPLETE; } - uint32 GetData(uint32 uiType) + uint32 GetData(uint32 uiType) override { if (uiType == ULDAMAN_ENCOUNTER_IRONAYA_DOOR) return m_auiEncounter[ULDAMAN_ENCOUNTER_IRONAYA_DOOR]; if (uiType == ULDAMAN_ENCOUNTER_STONE_KEEPERS) return m_auiEncounter[ULDAMAN_ENCOUNTER_STONE_KEEPERS]; @@ -534,7 +534,7 @@ struct instance_uldaman : public ScriptedInstance return 0; } - void Update(uint32 uiDiff) + void Update(uint32 uiDiff) override { if (!bKeystoneCheck) { diff --git a/src/scripts/eastern_kingdoms/uldaman/uldaman.cpp b/src/scripts/eastern_kingdoms/uldaman/uldaman.cpp index a8465acc0..1f1b3eda1 100644 --- a/src/scripts/eastern_kingdoms/uldaman/uldaman.cpp +++ b/src/scripts/eastern_kingdoms/uldaman/uldaman.cpp @@ -79,12 +79,12 @@ struct mob_stone_keeperAI : public ScriptedAI uint32 m_uiTrample_Timer; - void Reset() + void Reset() override { m_uiTrample_Timer = urand(4000, 9000); } - void EnterEvadeMode() + void EnterEvadeMode() override { if (Unit* target = me->SelectNearestHostileUnitInAggroRange(true)) { @@ -96,13 +96,13 @@ struct mob_stone_keeperAI : public ScriptedAI instance->SetData(ULDAMAN_ENCOUNTER_STONE_KEEPERS, FAIL); } - void JustDied(Unit* pWho) + void JustDied(Unit* pWho) override { if (instance) instance->SetData(ULDAMAN_ENCOUNTER_STONE_KEEPERS, IN_PROGRESS); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) { @@ -140,12 +140,12 @@ struct mob_jadespine_basiliskAI : public ScriptedAI uint32 Cslumber_Timer; - void Reset() + void Reset() override { Cslumber_Timer = 2000; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) @@ -290,15 +290,15 @@ struct AnnoraAI : public ScriptedAI uint32 m_uiNbScorpion; bool isSpawned; - void Reset() + void Reset() override { } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!isSpawned) { diff --git a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_darkmaster_gandling.cpp b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_darkmaster_gandling.cpp index 4f5439fc1..ac6bbc16f 100644 --- a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_darkmaster_gandling.cpp +++ b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_darkmaster_gandling.cpp @@ -72,7 +72,7 @@ struct boss_darkmaster_gandlingAI : public ScriptedAI bool bShadowPortalCasted; uint64 ShadowPortalTargetGUID; - void Reset() + void Reset() override { ArcaneMissiles_Timer = 4500; ShadowShield_Timer = 12000; @@ -82,7 +82,7 @@ struct boss_darkmaster_gandlingAI : public ScriptedAI ShadowPortalTargetGUID = 0; } - void JustDied(Unit *killer) + void JustDied(Unit *killer) override { if (m_pInstance) m_pInstance->SetData(TYPE_GANDLING, DONE); @@ -90,13 +90,13 @@ struct boss_darkmaster_gandlingAI : public ScriptedAI DoScriptText(SAY_GANDLING_DEATH, m_creature); } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) m_pInstance->SetData(TYPE_GANDLING, FAIL); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_doctor_theolen_krastinov.cpp b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_doctor_theolen_krastinov.cpp index 960cdb5c6..808f97fda 100644 --- a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_doctor_theolen_krastinov.cpp +++ b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_doctor_theolen_krastinov.cpp @@ -44,20 +44,20 @@ struct boss_theolenkrastinovAI : public ScriptedAI uint32 m_uiBackhand_Timer; uint32 m_uiFrenzy_Timer; - void Reset() + void Reset() override { m_uiRend_Timer = 8000; m_uiBackhand_Timer = 9000; m_uiFrenzy_Timer = 1000; } - void JustDied(Unit *killer) + void JustDied(Unit *killer) override { if (ScriptedInstance* pInstance = (ScriptedInstance*)m_creature->GetInstanceData()) pInstance->SetData(TYPE_THEOLEN, DONE); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_illucia_barov.cpp b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_illucia_barov.cpp index f1f26f005..cd3f67fda 100644 --- a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_illucia_barov.cpp +++ b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_illucia_barov.cpp @@ -41,7 +41,7 @@ struct boss_illuciabarovAI : public ScriptedAI uint32 Silence_Timer; uint32 Fear_Timer; - void Reset() + void Reset() override { CurseOfAgony_Timer = 18000; ShadowShock_Timer = 9000; @@ -49,13 +49,13 @@ struct boss_illuciabarovAI : public ScriptedAI Fear_Timer = 30000; } - void JustDied(Unit *killer) + void JustDied(Unit *killer) override { if (ScriptedInstance* pInstance = (ScriptedInstance*)m_creature->GetInstanceData()) pInstance->SetData(TYPE_ILLUCIABAROV, DONE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_instructor_malicia.cpp b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_instructor_malicia.cpp index 0425398f7..fbf3ffa9c 100644 --- a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_instructor_malicia.cpp +++ b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_instructor_malicia.cpp @@ -45,7 +45,7 @@ struct boss_instructormaliciaAI : public ScriptedAI uint32 FlashCounter; uint32 TouchCounter; - void Reset() + void Reset() override { CallOfGraves_Timer = 4000; Corruption_Timer = 8000; @@ -56,13 +56,13 @@ struct boss_instructormaliciaAI : public ScriptedAI TouchCounter = 0; } - void JustDied(Unit *killer) + void JustDied(Unit *killer) override { if (ScriptedInstance* pInstance = (ScriptedInstance*)m_creature->GetInstanceData()) pInstance->SetData(TYPE_MALICIA, DONE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_jandice_barov.cpp b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_jandice_barov.cpp index 0a0525ffa..0521abe7c 100644 --- a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_jandice_barov.cpp +++ b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_jandice_barov.cpp @@ -52,7 +52,7 @@ struct boss_jandicebarovAI : public ScriptedAI bool Invisible; bool checkForDamage; - void Reset() + void Reset() override { CurseOfBlood_Timer = 10000; Illusion_Timer = 15000; @@ -86,7 +86,7 @@ struct boss_jandicebarovAI : public ScriptedAI IllusionGUIDS.clear(); } - void JustDied(Unit *pKiller) + void JustDied(Unit *pKiller) override { UnsummonIllusions(); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -98,7 +98,7 @@ struct boss_jandicebarovAI : public ScriptedAI } } - void DamageTaken(Unit* /*pDealer*/, uint32& uiDamage) + void DamageTaken(Unit* /*pDealer*/, uint32& uiDamage) override { if (checkForDamage) { @@ -112,7 +112,7 @@ struct boss_jandicebarovAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (Invisible && Invisible_Timer < diff) { @@ -187,13 +187,13 @@ struct mob_illusionofjandicebarovAI : public ScriptedAI uint32 Cleave_Timer; - void Reset() + void Reset() override { Cleave_Timer = urand(2000, 8000); m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_kormok.cpp b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_kormok.cpp index 2498e5298..c3913df4e 100644 --- a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_kormok.cpp +++ b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_kormok.cpp @@ -39,7 +39,7 @@ struct boss_kormokAI : public ScriptedAI uint32 Mage_Timer; bool Mages; - void Reset() + void Reset() override { ShadowVolley_Timer = 10000; BoneShield_Timer = 2000; @@ -62,7 +62,7 @@ struct boss_kormokAI : public ScriptedAI summonedMage->AI()->AttackStart(victim); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_lord_alexei_barov.cpp b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_lord_alexei_barov.cpp index 9958fe9a2..7ced53d83 100644 --- a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_lord_alexei_barov.cpp +++ b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_lord_alexei_barov.cpp @@ -37,7 +37,7 @@ struct boss_lordalexeibarovAI : public ScriptedAI uint32 Immolate_Timer; uint32 VeilofShadow_Timer; - void Reset() + void Reset() override { Immolate_Timer = 7000; VeilofShadow_Timer = 15000; @@ -45,13 +45,13 @@ struct boss_lordalexeibarovAI : public ScriptedAI m_creature->LoadCreatureAddon(true); } - void JustDied(Unit *killer) + void JustDied(Unit *killer) override { if (ScriptedInstance* pInstance = (ScriptedInstance*)m_creature->GetInstanceData()) pInstance->SetData(TYPE_ALEXEIBAROV, DONE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_lorekeeper_polkelt.cpp b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_lorekeeper_polkelt.cpp index 1150d4648..2379ebb28 100644 --- a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_lorekeeper_polkelt.cpp +++ b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_lorekeeper_polkelt.cpp @@ -41,25 +41,25 @@ struct boss_lorekeeperpolkeltAI : public ScriptedAI uint32 CorrosiveAcid_Timer; uint32 NoxiousCatalyst_Timer; - void Reset() + void Reset() override { VolatileInfection_Timer = 38000; CorrosiveAcid_Timer = 45000; NoxiousCatalyst_Timer = 35000; } - void Aggro(Unit* /*pWho*/) + void Aggro(Unit* /*pWho*/) override { DoCastSpellIfCan(m_creature, SPELL_DARKPLAGUE_AURA, CF_TRIGGERED | CF_AURA_NOT_PRESENT); } - void JustDied(Unit *killer) + void JustDied(Unit *killer) override { if (ScriptedInstance* pInstance = (ScriptedInstance*)m_creature->GetInstanceData()) pInstance->SetData(TYPE_POLKELT, DONE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_ras_frostwhisper.cpp b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_ras_frostwhisper.cpp index b0fe262ee..375301c16 100644 --- a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_ras_frostwhisper.cpp +++ b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_ras_frostwhisper.cpp @@ -44,7 +44,7 @@ struct boss_rasfrostAI : public ScriptedAI uint32 ChillNova_Timer; uint32 FrostVolley_Timer; - void Reset() + void Reset() override { IceArmor_Timer = 2000; Frostbolt_Timer = 8000; @@ -56,7 +56,7 @@ struct boss_rasfrostAI : public ScriptedAI m_creature->CastSpell(m_creature, SPELL_ICEARMOR, true); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_the_ravenian.cpp b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_the_ravenian.cpp index f8e9ebaea..ac9a233f6 100644 --- a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_the_ravenian.cpp +++ b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_the_ravenian.cpp @@ -42,7 +42,7 @@ struct boss_theravenianAI : public ScriptedAI uint32 KnockAway_Timer; bool HasYelled; - void Reset() + void Reset() override { Trample_Timer = 24000; Cleave_Timer = 15000; @@ -51,13 +51,13 @@ struct boss_theravenianAI : public ScriptedAI HasYelled = false; } - void JustDied(Unit *killer) + void JustDied(Unit *killer) override { if (ScriptedInstance* pInstance = (ScriptedInstance*)m_creature->GetInstanceData()) pInstance->SetData(TYPE_RAVENIAN, DONE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_vectus.cpp b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_vectus.cpp index 7e8abac3b..685573207 100644 --- a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_vectus.cpp +++ b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/boss_vectus.cpp @@ -67,7 +67,7 @@ struct boss_vectusAI : public ScriptedAI bool m_bStartedDialogue; - void Reset() + void Reset() override { m_uiFlameStrike_Timer = 2000; m_uiBlastWave_Timer = 14000; @@ -90,7 +90,7 @@ struct boss_vectusAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(pWho); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { // Chakor@Nostalrius : Event Du Gambit if (!eventGambitDone) @@ -223,9 +223,9 @@ struct npc_scholomance_studentAI : public ScriptedAI ScriptedInstance* m_pInstance; bool isTransformed; - void Reset() {} + void Reset() override {} - void SpellHit(Unit *pCaster, const SpellEntry *pSpell) + void SpellHit(Unit *pCaster, const SpellEntry *pSpell) override { if (pSpell->Id == SPELL_VIEWING_ROOM_STUDENT_TRANSFORM_EFFECT) { @@ -239,7 +239,7 @@ struct npc_scholomance_studentAI : public ScriptedAI } } - void Aggro(Unit* /*pWho*/) + void Aggro(Unit* /*pWho*/) override { // set the viewing room and Marduk and Vectus to hostile on aggro std::list creatures; @@ -254,7 +254,7 @@ struct npc_scholomance_studentAI : public ScriptedAI pVectus->setFaction(14); } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { if (isTransformed) { @@ -283,7 +283,7 @@ struct npc_scholomance_studentAI : public ScriptedAI } } - void JustRespawned() + void JustRespawned() override { if (isTransformed) m_creature->AddAura(SPELL_VIEWING_ROOM_STUDENT_TRANSFORM_EFFECT, ADD_AURA_NO_OPTION, m_creature); @@ -291,7 +291,7 @@ struct npc_scholomance_studentAI : public ScriptedAI Reset(); } - void EnterEvadeMode() + void EnterEvadeMode() override { m_creature->RemoveAllAuras(); m_creature->DeleteThreatList(); diff --git a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/instance_scholomance.cpp b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/instance_scholomance.cpp index 1930d4fb8..b3c892ae6 100644 --- a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/instance_scholomance.cpp +++ b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/instance_scholomance.cpp @@ -54,7 +54,7 @@ struct instance_scholomance : public ScriptedInstance uint32 m_uiBoneMinionCount4; uint32 m_uiBoneMinionCount5; - void Initialize() + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -76,7 +76,7 @@ struct instance_scholomance : public ScriptedInstance m_uiBoneMinionCount5 = 0; } - void OnCreatureCreate(Creature* pCreature) + void OnCreatureCreate(Creature* pCreature) override { switch (pCreature->GetEntry()) { @@ -88,7 +88,7 @@ struct instance_scholomance : public ScriptedInstance break; } } - void OnGameObjectCreate(GameObject* pGo) + void OnGameObjectCreate(GameObject* pGo) override { switch (pGo->GetEntry()) { @@ -126,7 +126,7 @@ struct instance_scholomance : public ScriptedInstance } } - uint32 GetData(uint32 uiType) + uint32 GetData(uint32 uiType) override { if (uiType == TYPE_GANDLING) { @@ -139,7 +139,7 @@ struct instance_scholomance : public ScriptedInstance return m_auiEncounter[uiType]; return 0; } - uint64 GetData64(uint32 uiData) + uint64 GetData64(uint32 uiData) override { switch (uiData) { @@ -150,7 +150,7 @@ struct instance_scholomance : public ScriptedInstance } return 0; } - void OnCreatureDeath(Creature *who) + void OnCreatureDeath(Creature *who) override { switch (who->GetEntry()) { @@ -162,7 +162,7 @@ struct instance_scholomance : public ScriptedInstance } } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) override { switch (uiType) { @@ -341,12 +341,12 @@ struct instance_scholomance : public ScriptedInstance SummonGandlingIfPossible(); } /** Load / save system */ - const char* Save() + const char* Save() override { return strInstData.c_str(); } - void Load(const char* chrIn) + void Load(const char* chrIn) override { if (!chrIn) return; @@ -390,7 +390,7 @@ bool GOOpen_brazier_herald(Player* pUser, GameObject *pGo) pInst->SetData(TYPE_KIRTONOS, IN_PROGRESS); pGo->PlayDirectSound(SOUND_SCREECH, 0); - Creature* kirtonos = pUser->SummonCreature(NPC_KIRTONOS, 315.028f, 70.53845f, 102.1496f, 0.3859715f, TEMPSUMMON_DEAD_DESPAWN, 900000); + pUser->SummonCreature(NPC_KIRTONOS, 315.028f, 70.53845f, 102.1496f, 0.3859715f, TEMPSUMMON_DEAD_DESPAWN, 900000); } return true; @@ -426,14 +426,14 @@ struct boss_lordblackwoodAI : public ScriptedAI uint32 MultiShot_Timer; uint32 LastWayPoint; - void Reset() + void Reset() override { ShieldBash_Timer = 8000; MultiShot_Timer = 1000; m_creature->GetMotionMaster()->MovePoint(LastWayPoint, ronde[LastWayPoint].x, ronde[LastWayPoint].y, ronde[LastWayPoint].z); } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (!m_creature->getVictim()) { @@ -447,7 +447,7 @@ struct boss_lordblackwoodAI : public ScriptedAI LastWayPoint = uiPointId; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -482,7 +482,7 @@ struct go_viewing_room_door : public GameObjectAI { go_viewing_room_door(GameObject* pGo) : GameObjectAI(pGo) {} - bool OnUse(Unit* user) + bool OnUse(Unit* user) override { // Save door state to database if (user && user->GetInstanceData()) diff --git a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/scholo_trash.cpp b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/scholo_trash.cpp index 68f17ad94..9ff8347dc 100644 --- a/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/scholo_trash.cpp +++ b/src/scripts/eastern_kingdoms/western_plaguelands/scholomance/scholo_trash.cpp @@ -23,19 +23,19 @@ struct npc_unstable_corpseAI : public ScriptedAI { npc_unstable_corpseAI(Creature* pCreature) : ScriptedAI(pCreature) {} - void Reset() {} + void Reset() override {} - void Aggro(Unit* /*pWho*/) + void Aggro(Unit* /*pWho*/) override { DoCastSpellIfCan(m_creature, SPELL_DARK_PLAGUE_AURA, CF_TRIGGERED | CF_AURA_NOT_PRESENT); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { m_creature->CastSpell(m_creature, SPELL_EXPLOSION, true); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -63,14 +63,14 @@ struct npc_reanimated_corpseAI : public ScriptedAI uint32 m_uiHealTimer; bool m_bHasRessed; - void Reset() + void Reset() override { m_uiHealTimer = 0; m_bHasRessed = false; Resurrect(); } - void Aggro(Unit* /*pWho*/) + void Aggro(Unit* /*pWho*/) override { DoCastSpellIfCan(m_creature, SPELL_DARK_PLAGUE_AURA, CF_TRIGGERED | CF_AURA_NOT_PRESENT); } @@ -83,7 +83,7 @@ struct npc_reanimated_corpseAI : public ScriptedAI m_creature->AttackStop(); } - void DamageTaken(Unit* done_by, uint32& damage) + void DamageTaken(Unit* done_by, uint32& damage) override { if (damage < m_creature->GetHealth()) return; @@ -103,7 +103,7 @@ struct npc_reanimated_corpseAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (m_uiHealTimer) { diff --git a/src/scripts/eastern_kingdoms/westfall/deadmines/deadmines.cpp b/src/scripts/eastern_kingdoms/westfall/deadmines/deadmines.cpp index 212e46e9a..bf6ef8a7f 100644 --- a/src/scripts/eastern_kingdoms/westfall/deadmines/deadmines.cpp +++ b/src/scripts/eastern_kingdoms/westfall/deadmines/deadmines.cpp @@ -77,7 +77,7 @@ struct go_defias_gunpowderAI: public GameObjectAI { go_defias_gunpowderAI(GameObject* go) : GameObjectAI(go) {} - void SummonedMovementInform(Creature* summoned, uint32 motion_type, uint32 point_id) + void SummonedMovementInform(Creature* summoned, uint32 motion_type, uint32 point_id) override { if (motion_type == POINT_MOTION_TYPE) { diff --git a/src/scripts/eastern_kingdoms/westfall/deadmines/instance_deadmines.cpp b/src/scripts/eastern_kingdoms/westfall/deadmines/instance_deadmines.cpp index 1d6f15c94..b349f880b 100644 --- a/src/scripts/eastern_kingdoms/westfall/deadmines/instance_deadmines.cpp +++ b/src/scripts/eastern_kingdoms/westfall/deadmines/instance_deadmines.cpp @@ -53,7 +53,7 @@ struct instance_deadmines : public ScriptedInstance uint32 m_uiIronDoor_Timer; uint32 m_uiDoor_Step; - void Initialize() + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -72,7 +72,7 @@ struct instance_deadmines : public ScriptedInstance m_uiDoor_Step = 0; } - void OnCreatureCreate(Creature* pCreature) + void OnCreatureCreate(Creature* pCreature) override { if (pCreature->GetEntry() == NPC_RHAHKZOR) m_uiRhahkGUID = pCreature->GetGUID(); @@ -98,7 +98,7 @@ struct instance_deadmines : public ScriptedInstance } } - void OnCreatureDeath(Creature *who) + void OnCreatureDeath(Creature *who) override { switch (who->GetEntry()) { @@ -127,7 +127,7 @@ struct instance_deadmines : public ScriptedInstance } } - void OnObjectCreate(GameObject* pGo) + void OnObjectCreate(GameObject* pGo) override { if (pGo->GetEntry() == GO_IRON_CLAD) m_uiIronCladGUID = pGo->GetGUID(); @@ -149,7 +149,7 @@ struct instance_deadmines : public ScriptedInstance } } - void OnPlayerEnter(Player* pPlayer) + void OnPlayerEnter(Player* pPlayer) override { if (!pPlayer) return; @@ -162,7 +162,7 @@ struct instance_deadmines : public ScriptedInstance } } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) override { if (uiType == TYPE_DEFIAS_ENDDOOR) { @@ -182,7 +182,7 @@ struct instance_deadmines : public ScriptedInstance isGunPowderEventDone = uiData; } - uint32 GetData(uint32 uiType) + uint32 GetData(uint32 uiType) override { if (uiType == TYPE_DEFIAS_ENDDOOR) return m_auiEncounter[0]; @@ -191,7 +191,7 @@ struct instance_deadmines : public ScriptedInstance return 0; } - uint64 GetData64(uint32 uiData) + uint64 GetData64(uint32 uiData) override { if (uiData == DATA_DEFIAS_DOOR) return m_uiIronCladGUID; @@ -199,7 +199,7 @@ struct instance_deadmines : public ScriptedInstance return 0; } - void Update(uint32 uiDiff) + void Update(uint32 uiDiff) override { if (isRhahkDead) { diff --git a/src/scripts/eastern_kingdoms/westfall/westfall.cpp b/src/scripts/eastern_kingdoms/westfall/westfall.cpp index f4714e914..afa7fccc0 100644 --- a/src/scripts/eastern_kingdoms/westfall/westfall.cpp +++ b/src/scripts/eastern_kingdoms/westfall/westfall.cpp @@ -57,7 +57,7 @@ struct npc_daphne_stilwellAI : public npc_escortAI uint32 m_uiWPHolder; uint32 m_uiShootTimer; - void Reset() + void Reset() override { if (HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -80,7 +80,7 @@ struct npc_daphne_stilwellAI : public npc_escortAI m_uiShootTimer = 0; } - void WaypointReached(uint32 uiPoint) + void WaypointReached(uint32 uiPoint) override { m_uiWPHolder = uiPoint; @@ -129,7 +129,7 @@ struct npc_daphne_stilwellAI : public npc_escortAI } } - void AttackStart(Unit* pWho) + void AttackStart(Unit* pWho) override { if (!pWho) return; @@ -144,12 +144,12 @@ struct npc_daphne_stilwellAI : public npc_escortAI } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { pSummoned->AI()->AttackStart(m_creature); } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -206,7 +206,7 @@ struct npc_defias_traitorAI : public npc_escortAI Reset(); } - void WaypointReached(uint32 i) + void WaypointReached(uint32 i) override { switch (i) { @@ -227,12 +227,12 @@ struct npc_defias_traitorAI : public npc_escortAI } } - void Aggro(Unit* who) + void Aggro(Unit* who) override { DoScriptText(urand(0, 1) ? SAY_AGGRO_1 : SAY_AGGRO_2, m_creature, who); } - void Reset() { } + void Reset() override { } }; bool QuestAccept_npc_defias_traitor(Player* pPlayer, Creature* pCreature, const Quest* pQuest) diff --git a/src/scripts/eastern_kingdoms/wetlands/wetlands.cpp b/src/scripts/eastern_kingdoms/wetlands/wetlands.cpp index 92bfcf396..55bae9399 100644 --- a/src/scripts/eastern_kingdoms/wetlands/wetlands.cpp +++ b/src/scripts/eastern_kingdoms/wetlands/wetlands.cpp @@ -75,20 +75,20 @@ public: Reset(); } - void Reset() + void Reset() override { m_slowingPoisonTimer = urand(5000, 8900); m_backstabTimer = 500; m_creature->CastSpell(m_creature, SPELL_POISON_PROC, false); } - void AttackStart(Unit* pWho) + void AttackStart(Unit* pWho) override { if (pWho && m_creature->Attack(pWho, true)) m_creature->GetMotionMaster()->MoveChase(pWho); } - void AttackedBy(Unit* pAttacker) + void AttackedBy(Unit* pAttacker) override { if (!pAttacker || m_creature->getVictim()) return; @@ -199,7 +199,7 @@ struct npc_tapoke_slim_jahnAI : public npc_escortAI Reset(); } - void Reset() + void Reset() override { m_nextPhaseDelay = 0; m_mdDialogPhase = 0; @@ -208,14 +208,14 @@ struct npc_tapoke_slim_jahnAI : public npc_escortAI } // This function is also called when NPC runs away from player/group range. - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { DespawnFriendIfExists(); // Let escort ai do all checks for players and quests. npc_escortAI::JustDied(pKiller); } - void JustRespawned() + void JustRespawned() override { npc_escortAI::JustRespawned(); // calls Reset() @@ -231,7 +231,7 @@ struct npc_tapoke_slim_jahnAI : public npc_escortAI DoScriptText(SAY_PROGRESS_5_MIC, npcMikhail); } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { switch (uiPointId) { @@ -253,7 +253,7 @@ struct npc_tapoke_slim_jahnAI : public npc_escortAI } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { // This function is also called when Tapoke Slim Jahn has been defeated! if (Pet *slimsFriend = m_creature->FindGuardianWithEntry(NPC_SLIMS_FRIEND)) @@ -266,7 +266,7 @@ struct npc_tapoke_slim_jahnAI : public npc_escortAI DoScriptText(SAY_PROGRESS_1_TAP, m_creature); } - void AttackedBy(Unit* pAttacker) + void AttackedBy(Unit* pAttacker) override { if (!pAttacker || m_creature->getVictim() || m_creature->IsFriendlyTo(pAttacker)) return; @@ -274,7 +274,7 @@ struct npc_tapoke_slim_jahnAI : public npc_escortAI AttackStart(pAttacker); } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { if (m_justCreated) { @@ -365,13 +365,13 @@ struct npc_tapoke_slim_jahnAI : public npc_escortAI } } - void JustStartedEscort() + void JustStartedEscort() override { // Once event starts, NPC will use his Stealth spell. m_creature->CastSpell(m_creature, SPELL_STEALTH, false); } - void DamageTaken(Unit* pDoneBy, uint32& uiDamage) + void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) return; diff --git a/src/scripts/kalimdor/ashenvale/ashenvale.cpp b/src/scripts/kalimdor/ashenvale/ashenvale.cpp index 35402fb39..a942804c8 100644 --- a/src/scripts/kalimdor/ashenvale/ashenvale.cpp +++ b/src/scripts/kalimdor/ashenvale/ashenvale.cpp @@ -101,7 +101,7 @@ struct npc_muglashAI : public npc_escortAI uint32 m_uiEventTimer; uint32 impatienceTimer; - void Reset() + void Reset() override { m_uiEventTimer = 10000; impatienceTimer = 30000; @@ -114,7 +114,7 @@ struct npc_muglashAI : public npc_escortAI } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (HasEscortState(STATE_ESCORT_PAUSED)) { @@ -125,7 +125,7 @@ struct npc_muglashAI : public npc_escortAI } } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { switch (uiPointId) { @@ -187,12 +187,12 @@ struct npc_muglashAI : public npc_escortAI } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { pSummoned->AI()->AttackStart(m_creature); } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) { @@ -327,12 +327,12 @@ struct npc_ruul_snowhoofAI : public npc_escortAI Reset(); } - void Reset() + void Reset() override { m_creature->AddAura(BEAR_AURA); } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { //m_creature->MonsterYell("DEBUG : WayPoint reached", 0); //The hell, still skipping waypoints 13/02/2015 //sLog.outString("DEBUG : Ruul : WayPoint n° %u", uiPointId); @@ -357,7 +357,7 @@ struct npc_ruul_snowhoofAI : public npc_escortAI } } - void JustSummoned(Creature* summoned) + void JustSummoned(Creature* summoned) override { summoned->AI()->AttackStart(m_creature); } @@ -414,12 +414,12 @@ struct npc_torekAI : public npc_escortAI uint32 m_uiRend_Timer; uint32 m_uiThunderclap_Timer; - void Reset() + void Reset() override { m_uiRend_Timer = 5000; m_uiThunderclap_Timer = 8000; } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { std::list lCrea; m_creature->GetCreatureListWithEntryInGrid(lCrea, NPC_SPLINTERTREE_RAIDER, 40.0f); @@ -427,7 +427,7 @@ struct npc_torekAI : public npc_escortAI (*it)->DisappearAndDie(); npc_escortAI::JustDied(pKiller); } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { Player* pPlayer = GetPlayerForEscort(); @@ -464,12 +464,12 @@ struct npc_torekAI : public npc_escortAI } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { pSummoned->AI()->AttackStart(m_creature); } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -570,7 +570,7 @@ struct npc_feero_ironhandAI : public npc_escortAI uint8 m_uiCreaturesCount; bool m_bIsAttacked; - void Reset() + void Reset() override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -579,7 +579,7 @@ struct npc_feero_ironhandAI : public npc_escortAI } } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { switch (uiPointId) { @@ -610,7 +610,7 @@ struct npc_feero_ironhandAI : public npc_escortAI } } - void AttackedBy(Unit* pWho) + void AttackedBy(Unit* pWho) override { // Yell only at the first attack if (!m_bIsAttacked) @@ -632,7 +632,7 @@ struct npc_feero_ironhandAI : public npc_escortAI m_creature->SummonCreature(uiEntry, fX, fY, fZ, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 20000); } - void SummonedCreatureJustDied(Creature* pSummoned) + void SummonedCreatureJustDied(Creature* pSummoned) override { --m_uiCreaturesCount; @@ -655,7 +655,7 @@ struct npc_feero_ironhandAI : public npc_escortAI } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { if (pSummoned->GetEntry() == NPC_FORSAKEN_SCOUT) { @@ -783,7 +783,7 @@ struct go_foulweald_totem_moundAI: public GameObjectAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (eventPhase == 0 || eventPhase > 4) return; @@ -832,14 +832,14 @@ struct npc_enraged_foulwealdAI : public ScriptedAI { Reset(); } - void Reset() + void Reset() override { m_creature->AddAura(SPELL_CORRUPTED_STRENGTH); timer = 0; } uint32 timer; uint64 guidMound; - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (GameObject* gobj = m_creature->GetMap()->GetGameObject(guidMound)) { @@ -848,13 +848,13 @@ struct npc_enraged_foulwealdAI : public ScriptedAI } } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE || uiPointId != 2) return; HitBanner(); } - void AttackStart(Unit * unit) + void AttackStart(Unit * unit) override { if (m_creature->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) return; @@ -873,7 +873,7 @@ struct npc_enraged_foulwealdAI : public ScriptedAI } return false; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_creature->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) return; @@ -900,7 +900,7 @@ struct npc_enraged_foulwealdAI : public ScriptedAI } DoMeleeAttackIfReady(); } - void SpellHit(Unit* pCaster, const SpellEntry* pSpell) + void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override { if (pSpell->Id == SPELL_DESTROY_KARANG_S_BANNER_2) { diff --git a/src/scripts/kalimdor/ashenvale/blackfathom_deeps/instance_blackfathom_deeps.cpp b/src/scripts/kalimdor/ashenvale/blackfathom_deeps/instance_blackfathom_deeps.cpp index 2bdb2d2ad..1bd656130 100644 --- a/src/scripts/kalimdor/ashenvale/blackfathom_deeps/instance_blackfathom_deeps.cpp +++ b/src/scripts/kalimdor/ashenvale/blackfathom_deeps/instance_blackfathom_deeps.cpp @@ -109,7 +109,7 @@ struct instance_blackfathom_deeps : public ScriptedInstance uint32 m_auiEncounter[INSTANCE_BFD_MAX_ENCOUNTER]; std::string strInstData; - void Initialize() + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -129,13 +129,13 @@ struct instance_blackfathom_deeps : public ScriptedInstance m_uiSpawnMobsTimer[i] = 0; } - void OnCreatureCreate(Creature* pCreature) + void OnCreatureCreate(Creature* pCreature) override { if (pCreature->GetEntry() == 4832) m_uiTwilightLordKelrisGUID = pCreature->GetGUID(); } - void OnObjectCreate(GameObject* pGo) + void OnObjectCreate(GameObject* pGo) override { switch (pGo->GetEntry()) { @@ -165,7 +165,7 @@ struct instance_blackfathom_deeps : public ScriptedInstance } } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) override { switch (uiType) { @@ -209,12 +209,12 @@ struct instance_blackfathom_deeps : public ScriptedInstance } } - const char* Save() + const char* Save() override { return strInstData.c_str(); } - uint32 GetData(uint32 uiType) + uint32 GetData(uint32 uiType) override { switch (uiType) { @@ -229,7 +229,7 @@ struct instance_blackfathom_deeps : public ScriptedInstance return 0; } - uint64 GetData64(uint32 uiData) + uint64 GetData64(uint32 uiData) override { switch (uiData) { @@ -252,7 +252,7 @@ struct instance_blackfathom_deeps : public ScriptedInstance return 0; } - void Load(const char* chrIn) + void Load(const char* chrIn) override { if (!chrIn) { @@ -271,7 +271,7 @@ struct instance_blackfathom_deeps : public ScriptedInstance OUT_LOAD_INST_DATA_COMPLETE; } - void OnCreatureDeath(Creature* pCreature) + void OnCreatureDeath(Creature* pCreature) override { if (pCreature->GetEntry() == NPC_BARON_AQUANIS) SetData(TYPE_AQUANIS, DONE); @@ -338,7 +338,7 @@ struct instance_blackfathom_deeps : public ScriptedInstance return true; } - void Update(uint32 uiDiff) + void Update(uint32 uiDiff) override { // Only use this function if shrine event is in progress if (m_auiEncounter[BFD_ENCOUNTER_SHRINE] != IN_PROGRESS) @@ -379,7 +379,7 @@ struct go_fire_of_akumaiAI: public GameObjectAI { go_fire_of_akumaiAI(GameObject* pGo) : GameObjectAI(pGo) {} - bool OnUse(Unit* pUser) + bool OnUse(Unit* pUser) override { ScriptedInstance* pInstance = (ScriptedInstance*)me->GetInstanceData(); diff --git a/src/scripts/kalimdor/azshara/azshara.cpp b/src/scripts/kalimdor/azshara/azshara.cpp index dd31d6a60..9b8031ef4 100644 --- a/src/scripts/kalimdor/azshara/azshara.cpp +++ b/src/scripts/kalimdor/azshara/azshara.cpp @@ -44,13 +44,13 @@ struct mobs_spitelashesAI : public ScriptedAI uint32 morphtimer; bool spellhit; - void Reset() + void Reset() override { morphtimer = 0; spellhit = false; } - void SpellHit(Unit *Hitter, const SpellEntry *Spellkind) + void SpellHit(Unit *Hitter, const SpellEntry *Spellkind) override { if (!spellhit && Hitter->GetTypeId() == TYPEID_PLAYER) { @@ -63,7 +63,7 @@ struct mobs_spitelashesAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { // we mustn't remove the creature in the same round in which we cast the summon spell, otherwise there will be no summons if (spellhit && morphtimer >= 5000) @@ -218,7 +218,7 @@ struct mob_mawsAI : public ScriptedAI bool InCombat; bool PhaseTwo; - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (!InCombat) { @@ -231,7 +231,7 @@ struct mob_mawsAI : public ScriptedAI LastWayPoint = uiPointId; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (InCombat) { @@ -289,17 +289,17 @@ struct mob_mawsAI : public ScriptedAI else if (m_creature->getVictim()) InCombat = 1; } - void DamageTaken(Unit *done_by, uint32 &damage)// l'empecher d'etre kittable infini. s'applique pas aux dégats de la charge. + void DamageTaken(Unit *done_by, uint32 &damage) override// l'empecher d'etre kittable infini. s'applique pas aux dégats de la charge. { LeaveCombatTimer = 30000; } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { sWorld.SendWorldText(EMOTE_THE_BEAST_RETURNS); } - void Reset() + void Reset() override { PhaseTwo = 0; InCombat = 0; diff --git a/src/scripts/kalimdor/darkshore/darkshore.cpp b/src/scripts/kalimdor/darkshore/darkshore.cpp index 3a40a8a4d..c3070b6e9 100644 --- a/src/scripts/kalimdor/darkshore/darkshore.cpp +++ b/src/scripts/kalimdor/darkshore/darkshore.cpp @@ -893,7 +893,7 @@ struct npc_tharnariun_treetenderAI : public ScriptedAI Player* pPlaguedLandsPlayer = nullptr; Creature* pPlaguedLandsBear = nullptr; - void Reset() + void Reset() override { m_bPlaguedLandsEvent = false; PlaguedLandsCount = 0; @@ -909,7 +909,7 @@ struct npc_tharnariun_treetenderAI : public ScriptedAI m_uiPlaguedLandsTimer = 1100; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (m_bPlaguedLandsEvent) { diff --git a/src/scripts/kalimdor/desolace/desolace.cpp b/src/scripts/kalimdor/desolace/desolace.cpp index a84f0f61b..1f83083c5 100644 --- a/src/scripts/kalimdor/desolace/desolace.cpp +++ b/src/scripts/kalimdor/desolace/desolace.cpp @@ -451,7 +451,7 @@ struct go_serpent_statueAI: public GameObjectAI uint32 timer; bool state;//0 = usual, can launch. //1 = in use, cannot launch - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (state) { @@ -553,7 +553,7 @@ struct go_ghost_magnetAI: public GameObjectAI uint16 nbToSpawn; bool state;//0 = already are functioning magnets, do not spawn spectre. //1 = spawning. - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (state) { @@ -608,7 +608,7 @@ struct npc_magrami_spetreAI : public ScriptedAI corpseTimer = 20000; Reset(); } - void Reset() + void Reset() override { timer=0; curseTimer = urand(5000, 9000); @@ -623,7 +623,7 @@ struct npc_magrami_spetreAI : public ScriptedAI uint64 guidMagnet; bool isGreen; - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) override { if(isGreen) return; @@ -631,7 +631,7 @@ struct npc_magrami_spetreAI : public ScriptedAI return; turnGreen(); } - void JustReachedHome() + void JustReachedHome() override { if(!isGreen) turnGreen(); @@ -644,7 +644,7 @@ struct npc_magrami_spetreAI : public ScriptedAI isGreen=true; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -663,7 +663,7 @@ struct npc_magrami_spetreAI : public ScriptedAI curseTimer -= uiDiff; DoMeleeAttackIfReady(); } - void UpdateAI_corpse(const uint32 uiDiff) + void UpdateAI_corpse(const uint32 uiDiff) override { if ( corpseTimer < uiDiff)//purpose is to delay the new spawn. { @@ -716,7 +716,7 @@ struct go_demon_portalAI: public GameObjectAI { } ObjectGuid _demonGuid; - bool OnUse(Unit* caster) + bool OnUse(Unit* caster) override { Unit* demon; if (_demonGuid) @@ -831,9 +831,9 @@ const Coords Ambusher[] = const CaravanMember Caravan[] = { - { NPC_CARAVAN_KODO, -1887.26f, 2465.12f, 59.8224f, 4.48f, { 26.0f, 3.14f } }, - { NPC_RIGGER_GIZELTON, -1883.63f, 2471.68f, 59.8224f, 4.48f, { 18.0f, 3.14f } }, - { NPC_CARAVAN_KODO, -1882.11f, 2476.80f, 59.8224f, 4.48f, { 8.0f, 3.14f } } + { {NPC_CARAVAN_KODO, -1887.26f, 2465.12f, 59.8224f, 4.48f}, { 26.0f, 3.14f } }, + { {NPC_RIGGER_GIZELTON, -1883.63f, 2471.68f, 59.8224f, 4.48f}, { 18.0f, 3.14f } }, + { {NPC_CARAVAN_KODO, -1882.11f, 2476.80f, 59.8224f, 4.48f}, { 8.0f, 3.14f } } }; struct npc_cork_gizeltonAI : npc_escortAI @@ -942,11 +942,13 @@ struct npc_cork_gizeltonAI : npc_escortAI { if (*itr != m_creature->GetObjectGuid()) { - if (auto pCreature = m_creature->GetMap()->GetCreature(*itr)) + if (Creature* pCreature = m_creature->GetMap()->GetCreature(*itr)) + { if (apply) pCreature->SetFactionTemporary(FACTION_ESCORT_N_NEUTRAL_PASSIVE, TEMPFACTION_NONE); else pCreature->ClearTemporaryFaction(); + } } } diff --git a/src/scripts/kalimdor/desolace/maraudon/boss_celebras_the_cursed.cpp b/src/scripts/kalimdor/desolace/maraudon/boss_celebras_the_cursed.cpp index cbcd61d83..d190fcac6 100644 --- a/src/scripts/kalimdor/desolace/maraudon/boss_celebras_the_cursed.cpp +++ b/src/scripts/kalimdor/desolace/maraudon/boss_celebras_the_cursed.cpp @@ -62,20 +62,20 @@ struct celebras_the_cursedAI : public ScriptedAI uint32 EntanglingRoots_Timer; uint32 CorruptForces_Timer; - void Reset() + void Reset() override { Wrath_Timer = 8000; EntanglingRoots_Timer = 2000; CorruptForces_Timer = 30000; } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { if (m_pInstance) m_pInstance->SetData(TYPE_CELEBRAS, DONE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -134,7 +134,7 @@ struct celebrasSpiritAI : public npc_escortAI uint64 auraGUID; bool m_bBookRead; - void Reset() + void Reset() override { m_uiPhase = 0; Event_Timer = 0; @@ -142,7 +142,7 @@ struct celebrasSpiritAI : public npc_escortAI m_bBookRead = false; } - void WaypointReached(uint32 i) + void WaypointReached(uint32 i) override { std::list scepterList; switch (i) @@ -221,7 +221,7 @@ struct celebrasSpiritAI : public npc_escortAI Event_Timer = 1000; } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { if (Event_Timer && !m_creature->getVictim()) { diff --git a/src/scripts/kalimdor/desolace/maraudon/boss_landslide.cpp b/src/scripts/kalimdor/desolace/maraudon/boss_landslide.cpp index e11049bf9..60d2d4efe 100644 --- a/src/scripts/kalimdor/desolace/maraudon/boss_landslide.cpp +++ b/src/scripts/kalimdor/desolace/maraudon/boss_landslide.cpp @@ -38,14 +38,14 @@ struct boss_landslideAI : public ScriptedAI uint32 Trample_Timer; uint32 Landslide_Timer; - void Reset() + void Reset() override { KnockAway_Timer = 8000; Trample_Timer = 2000; Landslide_Timer = 0; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/kalimdor/desolace/maraudon/boss_noxxion.cpp b/src/scripts/kalimdor/desolace/maraudon/boss_noxxion.cpp index 799174dec..310f99b42 100644 --- a/src/scripts/kalimdor/desolace/maraudon/boss_noxxion.cpp +++ b/src/scripts/kalimdor/desolace/maraudon/boss_noxxion.cpp @@ -39,7 +39,7 @@ struct boss_noxxionAI : public ScriptedAI uint32 Invisible_Timer; bool Invisible; - void Reset() + void Reset() override { ToxicVolley_Timer = 7000; Uppercut_Timer = 16000; @@ -55,7 +55,7 @@ struct boss_noxxionAI : public ScriptedAI summoned->AI()->AttackStart(victim); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (Invisible && Invisible_Timer < diff) { diff --git a/src/scripts/kalimdor/desolace/maraudon/boss_princess_theradras.cpp b/src/scripts/kalimdor/desolace/maraudon/boss_princess_theradras.cpp index 5528dd21b..fddcb8fbf 100644 --- a/src/scripts/kalimdor/desolace/maraudon/boss_princess_theradras.cpp +++ b/src/scripts/kalimdor/desolace/maraudon/boss_princess_theradras.cpp @@ -41,7 +41,7 @@ struct boss_ptheradrasAI : public ScriptedAI uint32 RepulsiveGaze_Timer; uint32 RestoreTargetTimer; - void Reset() + void Reset() override { Dustfield_Timer = 8000; Boulder_Timer = 2000; @@ -50,12 +50,12 @@ struct boss_ptheradrasAI : public ScriptedAI RestoreTargetTimer = 0; } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { m_creature->SummonCreature(12238, 28.067f, 61.875f, -123.405f, 4.67f, TEMPSUMMON_TIMED_DESPAWN, 600000); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/kalimdor/desolace/maraudon/instance_maraudon.cpp b/src/scripts/kalimdor/desolace/maraudon/instance_maraudon.cpp index 247aebf17..fd59ef684 100644 --- a/src/scripts/kalimdor/desolace/maraudon/instance_maraudon.cpp +++ b/src/scripts/kalimdor/desolace/maraudon/instance_maraudon.cpp @@ -22,7 +22,7 @@ struct instance_maraudon : public ScriptedInstance bool bRespawnSpewedLarva; uint32 uiSpewedLarvaTimer; - void Initialize() + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -35,7 +35,7 @@ struct instance_maraudon : public ScriptedInstance } - void OnCreatureCreate(Creature *pCreature) + void OnCreatureCreate(Creature *pCreature) override { switch (pCreature->GetEntry()) { @@ -54,7 +54,7 @@ struct instance_maraudon : public ScriptedInstance } } - void OnGameObjectCreate(GameObject* pGo) + void OnGameObjectCreate(GameObject* pGo) override { switch (pGo->GetEntry()) { @@ -71,7 +71,7 @@ struct instance_maraudon : public ScriptedInstance } } - void OnCreatureRespawn(Creature *pCreature) + void OnCreatureRespawn(Creature *pCreature) override { switch (pCreature->GetEntry()) { @@ -83,12 +83,12 @@ struct instance_maraudon : public ScriptedInstance } } - const char* Save() + const char* Save() override { return strInstData.c_str(); } - void Load(const char* chrIn) + void Load(const char* chrIn) override { if (!chrIn) return; @@ -101,7 +101,7 @@ struct instance_maraudon : public ScriptedInstance } } - uint32 GetData(uint32 uiType) + uint32 GetData(uint32 uiType) override { switch (uiType) { @@ -116,7 +116,7 @@ struct instance_maraudon : public ScriptedInstance } } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) override { switch (uiType) { @@ -155,7 +155,7 @@ struct instance_maraudon : public ScriptedInstance } } - uint64 GetData64(uint32 uiData) + uint64 GetData64(uint32 uiData) override { switch (uiData) { @@ -178,7 +178,7 @@ struct instance_maraudon : public ScriptedInstance } } - void Update(uint32 uiDiff) + void Update(uint32 uiDiff) override { // Remove a corrupted vine when a healed one was summoned over if (vineGuid) diff --git a/src/scripts/kalimdor/durotar/durotar.cpp b/src/scripts/kalimdor/durotar/durotar.cpp index ec42e2ff4..5fe1e6b05 100644 --- a/src/scripts/kalimdor/durotar/durotar.cpp +++ b/src/scripts/kalimdor/durotar/durotar.cpp @@ -67,14 +67,14 @@ struct LazyPeonAI : public ScriptedAI uint8 state; ObjectGuid playerGuid; - void DoAction(const uint32 state) + void DoAction(const uint32 state) override { this->state = state; } - void Reset() {} + void Reset() override {} - void SpellHit(Unit* caster, SpellEntry const* spell) + void SpellHit(Unit* caster, SpellEntry const* spell) override { if (spell->Id == SPELL_AWAKEN_PEON && m_creature->GetEntry() == LAZY_PEON_ENTRY && m_creature->HasAura(SPELL_BUFF_SLEEP)) { @@ -86,7 +86,7 @@ struct LazyPeonAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { switch (state) { @@ -155,7 +155,7 @@ struct LazyPeonAI : public ScriptedAI } } - void MovementInform(uint32 MovementType, uint32 id) + void MovementInform(uint32 MovementType, uint32 id) override { if (MovementType == POINT_MOTION_TYPE && id == 1) { diff --git a/src/scripts/kalimdor/dustwallow_marsh/dustwallow_marsh.cpp b/src/scripts/kalimdor/dustwallow_marsh/dustwallow_marsh.cpp index abc8b44a8..cf3c4efbe 100644 --- a/src/scripts/kalimdor/dustwallow_marsh/dustwallow_marsh.cpp +++ b/src/scripts/kalimdor/dustwallow_marsh/dustwallow_marsh.cpp @@ -55,9 +55,9 @@ struct npc_morokkAI : public npc_escortAI bool m_bIsSuccess; - void Reset() {} + void Reset() override {} - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { switch (uiPointId) { @@ -76,7 +76,7 @@ struct npc_morokkAI : public npc_escortAI } } - void AttackedBy(Unit* pAttacker) + void AttackedBy(Unit* pAttacker) override { if (m_creature->getVictim()) return; @@ -87,7 +87,7 @@ struct npc_morokkAI : public npc_escortAI AttackStart(pAttacker); } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -106,7 +106,7 @@ struct npc_morokkAI : public npc_escortAI } } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) { @@ -280,7 +280,7 @@ struct npc_private_hendelAI : public ScriptedAI Reset(); } - void Reset() + void Reset() override { // if Hendel returns spawn point in MDQP_FIGHT phase, players have failed a quest. if (m_mdQuestPhase == MDQP_FIGHT) @@ -316,7 +316,7 @@ struct npc_private_hendelAI : public ScriptedAI m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_1 | UNIT_FLAG_PASSIVE); } - void AttackedBy(Unit* pAttacker) + void AttackedBy(Unit* pAttacker) override { if (m_creature->getVictim()) return; @@ -460,7 +460,7 @@ struct npc_private_hendelAI : public ScriptedAI } } - void JustRespawned() + void JustRespawned() override { ScriptedAI::JustRespawned(); // calls Reset() @@ -482,7 +482,7 @@ struct npc_private_hendelAI : public ScriptedAI } } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) override { // This is required to handle other fight cases For example if NPC is getting attacked by opposite faction, hostile creatures, etc. if (m_mdQuestPhase == MDQP_NONE) @@ -511,7 +511,7 @@ struct npc_private_hendelAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { #ifdef ELYSIUM_CORE_JUST_RESPAWNED if (m_justCreated) @@ -821,7 +821,7 @@ struct npc_archmage_tervoshAI : public ScriptedAI // returns the current phase in the event const uint32 getCurrentPhase() const { return m_eventPhase; } - void Reset() + void Reset() override { m_eventStarted = false; m_eventPhase = MDQP_ARRIVE; @@ -829,7 +829,7 @@ struct npc_archmage_tervoshAI : public ScriptedAI m_despawnDelayTimer = TERVOSH_SPAWN_DURATION; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_eventStarted) { @@ -1038,13 +1038,13 @@ struct npc_lady_jaina_proudmooreAI : public ScriptedAI uint32 m_uiSpellTimer; uint32 m_uiSpecialTimer; - void Reset() + void Reset() override { m_uiSpellTimer = 3000; m_uiSpecialTimer = 15000; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim() || m_creature->IsNonMeleeSpellCasted()) return; @@ -1204,9 +1204,9 @@ struct npc_stinky_ignatzAI : public npc_escortAI Reset(); } - void Reset() {} + void Reset() override {} - void JustRespawned() + void JustRespawned() override { currWaypoint = 0; timer = 21000; @@ -1216,7 +1216,7 @@ struct npc_stinky_ignatzAI : public npc_escortAI uint32 currWaypoint; uint32 timer; - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { currWaypoint = uiPointId; @@ -1250,7 +1250,7 @@ struct npc_stinky_ignatzAI : public npc_escortAI break; } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) { diff --git a/src/scripts/kalimdor/dustwallow_marsh/onyxias_lair/boss_onyxia.cpp b/src/scripts/kalimdor/dustwallow_marsh/onyxias_lair/boss_onyxia.cpp index ee217aa87..98867ce98 100644 --- a/src/scripts/kalimdor/dustwallow_marsh/onyxias_lair/boss_onyxia.cpp +++ b/src/scripts/kalimdor/dustwallow_marsh/onyxias_lair/boss_onyxia.cpp @@ -161,7 +161,7 @@ struct boss_onyxiaAI : public ScriptedAI ScriptedInstance* m_pInstance; std::list GOListe; - void Reset() + void Reset() override { m_uiPhase = PHASE_ONE; m_bTransition = false; @@ -294,7 +294,7 @@ struct boss_onyxiaAI : public ScriptedAI } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { // Daemon: Fix orientation. m_creature->SetStandState(UNIT_STAND_STATE_STAND); @@ -311,7 +311,7 @@ struct boss_onyxiaAI : public ScriptedAI (*itr)->Respawn(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(DATA_ONYXIA_EVENT, DONE); @@ -327,7 +327,7 @@ struct boss_onyxiaAI : public ScriptedAI ScriptedAI::EnterEvadeMode(); } - void JustSummoned(Creature *pSummoned) + void JustSummoned(Creature *pSummoned) override { if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0)) pSummoned->AI()->AttackStart(pTarget); @@ -335,7 +335,7 @@ struct boss_onyxiaAI : public ScriptedAI ++m_uiSummonCount; } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { DoScriptText(SAY_KILL, m_creature); } @@ -357,7 +357,7 @@ struct boss_onyxiaAI : public ScriptedAI return nullptr; } - void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) + void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override { if (pSpell->Id == SPELL_BELLOWINGROAR) { @@ -648,8 +648,7 @@ struct boss_onyxiaAI : public ScriptedAI m_creature->CastSpell(m_creature, 17131, true); /** Start flying */ m_bTransition = false; m_uiTransTimer = 0; - float X = m_creature->GetPositionX() - m_pPointData->fX; - float Y = m_creature->GetPositionY() - m_pPointData->fY; + // increase Onyxia's hitbox while in the air to make it slightly easier for melee to use specials on her m_creature->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 21.0f); m_creature->SetFloatValue(UNIT_FIELD_COMBATREACH, 22.0f); @@ -710,7 +709,7 @@ struct boss_onyxiaAI : public ScriptedAI m_uiTransTimer -= uiDiff; } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE) return; @@ -745,7 +744,7 @@ struct boss_onyxiaAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { CheckForTargetsInAggroRadius(uiDiff); @@ -822,16 +821,16 @@ struct OnyxianWhelpAI: public ScriptedAI } - void Reset() + void Reset() override { } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/kalimdor/dustwallow_marsh/onyxias_lair/instance_onyxia_lair.cpp b/src/scripts/kalimdor/dustwallow_marsh/onyxias_lair/instance_onyxia_lair.cpp index f5b273337..c273a5bfc 100644 --- a/src/scripts/kalimdor/dustwallow_marsh/onyxias_lair/instance_onyxia_lair.cpp +++ b/src/scripts/kalimdor/dustwallow_marsh/onyxias_lair/instance_onyxia_lair.cpp @@ -11,7 +11,7 @@ struct instance_onyxia_lair : public ScriptedInstance }; uint32 m_auiEncounter[MAX_ENCOUNTER]; - void Initialize() { } + void Initialize() override { } bool IsEncounterInProgress() const override { @@ -21,7 +21,7 @@ struct instance_onyxia_lair : public ScriptedInstance return false; } - uint32 GetData(uint32 identifier) + uint32 GetData(uint32 identifier) override { switch (identifier) { diff --git a/src/scripts/kalimdor/felwood/felwood.cpp b/src/scripts/kalimdor/felwood/felwood.cpp index 41d704589..1bb94012a 100644 --- a/src/scripts/kalimdor/felwood/felwood.cpp +++ b/src/scripts/kalimdor/felwood/felwood.cpp @@ -68,9 +68,9 @@ struct npc_kittenAI : public FollowerAI uint32 m_uiMoonwellCooldown; - void Reset() { } + void Reset() override { } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* pWho) override { //should not have npc_flags by default, so set when expected if (!m_creature->getVictim() && !m_creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP) && HasFollowState(STATE_FOLLOW_INPROGRESS) && pWho->GetEntry() == NPC_WINNA) @@ -80,7 +80,7 @@ struct npc_kittenAI : public FollowerAI } } - void UpdateFollowerAI(const uint32 uiDiff) + void UpdateFollowerAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) { @@ -248,7 +248,7 @@ struct npc_niby_the_almightyAI : public ScriptedAI bool m_bEventStarted; - void Reset() + void Reset() override { m_uiSummonTimer = 500; m_uiSpeech = 0; @@ -263,7 +263,7 @@ struct npc_niby_the_almightyAI : public ScriptedAI m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_bEventStarted) { @@ -348,12 +348,12 @@ struct npc_cursed_oozeAI : public ScriptedAI Reset(); } uint32 SpellTimer; - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit *caster, const SpellEntry *spell) override { if (spell && spell->Id == SPELL_QUEST_CURSED_JAR) m_creature->ForcedDespawn(); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -366,7 +366,7 @@ struct npc_cursed_oozeAI : public ScriptedAI SpellTimer -= diff; DoMeleeAttackIfReady(); } - void Reset() + void Reset() override { SpellTimer = 3000; } @@ -385,12 +385,12 @@ struct npc_tainted_oozeAI : public ScriptedAI Reset(); } uint32 SpellTimer; - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit *caster, const SpellEntry *spell) override { if (spell && spell->Id == SPELL_QUEST_TAINTED_JAR) m_creature->ForcedDespawn(); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -403,7 +403,7 @@ struct npc_tainted_oozeAI : public ScriptedAI SpellTimer -= diff; DoMeleeAttackIfReady(); } - void Reset() + void Reset() override { SpellTimer = 3000; } @@ -857,7 +857,7 @@ public: uint32 cleansedEntry; ObjectGuid cleansedGuid; - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (me->isSpawned() && cleansedGuid) { diff --git a/src/scripts/kalimdor/feralas/dire_maul/boss_gordok_king.cpp b/src/scripts/kalimdor/feralas/dire_maul/boss_gordok_king.cpp index de0181b3b..4f9c07c10 100644 --- a/src/scripts/kalimdor/feralas/dire_maul/boss_gordok_king.cpp +++ b/src/scripts/kalimdor/feralas/dire_maul/boss_gordok_king.cpp @@ -34,7 +34,7 @@ struct boss_king_gordokAI : public ScriptedAI uint32 m_uiLinkCheckTimer; - void Reset() + void Reset() override { m_uiWarStomp_Timer = urand(7000, 8000); m_uiMortalStrike_Timer = urand(15000, 25000); @@ -45,12 +45,12 @@ struct boss_king_gordokAI : public ScriptedAI m_uiLinkCheckTimer = 2500; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { DoScriptText(SAY_AGGRO, m_creature); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -179,7 +179,7 @@ struct boss_chorushAI : public ScriptedAI bool const m_bLinkCheckEnabled = sWorld.GetWowPatch() >= WOW_PATCH_109; uint32 m_uiLinkCheckTimer; - void Reset() + void Reset() override { m_uiLinkCheckTimer = 2500; m_uiEquipment = 0; @@ -208,7 +208,7 @@ struct boss_chorushAI : public ScriptedAI void UpdateAIShaman(const uint32 uiDiff); void UpdateAIPrist(const uint32 uiDiff); - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/kalimdor/feralas/dire_maul/boss_immol_thar.cpp b/src/scripts/kalimdor/feralas/dire_maul/boss_immol_thar.cpp index e210cf3c4..1fab8291b 100644 --- a/src/scripts/kalimdor/feralas/dire_maul/boss_immol_thar.cpp +++ b/src/scripts/kalimdor/feralas/dire_maul/boss_immol_thar.cpp @@ -43,13 +43,13 @@ struct boss_immol_tharAI : public ScriptedAI return false; } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(TYPE_IMMOL_THAR, DONE); } - void Reset() + void Reset() override { m_uiEnrageTimer = 50000; m_uiTrampleTimer = urand(5000, 9000); @@ -67,13 +67,13 @@ struct boss_immol_tharAI : public ScriptedAI ScriptedAI::EnterEvadeMode(); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if(!m_bEngage) m_bEngage = true; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) { diff --git a/src/scripts/kalimdor/feralas/dire_maul/boss_tendris_warpwood.cpp b/src/scripts/kalimdor/feralas/dire_maul/boss_tendris_warpwood.cpp index b53d21e9d..446a682fe 100644 --- a/src/scripts/kalimdor/feralas/dire_maul/boss_tendris_warpwood.cpp +++ b/src/scripts/kalimdor/feralas/dire_maul/boss_tendris_warpwood.cpp @@ -47,7 +47,7 @@ struct boss_tendris_warpwoodAI : public ScriptedAI return false; } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { m_creature->SummonCreature(NPC_ANCIENT_EQUINE_SPIRIT, pKiller->GetPositionX(), @@ -57,7 +57,7 @@ struct boss_tendris_warpwoodAI : public ScriptedAI TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (!m_uiAggroProtector) { @@ -78,7 +78,7 @@ struct boss_tendris_warpwoodAI : public ScriptedAI } } - void Reset() + void Reset() override { m_uiInvocation_Timer = 0; m_uiTrampleTimer = urand(5000, 9000); @@ -87,14 +87,14 @@ struct boss_tendris_warpwoodAI : public ScriptedAI m_uiAggroProtector = false; } - void AttackStart(Unit* Who) + void AttackStart(Unit* Who) override { ScriptedAI::AttackStart(Who); if (m_pInstance) m_pInstance->SetData(DATA_TENDRIS_AGGRO, IN_PROGRESS); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim() || m_creature->IsNonMeleeSpellCasted(false)) return; diff --git a/src/scripts/kalimdor/feralas/dire_maul/boss_zevrim.cpp b/src/scripts/kalimdor/feralas/dire_maul/boss_zevrim.cpp index 3e74fffeb..d2bd921d9 100644 --- a/src/scripts/kalimdor/feralas/dire_maul/boss_zevrim.cpp +++ b/src/scripts/kalimdor/feralas/dire_maul/boss_zevrim.cpp @@ -25,19 +25,19 @@ struct boss_zevrimAI : public ScriptedAI uint32 m_uiIntensePainTimer; uint32 m_uiSacrificeTimer; - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(TYPE_BOSS_ZEVRIM, DONE); } - void Reset() + void Reset() override { m_uiIntensePainTimer = urand(5000, 9000); m_uiSacrificeTimer = urand(9000, 12000); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim() || m_creature->IsNonMeleeSpellCasted(false)) return; diff --git a/src/scripts/kalimdor/feralas/dire_maul/dire_maul.h b/src/scripts/kalimdor/feralas/dire_maul/dire_maul.h index 74ce04807..294af431b 100644 --- a/src/scripts/kalimdor/feralas/dire_maul/dire_maul.h +++ b/src/scripts/kalimdor/feralas/dire_maul/dire_maul.h @@ -111,23 +111,23 @@ class instance_dire_maul : public ScriptedInstance { public: instance_dire_maul(Map* pMap); - ~instance_dire_maul() {} + ~instance_dire_maul() override {} - void Initialize(); + void Initialize() override; - void OnPlayerEnter(Player* pPlayer); - void OnPlayerLeave(Player* pPlayer); - void OnObjectCreate(GameObject* pGo); - void OnCreatureDeath(Creature* pCreature); - void OnCreatureCreate(Creature* pCreature); + void OnPlayerEnter(Player* pPlayer) override; + void OnPlayerLeave(Player* pPlayer) override; + void OnObjectCreate(GameObject* pGo) override; + void OnCreatureDeath(Creature* pCreature) override; + void OnCreatureCreate(Creature* pCreature) override; - void SetData(uint32 uiType, uint32 uiData); - void SetData64(uint32 uiType, uint64 uiData); - uint32 GetData(uint32 uiType); - uint64 GetData64(uint32 uiType); + void SetData(uint32 uiType, uint32 uiData) override; + void SetData64(uint32 uiType, uint64 uiData) override; + uint32 GetData(uint32 uiType) override; + uint64 GetData64(uint32 uiType) override; - const char* Save() { return strInstData.c_str(); } - void Load(const char* chrIn); + const char* Save() override { return strInstData.c_str(); } + void Load(const char* chrIn) override; uint8 GetChoRushEquipment(); void DoSortCristalsEventMobs(); @@ -171,7 +171,6 @@ class instance_dire_maul : public ScriptedInstance uint64 m_uiGordokTribute5GUID; uint64 m_uiGordokTribute6GUID; - uint64 m_uiKnotsBallandChainGUID; uint64 m_uiBrokenTrapGUID; bool m_bIsGordokTributeRespawned; bool m_bIsTanninLooted; diff --git a/src/scripts/kalimdor/feralas/dire_maul/dreadsteed_ritual.cpp b/src/scripts/kalimdor/feralas/dire_maul/dreadsteed_ritual.cpp index 1c4b39c98..4d5aba928 100644 --- a/src/scripts/kalimdor/feralas/dire_maul/dreadsteed_ritual.cpp +++ b/src/scripts/kalimdor/feralas/dire_maul/dreadsteed_ritual.cpp @@ -653,7 +653,7 @@ struct go_pedestal_of_immol_tharAI: public GameObjectAI } nodeNb++; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (eventPhase == 1 || eventPhase == 2 || eventPhase == 4) //and phase < ended { @@ -725,16 +725,16 @@ struct npc_ritual_triggerAI : public ScriptedAI { Reset(); } - void Reset() + void Reset() override { timer = 0; } - void EnterCombat(Unit* enemy) {} - void AttackedBy(Unit* attacker) {} - void AttackStart(Unit * unit) {} - void EnterEvadeMode() {} + void EnterCombat(Unit* enemy) override {} + void AttackedBy(Unit* attacker) override {} + void AttackStart(Unit * unit) override {} + void EnterEvadeMode() override {} uint32 timer; - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { /*if (timer < uiDiff) { @@ -765,7 +765,7 @@ struct go_ritual_nodeAI: public GameObjectAI uint32 spell; /*bool OnUse(Unit* pUser){ }*/ - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (me->GetGoState() == GO_STATE_ACTIVE && me->isSpawned()) { @@ -829,14 +829,14 @@ struct boss_lordHelNurathAI : public ScriptedAI uint32 m_uiSleep_Timer; uint32 m_uiKnockAway_Timer; - void Reset() + void Reset() override { m_uiShadowWord_Timer = 28000; m_uiVielOfShadow_Timer = 16000; m_uiSleep_Timer = 21000; m_uiKnockAway_Timer = 20000; //less than 20s } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -887,12 +887,12 @@ struct boss_xorothianDreadsteedAI : public ScriptedAI uint32 m_uiCharge_Timer; uint32 m_uiFlameBuffet_Timer; - void Reset() + void Reset() override { m_uiCharge_Timer = 8000; m_uiFlameBuffet_Timer = 10000; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -914,7 +914,7 @@ struct boss_xorothianDreadsteedAI : public ScriptedAI m_uiFlameBuffet_Timer -= uiDiff; DoMeleeAttackIfReady(); } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { m_creature->CastSpell(m_creature, SPELL_SUMMON_DREADSTEED_SPIRIT, true); } diff --git a/src/scripts/kalimdor/feralas/dire_maul/instance_dire_maul.cpp b/src/scripts/kalimdor/feralas/dire_maul/instance_dire_maul.cpp index 83cbce6ef..60e646338 100644 --- a/src/scripts/kalimdor/feralas/dire_maul/instance_dire_maul.cpp +++ b/src/scripts/kalimdor/feralas/dire_maul/instance_dire_maul.cpp @@ -16,18 +16,26 @@ void EnableCreature(Creature* pCreature) instance_dire_maul::instance_dire_maul(Map* pMap) : ScriptedInstance(pMap), // East - m_uiCorruptVineGUID(0), - m_uiCrumbleWallGUID(0), - m_uiOldIronbarkGUID(0), m_uiDoorAlzzinInGUID(0), + m_uiCrumbleWallGUID(0), + m_uiCorruptVineGUID(0), + // West - m_uiForceFieldGUID(0), - m_uiTortheldrinGUID(0), - m_uiImmolTharGUID(0), - m_uiTendrisGUID(0), m_uiMagicVortexGUID(0), + m_uiForceFieldGUID(0), + m_uiImmolTharGUID(0), + m_uiTortheldrinGUID(0), + // North m_uiGuardAliveCount(6), + m_uiTendrisGUID(0), + m_uiOldIronbarkGUID(0), + m_uiSlipKikGUID(0), + m_uiCaptainKromcrushGUID(0), + m_uiKingGordokGUID(0), + m_uiChoRushTheObserverGUID(0), + m_uiChoRushEquipment(0), + m_uiGordokTribute0GUID(0), m_uiGordokTribute1GUID(0), m_uiGordokTribute2GUID(0), @@ -35,14 +43,10 @@ instance_dire_maul::instance_dire_maul(Map* pMap) : ScriptedInstance(pMap), m_uiGordokTribute4GUID(0), m_uiGordokTribute5GUID(0), m_uiGordokTribute6GUID(0), + + m_uiBrokenTrapGUID(0), m_bIsGordokTributeRespawned(false), - m_bIsTanninLooted(false), - m_uiSlipKikGUID(0), - m_uiCaptainKromcrushGUID(0), - m_uiKingGordokGUID(0), - m_uiChoRushTheObserverGUID(0), - m_uiChoRushEquipment(0), - m_uiBrokenTrapGUID(0) + m_bIsTanninLooted(false) { Initialize(); } @@ -592,20 +596,20 @@ struct npc_reste_manaAI : public ScriptedAI uint32 m_uiChainLighting_Timer; uint32 m_uiBlink_Timer; - void Reset() + void Reset() override { m_uiBlink_Timer = urand(12000, 23000); m_uiChainLighting_Timer = urand(2000, 6000); m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_ARCANE, true); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData64(TYPE_CRISTAL_EVENT, m_creature->GetGUID()); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -658,20 +662,20 @@ struct npc_arcane_aberrationAI : public ScriptedAI uint32 m_uiArcaneBoltTimer; bool m_bManaBurnDone; - void Reset() + void Reset() override { m_uiArcaneBoltTimer = urand(0, 400); m_bManaBurnDone = false; m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_ARCANE, true); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData64(TYPE_CRISTAL_EVENT, m_creature->GetGUID()); } - void DamageTaken(Unit* pDoneBy, uint32& uiDamage) + void DamageTaken(Unit* pDoneBy, uint32& uiDamage) override { if (m_creature->GetHealthPercent() > 5.0f) return; @@ -683,7 +687,7 @@ struct npc_arcane_aberrationAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -728,14 +732,14 @@ struct npc_residual_montruosityAI : public ScriptedAI uint32 m_uiArcaneBoltTimer; uint32 m_uiArcaneBlastTimer; - void Reset() + void Reset() override { m_uiArcaneBlastTimer = urand(1000, 2500); m_uiArcaneBoltTimer = urand(0, 400); m_creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_ARCANE, true); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { DoCastSpellIfCan(m_creature, SPELL_SUMMON_MANABURSTS); } @@ -780,7 +784,7 @@ struct npc_residual_montruosityAI : public ScriptedAI m_creature->SetSpeedRate(MOVE_WALK, newspeed); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) @@ -869,9 +873,9 @@ struct npc_mizzle_the_craftyAI : public ScriptedAI bool m_bJustReachedHome; instance_dire_maul* m_pInstance; - void Reset() {} + void Reset() override {} - void JustReachedHome() + void JustReachedHome() override { if (!m_bJustReachedHome) { @@ -881,7 +885,7 @@ struct npc_mizzle_the_craftyAI : public ScriptedAI } } - void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) + void SpellHitTarget(Unit* pTarget, const SpellEntry* pSpell) override { m_creature->SetOrientation(3.170f); } @@ -967,9 +971,9 @@ struct npc_knot_thimblejackAI : public ScriptedAI instance_dire_maul* m_pInstance; - void Reset() {} + void Reset() override {} - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) override { if (type != POINT_MOTION_TYPE) return; @@ -1107,7 +1111,7 @@ struct GordokBruteAI : public ScriptedAI uint32 m_uiUppercut_Timer; bool m_bEnrage; - void Reset() + void Reset() override { m_creature->LoadEquipment(m_uiEquipment_id, true); m_uiBackhand_Timer = 2000; @@ -1117,7 +1121,7 @@ struct GordokBruteAI : public ScriptedAI m_bEnrage = false; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { uint32 yellChance = urand(0, 4); switch (yellChance) @@ -1138,7 +1142,7 @@ struct GordokBruteAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -1247,7 +1251,7 @@ struct boss_guardsAI : public ScriptedAI uint32 m_uiCombatBugTimer; - void Reset() + void Reset() override { m_uiShieldCharge_Timer = 500; m_uiStrike_Timer = urand(10000, 20000); @@ -1258,7 +1262,7 @@ struct boss_guardsAI : public ScriptedAI m_uiCombatBugTimer = 0; } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { // Guards no longer drop loot after contributing to the Tribute if (pInstance->GetData(TYPE_GORDOK_TRIBUTE) == DONE) @@ -1268,13 +1272,13 @@ struct boss_guardsAI : public ScriptedAI } } - void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) + void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) override { if (pSpell->Id == SPELL_KNOCK_AWAY) m_creature->getThreatManager().modifyThreatPercent(pCaster, -50); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { // Workaround fix for bug where Slip'kik doesnt leave combat properly if he charges through the trap if (m_uiCombatBugTimer) @@ -1433,7 +1437,7 @@ struct go_fixed_trap : public GameObjectAI instance_dire_maul* pInstance; - void UpdateAI(uint32 const diff) + void UpdateAI(uint32 const diff) override { if (Creature* pSlipkik = me->GetMap()->GetCreature(pInstance->GetData64(NPC_GUARD_SLIPKIK))) { @@ -1493,7 +1497,7 @@ struct boss_kromcrushAI : public ScriptedAI bool m_bRetaliationUsed; bool m_bCallReavers; - void Reset() + void Reset() override { m_uiMortalCleave_Timer = urand(7000, 13000); m_uiIntimidatingShout_Timer = 10000; @@ -1512,12 +1516,12 @@ struct boss_kromcrushAI : public ScriptedAI m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { DoScriptText(SAY_AGGRO, m_creature, pWho); } - void MovementInform(uint32 uiMovementType, uint32 uiData) + void MovementInform(uint32 uiMovementType, uint32 uiData) override { if (uiMovementType == POINT_MOTION_TYPE) { @@ -1540,7 +1544,7 @@ struct boss_kromcrushAI : public ScriptedAI } } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { // Kromcrush no longer drops loot after contributing to the Tribute if (pInstance->GetData(TYPE_GORDOK_TRIBUTE) == DONE) @@ -1550,7 +1554,7 @@ struct boss_kromcrushAI : public ScriptedAI } } - void EnterEvadeMode() + void EnterEvadeMode() override { ScriptedAI::EnterEvadeMode(); @@ -1561,7 +1565,7 @@ struct boss_kromcrushAI : public ScriptedAI } } - void JustSummoned(Creature *pSummoned) + void JustSummoned(Creature *pSummoned) override { if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0)) pSummoned->AI()->AttackStart(pTarget); @@ -1584,7 +1588,7 @@ struct boss_kromcrushAI : public ScriptedAI //m_creature->CastSpell(m_creature, SPELL_CALL_REAVERS, false); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -1709,7 +1713,7 @@ struct boss_prince_tortheldrinAI:public ScriptedAI uint32 summonTimer; uint32 whirlwindTimer; - void Reset() + void Reset() override { arcaneBlastTimer = urand(15000, 20000); counterspellTimer = urand(10000, 20000); @@ -1720,7 +1724,7 @@ struct boss_prince_tortheldrinAI:public ScriptedAI DoCastSpellIfCan(m_creature, SPELL_THRASH, CF_TRIGGERED | CF_AURA_NOT_PRESENT); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -2239,7 +2243,7 @@ struct boss_ferraAI : public ScriptedAI uint32 m_uiCharge_Timer; uint32 m_uiMaul_Timer; - void Reset() + void Reset() override { m_uiCharge_Timer = 0; m_uiMaul_Timer = urand(5000, 10000); @@ -2247,7 +2251,7 @@ struct boss_ferraAI : public ScriptedAI m_creature->SetNoCallAssistance(true); } - void MoveInLineOfSight(Unit *pWho) + void MoveInLineOfSight(Unit *pWho) override { if (!m_creature->isInCombat()) { @@ -2261,7 +2265,7 @@ struct boss_ferraAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -2326,7 +2330,7 @@ struct boss_magister_kalendrisAI:public ScriptedAI bool m_bShadowformUsed; bool m_bInMeele; - void Reset() + void Reset() override { m_bShadowformUsed = false; m_uiShadowWordPainTimer = urand(5000, 10000); @@ -2335,7 +2339,7 @@ struct boss_magister_kalendrisAI:public ScriptedAI m_uiDominateMindTimer = urand(20000, 30000); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/kalimdor/feralas/dire_maul/npc_ecorcefer.cpp b/src/scripts/kalimdor/feralas/dire_maul/npc_ecorcefer.cpp index 3f244fb07..8077f2377 100644 --- a/src/scripts/kalimdor/feralas/dire_maul/npc_ecorcefer.cpp +++ b/src/scripts/kalimdor/feralas/dire_maul/npc_ecorcefer.cpp @@ -21,14 +21,14 @@ struct npc_ecorceferAI : public ScriptedAI bool m_bHasBrokenDoor; bool m_bIsZevrimDead; - void Reset() + void Reset() override { m_uiCheckDoorTimer = 0; m_bHasBrokenDoor = false; m_bIsZevrimDead = false; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_bIsZevrimDead) { diff --git a/src/scripts/kalimdor/feralas/dire_maul/npc_pusillin.cpp b/src/scripts/kalimdor/feralas/dire_maul/npc_pusillin.cpp index ec4599417..e525f12cf 100644 --- a/src/scripts/kalimdor/feralas/dire_maul/npc_pusillin.cpp +++ b/src/scripts/kalimdor/feralas/dire_maul/npc_pusillin.cpp @@ -43,11 +43,11 @@ struct npc_pusillinAI : public ScriptedAI float fNextPositions[3]; uint32 uiGlobalCD; - void Reset() + void Reset() override { } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { std::list m_impList; GetCreatureListWithEntryInGrid(m_impList, ME, 13276, 100.0f); @@ -55,7 +55,7 @@ struct npc_pusillinAI : public ScriptedAI (*it)->Attack(pWho,true); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!ME->SelectHostileTarget() || !ME->getVictim()) return; diff --git a/src/scripts/kalimdor/feralas/feralas.cpp b/src/scripts/kalimdor/feralas/feralas.cpp index 19bbbff6d..8852fc688 100644 --- a/src/scripts/kalimdor/feralas/feralas.cpp +++ b/src/scripts/kalimdor/feralas/feralas.cpp @@ -153,7 +153,7 @@ struct npc_shay_leafrunnerAI : public FollowerAI } } } - void JustDied(Unit* killer) + void JustDied(Unit* killer) override { m_uiWanderTimer = 0; m_uiDespawnTimer = 0; @@ -174,7 +174,7 @@ struct npc_shay_leafrunnerAI : public FollowerAI SetFollowPaused(false); } - void UpdateFollowerAI(const uint32 uiDiff) + void UpdateFollowerAI(const uint32 uiDiff) override { if (m_uiDespawnTimer) { @@ -287,7 +287,7 @@ struct MushgogAI : public ScriptedAI bool m_bEnrage; bool m_bAggro; - void Reset() + void Reset() override { m_uiInvocation_Timer = 1000; m_uiSporeCloud_Timer = 6000; @@ -297,7 +297,7 @@ struct MushgogAI : public ScriptedAI m_bAggro = false; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); if (!m_bAggro) @@ -313,7 +313,7 @@ struct MushgogAI : public ScriptedAI } } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { uint32 chanceToSpawn = urand(0,5); if (chanceToSpawn==0) @@ -328,7 +328,7 @@ struct MushgogAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -407,7 +407,7 @@ struct TheRazzaAI : public ScriptedAI uint32 m_uiInvocation_Timer; bool m_bAggro; - void Reset() + void Reset() override { m_uiInvocation_Timer = 1000; m_uiPoisonBolt_Timer = 5000; @@ -415,7 +415,7 @@ struct TheRazzaAI : public ScriptedAI m_bAggro = false; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); if (!m_bAggro) @@ -431,7 +431,7 @@ struct TheRazzaAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -498,7 +498,7 @@ struct SkarrTheUnbreakableAI : public ScriptedAI uint32 m_uiInvocation_Timer; bool m_bAggro; - void Reset() + void Reset() override { m_uiInvocation_Timer = 1000; m_uiCleave_Timer = urand(7000,10000); @@ -507,7 +507,7 @@ struct SkarrTheUnbreakableAI : public ScriptedAI m_bAggro = false; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); if (!m_bAggro) @@ -523,7 +523,7 @@ struct SkarrTheUnbreakableAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/kalimdor/moonglade/moonglade.cpp b/src/scripts/kalimdor/moonglade/moonglade.cpp index 610b63db4..2e0f74724 100644 --- a/src/scripts/kalimdor/moonglade/moonglade.cpp +++ b/src/scripts/kalimdor/moonglade/moonglade.cpp @@ -371,7 +371,7 @@ struct npc_keeper_remulosAI : public npc_escortAI bool m_bIsFirstWave; - void Reset() + void Reset() override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -409,7 +409,7 @@ struct npc_keeper_remulosAI : public npc_escortAI } // Remulos follows player - void EnterEvadeMode() + void EnterEvadeMode() override { npc_escortAI::EnterEvadeMode(); if (HasEscortState(STATE_ESCORT_ESCORTING) && !m_bIsFirstWave) @@ -422,7 +422,7 @@ struct npc_keeper_remulosAI : public npc_escortAI } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { switch (pSummoned->GetEntry()) { @@ -449,7 +449,7 @@ struct npc_keeper_remulosAI : public npc_escortAI } } - void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) + void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) override { if (m_idQuestActive == QUEST_NIGHTMARE_MANIFESTS) { @@ -473,7 +473,7 @@ struct npc_keeper_remulosAI : public npc_escortAI } } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_idQuestActive == QUEST_NIGHTMARE_MANIFESTS) { @@ -495,7 +495,7 @@ struct npc_keeper_remulosAI : public npc_escortAI } } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { if (m_idQuestActive == QUEST_NIGHTMARE_MANIFESTS) { @@ -596,7 +596,7 @@ struct npc_keeper_remulosAI : public npc_escortAI m_uiOutroTimer = 3000; } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { if (m_idQuestActive == QUEST_NIGHTMARE_MANIFESTS) { @@ -771,7 +771,7 @@ struct npc_keeper_remulosAI : public npc_escortAI } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { npc_escortAI::UpdateAI(uiDiff); @@ -1167,7 +1167,7 @@ struct boss_eranikusAI : public ScriptedAI ObjectGuid m_uiTyrandeGUID; std::list m_lPriestessList; - void Reset() + void Reset() override { m_uiAcidBreathTimer = 10000; m_uiNoxiousBreathTimer = 3000; @@ -1185,7 +1185,7 @@ struct boss_eranikusAI : public ScriptedAI SetCombatMovement(false); } - void EnterEvadeMode() + void EnterEvadeMode() override { if (m_creature->GetHealthPercent() < 20.0f) { @@ -1226,7 +1226,7 @@ struct boss_eranikusAI : public ScriptedAI } } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { if (pVictim->GetTypeId() != TYPEID_PLAYER) return; @@ -1244,7 +1244,7 @@ struct boss_eranikusAI : public ScriptedAI } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { switch (pSummoned->GetEntry()) { @@ -1275,7 +1275,7 @@ struct boss_eranikusAI : public ScriptedAI } } - void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) + void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE) return; @@ -1329,7 +1329,7 @@ struct boss_eranikusAI : public ScriptedAI } } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE || uiPointId != POINT_ID_ERANIKUS_REDEEMED) return; @@ -1338,7 +1338,7 @@ struct boss_eranikusAI : public ScriptedAI m_uiEventTimer = 11000; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_uiEventTimer) { diff --git a/src/scripts/kalimdor/mulgore/mulgore.cpp b/src/scripts/kalimdor/mulgore/mulgore.cpp index 29cf1a37e..a41437429 100644 --- a/src/scripts/kalimdor/mulgore/mulgore.cpp +++ b/src/scripts/kalimdor/mulgore/mulgore.cpp @@ -62,15 +62,15 @@ struct plainVisionAI : public npc_escortAI bool isEngaged; - void Reset() + void Reset() override { } - void WaypointReached(uint32 i) + void WaypointReached(uint32 i) override { } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { if (!isEngaged) { diff --git a/src/scripts/kalimdor/orgrimmar/orgrimmar.cpp b/src/scripts/kalimdor/orgrimmar/orgrimmar.cpp index 38f4c4209..4275d6ec2 100644 --- a/src/scripts/kalimdor/orgrimmar/orgrimmar.cpp +++ b/src/scripts/kalimdor/orgrimmar/orgrimmar.cpp @@ -50,7 +50,7 @@ struct npc_shenthulAI : public ScriptedAI uint32 Reset_Timer; uint64 playerGUID; - void Reset() + void Reset() override { CanTalk = false; CanEmote = false; @@ -59,7 +59,7 @@ struct npc_shenthulAI : public ScriptedAI playerGUID = 0; } - void ReceiveEmote(Player* pPlayer, uint32 emote) + void ReceiveEmote(Player* pPlayer, uint32 emote) override { if (emote == TEXTEMOTE_SALUTE && pPlayer->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE) { @@ -71,7 +71,7 @@ struct npc_shenthulAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (CanEmote) { diff --git a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_ayamiss.cpp b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_ayamiss.cpp index ca300834d..75e539f87 100644 --- a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_ayamiss.cpp +++ b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_ayamiss.cpp @@ -96,7 +96,7 @@ struct boss_ayamissAI : public ScriptedAI ObjectGuid m_uiSacrificeGuid; float m_fSacrificeAggro; - void Reset() + void Reset() override { m_uiStingerSpray_Timer = 10000; m_uiPoisonStinger_Timer = 5000; @@ -141,19 +141,19 @@ struct boss_ayamissAI : public ScriptedAI m_pInstance->SetData(TYPE_AYAMISS, NOT_STARTED); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (m_pInstance) m_pInstance->SetData(TYPE_AYAMISS, IN_PROGRESS); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(TYPE_AYAMISS, DONE); } - void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) + void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) override { if (pSpell->Id == SPELL_PARALYZE) { @@ -169,12 +169,12 @@ struct boss_ayamissAI : public ScriptedAI } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { pSummoned->SetInCombatWithZone(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -338,7 +338,7 @@ struct mob_zara_larvaAI : public ScriptedAI uint8 m_waypoint; Unit * m_victim; - void Reset() + void Reset() override { m_victim = nullptr; m_waypoint = 0; @@ -346,7 +346,7 @@ struct mob_zara_larvaAI : public ScriptedAI SetCombatMovement(false); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (Active > uiDiff) { diff --git a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_buru.cpp b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_buru.cpp index 53b38ab0b..17c97b2b4 100644 --- a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_buru.cpp +++ b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_buru.cpp @@ -86,7 +86,7 @@ struct boss_buruAI : public ScriptedAI uint64 m_eggsGUID[6]; - void Reset() + void Reset() override { m_creature->SetDisplayId(15654); m_creature->RemoveAllAuras(); @@ -114,7 +114,7 @@ struct boss_buruAI : public ScriptedAI m_pInstance->SetData(TYPE_BURU, NOT_STARTED); } - void Aggro(Unit *pWho) + void Aggro(Unit *pWho) override { m_creature->SetInCombatWithZone(); DoCast(m_creature, SPELL_THORNS); @@ -123,7 +123,7 @@ struct boss_buruAI : public ScriptedAI m_pInstance->SetData(TYPE_BURU, IN_PROGRESS); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { // Le debuff fade quand il est mort, sinon le raid se fait decimer Map::PlayerList const &liste = m_creature->GetMap()->GetPlayers(); @@ -134,7 +134,7 @@ struct boss_buruAI : public ScriptedAI m_pInstance->SetData(TYPE_BURU, DONE); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { Creature* egg; @@ -314,14 +314,14 @@ struct mob_buru_eggAI : public ScriptedAI ScriptedInstance* m_pInstance; Creature* pBuru; - void Reset() + void Reset() override { // Empêche les oeufs d'aggro et de tourner SetCombatMovement(false); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE); } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) override { // Aggro de Buru quand on tape un oeuf if (Creature* pBuru = m_pInstance->GetCreature(m_pInstance->GetData64(DATA_BURU))) @@ -331,7 +331,7 @@ struct mob_buru_eggAI : public ScriptedAI } } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (!m_pInstance) return; @@ -357,7 +357,7 @@ struct mob_buru_eggAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { return; } diff --git a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_kurinnaxx.cpp b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_kurinnaxx.cpp index 2dbe919d9..8b9abb0c3 100644 --- a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_kurinnaxx.cpp +++ b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_kurinnaxx.cpp @@ -57,7 +57,7 @@ struct boss_kurinnaxxAI : public ScriptedAI uint32 m_uiWideSlash_Timer; bool m_bHasEnraged; - void Reset() + void Reset() override { m_uiInvocation_Timer = 10000; m_uiMortalWound_Timer = 7000; @@ -70,14 +70,14 @@ struct boss_kurinnaxxAI : public ScriptedAI m_pInstance->SetData(TYPE_KURINNAXX, NOT_STARTED); } - void Aggro(Unit* pPuller) + void Aggro(Unit* pPuller) override { m_creature->SetInCombatWithZone(); if (m_pInstance) m_pInstance->SetData(TYPE_KURINNAXX, IN_PROGRESS); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (!m_pInstance) return; @@ -87,7 +87,7 @@ struct boss_kurinnaxxAI : public ScriptedAI m_pInstance->SetData(TYPE_KURINNAXX, DONE); } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) override { if (!m_bHasEnraged && ((m_creature->GetHealth() * 100) / m_creature->GetMaxHealth()) <= 30 && !m_creature->IsNonMeleeSpellCasted(false)) { @@ -96,7 +96,7 @@ struct boss_kurinnaxxAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { // if no one gets to the trap in 5 seconds delete the trap if (m_uiCleanSandTrap_Timer < uiDiff) diff --git a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_moam.cpp b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_moam.cpp index ed5e8424c..4aecad2de 100644 --- a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_moam.cpp +++ b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_moam.cpp @@ -62,7 +62,7 @@ struct boss_moamAI : public ScriptedAI ObjectGuid m_OGvictim; // Memorize last target before turning into stone, then take it back. bool m_bIsInCombat; - void Reset() + void Reset() override { m_uiTrample_Timer = 6000; m_uiSummonManaFiend_Timer = 90000; @@ -81,7 +81,7 @@ struct boss_moamAI : public ScriptedAI m_pInstance->SetData(TYPE_MOAM, NOT_STARTED); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); DoScriptText(EMOTE_AGGRO, m_creature); @@ -95,7 +95,7 @@ struct boss_moamAI : public ScriptedAI m_pInstance->SetData(TYPE_MOAM, IN_PROGRESS); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (GameObject *pObsidian = m_creature->SummonGameObject(181069, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, 0, 0, 0, 0, -1, false)) pObsidian->SetRespawnTime(345600); @@ -105,7 +105,7 @@ struct boss_moamAI : public ScriptedAI } /** This function seems to be unused, kept as it is in case of...*/ - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { if (Unit* pTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 0)) { @@ -138,7 +138,7 @@ struct boss_moamAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if ((!m_creature->SelectHostileTarget() || !m_creature->getVictim()) && !m_creature->HasAura(SPELL_ENERGIZE)) return; diff --git a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_ossirian.cpp b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_ossirian.cpp index 59c3b26e9..9ce51f6b0 100644 --- a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_ossirian.cpp +++ b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_ossirian.cpp @@ -93,7 +93,7 @@ struct boss_ossirianAI : public ScriptedAI bool m_bIsEnraged; bool m_bAggro; - void Reset() + void Reset() override { m_bAggro = false; @@ -133,7 +133,7 @@ struct boss_ossirianAI : public ScriptedAI m_pInstance->SetData(TYPE_OSSIRIAN, FAIL); } - void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) + void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) override { if (pSpell->Id == SPELL_ENVELOPING_WINDS) { @@ -143,7 +143,7 @@ struct boss_ossirianAI : public ScriptedAI } } - void SpellHit(Unit* pUnit, const SpellEntry* pSpell) + void SpellHit(Unit* pUnit, const SpellEntry* pSpell) override { for (int i = 0; i < SpellWeakness.size(); ++i) { @@ -162,7 +162,7 @@ struct boss_ossirianAI : public ScriptedAI } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { DoScriptText(SAY_AGGRO, m_creature); m_creature->SetInCombatWithZone(); @@ -198,7 +198,7 @@ struct boss_ossirianAI : public ScriptedAI m_pInstance->SetData(TYPE_OSSIRIAN, IN_PROGRESS); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { DoScriptText(SAY_DEATH, m_creature); if (!TornadoGUIDs.empty()) @@ -215,13 +215,13 @@ struct boss_ossirianAI : public ScriptedAI m_pInstance->SetData(TYPE_OSSIRIAN, DONE); } - void KilledUnit(Unit* pVictim) + void KilledUnit(Unit* pVictim) override { if (pVictim->GetTypeId() == TYPEID_PLAYER) DoScriptText(SAY_SLAY, m_creature); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -303,13 +303,13 @@ struct generic_random_moveAI : public ScriptedAI uint32 m_uiTimer; - void Reset() + void Reset() override { m_uiTimer = 5000; SetCombatMovement(false); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_uiTimer < uiDiff) { @@ -349,7 +349,7 @@ struct ossirian_crystalAI : public GameObjectAI { ossirian_crystalAI(GameObject* pGo) : GameObjectAI(pGo) {} - bool OnUse(Unit* user) + bool OnUse(Unit* user) override { instance_ruins_of_ahnqiraj* pInstance = dynamic_cast(me->GetInstanceData()); diff --git a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_rajaxx.cpp b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_rajaxx.cpp index aba71340b..7b2e63ddf 100644 --- a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_rajaxx.cpp +++ b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/boss_rajaxx.cpp @@ -114,7 +114,7 @@ struct boss_rajaxxAI : public ScriptedAI uint32 m_uiNextWaveIndex; bool m_bHasEnraged; - void Reset() + void Reset() override { // Rajaxx's spells m_uiResetAggro_Timer = 20000; @@ -225,7 +225,7 @@ struct boss_rajaxxAI : public ScriptedAI return m_pInstance->GetData64(data); } - void Aggro(Unit* pPuller) + void Aggro(Unit* pPuller) override { m_creature->SetInCombatWithZone(); @@ -233,7 +233,7 @@ struct boss_rajaxxAI : public ScriptedAI m_pInstance->SetData(TYPE_RAJAXX, IN_PROGRESS); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (!m_pInstance) return; @@ -249,13 +249,13 @@ struct boss_rajaxxAI : public ScriptedAI OnKillReputationReward(); } - void KilledUnit(Unit *pKilled) + void KilledUnit(Unit *pKilled) override { // if (!m_creature->isInCombat()) // DoScriptText(SAY_DEAGGRO, m_creature, pKilled); } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) override { // Frenzy if (!m_bHasEnraged && ((m_creature->GetHealth() * 100) / m_creature->GetMaxHealth()) < 30) @@ -315,7 +315,7 @@ struct boss_rajaxxAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { // Waves launcher if (m_pInstance && (m_pInstance->GetData(TYPE_RAJAXX) == IN_PROGRESS)) @@ -410,7 +410,7 @@ struct boss_rajaxxAQWarAI : public boss_rajaxxAI return; } - bool FillLoot(Loot* loot, Player* looter) const + bool FillLoot(Loot* loot, Player* looter) const override { return true; // Do nothing. No loot drop out here. } @@ -430,7 +430,7 @@ struct npc_andorovAI : public ScriptedAI uint32 m_uiBash_Timer; uint32 m_uiStrike_Timer; - void Reset() + void Reset() override { m_uiCommandAura_Timer = 10000; m_uiBash_Timer = 5000; @@ -441,7 +441,7 @@ struct npc_andorovAI : public ScriptedAI m_pInstance->SetData(TYPE_GENERAL_ANDOROV, NOT_STARTED); } - void JustDied(Unit *pKiller) + void JustDied(Unit *pKiller) override { if (!m_pInstance) return; @@ -455,7 +455,7 @@ struct npc_andorovAI : public ScriptedAI m_pInstance->SetData(TYPE_GENERAL_ANDOROV, FAIL); } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) override { DEBUG_EMOTE_YELL(m_creature, "DEBUG : Move inform"); if (uiType != WAYPOINT_MOTION_TYPE) @@ -506,7 +506,7 @@ struct npc_andorovAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_pInstance) return; diff --git a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/npc_sandstalker.cpp b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/npc_sandstalker.cpp index 6f40b4cb3..20993904b 100644 --- a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/npc_sandstalker.cpp +++ b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/npc_sandstalker.cpp @@ -17,30 +17,30 @@ struct npc_sandstalkerAI : public ScriptedAI uint32 m_uiBurrow_Timer; - void JustReachedHome() + void JustReachedHome() override { EnterVanish(); } - void Reset() + void Reset() override { EnterVanish(); m_uiBurrow_Timer = 5000; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { Unit* pVanishTarget = m_creature->SelectAttackingTarget(ATTACKING_TARGET_RANDOM, 0); LeaveVanish(); Ambush(pVanishTarget, SPELL_BURROW); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { LeaveVanish(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->isInCombat()) EnterVanish(); diff --git a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/ruins_of_ahnqiraj.cpp b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/ruins_of_ahnqiraj.cpp index 50647ac60..73ffba8f0 100644 --- a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/ruins_of_ahnqiraj.cpp +++ b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/ruins_of_ahnqiraj.cpp @@ -73,7 +73,7 @@ struct mob_anubisath_guardianAI : public ScriptedAI bool m_bIsEnraged; bool m_bIsExploding; - void Reset() + void Reset() override { m_uiSpell1 = urand(0, 1) ? SPELL_METEOR : SPELL_PLAGUE; m_uiSpell2 = urand(0, 1) ? SPELL_SHADOW_STORM : SPELL_THUNDER_CLAP; @@ -92,29 +92,29 @@ struct mob_anubisath_guardianAI : public ScriptedAI m_creature->RemoveAllAuras(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (GameObject *pObsidian = m_creature->SummonGameObject(OBJ_SMALL_OBSIDIAN_CHUNK, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, 0, 0, 0, 0, -1, false)) pObsidian->SetRespawnTime(345600); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { DoCast(m_creature, m_uiSpell3); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { pSummoned->AI()->AttackStart(m_creature->getVictim()); ++m_uiSummonCount; } - void SummonedCreatureDespawn(Creature *pDespawned) + void SummonedCreatureDespawn(Creature *pDespawned) override { -- m_uiSummonCount; } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) override { if (!m_bIsEnraged && (m_creature->GetHealth() * 100 / m_creature->GetMaxHealth()) < 10) { @@ -133,7 +133,7 @@ struct mob_anubisath_guardianAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -209,16 +209,16 @@ struct OssirianTornadoAI : public ScriptedAI Reset(); } - void Reset() + void Reset() override { } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -258,7 +258,7 @@ struct mob_flesh_hunterAI : public ScriptedAI bool m_bPlayerConsumed; bool m_bPlayerConsumedCharged; - void Reset() + void Reset() override { m_uiPoisonBolt_Timer = 3000; m_uiTrash_Timer = 5000; @@ -270,7 +270,7 @@ struct mob_flesh_hunterAI : public ScriptedAI m_bPlayerConsumedCharged = false; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); } @@ -291,13 +291,13 @@ struct mob_flesh_hunterAI : public ScriptedAI } } */ - void KilledUnit(Unit* pWho) + void KilledUnit(Unit* pWho) override { if (pWho->GetGUID() == m_uiConsumeVictim) DoCast(m_creature, SPELL_CONSUME_HEAL); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -399,7 +399,7 @@ struct ObsidianDestroyerAI : public ScriptedAI uint8 m_uiDrainCount; std::vector PlayerList; - void Reset() + void Reset() override { m_uiDrainMana_Timer = 7000; m_uiDrainCount = 0; @@ -407,7 +407,7 @@ struct ObsidianDestroyerAI : public ScriptedAI m_bIsInCombat = false; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); if (m_bIsInCombat == false) @@ -417,7 +417,7 @@ struct ObsidianDestroyerAI : public ScriptedAI } } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (GameObject *pObsidian = m_creature->SummonGameObject(OBJ_SMALL_OBSIDIAN_CHUNK, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), 0, 0, 0, 0, 0, -1, false)) pObsidian->SetRespawnTime(345600); @@ -433,7 +433,7 @@ struct ObsidianDestroyerAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -504,18 +504,18 @@ struct HiveZaraSoldierAI : public ScriptedAI uint32 m_uiVenomSpit_Timer; bool m_bRetaliation; - void Reset() + void Reset() override { m_uiVenomSpit_Timer = 5000; m_bRetaliation = false; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -561,18 +561,18 @@ struct SilicateFeederAI : public ScriptedAI Reset(); } - void Reset() + void Reset() override { m_creature->setFaction(7); m_bIsAttacked = false; } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { DoCastSpellIfCan(m_creature, SPELL_CLOUD_OF_DISEASE); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -603,17 +603,17 @@ struct QirajiSwarmguardAI : public ScriptedAI uint32 m_uiSunder_Timer; - void Reset() + void Reset() override { m_uiSunder_Timer = 2000; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_creature->IsWalking()) m_creature->SetWalk(false); @@ -655,7 +655,7 @@ struct QirajiGladiatorAI : public ScriptedAI uint32 m_uiUppercut_Timer; bool m_bIsEnraged; - void Reset() + void Reset() override { m_uiTrample_Timer = 4000; m_uiUppercut_Timer = 9000; @@ -664,20 +664,20 @@ struct QirajiGladiatorAI : public ScriptedAI m_pInstance->SetData(TYPE_QIRAJI_GLADIATOR, 0); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (m_pInstance) m_pInstance->SetData(TYPE_QIRAJI_GLADIATOR, 0); m_creature->SetInCombatWithZone(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (m_pInstance) m_pInstance->SetData(TYPE_QIRAJI_GLADIATOR, 1); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -725,14 +725,14 @@ struct HiveZaraStingerAI : public ScriptedAI uint32 m_uiChargeCasted_Timer; bool m_bChargeCasted; - void Reset() + void Reset() override { m_uiCharge_Timer = 3000; m_uiChargeCasted_Timer = 0; m_bChargeCasted = false; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -788,7 +788,7 @@ struct TuubidAI : public ScriptedAI uint32 m_uiSunderArmor_Timer; uint64 m_uiMarkedGUID; - void Reset() + void Reset() override { m_uiMarkedGUID = 0; m_uiAttackOrder_Timer = 5000; @@ -796,7 +796,7 @@ struct TuubidAI : public ScriptedAI m_uiSunderArmor_Timer = 6000; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -882,7 +882,7 @@ struct QirajiWarriorAI : public ScriptedAI return nullptr; } - void Reset() + void Reset() override { m_uiThunderclap_Timer = urand(6000, 12000); m_uiUppercut_Timer = urand(10000, 15000); @@ -892,12 +892,12 @@ struct QirajiWarriorAI : public ScriptedAI m_bisTuubidAlive = true; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); } - void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) + void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) override { if (!m_bHasEnraged && ((m_creature->GetHealth() * 100) / m_creature->GetMaxHealth()) <= 20 && !m_creature->IsNonMeleeSpellCasted(false)) { @@ -906,7 +906,7 @@ struct QirajiWarriorAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { /** Needed for "marking target system" */ if (!m_creature->GetCreatureGroup()) // Should not happen @@ -990,7 +990,7 @@ struct SwarmguardNeedlerAI : public ScriptedAI return nullptr; } - void Reset() + void Reset() override { m_uiUpdateTarget_Timer = 2000; m_uiTuubidGuid = 0; @@ -998,12 +998,12 @@ struct SwarmguardNeedlerAI : public ScriptedAI m_bisTuubidAlive = true; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { /** Needed for "marking target system" */ if (!m_creature->GetCreatureGroup()) // Should not happen diff --git a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h index 2dae40951..0a03f5ddc 100644 --- a/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h +++ b/src/scripts/kalimdor/silithus/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h @@ -123,7 +123,7 @@ struct instance_ruins_of_ahnqiraj : public ScriptedInstance { public: instance_ruins_of_ahnqiraj(Map* pMap); - void Initialize(); + void Initialize() override; void SetData(uint32 uiType, uint32 uiData) override; uint32 GetData(uint32 uiType) override; diff --git a/src/scripts/kalimdor/silithus/silithus.cpp b/src/scripts/kalimdor/silithus/silithus.cpp index a95bfb06c..490150d47 100644 --- a/src/scripts/kalimdor/silithus/silithus.cpp +++ b/src/scripts/kalimdor/silithus/silithus.cpp @@ -282,7 +282,7 @@ struct go_pierre_ventsAI: public GameObjectAI return true; } - bool OnUse(Unit* user) + bool OnUse(Unit* user) override { Player* player = user->ToPlayer(); if (!CanUse(player)) @@ -454,7 +454,7 @@ struct npc_solenorAI : public ScriptedAI uint32 m_uiCastSoulFlame_Timer; uint32 m_uiDespawn_Timer; - void Reset() + void Reset() override { switch (m_creature->GetEntry()) { @@ -512,7 +512,7 @@ struct npc_solenorAI : public ScriptedAI } /** Solenor the Slayer */ - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (pWho->getClass() == CLASS_HUNTER && (m_hunterGuid.IsEmpty() || m_hunterGuid == pWho->GetObjectGuid())/*&& pWho->GetQuestStatus(QUEST_STAVE_OF_THE_ANCIENTS) == QUEST_STATUS_INCOMPLETE*/) { @@ -535,7 +535,7 @@ struct npc_solenorAI : public ScriptedAI pSummoned->AI()->AttackStart(m_creature->getVictim()); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { m_creature->SetHomePosition(-7724.21f, 1676.43f, 7.0571f, 4.80044f); // DRSS @@ -581,7 +581,7 @@ struct npc_solenorAI : public ScriptedAI m_creature->ForcedDespawn(); } - void SpellHit(Unit* pCaster, const SpellEntry* pSpell) + void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override { if (pSpell && pSpell->Id == 14268) // Wing Clip (Rank 3) @@ -591,7 +591,7 @@ struct npc_solenorAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { /** Nelson the Nice */ if (m_bTransform) @@ -704,7 +704,7 @@ struct npc_creeping_doomAI : public ScriptedAI { npc_creeping_doomAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); } - void Reset() {}; + void Reset() override {}; void DamageTaken(Unit* pDoneBy, uint32 &uiDamage) override { @@ -747,13 +747,13 @@ struct npc_prince_thunderaanAI : public ScriptedAI bool engaged; bool emerged; - void Reset() + void Reset() override { m_uiTendrilsTimer = 8000; m_uiTearsTimer = 15000; } - void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) + void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) override { if (pCaster->GetTypeId() != TYPEID_PLAYER) return; @@ -762,7 +762,7 @@ struct npc_prince_thunderaanAI : public ScriptedAI m_creature->getThreatManager().modifyThreatPercent(pCaster, -100); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (!engaged) { @@ -771,7 +771,7 @@ struct npc_prince_thunderaanAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!emerged) { @@ -852,22 +852,22 @@ struct npc_colossusAI : public ScriptedAI uint32 m_uiColossalSmashEmoteTimer; bool firstSmash; - void Reset() + void Reset() override { firstSmash = true; m_uiColossalSmashTimer = 60000; m_uiColossalSmashEmoteTimer = 0; } - void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) + void SpellHitTarget(Unit* pCaster, const SpellEntry* pSpell) override { } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { } - void EnterEvadeMode() + void EnterEvadeMode() override { // Ustaag : Must neither resume life if Evade, nor return to its starting point m_creature->RemoveAllAuras(); @@ -876,7 +876,7 @@ struct npc_colossusAI : public ScriptedAI m_creature->GetMotionMaster()->MoveIdle(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -909,7 +909,7 @@ struct npc_colossusAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { // Spawn the event quest that lets players attain a reward for the // death of the colossus. @@ -975,7 +975,7 @@ struct npc_Geologist_LarksbaneAI : public ScriptedAI uint32 uiNextActionTimer; uint32 uiCurrAction; - void Reset() + void Reset() override { m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); @@ -1216,7 +1216,7 @@ struct npc_Geologist_LarksbaneAI : public ScriptedAI ++uiCurrAction; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (uiCurrAction) { @@ -1288,7 +1288,7 @@ struct npc_Emissary_RomankhanAI : public ScriptedAI bool m_bNeedCheck; - void Reset() + void Reset() override { m_uiWiltTimer = urand(3000, 5000); m_uiSchockTimer = urand(8000, 12000); @@ -1302,7 +1302,7 @@ struct npc_Emissary_RomankhanAI : public ScriptedAI PlayerGuids[i] = 0; } - void SummonedCreatureJustDied(Creature* unit) + void SummonedCreatureJustDied(Creature* unit) override { ++OverlordCount; if (OverlordCount >= 3) @@ -1314,7 +1314,7 @@ struct npc_Emissary_RomankhanAI : public ScriptedAI } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->AllowManaRegen(true); } @@ -1324,7 +1324,7 @@ struct npc_Emissary_RomankhanAI : public ScriptedAI return (((float)m_creature->GetPower(POWER_MANA) / (float)m_creature->GetMaxPower(POWER_MANA)) * 100); } - void SpellHitTarget(Unit* target, const SpellEntry* pSpell) + void SpellHitTarget(Unit* target, const SpellEntry* pSpell) override { if (!target || !target->IsPlayer()) return; @@ -1347,7 +1347,7 @@ struct npc_Emissary_RomankhanAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -1606,7 +1606,7 @@ struct npc_anachronos_the_ancientAI : public ScriptedAI // Needed to restore gate to state before scene bool AQopen; - void Reset() + void Reset() override { // We summon the rest of the dragons on timer m_uiEventTimer = 0; @@ -1663,7 +1663,7 @@ struct npc_anachronos_the_ancientAI : public ScriptedAI m_creature->ForcedDespawn(SCENE_BLOCK_TIME); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) override { AbortScene(); } @@ -1792,7 +1792,7 @@ struct npc_anachronos_the_ancientAI : public ScriptedAI } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { // Also remove npc flags where needed switch (pSummoned->GetEntry()) @@ -1890,7 +1890,7 @@ struct npc_anachronos_the_ancientAI : public ScriptedAI } } - void MovementInform(uint32 uiType, uint32 uiPointId) + void MovementInform(uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE) return; @@ -1925,7 +1925,7 @@ struct npc_anachronos_the_ancientAI : public ScriptedAI } } - void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) + void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) override { if (uiType != POINT_MOTION_TYPE) return; @@ -1969,7 +1969,7 @@ struct npc_anachronos_the_ancientAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_uiEventTimer) { @@ -2448,7 +2448,7 @@ struct scarab_gongAI: public GameObjectAI // Invisible AQ barrier GameObject* go_aq_ghost_gate; - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (eventTimer) { @@ -3214,12 +3214,12 @@ struct npc_ShaiAI : public ScriptedAI uint32 m_uiFlashHeal; - void Reset() + void Reset() override { m_uiFlashHeal = 12000; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -3272,7 +3272,7 @@ struct boss_vamAI : public ScriptedAI bool Enraged; - void Reset() + void Reset() override { Charge_Timer = urand(15000, 27000); KnockBack_Timer = urand(8000, 20000); @@ -3281,15 +3281,15 @@ struct boss_vamAI : public ScriptedAI Enraged = false; } - void Aggro(Unit *who) + void Aggro(Unit *who) override { } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_bug_trio.cpp b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_bug_trio.cpp index 4b76c77e8..bb47e3107 100644 --- a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_bug_trio.cpp +++ b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_bug_trio.cpp @@ -140,11 +140,26 @@ struct boss_bug_trioAI : public ScriptedAI { // Force evade all 3 bugs and respawn any that are already dead. We have to do this manually or linked bugs don't evade/respawn on region triggered EnterEvadeMode. if (Creature* pKri = m_pInstance->GetSingleCreatureFromStorage(NPC_KRI)) - if (pKri->isDead()) pKri->Respawn(); else pKri->AI()->EnterEvadeMode(); + { + if (pKri->isDead()) + pKri->Respawn(); + else + pKri->AI()->EnterEvadeMode(); + } if (Creature* pYauj = m_pInstance->GetSingleCreatureFromStorage(NPC_PRINCESS_YAUJ)) - if (pYauj->isDead()) pYauj->Respawn(); else pYauj->AI()->EnterEvadeMode(); + { + if (pYauj->isDead()) + pYauj->Respawn(); + else + pYauj->AI()->EnterEvadeMode(); + } if (Creature* pVem = m_pInstance->GetSingleCreatureFromStorage(NPC_VEM)) - if (pVem->isDead()) pVem->Respawn(); else pVem->AI()->EnterEvadeMode(); + { + if (pVem->isDead()) + pVem->Respawn(); + else + pVem->AI()->EnterEvadeMode(); + } } virtual bool UpdateBugAI(const uint32 /*uiDiff*/) { return true; } @@ -217,7 +232,7 @@ struct boss_kriAI : public boss_bug_trioAI boss_bug_trioAI::JustDied(pKiller); } - bool UpdateBugAI(const uint32 uiDiff) + bool UpdateBugAI(const uint32 uiDiff) override { // Cleave if (m_uiCleaveTimer < uiDiff) @@ -302,7 +317,7 @@ struct boss_yaujAI : public boss_bug_trioAI pSummoned->SetInCombatWithZone(); } - bool UpdateBugAI(const uint32 uiDiff) + bool UpdateBugAI(const uint32 uiDiff) override { // Fear if (m_uiFearTimer < uiDiff) @@ -382,7 +397,7 @@ struct boss_vemAI : public boss_bug_trioAI } } - bool UpdateBugAI(const uint32 uiDiff) + bool UpdateBugAI(const uint32 uiDiff) override { // Charge if (m_uiChargeTimer < uiDiff) diff --git a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_cthun.cpp b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_cthun.cpp index e2a2782cc..2ae5175eb 100644 --- a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_cthun.cpp +++ b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_cthun.cpp @@ -127,9 +127,9 @@ public: cooldown(initialCD), resetCD(resetCD), triggered(triggeredSpell), - targetSelectFunc(targetSelectFunc), + retryOnFail(retryOnFail), timeSinceLast(std::numeric_limits::max()), - retryOnFail(retryOnFail) + targetSelectFunc(targetSelectFunc) {} virtual void Reset(int custom = -1) { @@ -255,13 +255,6 @@ static Player* SelectRandomAliveNotStomach(instance_temple_of_ahnqiraj* instance } // Helper functions for SpellTimer users -static Unit* selectRandNotStomachFunc(Creature* c) { - instance_temple_of_ahnqiraj* inst = dynamic_cast(c->GetInstanceData()); - if (inst) { - return SelectRandomAliveNotStomach(inst); - } - return nullptr; -} static Unit* selectSelfFunc(Creature* c) { return c; } @@ -275,7 +268,7 @@ static constexpr uint32 SPELL_ROTATE_TRIGGER_CASTTIME = 3000; static constexpr uint32 GREEN_BEAM_PHASE_DURATION = 45000; static constexpr uint32 DARK_GLARE_PHASE_DURATION = 38000; static constexpr uint32 DARK_GLARE_COOLING_DOWN = 1000; -static constexpr int32 MAX_INITIAL_PULLER_HITS = 3; // How many times will c'thun target the initial +//static constexpr int32 MAX_INITIAL_PULLER_HITS = 3; // How many times will c'thun target the initial // puller with green beam before random target. static constexpr int32 P1_GREEN_BEAM_COOLDOWN = 3000; // Green beam has a 2 sec cast time. If this number is > 2000, // the cooldown will be P1_GREEN_BEAM_COOLDOWN - 2000 @@ -306,7 +299,7 @@ static constexpr uint32 HAMSTRING_INITIAL_COOLDOWN = 2000; static const uint32 hamstringResetCooldownFunc() { return 5000; } // Claw tentacle hamstring cooldown after use static const uint32 trashResetCooldownFunc() { return urand(6000, 12000); } static const uint32 groundTremorResetCooldownFunc() { return urand(6000, 12000); } -static constexpr uint32 CLAW_TENTACLE_FIRST_MELEE_DELAY = 1000; // Earliest possible point for a claw tentacle to melee after spawn/tp +//static constexpr uint32 CLAW_TENTACLE_FIRST_MELEE_DELAY = 1000; // Earliest possible point for a claw tentacle to melee after spawn/tp static constexpr uint32 CLAW_TENTACLE_EVADE_PORT_COOLDOWN = 5000; // How long does a claw tentacle evade before TPing to new target static constexpr uint32 TENTACLE_BIRTH_DURATION = 3000; // Duration of birth animation and /afk before tentacles start doing stuff @@ -359,7 +352,7 @@ struct cthunTentacle : public ScriptedAI defaultOrientation = m_creature->GetOrientation(); } - virtual void Reset() override + void Reset() override { m_creature->addUnitState(UNIT_STAT_ROOT); m_creature->StopMoving(); @@ -459,7 +452,6 @@ struct cthunTentacle : public ScriptedAI if (m_creature->CanHaveThreatList()) { ThreatList const& threatlist = m_creature->getThreatManager().getThreatList(); ThreatList::const_iterator itr = threatlist.begin(); - ThreatList::const_reverse_iterator ritr = threatlist.rbegin(); // Implementing this loop manually instead of using Creature::SelectAttackingTarget // to use target->CanReachWithMeleeAutoAttack(creature) instead of creature->isWithinMeleeRange(target), @@ -539,7 +531,7 @@ public: } } - virtual void Reset() override + void Reset() override { cthunTentacle::Reset(); groundRuptureTimer.Reset(); @@ -644,7 +636,7 @@ struct clawTentacle : public cthunPortalTentacle { } - virtual void Reset() override + void Reset() override { cthunPortalTentacle::Reset(); hamstringTimer.Reset(HAMSTRING_INITIAL_COOLDOWN); @@ -792,7 +784,7 @@ struct eye_tentacleAI : public cthunPortalTentacle eye_tentacleAI::Reset(); } - void Reset() + void Reset() override { cthunPortalTentacle::Reset(); nextMFAttempt = MIND_FLAY_INITIAL_WAIT_DURATION; @@ -807,7 +799,7 @@ struct eye_tentacleAI : public cthunPortalTentacle } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!cthunPortalTentacle::UpdatePortalTentacle(diff)) return; @@ -871,7 +863,7 @@ struct claw_tentacleAI : public clawTentacle clawTentacle::Reset(); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { clawTentacle::UpdateClawTentacle(diff); } @@ -897,7 +889,7 @@ struct giant_claw_tentacleAI : public clawTentacle trashTimer.Reset(); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!clawTentacle::UpdateClawTentacle(diff)) return; @@ -917,14 +909,14 @@ struct giant_eye_tentacleAI : public cthunPortalTentacle { giant_eye_tentacleAI::Reset(); } - void Reset() + void Reset() override { cthunPortalTentacle::Reset(); BeamTimer = GIANT_EYE_INITIAL_GREEN_BEAM_COOLDOWN; isCasting = false; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!isCasting) { @@ -1055,7 +1047,7 @@ struct eye_of_cthunAI : public ScriptedAI IsAlreadyPulled = true; } - void Aggro(Unit* puller) + void Aggro(Unit* puller) override { // Just in case someone manages to get through the AggroRadius logic in C'thuns AI // we make sure the proper pull-sequence is initiated by calling C'thuns attackstart. @@ -1066,7 +1058,7 @@ struct eye_of_cthunAI : public ScriptedAI } } - void Reset() + void Reset() override { currentPhase = GREEN_BEAM; initialPullerGuid = 0; @@ -1087,7 +1079,7 @@ struct eye_of_cthunAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_pInstance) return; diff --git a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_fankriss.cpp b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_fankriss.cpp index abeffbf8c..a0ea566ff 100644 --- a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_fankriss.cpp +++ b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_fankriss.cpp @@ -48,7 +48,7 @@ static constexpr SpawnLocation hatchlingLocations[3] = static constexpr float PULL_DISTANCE = 80.0f; static constexpr SpawnLocation pullCenter = {-8074.88f, 1193.64f, -92.11f}; static constexpr uint32 aIndex[3] = { 0, 1, 2 }; -static constexpr uint32 aEntangleSpells[3] = { SPELL_ENTANGLE_1, SPELL_ENTANGLE_2, SPELL_ENTANGLE_3 }; +//static constexpr uint32 aEntangleSpells[3] = { SPELL_ENTANGLE_1, SPELL_ENTANGLE_2, SPELL_ENTANGLE_3 }; static constexpr size_t MAX_HATCHLINGS = 20; // Max hatchlings alive at any one time static constexpr size_t MAX_HATCHLINGS_PER_WEB = 4; // Max amount of hatchlings that can spawn at the same time, on one web. Its at least 4, might be 5. static constexpr uint32 HATCHLINGS_ATTACK_DELAY = 2500; // ~2.5sec in curse killvideo. diff --git a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_huhuran.cpp b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_huhuran.cpp index 29294eaba..bc16fbe24 100644 --- a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_huhuran.cpp +++ b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_huhuran.cpp @@ -88,7 +88,7 @@ struct boss_huhuranAI : public ScriptedAI m_pInstance->SetData(TYPE_HUHURAN, DONE); } - void Reset() + void Reset() override { m_uiFrenzyTimer = urand(25000, 35000); m_uiWyvernTimer = urand(18000, 28000); @@ -99,7 +99,7 @@ struct boss_huhuranAI : public ScriptedAI m_bBerserk = false; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_ouro.cpp b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_ouro.cpp index 64d6d0946..18596a28e 100644 --- a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_ouro.cpp +++ b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_ouro.cpp @@ -107,7 +107,7 @@ struct boss_ouroAI : public Scripted_NoMovementAI WorldLocation m_StartingLoc; - void Reset() + void Reset() override { m_uiSweepTimer = urand(30000, 40000); m_uiSandBlastTimer = urand(SANDBLAST_TIMER_INITIAL_MIN, SANDBLAST_TIMER_INITIAL_MAX); @@ -128,7 +128,7 @@ struct boss_ouroAI : public Scripted_NoMovementAI m_ouroTriggerGuid.Clear(); } - void Aggro(Unit* /*pWho*/) + void Aggro(Unit* /*pWho*/) override { if (m_pInstance) m_pInstance->SetData(TYPE_OURO, IN_PROGRESS); @@ -146,7 +146,7 @@ struct boss_ouroAI : public Scripted_NoMovementAI (*itr)->ForcedDespawn(); } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) m_pInstance->SetData(TYPE_OURO, FAIL); @@ -158,7 +158,7 @@ struct boss_ouroAI : public Scripted_NoMovementAI m_creature->ForcedDespawn(2000); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { if (m_pInstance) m_pInstance->SetData(TYPE_OURO, DONE); @@ -166,7 +166,7 @@ struct boss_ouroAI : public Scripted_NoMovementAI m_creature->CastSpell(m_creature, SPELL_DESPAWN_BASE, true); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { switch (pSummoned->GetEntry()) { @@ -269,7 +269,7 @@ struct boss_ouroAI : public Scripted_NoMovementAI return false; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { // Return since we have no pTarget if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) @@ -449,7 +449,7 @@ struct npc_ouro_spawnerAI : public Scripted_NoMovementAI bool m_bHasSummoned; - void Reset() + void Reset() override { m_bHasSummoned = false; @@ -470,7 +470,7 @@ struct npc_ouro_spawnerAI : public Scripted_NoMovementAI ScriptedAI::MoveInLineOfSight(pWho); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { // Despawn when Ouro is spawned if (pSummoned->GetEntry() == NPC_OURO) @@ -481,7 +481,7 @@ struct npc_ouro_spawnerAI : public Scripted_NoMovementAI } } - void UpdateAI(const uint32 /*uiDiff*/) { } + void UpdateAI(const uint32 /*uiDiff*/) override { } }; CreatureAI* GetAI_npc_ouro_spawner(Creature* pCreature) @@ -504,7 +504,7 @@ struct npc_dirt_moundAI : public ScriptedAI ScriptedAI::JustRespawned(); } - void Reset() + void Reset() override { m_uiDespawnTimer = 30000; m_TargetGUID.Clear(); @@ -513,7 +513,7 @@ struct npc_dirt_moundAI : public ScriptedAI DoCastSpellIfCan(m_creature, SPELL_DIRTMOUND_PASSIVE); } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit *who) override { if (!m_TargetGUID && who->GetTypeId() == TYPEID_PLAYER) { @@ -521,7 +521,7 @@ struct npc_dirt_moundAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { Unit *pTarget = m_creature->GetMap()->GetUnit(m_CurrentTargetGUID); const bool bForceChangeTarget = !pTarget || pTarget->isDead() @@ -569,12 +569,12 @@ struct npc_ouro_scarabAI : public ScriptedAI uint32 m_uiDespawnTimer; - void Reset() + void Reset() override { m_uiDespawnTimer = 45000; } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit *who) override { if (who->GetTypeId() == TYPEID_PLAYER && !m_creature->getVictim() && !urand(0, 5)) { @@ -582,7 +582,7 @@ struct npc_ouro_scarabAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_creature->getVictim()) DoMeleeAttackIfReady(); @@ -605,7 +605,7 @@ struct go_sandworm_baseAI: public GameObjectAI bool m_bActive; - bool OnUse(Unit* pUser) + bool OnUse(Unit* pUser) override { WorldLocation loc; pUser->GetObjectScale(); diff --git a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_skeram.cpp b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_skeram.cpp index 4d73b39ee..b8ebe7927 100644 --- a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_skeram.cpp +++ b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_skeram.cpp @@ -80,7 +80,7 @@ struct boss_skeramAI : public ScriptedAI bool IsImage; - void Reset() + void Reset() override { ArcaneExplosion_Timer = urand(6000, 8000); EarthShock_Timer = 1000; @@ -125,7 +125,7 @@ struct boss_skeramAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(pWho); } - void KilledUnit(Unit* victim) + void KilledUnit(Unit* victim) override { switch (urand(0,8)) { @@ -135,7 +135,7 @@ struct boss_skeramAI : public ScriptedAI } } - void JustDied(Unit* Killer) + void JustDied(Unit* Killer) override { if (IsImage) { @@ -154,7 +154,7 @@ struct boss_skeramAI : public ScriptedAI m_pInstance->SetData(TYPE_SKERAM, DONE); } - void Aggro(Unit *who) + void Aggro(Unit *who) override { if (IsImage) return; @@ -173,7 +173,7 @@ struct boss_skeramAI : public ScriptedAI m_pInstance->SetData(TYPE_SKERAM, IN_PROGRESS); } - void JustReachedHome() + void JustReachedHome() override { CancelFulfillment(); @@ -184,7 +184,7 @@ struct boss_skeramAI : public ScriptedAI m_pInstance->SetData(TYPE_SKERAM, FAIL); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { // Despawn Images instantly if the True Prophet died if (IsImage && m_pInstance && m_pInstance->GetData(TYPE_SKERAM) == DONE) @@ -264,7 +264,7 @@ struct boss_skeramAI : public ScriptedAI } - void JustSummoned(Creature* skeramImage) + void JustSummoned(Creature* skeramImage) override { if (m_creature->GetEntry() != skeramImage->GetEntry()) return; diff --git a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_twinemperors.cpp b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_twinemperors.cpp index 0b0e153f5..850bbd23c 100644 --- a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_twinemperors.cpp +++ b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_twinemperors.cpp @@ -98,11 +98,11 @@ static constexpr uint32 TELEPORTTIME_MAX_CD = 40000; // Longest possi static constexpr uint32 TRY_HEAL_FREQUENCY = 0; // How ofthen will the emperors TRY to heal eachother, 0 for every update static constexpr uint32 SUCCESS_HEAL_FREQUENCY = 1500; // How ofthen will the emperors actually heal, when in range of each other -static constexpr float HEAL_BROTHER_AMOUNT = 30000.0f; // How much do they heal when in heal-range +//static constexpr float HEAL_BROTHER_AMOUNT = 30000.0f; // How much do they heal when in heal-range static constexpr float HEAL_BROTHER_RANGE = 60.0f; static constexpr uint32 RESPAWN_BUG_FREQUENCY = 10000; // How often do we try to respawn a dead bug -static constexpr float RESPAWN_BUG_DISTANCE = 50.0f; // How far away do we look for dead bugs for respawning +//static constexpr float RESPAWN_BUG_DISTANCE = 50.0f; // How far away do we look for dead bugs for respawning static constexpr float BUG_SPELL_MAX_DIST = 20.0f; // Max distance a bug can be for the twin to choose it // Vek'nilash constants @@ -154,7 +154,7 @@ struct mob_TwinsBug : public ScriptedAI { m_creature->RemoveAllAuras(); } - virtual void Reset() override + void Reset() override { m_creature->setFaction(7); m_creature->RemoveAllAuras(); @@ -163,7 +163,7 @@ struct mob_TwinsBug : public ScriptedAI { } - virtual void UpdateAI(const uint32 diff) override + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -634,12 +634,12 @@ struct boss_veklorAI : public boss_twinemperorsAI return urand(EXPLODE_BUG_MIN_CD, EXPLODE_BUG_MAX_CD); } - uint32 GetBugSpell() + uint32 GetBugSpell() override { return SPELL_EXPLODEBUG; } - virtual void UpdateTeleportToMyBrother(uint32 diff) override + void UpdateTeleportToMyBrother(uint32 diff) override { // Updating time and returning if it's not yet time to teleport if (teleportTimer >= diff) { @@ -835,7 +835,7 @@ struct boss_veknilashAI : public boss_twinemperorsAI m_creature->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_SPELL, true); } - void OnEndTeleportVirtual() + void OnEndTeleportVirtual() override { //todo: anything that needs doing? } @@ -845,7 +845,7 @@ struct boss_veknilashAI : public boss_twinemperorsAI return urand(MUTATE_BUG_MIN_CD, MUTATE_BUG_MAX_CD); } - uint32 GetBugSpell() + uint32 GetBugSpell() override { return SPELL_MUTATE_BUG; } @@ -875,7 +875,7 @@ struct boss_veknilashAI : public boss_twinemperorsAI return m_creature->GetMap()->GetUnit((*it)->getUnitGuid()); } - void UpdateEmperor(uint32 diff) + void UpdateEmperor(uint32 diff) override { // Vek'nilash goes first, instantly does his yell when we are in combat. if (!didPullDialogue) { @@ -918,7 +918,7 @@ struct boss_veknilashAI : public boss_twinemperorsAI } } - void AttackStart(Unit* who) + void AttackStart(Unit* who) override { ScriptedAI::AttackStart(who); } diff --git a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_viscidus.cpp b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_viscidus.cpp index 13428f56f..0c7af84dc 100644 --- a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_viscidus.cpp +++ b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_viscidus.cpp @@ -106,12 +106,12 @@ struct mob_viscidus_globAI : public ScriptedAI { } // dummy methods - void Reset() { } - void AttackStart(Unit* /*pWho*/) { } - void MoveInLineOfSight(Unit* /*pWho*/) { } + void Reset() override { } + void AttackStart(Unit* /*pWho*/) override { } + void MoveInLineOfSight(Unit* /*pWho*/) override { } // Implements acceleration on timer, prevents combat. - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_uiGlobStartAccelerationTimer <= uiDiff) { @@ -148,11 +148,11 @@ struct mob_viscidus_triggerAI : public ScriptedAI { } // dummy methods - void Reset() { } - void AttackStart(Unit* /*pWho*/) { } - void MoveInLineOfSight(Unit* /*pWho*/) { } + void Reset() override { } + void AttackStart(Unit* /*pWho*/) override { } + void MoveInLineOfSight(Unit* /*pWho*/) override { } // Implements toxin cloud on timer, prevents combat. - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_uiToxinDelayTimer <= uiDiff) { @@ -213,7 +213,7 @@ struct boss_viscidusAI : public ScriptedAI Reset(); } - void Reset() + void Reset() override { m_uiGrowTimer = 0; m_uiPhase = PHASE_NORMAL; @@ -246,13 +246,13 @@ struct boss_viscidusAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - void Aggro(Unit* /*pWho*/) + void Aggro(Unit* /*pWho*/) override { if (m_pInstance) m_pInstance->SetData(TYPE_VISCIDUS, IN_PROGRESS); } - void JustReachedHome() + void JustReachedHome() override { if (m_pInstance) m_pInstance->SetData(TYPE_VISCIDUS, FAIL); @@ -260,13 +260,13 @@ struct boss_viscidusAI : public ScriptedAI DoCastSpellIfCan(m_creature, SPELL_DESPAWN_GLOBS, CF_TRIGGERED); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { if (m_pInstance) m_pInstance->SetData(TYPE_VISCIDUS, DONE); } - void DamageTaken(Unit* pDealer, uint32 &damage) + void DamageTaken(Unit* pDealer, uint32 &damage) override { if (pDealer->IsCreature() && ((Creature*)pDealer)->GetEntry() == NPC_VISCIDUS) return; @@ -279,7 +279,7 @@ struct boss_viscidusAI : public ScriptedAI m_creature->SetHealthPercent(1.0f); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { if (pSummoned->GetEntry() == NPC_GLOB_OF_VISCIDUS) { @@ -311,7 +311,7 @@ struct boss_viscidusAI : public ScriptedAI SetCombatMovement(true); } - void SummonedCreatureJustDied(Creature* pSummoned) + void SummonedCreatureJustDied(Creature* pSummoned) override { if (pSummoned->GetEntry() == NPC_GLOB_OF_VISCIDUS) { @@ -339,7 +339,7 @@ struct boss_viscidusAI : public ScriptedAI } } - void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) + void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) override { if (pSummoned->GetEntry() != NPC_GLOB_OF_VISCIDUS || uiType != POINT_MOTION_TYPE || !uiPointId) return; @@ -355,7 +355,7 @@ struct boss_viscidusAI : public ScriptedAI } } - void SpellHit(Unit* pCaster, const SpellEntry* pSpell) + void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override { if (pSpell->Id == SPELL_VISCIDUS_EXPLODE) { @@ -460,7 +460,7 @@ struct boss_viscidusAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp index b99790152..8a0199ab2 100644 --- a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp @@ -144,9 +144,9 @@ void TwinsIntroDialogue::JustDidDialogueStep(int32 iEntry) instance_temple_of_ahnqiraj::instance_temple_of_ahnqiraj(Map* pMap) : ScriptedInstance(pMap), m_uiBugTrioDeathCount(0), + m_twinsDeadDialogue(twinsDeathDialogue), m_uiCthunWhisperTimer(CTHUN_FIRST_WHISPER), - m_uiCthunPrevWhisperTimer(CTHUN_FIRST_WHISPER), - m_twinsDeadDialogue(twinsDeathDialogue) + m_uiCthunPrevWhisperTimer(CTHUN_FIRST_WHISPER) { Initialize(); }; diff --git a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp index 51745dc3c..1a2d0ac8a 100644 --- a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp +++ b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp @@ -233,7 +233,7 @@ struct aqsentinelAI : public ScriptedAI CallBuddiesToAttack(who); } - void Reset() + void Reset() override { if (!m_creature->isDead()) { @@ -268,7 +268,7 @@ struct aqsentinelAI : public ScriptedAI } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (gatherOthersWhenAggro) GetOtherSentinels(pWho); @@ -279,7 +279,7 @@ struct aqsentinelAI : public ScriptedAI } // Transfer powers on death - void JustDied(Unit* killer) + void JustDied(Unit* killer) override { m_bAlone = true; for (auto iter = nearby.cbegin(); iter != nearby.cend(); ++iter) @@ -305,7 +305,7 @@ struct aqsentinelAI : public ScriptedAI DoScriptText(EMOTE_TRANSFER, m_creature); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { //Return since we have no target if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/temple_of_ahnqiraj.h b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/temple_of_ahnqiraj.h index 691d17565..499ee5a31 100644 --- a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/temple_of_ahnqiraj.h +++ b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/temple_of_ahnqiraj.h @@ -125,25 +125,25 @@ class instance_temple_of_ahnqiraj : public ScriptedInstance public: instance_temple_of_ahnqiraj(Map* pMap); - void Initialize(); + void Initialize() override; bool IsEncounterInProgress() const override; - void OnCreatureRespawn(Creature* pCreature); - void OnCreatureCreate(Creature* pCreature); - void OnObjectCreate(GameObject* pGo); + void OnCreatureRespawn(Creature* pCreature) override; + void OnCreatureCreate(Creature* pCreature) override; + void OnObjectCreate(GameObject* pGo) override; void SetData(uint32 uiType, uint32 uiData) override; uint32 GetData(uint32 uiType) override; - bool CheckConditionCriteriaMeet(Player const* player, uint32 map_id, WorldObject const* source, uint32 instance_condition_id) const; + bool CheckConditionCriteriaMeet(Player const* player, uint32 map_id, WorldObject const* source, uint32 instance_condition_id) const override; void GetRoyalGuardGUIDList(GuidList& lList) { lList = m_lRoyalGuardGUIDList; } - const char* Save() { return m_strInstData.c_str(); } - void Load(const char* chrIn); + const char* Save() override { return m_strInstData.c_str(); } + void Load(const char* chrIn) override; - void Update(uint32 uiDiff); + void Update(uint32 uiDiff) override; bool TwinsDialogueStartedOrDone(); @@ -152,8 +152,6 @@ private: std::string m_strInstData; uint32 m_uiBugTrioDeathCount; - uint32 m_uiCthunPhase; - GuidList m_lRoyalGuardGUIDList; TwinsIntroDialogue m_twinsIntroDialogue; diff --git a/src/scripts/kalimdor/tanaris/tanaris.cpp b/src/scripts/kalimdor/tanaris/tanaris.cpp index 9a5e97700..a9d2ca17e 100644 --- a/src/scripts/kalimdor/tanaris/tanaris.cpp +++ b/src/scripts/kalimdor/tanaris/tanaris.cpp @@ -54,7 +54,7 @@ struct mob_aquementasAI : public ScriptedAI uint32 FrostShock_Timer; uint32 AquaJet_Timer; - void Reset() + void Reset() override { SendItem_Timer = 0; SwitchFaction_Timer = 10000; @@ -79,12 +79,12 @@ struct mob_aquementasAI : public ScriptedAI } } - void Aggro(Unit* who) + void Aggro(Unit* who) override { DoScriptText(AGGRO_YELL_AQUE, m_creature, who); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (isFriendly) { @@ -155,7 +155,7 @@ struct npc_custodian_of_timeAI : public npc_escortAI Reset(); } - void WaypointReached(uint32 i) + void WaypointReached(uint32 i) override { Player* pPlayer = GetPlayerForEscort(); @@ -224,7 +224,7 @@ struct npc_custodian_of_timeAI : public npc_escortAI } } - void MoveInLineOfSight(Unit *who) + void MoveInLineOfSight(Unit *who) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) return; @@ -241,7 +241,7 @@ struct npc_custodian_of_timeAI : public npc_escortAI } } - void Reset() { } + void Reset() override { } }; CreatureAI* GetAI_npc_custodian_of_time(Creature* pCreature) @@ -351,7 +351,7 @@ struct npc_toogaAI : public FollowerAI ObjectGuid m_tortaGuid; - void Reset() + void Reset() override { m_uiCheckSpeechTimer = 2500; m_uiPostEventTimer = 1000; @@ -360,7 +360,7 @@ struct npc_toogaAI : public FollowerAI m_tortaGuid.Clear(); } - void MoveInLineOfSight(Unit* pWho) + void MoveInLineOfSight(Unit* pWho) override { FollowerAI::MoveInLineOfSight(pWho); @@ -380,7 +380,7 @@ struct npc_toogaAI : public FollowerAI } } - void MovementInform(uint32 uiMotionType, uint32 uiPointId) + void MovementInform(uint32 uiMotionType, uint32 uiPointId) override { FollowerAI::MovementInform(uiMotionType, uiPointId); @@ -391,7 +391,7 @@ struct npc_toogaAI : public FollowerAI SetFollowComplete(); } - void UpdateFollowerAI(const uint32 uiDiff) + void UpdateFollowerAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) { @@ -504,7 +504,7 @@ struct go_inconspicuous_landmarkAI: public GameObjectAI uint32 timer; bool state;//0 = usual, can launch. //1 = in use, cannot launch - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (state) { @@ -554,7 +554,6 @@ bool GOHello_go_inconspicuous_landmark(Player* pPlayer, GameObject* pGo) Creature* pirate3 = nullptr; Creature* pirate4 = nullptr; Creature* pirate5 = nullptr; - GameObject* pTreasure = nullptr; int extraPirateType[2]; extraPirateType[0] = NPC_PIRATES_1; extraPirateType[1] = NPC_PIRATES_2; @@ -600,27 +599,6 @@ bool GOHello_go_inconspicuous_landmark(Player* pPlayer, GameObject* pGo) pirate5->AI()->AttackStart(pPlayer); pirate5->SetRespawnDelay(350000); } - - //code pour le dev où le coffre est pas pop ET pop en invisible... - /*if (! (pTreasure = pGo->FindNearestGameObject (GO_PIRATES_TREASURE, 10.000000))) - { - if(pTreasure = pGo->SummonGameObject(GO_PIRATES_TREASURE, -10115.037109, -4050.484863, 5.521664, 0, 0, 0, 0, 0, 13)); - } - if(pTreasure != nullptr) - { - //pTreasure->SetGoState(GO_STATE_READY); - //pTreasure->SetLootState(GO_READY); - //pTreasure->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NO_INTERACT); - - //if (pTreasure->isSpawned()); - - pTreasure->SetRespawnTime(3); - //pTreasure->SetRespawnDelay(10000); on peut pas :( - - //pTreasure->UseDoorOrButton(12, false); - //pTreasure->ForcedDespawn(5000); on peut pas :( - - }*/ } } } @@ -645,7 +623,7 @@ struct npc_yehkinyaAI : public npc_escortAI bool isEventStarted; uint32 Point; - void Reset() + void Reset() override { isEventStarted = false; m_creature->LoadEquipment(1315, true); @@ -657,7 +635,7 @@ struct npc_yehkinyaAI : public npc_escortAI return; } - void WaypointReached(uint32 i) + void WaypointReached(uint32 i) override { switch (i) { @@ -674,7 +652,7 @@ struct npc_yehkinyaAI : public npc_escortAI } } - void UpdateEscortAI(const uint32 diff) + void UpdateEscortAI(const uint32 diff) override { if (Event_Timer <= diff) { diff --git a/src/scripts/kalimdor/tanaris/zulfarrak/instance_zulfarrak.cpp b/src/scripts/kalimdor/tanaris/zulfarrak/instance_zulfarrak.cpp index d88af1686..7f9b4fbd7 100644 --- a/src/scripts/kalimdor/tanaris/zulfarrak/instance_zulfarrak.cpp +++ b/src/scripts/kalimdor/tanaris/zulfarrak/instance_zulfarrak.cpp @@ -114,7 +114,7 @@ public: uint32 addGroupSize; uint32 waypoint; - void Initialize() + void Initialize() override { EndDoorEncounter = NOT_STARTED; GahzRillaEncounter = NOT_STARTED; @@ -135,7 +135,7 @@ public: EndDoorGUID = 0; } - void OnCreatureCreate(Creature* pCreature) + void OnCreatureCreate(Creature* pCreature) override { switch (pCreature->GetEntry()) { @@ -174,7 +174,7 @@ public: } } - void OnObjectCreate(GameObject* pGo) + void OnObjectCreate(GameObject* pGo) override { switch (pGo->GetEntry()) { @@ -186,7 +186,7 @@ public: } } - uint32 GetData(uint32 type) + uint32 GetData(uint32 type) override { switch (type) { @@ -196,7 +196,7 @@ public: return 0; } - uint64 GetData64(uint32 data) + uint64 GetData64(uint32 data) override { switch (data) { @@ -220,7 +220,7 @@ public: return 0; } - void SetData(uint32 type, uint32 data) + void SetData(uint32 type, uint32 data) override { switch (type) { @@ -243,7 +243,7 @@ public: } } - virtual void Update(uint32 diff) + void Update(uint32 diff) override { switch (PyramidPhase) { diff --git a/src/scripts/kalimdor/tanaris/zulfarrak/zulfarrak.cpp b/src/scripts/kalimdor/tanaris/zulfarrak/zulfarrak.cpp index 5a30a8fb3..a33593066 100644 --- a/src/scripts/kalimdor/tanaris/zulfarrak/zulfarrak.cpp +++ b/src/scripts/kalimdor/tanaris/zulfarrak/zulfarrak.cpp @@ -77,7 +77,7 @@ struct npc_sergeant_blyAI : public ScriptedAI uint32 Revenge_Timer; //this is wrong, spell should never be used unless m_creature->getVictim() dodge, parry or block attack. Trinity support required. uint64 PlayerGUID; - void Reset() + void Reset() override { ShieldBash_Timer = 5000; Revenge_Timer = 8000; @@ -85,7 +85,7 @@ struct npc_sergeant_blyAI : public ScriptedAI // m_creature->setFaction(FACTION_FRIENDLY); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!pInstance) return; @@ -147,7 +147,7 @@ struct npc_sergeant_blyAI : public ScriptedAI DoMeleeAttackIfReady(); } - void DoAction(const uint32 param) + void DoAction(const uint32 param) override { postGossipStep = 1; Text_Timer = 0; @@ -297,25 +297,25 @@ struct npc_weegli_blastfuseAI : public ScriptedAI bool regen; ScriptedInstance* pInstance; - void Reset() + void Reset() override { /*if (pInstance) pInstance->SetData(0, NOT_STARTED);*/ } - void AttackStart(Unit *victim) + void AttackStart(Unit *victim) override { ScriptedAI::AttackStart(victim); //AttackStartCaster(victim,10);//keep back & toss bombs/shoot } - void JustDied(Unit * /*victim*/) + void JustDied(Unit * /*victim*/) override { /*if (pInstance) pInstance->SetData(0, DONE);*/ } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (regen == false && pInstance->GetData(EVENT_PYRAMID) == PYRAMID_KILLED_ALL_TROLLS) { @@ -381,7 +381,7 @@ struct npc_weegli_blastfuseAI : public ScriptedAI } } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) override { if (pInstance) { @@ -433,7 +433,7 @@ struct npc_weegli_blastfuseAI : public ScriptedAI } } - void DoAction(const uint32 param) + void DoAction(const uint32 param) override { sLog.outString("DoAction de npc_weegli_blastfuse : Destruction porte"); DestroyDoor(); @@ -608,13 +608,13 @@ struct ward_zumrahAI : public ScriptedAI uint32 m_uiSkeletonTimer; - void Reset() + void Reset() override { m_uiSkeletonTimer = 5000; m_creature->SetDefaultMovementType(IDLE_MOTION_TYPE); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { m_creature->SetDefaultMovementType(IDLE_MOTION_TYPE); diff --git a/src/scripts/kalimdor/teldrassil/teldrassil.cpp b/src/scripts/kalimdor/teldrassil/teldrassil.cpp index 640075cce..c26c9a771 100644 --- a/src/scripts/kalimdor/teldrassil/teldrassil.cpp +++ b/src/scripts/kalimdor/teldrassil/teldrassil.cpp @@ -47,9 +47,9 @@ struct npc_mistAI : public FollowerAI Reset(); } - void Reset() { } + void Reset() override { } - void MoveInLineOfSight(Unit *pWho) + void MoveInLineOfSight(Unit *pWho) override { FollowerAI::MoveInLineOfSight(pWho); @@ -99,11 +99,11 @@ struct npc_sethirAI : public ScriptedAI Reset(); } - void Reset() + void Reset() override { } - void Aggro(Unit* pUnit) + void Aggro(Unit* pUnit) override { m_creature->MonsterSay("Filfh! Filfh everywhere! The forests must be cleansed!"); for (uint32 counter = 0; counter < 6; counter++) @@ -114,7 +114,7 @@ struct npc_sethirAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/kalimdor/the_barrens/razorfen_downs/instance_razorfen_downs.cpp b/src/scripts/kalimdor/the_barrens/razorfen_downs/instance_razorfen_downs.cpp index da7a61741..d3289f40c 100644 --- a/src/scripts/kalimdor/the_barrens/razorfen_downs/instance_razorfen_downs.cpp +++ b/src/scripts/kalimdor/the_barrens/razorfen_downs/instance_razorfen_downs.cpp @@ -39,7 +39,7 @@ struct instance_razorfen_downs : public ScriptedInstance std::string str_data; std::string strInstData; - void Initialize() + void Initialize() override { uiGongGUID = 0; @@ -52,7 +52,7 @@ struct instance_razorfen_downs : public ScriptedInstance memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); } - void Load(const char* chrIn) + void Load(const char* chrIn) override { if (!chrIn) { @@ -73,7 +73,7 @@ struct instance_razorfen_downs : public ScriptedInstance OUT_LOAD_INST_DATA_COMPLETE; } - void OnObjectCreate(GameObject* pGo) + void OnObjectCreate(GameObject* pGo) override { switch (pGo->GetEntry()) { @@ -93,7 +93,7 @@ struct instance_razorfen_downs : public ScriptedInstance } } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) override { if (uiType == DATA_GONG_WAVES) { @@ -203,7 +203,7 @@ struct instance_razorfen_downs : public ScriptedInstance } - uint32 GetData(uint32 uiType) + uint32 GetData(uint32 uiType) override { switch (uiType) { @@ -214,7 +214,7 @@ struct instance_razorfen_downs : public ScriptedInstance return 0; } - uint64 GetData64(uint32 uiType) + uint64 GetData64(uint32 uiType) override { switch (uiType) { diff --git a/src/scripts/kalimdor/the_barrens/razorfen_downs/razorfen_downs.cpp b/src/scripts/kalimdor/the_barrens/razorfen_downs/razorfen_downs.cpp index b7a61f9dc..7a3b952ba 100644 --- a/src/scripts/kalimdor/the_barrens/razorfen_downs/razorfen_downs.cpp +++ b/src/scripts/kalimdor/the_barrens/razorfen_downs/razorfen_downs.cpp @@ -90,7 +90,7 @@ struct boss_ladyFaltheressAI : public ScriptedAI uint32 MindBlast_Timer; - void Reset() + void Reset() override { MindBlast_Timer = 8000; } @@ -102,7 +102,7 @@ struct boss_ladyFaltheressAI : public ScriptedAI m_creature->SetDisplayId(MODEL_ID_UNDEAD); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -191,13 +191,13 @@ struct npc_belnistraszAI : public npc_escortAI uint32 m_uiFireballTimer; uint32 m_uiFrostNovaTimer; - void Reset() + void Reset() override { m_uiFireballTimer = 1000; m_uiFrostNovaTimer = 6000; } - void AttackedBy(Unit* pAttacker) + void AttackedBy(Unit* pAttacker) override { if (HasEscortState(STATE_ESCORT_PAUSED)) { @@ -254,7 +254,7 @@ struct npc_belnistraszAI : public npc_escortAI } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { SpawnerSummon(pSummoned); } @@ -266,7 +266,7 @@ struct npc_belnistraszAI : public npc_escortAI crea->SetRespawnDelay(600000); } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { if (uiPointId == 24) { @@ -275,7 +275,7 @@ struct npc_belnistraszAI : public npc_escortAI } } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { if (HasEscortState(STATE_ESCORT_PAUSED)) { @@ -432,12 +432,12 @@ struct npc_tomb_creatureAI : public ScriptedAI uint32 uiWebTimer; - void Reset() + void Reset() override { uiWebTimer = urand(5000, 8000); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!UpdateVictim()) return; @@ -456,7 +456,7 @@ struct npc_tomb_creatureAI : public ScriptedAI DoMeleeAttackIfReady(); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (pInstance) pInstance->SetData(DATA_GONG_WAVES, pInstance->GetData(DATA_GONG_WAVES) + 1); diff --git a/src/scripts/kalimdor/the_barrens/razorfen_kraul/razorfen_kraul.cpp b/src/scripts/kalimdor/the_barrens/razorfen_kraul/razorfen_kraul.cpp index f27a3aecf..cc482603c 100644 --- a/src/scripts/kalimdor/the_barrens/razorfen_kraul/razorfen_kraul.cpp +++ b/src/scripts/kalimdor/the_barrens/razorfen_kraul/razorfen_kraul.cpp @@ -362,19 +362,19 @@ struct RazorfenDefenderAI : public ScriptedAI uint32 m_uiImprovedBlocking_Timer; uint32 m_uiShieldBash_Timer; - void Reset() + void Reset() override { m_uiImprovedBlocking_Timer = 1000; m_uiShieldBash_Timer = 6600; DoCastSpellIfCan(m_creature, SPELL_DEFENSIVE_STANCE, true); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { m_creature->SetInCombatWithZone(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; diff --git a/src/scripts/kalimdor/the_barrens/razorfen_kraul/razorfen_kraul.h b/src/scripts/kalimdor/the_barrens/razorfen_kraul/razorfen_kraul.h index 969709982..92c6dba37 100644 --- a/src/scripts/kalimdor/the_barrens/razorfen_kraul/razorfen_kraul.h +++ b/src/scripts/kalimdor/the_barrens/razorfen_kraul/razorfen_kraul.h @@ -21,7 +21,7 @@ class instance_razorfen_kraul : public ScriptedInstance { public: instance_razorfen_kraul(Map* pMap); - ~instance_razorfen_kraul() {} + ~instance_razorfen_kraul() override {} void Initialize() override; diff --git a/src/scripts/kalimdor/the_barrens/the_barrens.cpp b/src/scripts/kalimdor/the_barrens/the_barrens.cpp index f2442b7e9..7e77b42d6 100644 --- a/src/scripts/kalimdor/the_barrens/the_barrens.cpp +++ b/src/scripts/kalimdor/the_barrens/the_barrens.cpp @@ -119,12 +119,12 @@ struct npc_pollyAI : public ScriptedAI bool b_text; - void Reset() + void Reset() override { b_text = false; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (b_text == false) { @@ -170,9 +170,9 @@ struct npc_giltharesAI : public npc_escortAI Reset(); } - void Reset() { } + void Reset() override { } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { Player* pPlayer = GetPlayerForEscort(); @@ -203,7 +203,7 @@ struct npc_giltharesAI : public npc_escortAI } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { //not always use if (urand(0, 3)) @@ -276,7 +276,7 @@ struct npc_taskmaster_fizzuleAI : public ScriptedAI uint32 Reset_Timer; uint8 FlareCount; - void Reset() + void Reset() override { IsFriend = false; Reset_Timer = 120000; @@ -297,7 +297,7 @@ struct npc_taskmaster_fizzuleAI : public ScriptedAI m_creature->HandleEmoteCommand(EMOTE_ONESHOT_SALUTE); } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit *caster, const SpellEntry *spell) override { if (spell->Id == SPELL_FLARE || spell->Id == SPELL_FOLLY) { @@ -308,7 +308,7 @@ struct npc_taskmaster_fizzuleAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (IsFriend) { @@ -323,7 +323,7 @@ struct npc_taskmaster_fizzuleAI : public ScriptedAI DoMeleeAttackIfReady(); } - void ReceiveEmote(Player* pPlayer, uint32 emote) + void ReceiveEmote(Player* pPlayer, uint32 emote) override { if (emote == TEXTEMOTE_SALUTE) { @@ -388,7 +388,7 @@ struct npc_twiggy_flatheadAI : public ScriptedAI uint64 BigWillGUID; uint64 AffrayChallenger[6]; - void Reset() + void Reset() override { EventInProgress = false; @@ -445,7 +445,7 @@ struct npc_twiggy_flatheadAI : public ScriptedAI pUnit->setFaction(14); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!EventInProgress) return; @@ -615,7 +615,7 @@ struct npc_wizzlecranks_shredderAI : public npc_escortAI uint32 m_uiPostEventTimer; uint32 m_uiPostEventCount; - void Reset() + void Reset() override { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -628,7 +628,7 @@ struct npc_wizzlecranks_shredderAI : public npc_escortAI } } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { switch (uiPointId) { @@ -652,7 +652,7 @@ struct npc_wizzlecranks_shredderAI : public npc_escortAI } } - void WaypointStart(uint32 uiPointId) + void WaypointStart(uint32 uiPointId) override { switch (uiPointId) { @@ -668,7 +668,7 @@ struct npc_wizzlecranks_shredderAI : public npc_escortAI } } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { if (pSummoned->GetEntry() == NPC_PILOT_WIZZ) m_creature->SetStandState(UNIT_STAND_STATE_DEAD); @@ -677,7 +677,7 @@ struct npc_wizzlecranks_shredderAI : public npc_escortAI pSummoned->AI()->AttackStart(m_creature); } - void UpdateEscortAI(const uint32 uiDiff) + void UpdateEscortAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) { @@ -810,7 +810,7 @@ struct npc_regthar_deathgateAI : public ScriptedAI ResetVars(); } - void Reset() + void Reset() override { } @@ -952,7 +952,7 @@ struct npc_regthar_deathgateAI : public ScriptedAI ResetVars(); } - void SummonedCreatureJustDied(Creature* pSummoned) + void SummonedCreatureJustDied(Creature* pSummoned) override { if (!pSummoned) return; @@ -1042,7 +1042,7 @@ struct npc_regthar_deathgateAI : public ScriptedAI } } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (eventPhase > 0) { @@ -1148,7 +1148,7 @@ struct npc_kolkar_invaderAI : public ScriptedAI { Reset(); } - void Reset() + void Reset() override { // torchTimer=30000; chargeTimer = 0; @@ -1159,13 +1159,13 @@ struct npc_kolkar_invaderAI : public ScriptedAI uint32 chargeTimer; uint32 strikeTimer; uint32 tetanosTimer; - void MovementInform(uint32 movementType, uint32 moveId) + void MovementInform(uint32 movementType, uint32 moveId) override { if (movementType != POINT_MOTION_TYPE || moveId != 2) return; //m_creature->CastSpell( m_creature->GetPositionX() + 10*cos( m_creature->GetOrientation()), m_creature->GetPositionY() + 10*sin( m_creature->GetOrientation()), m_creature->GetPositionZ(), SPELL_TORCH, false); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) @@ -1224,17 +1224,17 @@ struct npc_axe_throwerAI : public ScriptedAI { Reset(); } - void Reset() + void Reset() override { throwTimer = 0; } - void Aggro(Unit *who) + void Aggro(Unit *who) override { if (urand(0, 1)) DoScriptText(urand(0, 1) ? SAY_HORDE : SAY_FOES, m_creature); } uint32 throwTimer; - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) @@ -1261,17 +1261,17 @@ struct npc_warlord_kromzarAI : public ScriptedAI { Reset(); } - void Reset() + void Reset() override { strikeTimer = urand(4000, 7000); } uint32 strikeTimer; - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { m_creature->CastSpell(m_creature, 13965, true); //SPELL_BANNER } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) diff --git a/src/scripts/kalimdor/the_barrens/wailing_caverns/instance_wailing_caverns.cpp b/src/scripts/kalimdor/the_barrens/wailing_caverns/instance_wailing_caverns.cpp index 697f8c826..b93e39c69 100644 --- a/src/scripts/kalimdor/the_barrens/wailing_caverns/instance_wailing_caverns.cpp +++ b/src/scripts/kalimdor/the_barrens/wailing_caverns/instance_wailing_caverns.cpp @@ -47,7 +47,7 @@ struct instance_wailing_caverns : public ScriptedInstance // to be despawn when the nightmare is over std::vector vNightmareMonsters; - void Initialize() + void Initialize() override { memset(&m_auiEncounter, 0, sizeof(m_auiEncounter)); @@ -59,7 +59,7 @@ struct instance_wailing_caverns : public ScriptedInstance Assaulted = false; } - void OnCreatureCreate(Creature* pCreature) + void OnCreatureCreate(Creature* pCreature) override { switch (pCreature->GetEntry()) { @@ -89,7 +89,7 @@ struct instance_wailing_caverns : public ScriptedInstance vNightmareMonsters.push_back(pCreature->GetGUID()); } - void OnObjectCreate(GameObject* pGo) + void OnObjectCreate(GameObject* pGo) override { if (pGo->GetEntry() == GO_DMF_CHEST) { @@ -98,7 +98,7 @@ struct instance_wailing_caverns : public ScriptedInstance } } - void OnPlayerEnter(Player* pPlayer) + void OnPlayerEnter(Player* pPlayer) override { if (!pPlayer) return; @@ -111,7 +111,7 @@ struct instance_wailing_caverns : public ScriptedInstance } } - void SetData(uint32 uiType, uint32 uiData) + void SetData(uint32 uiType, uint32 uiData) override { switch (uiType) { @@ -200,12 +200,12 @@ struct instance_wailing_caverns : public ScriptedInstance } } - const char* Save() + const char* Save() override { return strInstData.c_str(); } - uint32 GetData(uint32 uiType) + uint32 GetData(uint32 uiType) override { switch (uiType) { @@ -220,7 +220,7 @@ struct instance_wailing_caverns : public ScriptedInstance return 0; } - uint64 GetData64(uint32 uiData) + uint64 GetData64(uint32 uiData) override { switch (uiData) { @@ -230,7 +230,7 @@ struct instance_wailing_caverns : public ScriptedInstance return 0; } - void Load(const char* chrIn) + void Load(const char* chrIn) override { if (!chrIn) { diff --git a/src/scripts/kalimdor/the_barrens/wailing_caverns/wailing_caverns.cpp b/src/scripts/kalimdor/the_barrens/wailing_caverns/wailing_caverns.cpp index 740db349f..306cc54cc 100644 --- a/src/scripts/kalimdor/the_barrens/wailing_caverns/wailing_caverns.cpp +++ b/src/scripts/kalimdor/the_barrens/wailing_caverns/wailing_caverns.cpp @@ -108,7 +108,7 @@ struct npc_disciple_of_naralexAI : public npc_escortAI bool Yelled; bool isAggro; - void Reset() + void Reset() override { Event_Timer = 0; Sleep_Timer = 5000; @@ -122,7 +122,7 @@ struct npc_disciple_of_naralexAI : public npc_escortAI isAggro = false; } - void EnterEvadeMode() + void EnterEvadeMode() override { m_creature->DeleteThreatList(); m_creature->CombatStop(true); @@ -137,7 +137,7 @@ struct npc_disciple_of_naralexAI : public npc_escortAI SetEscortPaused(false); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { isAggro = true; if (OnCastWaypoint() || OnFightWaypoint()) @@ -326,7 +326,7 @@ struct npc_disciple_of_naralexAI : public npc_escortAI } } - void UpdateEscortAI(const uint32 diff) + void UpdateEscortAI(const uint32 diff) override { if (!m_pInstance) return; @@ -653,14 +653,14 @@ struct EvolvingEctoplasmAI : public ScriptedAI uint32 m_uiImmuneTimer; bool isImmune; - void Reset() + void Reset() override { m_creature->RemoveAllAuras(); m_uiImmuneTimer = 0; isImmune = false; } - void SpellHit(Unit* pCaster, const SpellEntry* pSpell) + void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override { if (!isImmune) { @@ -695,7 +695,7 @@ struct EvolvingEctoplasmAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_uiImmuneTimer < uiDiff) { diff --git a/src/scripts/kalimdor/thousand_needles/thousand_needles.cpp b/src/scripts/kalimdor/thousand_needles/thousand_needles.cpp index dd9ab5dff..9551666cd 100644 --- a/src/scripts/kalimdor/thousand_needles/thousand_needles.cpp +++ b/src/scripts/kalimdor/thousand_needles/thousand_needles.cpp @@ -52,9 +52,9 @@ struct npc_kanatiAI : public npc_escortAI Reset(); } - void Reset() { } + void Reset() override { } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { switch (uiPointId) { @@ -77,12 +77,12 @@ struct npc_kanatiAI : public npc_escortAI TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); } - void JustSummoned(Creature* pSummoned) + void JustSummoned(Creature* pSummoned) override { pSummoned->AI()->AttackStart(m_creature); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { // set quest to failed if (Player* pPlayer = GetPlayerForEscort()) @@ -142,9 +142,9 @@ struct npc_lakota_windsongAI : public npc_escortAI Reset(); } - void Reset() { } + void Reset() override { } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { switch (uiPointId) { @@ -222,9 +222,9 @@ struct npc_paoka_swiftmountainAI : public npc_escortAI Reset(); } - void Reset() { } + void Reset() override { } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { switch (uiPointId) { @@ -294,7 +294,7 @@ struct npc_plucky_johnsonAI : public ScriptedAI uint32 m_uiNormFaction; uint32 m_uiResetTimer; - void Reset() + void Reset() override { m_uiResetTimer = 120000; @@ -307,7 +307,7 @@ struct npc_plucky_johnsonAI : public ScriptedAI m_creature->CastSpell(m_creature, SPELL_PLUCKY_CHICKEN, false); } - void ReceiveEmote(Player* pPlayer, uint32 uiTextEmote) + void ReceiveEmote(Player* pPlayer, uint32 uiTextEmote) override { if (pPlayer->GetQuestStatus(QUEST_SCOOP) == QUEST_STATUS_INCOMPLETE) { @@ -333,7 +333,7 @@ struct npc_plucky_johnsonAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP)) { diff --git a/src/scripts/kalimdor/ungoro_crater/ungoro_crater.cpp b/src/scripts/kalimdor/ungoro_crater/ungoro_crater.cpp index 434001dda..73eaa010c 100644 --- a/src/scripts/kalimdor/ungoro_crater/ungoro_crater.cpp +++ b/src/scripts/kalimdor/ungoro_crater/ungoro_crater.cpp @@ -50,9 +50,9 @@ struct npc_ame01AI : public npc_escortAI Reset(); } - void Reset() { } + void Reset() override { } - void WaypointReached(uint32 uiPointId) + void WaypointReached(uint32 uiPointId) override { switch (uiPointId) { @@ -70,7 +70,7 @@ struct npc_ame01AI : public npc_escortAI } } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (pWho->GetTypeId() == TYPEID_PLAYER) return; @@ -166,7 +166,7 @@ struct npc_ringoAI : public FollowerAI Unit* pSpraggle; - void Reset() + void Reset() override { m_uiFaintTimer = urand(30000, 60000); m_uiEndEventProgress = 0; @@ -174,7 +174,7 @@ struct npc_ringoAI : public FollowerAI pSpraggle = nullptr; } - void MoveInLineOfSight(Unit *pWho) + void MoveInLineOfSight(Unit *pWho) override { FollowerAI::MoveInLineOfSight(pWho); @@ -194,7 +194,7 @@ struct npc_ringoAI : public FollowerAI } } - void SpellHit(Unit* pCaster, const SpellEntry* pSpell) + void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override { if (HasFollowState(STATE_FOLLOW_INPROGRESS | STATE_FOLLOW_PAUSED) && pSpell->Id == SPELL_REVIVE_RINGO) ClearFaint(); @@ -253,7 +253,7 @@ struct npc_ringoAI : public FollowerAI SetFollowPaused(false); } - void UpdateFollowerAI(const uint32 uiDiff) + void UpdateFollowerAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) { @@ -361,7 +361,7 @@ struct ungoro_eggs_triggerAI : public ScriptedAI { Reset(); } - void Reset() + void Reset() override { checkTimer = 10000; summon_x = m_creature->GetPositionX(); @@ -386,7 +386,7 @@ struct ungoro_eggs_triggerAI : public ScriptedAI } return nullptr; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (checkTimer < diff) { @@ -430,13 +430,13 @@ struct mob_captured_felwood_oozeAI : public ScriptedAI uint32 initialTimer; bool mergeDone; - void Reset() + void Reset() override { initialTimer = 1000; mergeDone = false; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (initialTimer < uiDiff) { @@ -452,7 +452,7 @@ struct mob_captured_felwood_oozeAI : public ScriptedAI initialTimer -= uiDiff; } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) override { if (type == FOLLOW_MOTION_TYPE && !mergeDone) { @@ -499,13 +499,13 @@ struct npc_precious_the_devourerAI : public ScriptedAI ObjectGuid m_simoneGuid; uint32 m_uiSplitCheck_Timer; - void Reset() + void Reset() override { m_creature->SetVisibility(VISIBILITY_ON); m_uiSplitCheck_Timer = 7500; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (Creature* pSimone = m_creature->GetMap()->GetCreature(m_simoneGuid)) { @@ -529,7 +529,7 @@ struct npc_precious_the_devourerAI : public ScriptedAI ScriptedAI::EnterEvadeMode(); } - void DamageTaken(Unit* pDealer, uint32& /*uiDamage*/) + void DamageTaken(Unit* pDealer, uint32& /*uiDamage*/) override { if (Creature* pSimone = m_creature->GetMap()->GetCreature(m_simoneGuid)) { @@ -538,7 +538,7 @@ struct npc_precious_the_devourerAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) { @@ -589,7 +589,7 @@ struct npc_simone_seductressAI : public ScriptedAI uint32 m_uiDespawn_Timer; - void Reset() + void Reset() override { m_creature->SetVisibility(VISIBILITY_ON); @@ -637,7 +637,7 @@ struct npc_simone_seductressAI : public ScriptedAI Reset(); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (Creature* pPrecious = m_creature->GetMap()->GetCreature(m_preciousGuid)) { @@ -656,7 +656,7 @@ struct npc_simone_seductressAI : public ScriptedAI DemonDespawn(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { if (Creature* pSimone = m_creature->GetMap()->GetCreature(m_simoneGuid)) { @@ -732,7 +732,7 @@ struct npc_simone_seductressAI : public ScriptedAI m_creature->RemoveFromWorld(); } - void DamageTaken(Unit* /*pDealer*/, uint32& /*uiDamage*/) + void DamageTaken(Unit* /*pDealer*/, uint32& /*uiDamage*/) override { if (Creature* pPrecious = m_creature->GetMap()->GetCreature(m_preciousGuid)) { @@ -741,7 +741,7 @@ struct npc_simone_seductressAI : public ScriptedAI } } - void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) + void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override { if (pSpell && pSpell->Id == 14280) // Viper Sting (Rank 3) { @@ -750,7 +750,7 @@ struct npc_simone_seductressAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_uiDespawn_Timer < uiDiff) { @@ -834,7 +834,7 @@ struct npc_simone_the_inconspicuousAI : public ScriptedAI ObjectGuid m_playerGuid; Creature* pPrecious; - void Reset() + void Reset() override { m_creature->SetRespawnDelay(35*MINUTE); m_creature->SetRespawnTime(35*MINUTE); @@ -906,7 +906,7 @@ struct npc_simone_the_inconspicuousAI : public ScriptedAI m_bTransform = true; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_bTransform) { diff --git a/src/scripts/kalimdor/winterspring/winterspring.cpp b/src/scripts/kalimdor/winterspring/winterspring.cpp index 95f0932f0..df3571ec3 100644 --- a/src/scripts/kalimdor/winterspring/winterspring.cpp +++ b/src/scripts/kalimdor/winterspring/winterspring.cpp @@ -179,7 +179,7 @@ struct npc_artoriusAI : public ScriptedAI uint32 m_uiDemonic_Frenzy_Timer; uint32 m_uiDespawn_Timer; - void Reset() + void Reset() override { switch (m_creature->GetEntry()) { @@ -232,7 +232,7 @@ struct npc_artoriusAI : public ScriptedAI } /** Artorius the Doombringer */ - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { if (pWho->getClass() == CLASS_HUNTER && (m_hunterGuid.IsEmpty() || m_hunterGuid == pWho->GetObjectGuid())/*&& pWho->GetQuestStatus(QUEST_STAVE_OF_THE_ANCIENTS) == QUEST_STATUS_INCOMPLETE*/) { @@ -242,7 +242,7 @@ struct npc_artoriusAI : public ScriptedAI DemonDespawn(); } - void JustDied(Unit* /*pKiller*/) + void JustDied(Unit* /*pKiller*/) override { m_creature->SetHomePosition(7909.71f, -4598.67f, 710.008f, 0.606013f); @@ -297,7 +297,7 @@ struct npc_artoriusAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { /** Artorius the Amiable */ if (m_bTransform) @@ -574,15 +574,10 @@ struct npc_ranshallaAI : public npc_escortAI } } - void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) + void SummonedMovementInform(Creature* pSummoned, uint32 uiType, uint32 uiPointId) override { if (!(uiType != POINT_MOTION_TYPE || pSummoned->GetEntry() != 12116)) { - - int id = 1; - int maxid = 3; - //m_creature->MonsterSay("Dans SummonedMovementInform");//test - if (pretressesRepartent == 1) { if (uiPointId > 0 && uiPointId < 4) @@ -606,7 +601,7 @@ struct npc_ranshallaAI : public npc_escortAI } } - void WaypointReached(uint32 i) + void WaypointReached(uint32 i) override { //altar = 49182; /* @@ -689,7 +684,7 @@ struct npc_ranshallaAI : public npc_escortAI } // pretresses sont pop pile 2MIN - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (HasEscortState(STATE_ESCORT_ESCORTING)) { @@ -797,7 +792,7 @@ struct npc_ranshallaAI : public npc_escortAI npc_escortAI::UpdateAI(uiDiff); } - void Reset() + void Reset() override { m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE); m_creature->SetStandState(UNIT_STAND_STATE_STAND); @@ -899,7 +894,7 @@ struct npc_umi_yetiAI : public ScriptedAI { } - void SpellHit(Unit* pCaster, const SpellEntry* pSpell) + void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override { if (pSpell->Id == SPELL_UNSUMMON_YETI) { diff --git a/src/scripts/world/event_scourge_invasion.cpp b/src/scripts/world/event_scourge_invasion.cpp index a1d661305..cf04d3394 100644 --- a/src/scripts/world/event_scourge_invasion.cpp +++ b/src/scripts/world/event_scourge_invasion.cpp @@ -53,12 +53,12 @@ struct npc_flameshocker_spawn_pointAI : public ScriptedAI ObjectGuid _myMonster; uint32 _checkTimer; - void Reset() + void Reset() override { _checkTimer = urand(2000, 5000); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (_checkTimer < diff) { @@ -71,7 +71,7 @@ struct npc_flameshocker_spawn_pointAI : public ScriptedAI else _checkTimer -= diff; } - void OnRemoveFromWorld() + void OnRemoveFromWorld() override { if (Creature* myMonster = m_creature->GetMap()->GetCreature(_myMonster)) myMonster->AddObjectToRemoveList(); @@ -94,12 +94,12 @@ struct npc_horror_pallid_spawn_pointAI : public ScriptedAI ObjectGuid _myMonster; uint32 _checkTimer; - void Reset() + void Reset() override { _checkTimer = urand(12000, 30000); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (_checkTimer < diff) { @@ -113,7 +113,7 @@ struct npc_horror_pallid_spawn_pointAI : public ScriptedAI else _checkTimer -= diff; } - void OnRemoveFromWorld() + void OnRemoveFromWorld() override { if (Creature* myMonster = m_creature->GetMap()->GetCreature(_myMonster)) myMonster->AddObjectToRemoveList(); @@ -130,7 +130,7 @@ class WaypointForFlameshocker { public: WaypointForFlameshocker(Creature const& obj, std::set const& visited) - : i_obj(obj), i_range(300.f), i_visited(visited) {} + : i_obj(obj), i_visited(visited), i_range(300.f) {} Creature const& GetFocusObject() const { return i_obj; @@ -205,11 +205,11 @@ struct ScourgeInvasion_RandomAttackerAI : public ScriptedAI bool _alliance; bool _enableAutoMove; - void Reset() + void Reset() override { } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) override { // On n'attaque pas les joueurs spontannement. if (who->GetTypeId() == TYPEID_PLAYER) @@ -247,7 +247,7 @@ struct ScourgeInvasion_RandomAttackerAI : public ScriptedAI MaNGOS::CreatureWorker worker(m_creature, u_do); Cell::VisitGridObjects(m_creature, worker, 30.0f); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (_checksTimer < diff) { @@ -292,11 +292,11 @@ struct ScourgeInvasion_RandomAttackerAI : public ScriptedAI c->ResetLastDamageTakenTime(); DoMeleeAttackIfReady(); } - void CorpseRemoved(uint32&) + void CorpseRemoved(uint32&) override { m_creature->DeleteLater(); } - void EnterCombat(Unit* who) + void EnterCombat(Unit* who) override { // Riposte ! if (!m_creature->getVictim()) @@ -347,7 +347,7 @@ struct ScourgeInvasion_RandomAttackerAI : public ScriptedAI } _guards.insert(who->GetObjectGuid()); } - void OnRemoveFromWorld() + void OnRemoveFromWorld() override { for (std::set::iterator it = _guards.begin(); it != _guards.end(); ++it) if (Creature* c = m_creature->GetMap()->GetCreature(*it)) @@ -371,17 +371,17 @@ struct FlameshockerAI : public ScourgeInvasion_RandomAttackerAI uint32 _revengeTimer; - void Reset() + void Reset() override { m_creature->AddAura(SPELL_FLAMESHOCKERS_VISUAL); } - void InformGuid(const ObjectGuid guid, uint32 type = 0) + void InformGuid(const ObjectGuid guid, uint32 type = 0) override { _enableAutoMove = false; _pallidHorror = guid; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { ScourgeInvasion_RandomAttackerAI::UpdateAI(diff); if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) @@ -454,13 +454,13 @@ struct PallidHorrorAI : public ScourgeInvasion_RandomAttackerAI std::set _flameshockers; - void Reset() + void Reset() override { m_creature->AddAura(SPELL_PURPLE_VISUAL); m_creature->AddAura(SPELL_AURA_OF_FEAR); } - void OnRemoveFromWorld() + void OnRemoveFromWorld() override { for (std::set::iterator it = _flameshockers.begin(); it != _flameshockers.end(); ++it) if (Creature* c = m_creature->GetMap()->GetCreature(*it)) @@ -468,7 +468,7 @@ struct PallidHorrorAI : public ScourgeInvasion_RandomAttackerAI ScourgeInvasion_RandomAttackerAI::OnRemoveFromWorld(); } - void JustDied(Unit* killer) + void JustDied(Unit* killer) override { // Stormwind if (m_creature->GetZoneId() == 1519) @@ -492,8 +492,8 @@ struct QuestGiverCrystalAI : public ScriptedAI } uint32 _dieTimer; - void Reset() {} - void UpdateAI(const uint32 diff) + void Reset() override {} + void UpdateAI(const uint32 diff) override { if (_dieTimer < diff) m_creature->DoKillUnit(); diff --git a/src/scripts/world/go_scripts.cpp b/src/scripts/world/go_scripts.cpp index 2c2b3eb1e..c7fd8b16c 100644 --- a/src/scripts/world/go_scripts.cpp +++ b/src/scripts/world/go_scripts.cpp @@ -415,7 +415,7 @@ struct go_bells : public GameObjectAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { _events.Update(diff); @@ -486,7 +486,7 @@ struct go_darkmoon_faire_music : public GameObjectAI _events.ScheduleEvent(EVENT_DFM_START_MUSIC, Seconds(1)); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { _events.Update(diff); while (uint32 eventId = _events.ExecuteEvent()) diff --git a/src/scripts/world/npcs_special.cpp b/src/scripts/world/npcs_special.cpp index 01fd4a06e..d2599614f 100644 --- a/src/scripts/world/npcs_special.cpp +++ b/src/scripts/world/npcs_special.cpp @@ -62,7 +62,7 @@ struct npc_chicken_cluckAI : public ScriptedAI uint32 m_uiResetFlagTimer; - void Reset() + void Reset() override { m_uiResetFlagTimer = 120000; @@ -70,7 +70,7 @@ struct npc_chicken_cluckAI : public ScriptedAI m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); } - void ReceiveEmote(Player* pPlayer, uint32 uiEmote) + void ReceiveEmote(Player* pPlayer, uint32 uiEmote) override { if (uiEmote == TEXTEMOTE_CHICKEN) { @@ -104,7 +104,7 @@ struct npc_chicken_cluckAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { // Reset flags after a certain time has passed so that the next player has to start the 'event' again if (m_creature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER)) @@ -240,7 +240,7 @@ struct npc_doctorAI : public ScriptedAI std::list Patients; std::vector Coordinates; - void Reset() + void Reset() override { Playerguid = 0; @@ -260,7 +260,7 @@ struct npc_doctorAI : public ScriptedAI void BeginEvent(Player* pPlayer); void PatientDied(Location* Point); void PatientSaved(Creature* soldier, Player* pPlayer, Location* Point); - void UpdateAI(const uint32 diff); + void UpdateAI(const uint32 diff) override; }; /*##### @@ -279,7 +279,7 @@ struct npc_injured_patientAI : public ScriptedAI bool Pvloss; uint32 _healthModTimer; - void Reset() + void Reset() override { Doctorguid = 0; Coord = nullptr; @@ -315,7 +315,7 @@ struct npc_injured_patientAI : public ScriptedAI } } - void SpellHit(Unit *caster, const SpellEntry *spell) + void SpellHit(Unit *caster, const SpellEntry *spell) override { if (caster->GetTypeId() == TYPEID_PLAYER && m_creature->isAlive() && spell->Id == 20804) { @@ -369,7 +369,7 @@ struct npc_injured_patientAI : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (_healthModTimer > diff) { @@ -626,7 +626,7 @@ struct npc_garments_of_questsAI : public npc_escortAI uint32 RunAwayTimer; - void Reset() + void Reset() override { caster = 0; @@ -640,7 +640,7 @@ struct npc_garments_of_questsAI : public npc_escortAI m_creature->SetHealth(int(m_creature->GetMaxHealth() * 0.7)); } - void SpellHit(Unit* pCaster, const SpellEntry *Spell) + void SpellHit(Unit* pCaster, const SpellEntry *Spell) override { if (Spell->Id == SPELL_LESSER_HEAL_R2 || Spell->Id == SPELL_FORTITUDE_R1) { @@ -750,11 +750,11 @@ struct npc_garments_of_questsAI : public npc_escortAI } } - void WaypointReached(uint32 uiPoint) + void WaypointReached(uint32 uiPoint) override { } - void UpdateEscortAI(const uint32 diff) + void UpdateEscortAI(const uint32 diff) override { if (bCanRun && !m_creature->isInCombat()) { @@ -816,12 +816,12 @@ struct npc_guardianAI : public ScriptedAI Reset(); } - void Reset() + void Reset() override { m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -856,7 +856,7 @@ struct npc_tonk_mineAI : public ScriptedAI uint32 m_uiArmTimer; bool m_bArmed; - void Reset() + void Reset() override { m_uiArmTimer = 3000; m_bArmed = false; @@ -876,15 +876,17 @@ struct npc_tonk_mineAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_bArmed) + { if (m_uiArmTimer < uiDiff) { m_bArmed = true; } else m_uiArmTimer -= uiDiff; + } } }; @@ -909,13 +911,13 @@ struct npc_tonk_mortarAI : public ScriptedAI uint32 m_uiExplosionTimer; bool m_bExploded; - void Reset() + void Reset() override { m_uiExplosionTimer = 1500; m_bExploded = false; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_uiExplosionTimer < uiDiff) { @@ -949,7 +951,7 @@ struct npc_steam_tonkAI : public ScriptedAI uint32 m_uiPossesedCheck; - void Reset() + void Reset() override { m_uiPossesedCheck = 3000; } @@ -1169,12 +1171,12 @@ struct rat_des_profondeursAI : public ScriptedAI ObjectGuid m_FollowingPlayerGuid; uint32 QuestFinishCheck_Timer; - void Reset() + void Reset() override { QuestFinishCheck_Timer = 0; } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_FollowingPlayerGuid) return; @@ -1213,7 +1215,7 @@ struct rat_des_profondeursAI : public ScriptedAI QuestFinishCheck_Timer -= uiDiff; } - void SpellHit(Unit* pCaster, SpellEntry const* pSpellInfo) + void SpellHit(Unit* pCaster, SpellEntry const* pSpellInfo) override { // Ce rat est deja pris ! if (!m_FollowingPlayerGuid.IsEmpty()) @@ -1232,7 +1234,7 @@ struct rat_des_profondeursAI : public ScriptedAI pCaster->ToPlayer()->RewardPlayerAndGroupAtCast(m_creature, SPELL_EXTASE_MELODIEUSE); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (!m_FollowingPlayerGuid) return; @@ -1243,7 +1245,7 @@ struct rat_des_profondeursAI : public ScriptedAI m_FollowingPlayerGuid.Clear(); } - uint32 GetData(uint32 dataType) + uint32 GetData(uint32 dataType) override { return dataType == 0 ? m_FollowingPlayerGuid.GetCounter() : 0; } @@ -1272,12 +1274,12 @@ struct npc_felhound_minionAI : public ScriptedPetAI uint32 m_uiManaBurnTimer; - void Reset() + void Reset() override { m_uiManaBurnTimer = urand(1000, 2500); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_creature->getVictim()) { @@ -1547,7 +1549,7 @@ struct npc_the_cleanerAI : public ScriptedAI uint32 m_uiDespawnTimer; - void Reset() + void Reset() override { DoCastSpellIfCan(m_creature, SPELL_IMMUNITY, CF_TRIGGERED); m_uiDespawnTimer = 3000; @@ -1565,7 +1567,7 @@ struct npc_the_cleanerAI : public ScriptedAI m_creature->ForcedDespawn(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_uiDespawnTimer < uiDiff) { @@ -2520,14 +2522,14 @@ struct npc_sickly_critterAI : npc_critterAI { switch (team) { - case ALLIANCE: - m_creature->SetEntry(NPC_CURED_DEER); - m_creature->SetDisplayId(MODEL_CURED_DEER); - break; - case HORDE: - m_creature->SetEntry(NPC_CURED_GAZELLE); - m_creature->SetDisplayId(MODEL_CURED_GAZELLE); - break; + case ALLIANCE: + m_creature->SetEntry(NPC_CURED_DEER); + m_creature->SetDisplayId(MODEL_CURED_DEER); + break; + case HORDE: + m_creature->SetEntry(NPC_CURED_GAZELLE); + m_creature->SetDisplayId(MODEL_CURED_GAZELLE); + break; } m_creature->RemoveAurasDueToSpell(SPELL_SICKY_CRITTER_AURA); @@ -3253,7 +3255,7 @@ struct npc_event_fireworksAI : public ScriptedAI } } - void Reset() + void Reset() override { m_bExist = false; m_uiIndex = 0; @@ -3262,7 +3264,7 @@ struct npc_event_fireworksAI : public ScriptedAI IsUsable(); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_bExist) return; @@ -3356,7 +3358,7 @@ struct npc_kwee_peddlefeetAI : public ScriptedAI uint32 winningFaction; uint32 winningZone; - void Reset() { } + void Reset() override { } void SetVariables() { @@ -3390,7 +3392,7 @@ struct npc_kwee_peddlefeetAI : public ScriptedAI } } - void ReceiveEmote(Player* pPlayer, uint32 uiEmote) + void ReceiveEmote(Player* pPlayer, uint32 uiEmote) override { if (uiEmote == TEXTEMOTE_KISS) { @@ -3477,18 +3479,18 @@ struct npc_oozeling_jubjubAI : public ScriptedPetAI } uint32 m_uiReturnTimer; - void Reset() + void Reset() override { m_uiReturnTimer = 0; } - void SpellHit(Unit* pUnit, const SpellEntry* pSpell) + void SpellHit(Unit* pUnit, const SpellEntry* pSpell) override { if (pSpell->Id == SPELL_DARK_IRON_MUG) m_uiReturnTimer = 10000; } - void MovementInform(uint32 type, uint32 id) + void MovementInform(uint32 type, uint32 id) override { if (type == POINT_MOTION_TYPE && id == 1) { @@ -3498,7 +3500,7 @@ struct npc_oozeling_jubjubAI : public ScriptedPetAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (m_uiReturnTimer > 0) { diff --git a/src/scripts/world/totems.cpp b/src/scripts/world/totems.cpp index ce9286e8a..75a3bdf7b 100644 --- a/src/scripts/world/totems.cpp +++ b/src/scripts/world/totems.cpp @@ -10,7 +10,7 @@ struct TotemGlebeAI : public TotemAI { TotemGlebeAI(Creature* pCreature) : TotemAI(pCreature) {} - void SpellHit(Unit* /*u*/, const SpellEntry* pSpell) + void SpellHit(Unit* /*u*/, const SpellEntry* pSpell) override { if (pSpell->Id != SPELL_BUFF_GLEBE_PASSIVE && pSpell->Id != SPELL_BUFF_GLEBE) { diff --git a/src/scripts/world/world_event_naxxramas.cpp b/src/scripts/world/world_event_naxxramas.cpp index 620a3bbb4..9c85cfb9d 100644 --- a/src/scripts/world/world_event_naxxramas.cpp +++ b/src/scripts/world/world_event_naxxramas.cpp @@ -50,33 +50,33 @@ struct NecropolisProxyAI : public ScriptedAI ObjectGuid _necropolisGuid; - void Reset() + void Reset() override { } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { } - void InformGuid(const ObjectGuid necropolis, uint32 type = 0) + void InformGuid(const ObjectGuid necropolis, uint32 type = 0) override { _necropolisGuid = necropolis; } - void SpellHit(Unit* caster, const SpellEntry* spell) + void SpellHit(Unit* caster, const SpellEntry* spell) override { if (spell->Id == SPELL_COMMUNICATION_TRIGGER && caster != m_creature) DoCastSpellIfCan(m_creature, SPELL_COMMUNICATION_TRIGGER); } - void SpellHitTarget(Unit* target, const SpellEntry* spell) + void SpellHitTarget(Unit* target, const SpellEntry* spell) override { if (spell->Id == SPELL_COMMUNICATION_TRIGGER && target != m_creature) if (Creature* crea = target->ToCreature()) crea->AI()->InformGuid(_necropolisGuid); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { } }; @@ -106,7 +106,7 @@ struct NecropolisRelayAI : public ScriptedAI ObjectGuid _necropolisGuid; std::vector SpawnedShards; - void Reset() + void Reset() override { m_creature->CastSpell(m_creature, SPELL_COMMUNICATION_NAXXRAMAS, true); } @@ -120,7 +120,7 @@ struct NecropolisRelayAI : public ScriptedAI { SpawnedShards.push_back(pCreature->GetObjectGuid()); } - void SpellHitTarget(Unit* target, const SpellEntry* spell) + void SpellHitTarget(Unit* target, const SpellEntry* spell) override { if (spell->Id == SPELL_COMMUNICATION_TRIGGER && target != m_creature) { @@ -151,7 +151,7 @@ struct NecropolisRelayAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (despawnTimer) { @@ -186,7 +186,7 @@ public: me->SetActiveObjectState(true); me->SetVisibilityModifier(3000.0f); } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { } }; @@ -239,7 +239,7 @@ struct npc_necrotic_shard : public ScriptedAI uint32 eliteSpawnTimer; std::set _adds; - void OnRemoveFromWorld() + void OnRemoveFromWorld() override { DespawnAdds(); } @@ -278,15 +278,15 @@ struct npc_necrotic_shard : public ScriptedAI } } - void Reset() + void Reset() override { } - void Aggro(Unit* who) + void Aggro(Unit* who) override { } - void AttackStart(Unit* who) + void AttackStart(Unit* who) override { } @@ -300,12 +300,12 @@ struct npc_necrotic_shard : public ScriptedAI // break; //} } - void JustRespawned() + void JustRespawned() override { m_creature->UpdateEntry(NPC_NECROTIC_SHARD); } - void JustDied(Unit* pKiller) + void JustDied(Unit* pKiller) override { if (GameObject* necropolis = m_creature->GetMap()->GetGameObject(_necropolisGuid)) necropolis->SendGameObjectCustomAnim(); @@ -317,13 +317,13 @@ struct npc_necrotic_shard : public ScriptedAI DespawnAdds(); } - void SpellHit(Unit* pCaster, const SpellEntry* pSpell) + void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override { if (pSpell->Id == SPELL_COMMUNICATION_TRIGGER || pSpell->Id == SPELL_ZAP_CRYSTAL) DoCastSpellIfCan(m_creature, SPELL_CAMP_RECEIVES_COMMUNIQUE); } - void DamageTaken(Unit* doneBy, uint32& damage) + void DamageTaken(Unit* doneBy, uint32& damage) override { if (m_creature->GetHealth() < damage + 1) { @@ -356,7 +356,7 @@ struct npc_necrotic_shard : public ScriptedAI uiAmountHealed = 0; } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (eliteSpawnTimer < diff) { @@ -422,23 +422,23 @@ struct npc_cultist_engineer : public ScriptedAI uint32 _healTimer; ObjectGuid _shardGuid; - void Reset() + void Reset() override { _healTimer = 1000; } - void JustReachedHome() + void JustReachedHome() override { m_creature->SetUInt32Value(UNIT_CHANNEL_SPELL, SPELL_ENGINEER_REPAIR); m_creature->SetChannelObjectGuid(_shardGuid); } - void JustSummoned(Creature* creature) + void JustSummoned(Creature* creature) override { } - void DoAction(Unit* unit, uint32 action) + void DoAction(Unit* unit, uint32 action) override { if (action == ENGINEER_AI_ACTION_SET_PYLON) { @@ -461,7 +461,7 @@ struct npc_cultist_engineer : public ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (_healTimer < diff) { @@ -522,18 +522,18 @@ struct ShadowOfDoomAI : public ScriptedAI Reset(); } - void Reset() + void Reset() override { m_uiFear_Timer = 10000; m_uiMindFlay_Timer = 6000; m_uiScourgeStrike_Timer = 120000; } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { } - void JustSummoned(Creature* creature) + void JustSummoned(Creature* creature) override { uint32 rnd; rnd = urand(0, 1); @@ -543,7 +543,7 @@ struct ShadowOfDoomAI : public ScriptedAI creature->MonsterSay(LANG_SHADOW_OF_DOOM_TEST_1, LANG_UNIVERSAL, 0); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -597,33 +597,33 @@ struct GhoulBerserker : public ScriptedAI } uint32 _plagueTimer; uint32 _enrageTimer; - void Reset() + void Reset() override { m_creature->AddAura(SPELL_PURPLE_VISUAL); _plagueTimer = 10000; _enrageTimer = 0; } - void JustSummoned(Creature* creature) + void JustSummoned(Creature* creature) override { DoCastSpellIfCan(creature, SPELL_SPAWN_SMOKE_1); } - void Aggro(Unit* pWho) + void Aggro(Unit* pWho) override { } - void SpellHit(Unit* pCaster, const SpellEntry* pSpell) + void SpellHit(Unit* pCaster, const SpellEntry* pSpell) override { } - void JustDied(Unit*) + void JustDied(Unit*) override { if (Unit* shard = m_creature->FindNearestCreature(NPC_NECROTIC_SHARD, 100.0f)) DoCastSpellIfCan(me, SPELL_ZAP_CRYSTAL, CF_TRIGGERED); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -669,25 +669,25 @@ struct SpectralSoldierAI : public ScriptedAI uint32 _shoutTimer; uint32 _sunderArmorTimer; - void Reset() + void Reset() override { m_creature->AddAura(SPELL_PURPLE_VISUAL); _shoutTimer = 15000; _sunderArmorTimer = 10000; } - void JustSummoned(Creature* creature) + void JustSummoned(Creature* creature) override { DoCastSpellIfCan(creature, SPELL_SPIRIT_SPAWN_IN); } - void JustDied(Unit*) + void JustDied(Unit*) override { if (Unit* shard = m_creature->FindNearestCreature(NPC_NECROTIC_SHARD, 100.0f)) DoCastSpellIfCan(me, SPELL_ZAP_CRYSTAL, CF_TRIGGERED); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -731,25 +731,25 @@ struct SkeletalShocktrooperAI : public ScriptedAI uint32 _boneShardsTimer; uint32 _cleaveTimer; - void Reset() + void Reset() override { m_creature->AddAura(SPELL_PURPLE_VISUAL); _boneShardsTimer = 10000; _cleaveTimer = 8000; } - void JustSummoned(Creature* creature) + void JustSummoned(Creature* creature) override { DoCastSpellIfCan(creature, SPELL_SPIRIT_SPAWN_IN); } - void JustDied(Unit*) + void JustDied(Unit*) override { if (Unit* shard = m_creature->FindNearestCreature(NPC_NECROTIC_SHARD, 100.0f)) DoCastSpellIfCan(me, SPELL_ZAP_CRYSTAL, CF_TRIGGERED); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -792,25 +792,25 @@ struct SkeletalTrooperAI : public ScriptedAI uint32 _ShadowWordPainTimer; uint32 _ScourgeStrikeTimer; - void Reset() + void Reset() override { m_creature->AddAura(SPELL_PURPLE_VISUAL); _ScourgeStrikeTimer = 120000; // 2 min _ShadowWordPainTimer = 15000; // 15 sec } - void JustSummoned(Creature* creature) + void JustSummoned(Creature* creature) override { DoCastSpellIfCan(creature, SPELL_SPAWN_SMOKE_1); } - void JustDied(Unit*) + void JustDied(Unit*) override { if (Unit* shard = m_creature->FindNearestCreature(NPC_NECROTIC_SHARD, 100.0f)) DoCastSpellIfCan(me, SPELL_ZAP_CRYSTAL, CF_TRIGGERED); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -851,23 +851,23 @@ struct SpectralSpiritAI : public ScriptedAI Reset(); } - void Reset() + void Reset() override { m_creature->AddAura(SPELL_PURPLE_VISUAL); } - void JustSummoned(Creature* creature) + void JustSummoned(Creature* creature) override { DoCastSpellIfCan(creature, SPELL_SPIRIT_SPAWN_IN); } - void JustDied(Unit*) + void JustDied(Unit*) override { if (Unit* shard = m_creature->FindNearestCreature(NPC_NECROTIC_SHARD, 100.0f)) DoCastSpellIfCan(me, SPELL_ZAP_CRYSTAL, CF_TRIGGERED); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -894,24 +894,24 @@ struct SpectralApparitionAI : public ScriptedAI uint32 _ScourgeStrikeTimer; - void Reset() + void Reset() override { m_creature->AddAura(SPELL_PURPLE_VISUAL); _ScourgeStrikeTimer = 120000; // 2 min } - void JustSummoned(Creature* creature) + void JustSummoned(Creature* creature) override { DoCastSpellIfCan(creature, SPELL_SPIRIT_SPAWN_IN); } - void JustDied(Unit*) + void JustDied(Unit*) override { if (Unit* shard = m_creature->FindNearestCreature(NPC_NECROTIC_SHARD, 100.0f)) DoCastSpellIfCan(me, SPELL_ZAP_CRYSTAL, CF_TRIGGERED); } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (!m_creature->SelectHostileTarget() || !m_creature->getVictim()) return; @@ -947,11 +947,11 @@ struct naxx_event_rewards_giverAI : public ScriptedAI bool _alliance; - void Reset() + void Reset() override { } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { uint32 newEntry = 0; uint32 victories = sObjectMgr.GetSavedVariable(VARIABLE_NAXX_ATTACK_COUNT); diff --git a/src/scripts/world/world_event_wareffort.cpp b/src/scripts/world/world_event_wareffort.cpp index e015c6b19..618abc8f3 100644 --- a/src/scripts/world/world_event_wareffort.cpp +++ b/src/scripts/world/world_event_wareffort.cpp @@ -765,7 +765,7 @@ struct npc_resonating_CrystalAI : public ScriptedAI uint32 m_uiWisperingsTimer; uint32 SPELL_WHISPERINGS; - void Reset() + void Reset() override { SetCombatMovement(false); playerDetected = false; @@ -797,7 +797,7 @@ struct npc_resonating_CrystalAI : public ScriptedAI } } - void MoveInLineOfSight(Unit* who) + void MoveInLineOfSight(Unit* who) override { if (who->GetTypeId() != TYPEID_PLAYER || who->ToPlayer()->IsGameMaster()) return; @@ -838,7 +838,7 @@ struct npc_resonating_CrystalAI : public ScriptedAI } } - void UpdateAI(const uint32 uiDiff) + void UpdateAI(const uint32 uiDiff) override { if (playerDetected) { @@ -910,7 +910,7 @@ struct npc_infantrymanAI : ScriptedAI m_saurfangFollowDist = 0.0f; } - void MoveInLineOfSight(Unit *pWho) + void MoveInLineOfSight(Unit *pWho) override { if (m_creature->CanInitiateAttack() && pWho->isTargetableForAttack() && m_creature->IsHostileTo(pWho)) { @@ -1386,7 +1386,7 @@ struct npc_aqwar_saurfangAI : ScriptedAI m_movementPaused = true; } - void MoveInLineOfSight(Unit *pWho) + void MoveInLineOfSight(Unit *pWho) override { if (m_creature->CanInitiateAttack() && pWho->isTargetableForAttack() && m_creature->IsHostileTo(pWho)) { @@ -1417,7 +1417,7 @@ struct npc_aqwar_saurfangAI : ScriptedAI } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 diff) override { if (!m_creature->isAlive()) return; @@ -1546,7 +1546,7 @@ struct npc_aqwar_saurfangAI : ScriptedAI DoMeleeAttackIfReady(); } - void JustRespawned() + void JustRespawned() override { // Respawned back at CH. Keep running to the gate if (m_movingToGate) diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h index 9071c6963..02c1871d6 100644 --- a/src/shared/Database/Database.h +++ b/src/shared/Database/Database.h @@ -274,9 +274,9 @@ class MANGOS_DLL_SPEC Database // Frees data, cancels scheduled queries, closes connection void StopServer(); protected: - Database() : m_pAsyncConn(nullptr), m_pResultQueue(nullptr), m_threadsBodies(nullptr), m_delayThreads(nullptr), m_numAsyncWorkers(0), - m_serialDelayQueue(nullptr), m_delayQueue(new SqlQueue()), m_logSQL(false), m_pingIntervallms(0), m_nQueryConnPoolSize(1), - m_bAllowAsyncTransactions(false), m_iStmtIndex(-1) + Database() : m_nQueryConnPoolSize(1), m_delayQueue(new SqlQueue()), m_serialDelayQueue(nullptr), m_pAsyncConn(nullptr), + m_pResultQueue(nullptr), m_numAsyncWorkers(0), m_threadsBodies(nullptr), m_delayThreads(nullptr), + m_bAllowAsyncTransactions(false), m_iStmtIndex(-1), m_logSQL(false), m_pingIntervallms(0) { m_nQueryCounter = -1; } diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h index 7d39a8525..d129c9239 100644 --- a/src/shared/Database/DatabaseMysql.h +++ b/src/shared/Database/DatabaseMysql.h @@ -42,16 +42,16 @@ class MANGOS_DLL_SPEC MySqlPreparedStatement : public SqlPreparedStatement { public: MySqlPreparedStatement(const std::string& fmt, SqlConnection& conn, MYSQL * mysql); - ~MySqlPreparedStatement(); + ~MySqlPreparedStatement() override; //prepare statement - virtual bool prepare(); + bool prepare() override; //bind input parameters - virtual void bind(const SqlStmtParameters& holder); + void bind(const SqlStmtParameters& holder) override; //execute DML statement - virtual bool execute(); + bool execute() override; protected: //bind parameters @@ -73,24 +73,24 @@ class MANGOS_DLL_SPEC MySQLConnection : public SqlConnection { public: MySQLConnection(Database& db) : SqlConnection(db), mMysql(nullptr) {} - ~MySQLConnection(); + ~MySQLConnection() override; - bool OpenConnection(bool reconnect); + bool OpenConnection(bool reconnect) override; bool Reconnect(); bool HandleMySQLError(uint32 errNo); - QueryResult* Query(const char *sql); - QueryNamedResult* QueryNamed(const char *sql); - bool Execute(const char *sql); + QueryResult* Query(const char *sql) override; + QueryNamedResult* QueryNamed(const char *sql) override; + bool Execute(const char *sql) override; - unsigned long escape_string(char *to, const char *from, unsigned long length); + unsigned long escape_string(char *to, const char *from, unsigned long length) override; - bool BeginTransaction(); - bool CommitTransaction(); - bool RollbackTransaction(); + bool BeginTransaction() override; + bool CommitTransaction() override; + bool RollbackTransaction() override; protected: - SqlPreparedStatement * CreateStatement(const std::string& fmt); + SqlPreparedStatement * CreateStatement(const std::string& fmt) override; private: bool _TransactionCmd(const char *sql); @@ -105,18 +105,18 @@ class MANGOS_DLL_SPEC DatabaseMysql : public Database public: DatabaseMysql(); - ~DatabaseMysql(); + ~DatabaseMysql() override; //! Initializes Mysql and connects to a server. /*! infoString should be formated like hostname;username;password;database. */ // must be call before first query in thread - void ThreadStart(); + void ThreadStart() override; // must be call before finish thread run - void ThreadEnd(); + void ThreadEnd() override; protected: - virtual SqlConnection * CreateConnection(); + SqlConnection * CreateConnection() override; private: static size_t db_count; diff --git a/src/shared/Database/QueryResult.h b/src/shared/Database/QueryResult.h index 8886b640d..10aa96682 100644 --- a/src/shared/Database/QueryResult.h +++ b/src/shared/Database/QueryResult.h @@ -30,7 +30,7 @@ class MANGOS_DLL_SPEC QueryResult { public: QueryResult(uint64 rowCount, uint32 fieldCount) - : mFieldCount(fieldCount), mRowCount(rowCount), mCurrentRow(nullptr){} + : mCurrentRow(nullptr), mFieldCount(fieldCount), mRowCount(rowCount) {} virtual ~QueryResult() {} @@ -44,7 +44,7 @@ class MANGOS_DLL_SPEC QueryResult uint64 GetRowCount() const { return mRowCount; } protected: - Field *mCurrentRow; + Field* mCurrentRow; uint32 mFieldCount; uint64 mRowCount; }; diff --git a/src/shared/Database/QueryResultMysql.h b/src/shared/Database/QueryResultMysql.h index 0095b7307..f5698e007 100644 --- a/src/shared/Database/QueryResultMysql.h +++ b/src/shared/Database/QueryResultMysql.h @@ -38,9 +38,9 @@ class QueryResultMysql : public QueryResult public: QueryResultMysql(MYSQL_RES *result, MYSQL_FIELD *fields, uint64 rowCount, uint32 fieldCount); - ~QueryResultMysql(); + ~QueryResultMysql() override; - bool NextRow(); + bool NextRow() override; private: enum Field::DataTypes ConvertNativeType(enum_field_types mysqlType) const; diff --git a/src/shared/Database/SQLStorage.h b/src/shared/Database/SQLStorage.h index 019e27783..826e702cf 100644 --- a/src/shared/Database/SQLStorage.h +++ b/src/shared/Database/SQLStorage.h @@ -109,7 +109,7 @@ class SQLStorage : public SQLStorageBase SQLStorage(const char* src_fmt, const char* dst_fmt, const char* _entry_field, const char* sqlname); - ~SQLStorage() { Free(); } + ~SQLStorage() override { Free(); } template T const* LookupEntry(uint32 id) const @@ -146,7 +146,7 @@ class SQLHashStorage : public SQLStorageBase SQLHashStorage(const char* fmt, const char* _entry_field, const char* sqlname); SQLHashStorage(const char* src_fmt, const char* dst_fmt, const char* _entry_field, const char* sqlname); - ~SQLHashStorage() { Free(); } + ~SQLHashStorage() override { Free(); } template T const* LookupEntry(uint32 id) const @@ -188,7 +188,7 @@ class SQLMultiStorage : public SQLStorageBase SQLMultiStorage(const char* fmt, const char* _entry_field, const char* sqlname); SQLMultiStorage(const char* src_fmt, const char* dst_fmt, const char* _entry_field, const char* sqlname); - ~SQLMultiStorage() { Free(); } + ~SQLMultiStorage() override { Free(); } // forward declaration template class SQLMSIteratorBounds; diff --git a/src/shared/Database/SqlDelayThread.h b/src/shared/Database/SqlDelayThread.h index 4b2291ce3..f6d60a694 100644 --- a/src/shared/Database/SqlDelayThread.h +++ b/src/shared/Database/SqlDelayThread.h @@ -48,12 +48,12 @@ class SqlDelayThread : public ACE_Based::Runnable public: SqlDelayThread(Database* db, SqlConnection* conn, int workerId); - ~SqlDelayThread(); + ~SqlDelayThread() override; ///< Put sql statement to delay queue bool Delay(SqlOperation* sql) { m_sqlQueue.add(sql); return true; } virtual void Stop(); ///< Stop event - virtual void run(); ///< Main Thread loop + void run() override; ///< Main Thread loop }; #endif //__SQLDELAYTHREAD_H diff --git a/src/shared/Database/SqlPreparedStatement.h b/src/shared/Database/SqlPreparedStatement.h index fb77b6e3c..9e9d847bc 100644 --- a/src/shared/Database/SqlPreparedStatement.h +++ b/src/shared/Database/SqlPreparedStatement.h @@ -327,7 +327,7 @@ class MANGOS_DLL_SPEC SqlPreparedStatement virtual bool execute() = 0; protected: - SqlPreparedStatement(const std::string& fmt, SqlConnection& conn) : m_szFmt(fmt), m_nParams(0), m_nColumns(0), m_bPrepared(false), m_bIsQuery(false), m_pConn(conn) {} + SqlPreparedStatement(const std::string& fmt, SqlConnection& conn) : m_nParams(0), m_nColumns(0), m_bIsQuery(false), m_bPrepared(false), m_szFmt(fmt), m_pConn(conn) {} uint32 m_nParams; uint32 m_nColumns; @@ -342,15 +342,15 @@ class MANGOS_DLL_SPEC SqlPlainPreparedStatement : public SqlPreparedStatement { public: SqlPlainPreparedStatement(const std::string& fmt, SqlConnection& conn); - ~SqlPlainPreparedStatement() {} + ~SqlPlainPreparedStatement() override {} //this statement is always prepared - virtual bool prepare() { return true; } + bool prepare() override { return true; } //we should replace all '?' symbols with substrings with proper format - virtual void bind(const SqlStmtParameters& holder); + void bind(const SqlStmtParameters& holder) override; - virtual bool execute(); + bool execute() override; protected: void DataToString(const SqlStmtFieldData& data, std::ostringstream& fmt); diff --git a/src/shared/DelayExecutor.cpp b/src/shared/DelayExecutor.cpp index 8b9c1bdb3..360c6bfd6 100644 --- a/src/shared/DelayExecutor.cpp +++ b/src/shared/DelayExecutor.cpp @@ -28,7 +28,7 @@ DelayExecutor* DelayExecutor::instance() } DelayExecutor::DelayExecutor() - : activated_(false), pre_svc_hook_(0), post_svc_hook_(0) + : pre_svc_hook_(0), post_svc_hook_(0), activated_(false) { } diff --git a/src/shared/Log.cpp b/src/shared/Log.cpp index f7677a13c..9ccaf5ac5 100644 --- a/src/shared/Log.cpp +++ b/src/shared/Log.cpp @@ -57,7 +57,7 @@ LogFilterData logFilterData[LOG_FILTER_COUNT] = Log::Log() : logfile(nullptr), gmLogfile(nullptr), dberLogfile(nullptr), - wardenLogfile(nullptr), anticheatLogfile(nullptr), honorLogfile(nullptr), m_colored(false), m_wardenDebug(false), m_includeTime(false), m_gmlog_per_account(false) + wardenLogfile(nullptr), anticheatLogfile(nullptr), honorLogfile(nullptr), m_colored(false), m_includeTime(false), m_wardenDebug(false), m_gmlog_per_account(false) { for (int i = 0; i < LOG_MAX_FILES; ++i) { diff --git a/src/shared/Threading.cpp b/src/shared/Threading.cpp index 51ecac382..e93df53ab 100644 --- a/src/shared/Threading.cpp +++ b/src/shared/Threading.cpp @@ -116,7 +116,7 @@ Thread::Thread(Runnable* instance) : m_iThreadId(0), m_hThreadHandle(0), m_task( if (m_task) m_task->incReference(); - bool _start = start(); + /*bool _start = */ start(); //MANGOS_ASSERT (_start); } @@ -237,7 +237,7 @@ void Thread::setPriority(Priority type) { #ifndef __sun__ int _priority = m_TpEnum.getPriority(type); - int _ok = ACE_Thread::setprio(m_hThreadHandle, _priority); + /*int _ok =*/ ACE_Thread::setprio(m_hThreadHandle, _priority); //remove this ASSERT in case you don't want to know is thread priority change was successful or not //MANGOS_ASSERT (_ok == 0); #endif diff --git a/src/shared/Util.cpp b/src/shared/Util.cpp index 8ffabef76..11d3cab68 100644 --- a/src/shared/Util.cpp +++ b/src/shared/Util.cpp @@ -348,7 +348,7 @@ uint32 CreatePIDFile(const std::string& filename) pid_t pid = getpid(); #endif - fprintf(pid_file, "%d", pid ); + fprintf(pid_file, "%lu", pid ); fclose(pid_file); return (uint32)pid; @@ -491,7 +491,7 @@ void vutf8printf(FILE *out, const char *str, va_list* ap) temp_buf.resize(32 * 1024); std::wstring wtemp_buf; - size_t temp_len = vsnprintf(&temp_buf[0], 32 * 1024, str, *ap); + vsnprintf(&temp_buf[0], 32 * 1024, str, *ap); temp_buf.resize(strlen(temp_buf.c_str())); // Resize to match the formatted string if (!temp_buf.empty()) diff --git a/src/shared/WheatyExceptionReport.cpp b/src/shared/WheatyExceptionReport.cpp index 5f89d93f9..0c4cc4b16 100644 --- a/src/shared/WheatyExceptionReport.cpp +++ b/src/shared/WheatyExceptionReport.cpp @@ -271,13 +271,13 @@ BOOL WheatyExceptionReport::_GetWindowsVersion(TCHAR* szVersion, DWORD cntMax) lRet = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Hotfix\\Q246009"), 0, KEY_QUERY_VALUE, &hKey); if (lRet == ERROR_SUCCESS) { - _stprintf(wszTmp, _T("Service Pack 6a (Version %d.%d, Build %d)"), + _stprintf(wszTmp, _T("Service Pack 6a (Version %lu.%lu, Build %lu)"), osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF); _tcsncat(szVersion, wszTmp, cntMax); } else // Windows NT 4.0 prior to SP6a { - _stprintf(wszTmp, _T("%s (Version %d.%d, Build %d)"), + _stprintf(wszTmp, _T("%s (Version %lu.%lu, Build %lu)"), osvi.szCSDVersion, osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF); _tcsncat(szVersion, wszTmp, cntMax); } @@ -286,16 +286,16 @@ BOOL WheatyExceptionReport::_GetWindowsVersion(TCHAR* szVersion, DWORD cntMax) else // Windows NT 3.51 and earlier or Windows 2000 and later { if (!_tcslen(osvi.szCSDVersion)) - _stprintf(wszTmp, _T("(Version %d.%d, Build %d)"), + _stprintf(wszTmp, _T("(Version %lu.%lu, Build %lu)"), osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF); else - _stprintf(wszTmp, _T("%s (Version %d.%d, Build %d)"), + _stprintf(wszTmp, _T("%s (Version %lu.%lu, Build %lu)"), osvi.szCSDVersion, osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF); _tcsncat(szVersion, wszTmp, cntMax); } break; default: - _stprintf(wszTmp, _T("%s (Version %d.%d, Build %d)"), + _stprintf(wszTmp, _T("%s (Version %lu.%lu, Build %lu)"), osvi.szCSDVersion, osvi.dwMajorVersion, osvi.dwMinorVersion, osvi.dwBuildNumber & 0xFFFF); _tcsncat(szVersion, wszTmp, cntMax); break;