From aec1d1a2fa7ac51eb1b487883ab0918aef8ff336 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Thu, 23 Jul 2020 15:19:56 +0200 Subject: [PATCH] Misc: fixed build --- sql/base/auth_database.sql | 2 +- src/common/DataStores/DBCFileLoader.h | 4 ++-- src/server/game/Entities/Unit/Unit.cpp | 6 +++--- .../SunwellPlateau/instance_sunwell_plateau.cpp | 1 + .../IcecrownCitadel/boss_valithria_dreamwalker.cpp | 2 +- src/server/scripts/Pet/pet_hunter.cpp | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index 85d87ef642a..70701443f40 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -1848,7 +1848,7 @@ INSERT INTO `rbac_permissions` VALUES (865,'Command: npc showloot'), (866,'Command: list spawnpoints'), (867,'Command: reload quest_greeting_locale'), -(870,'Command: debug threatinfo'); +(870,'Command: debug threatinfo'), (872,'Command: server debug'), (873,'Command: reload creature_movement_override'); /*!40000 ALTER TABLE `rbac_permissions` ENABLE KEYS */; diff --git a/src/common/DataStores/DBCFileLoader.h b/src/common/DataStores/DBCFileLoader.h index 76aa97497fa..3c82aaa78ed 100644 --- a/src/common/DataStores/DBCFileLoader.h +++ b/src/common/DataStores/DBCFileLoader.h @@ -49,7 +49,7 @@ class TC_COMMON_API DBCFileLoader } int32 getInt(size_t field) const { - assert(field < file.fieldCount); + ASSERT(field < file.fieldCount); int32 val = *reinterpret_cast(offset + file.GetOffset(field)); EndianConvert(val); return val; @@ -61,7 +61,7 @@ class TC_COMMON_API DBCFileLoader } uint64 getUInt64(size_t field) const { - assert(field < file.fieldCount); + ASSERT(field < file.fieldCount); return *reinterpret_cast(offset + file.GetOffset(field)); } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 8f0cb29de73..f0dd5173286 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -325,9 +325,9 @@ Unit::Unit(bool isWorldObject) : IsAIEnabled(false), NeedChangeAI(false), LastCharmerGUID(), m_ControlledByPlayer(false), movespline(new Movement::MoveSpline()), i_AI(nullptr), i_disabledAI(nullptr), m_AutoRepeatFirstCast(false), m_procDeep(0), - m_removedAurasCount(0), i_motionMaster(new MotionMaster(this)), m_combatManager(this), - m_vehicle(nullptr), m_vehicleKit(nullptr), m_unitTypeMask(UNIT_MASK_NONE), - m_Diminishing(), m_isEngaged(false), m_threatManager(this), _lastDamagedTime(0), + m_removedAurasCount(0), i_motionMaster(new MotionMaster(this)), m_vehicle(nullptr), + m_vehicleKit(nullptr), m_unitTypeMask(UNIT_MASK_NONE), m_Diminishing(), + m_isEngaged(false), m_combatManager(this), m_threatManager(this), _lastDamagedTime(0), m_spellHistory(new SpellHistory(this)) { m_objectType |= TYPEMASK_UNIT; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp index e80be5577c7..c360c942445 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp @@ -17,6 +17,7 @@ #include "ScriptMgr.h" #include "AreaBoundary.h" +#include "Creature.h" #include "GameObject.h" #include "InstanceScript.h" #include "Log.h" diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index b16fc0203ad..e73e1141b39 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -231,7 +231,7 @@ class ValithriaDespawner : public BasicEvent case NPC_VALITHRIA_DREAMWALKER: if (InstanceScript* instance = creature->GetInstanceScript()) instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, creature); - // no break + [[fallthrough]]; case NPC_BLAZING_SKELETON: case NPC_SUPPRESSER: case NPC_BLISTERING_ZOMBIE: diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp index cd9c29a01c3..d6fb7b5e79c 100644 --- a/src/server/scripts/Pet/pet_hunter.cpp +++ b/src/server/scripts/Pet/pet_hunter.cpp @@ -73,7 +73,7 @@ class npc_pet_hunter_snake_trap : public CreatureScript } // Redefined for random target selection: - void MoveInLineOfSight(Unit* who) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override {