Misc: fixed build

This commit is contained in:
Ovahlord committed 2020-07-23 17:00:54 +02:00
1 parent c63fdd66b4
commit aec1d1a2fa
6 files changed
+9 -8

No files matched your search

+1 -1
View File
@@ -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 */;
+2 -2
View File
@@ -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<int32*>(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<uint64*>(offset + file.GetOffset(field));
}
+3 -3
View File
@@ -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;
@@ -17,6 +17,7 @@
#include "ScriptMgr.h"
#include "AreaBoundary.h"
#include "Creature.h"
#include "GameObject.h"
#include "InstanceScript.h"
#include "Log.h"
@@ -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:
+1 -1
View File
@@ -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
{