Core: Fix non-PCH build and remove a few warnings.
This commit is contained in:
@@ -50,7 +50,7 @@ class GameObjectAI
|
|||||||
virtual void Destroyed(Player* /*player*/, uint32 /*eventId*/) {}
|
virtual void Destroyed(Player* /*player*/, uint32 /*eventId*/) {}
|
||||||
virtual void SetData(uint32 /*id*/, uint32 /*value*/) {}
|
virtual void SetData(uint32 /*id*/, uint32 /*value*/) {}
|
||||||
virtual void OnGameEvent(bool /*start*/, uint16 /*eventId*/) {}
|
virtual void OnGameEvent(bool /*start*/, uint16 /*eventId*/) {}
|
||||||
virtual void OnStateChanged(uint32 state, Unit* unit) { }
|
virtual void OnStateChanged(uint32 /*state*/, Unit* /*unit*/) { }
|
||||||
};
|
};
|
||||||
|
|
||||||
class NullGameObjectAI : public GameObjectAI
|
class NullGameObjectAI : public GameObjectAI
|
||||||
|
|||||||
@@ -305,7 +305,7 @@ bool TradeData::HasItem(uint64 itemGuid) const
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
TradeSlots const TradeData::GetTradeSlotForItem(uint64 itemGuid)
|
TradeSlots TradeData::GetTradeSlotForItem(uint64 itemGuid) const
|
||||||
{
|
{
|
||||||
for (uint8 i = 0; i < TRADE_SLOT_COUNT; ++i)
|
for (uint8 i = 0; i < TRADE_SLOT_COUNT; ++i)
|
||||||
if (m_items[i] == itemGuid)
|
if (m_items[i] == itemGuid)
|
||||||
|
|||||||
@@ -1003,7 +1003,7 @@ class TradeData
|
|||||||
|
|
||||||
Item* GetItem(TradeSlots slot) const;
|
Item* GetItem(TradeSlots slot) const;
|
||||||
bool HasItem(uint64 itemGuid) const;
|
bool HasItem(uint64 itemGuid) const;
|
||||||
TradeSlots const GetTradeSlotForItem(uint64 itemGuid);
|
TradeSlots GetTradeSlotForItem(uint64 itemGuid) const;
|
||||||
void SetItem(TradeSlots slot, Item* item);
|
void SetItem(TradeSlots slot, Item* item);
|
||||||
|
|
||||||
uint32 GetSpell() const { return m_spell; }
|
uint32 GetSpell() const { return m_spell; }
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
#include "VMapFactory.h"
|
#include "VMapFactory.h"
|
||||||
#include "MoveSplineInit.h"
|
#include "MoveSplineInit.h"
|
||||||
#include "MoveSpline.h"
|
#include "MoveSpline.h"
|
||||||
|
#include "Player.h"
|
||||||
|
|
||||||
#ifdef MAP_BASED_RAND_GEN
|
#ifdef MAP_BASED_RAND_GEN
|
||||||
#define rand_norm() unit.rand_norm()
|
#define rand_norm() unit.rand_norm()
|
||||||
|
|||||||
@@ -23,6 +23,7 @@
|
|||||||
#include "World.h"
|
#include "World.h"
|
||||||
#include "MoveSplineInit.h"
|
#include "MoveSplineInit.h"
|
||||||
#include "MoveSpline.h"
|
#include "MoveSpline.h"
|
||||||
|
#include "Player.h"
|
||||||
|
|
||||||
//----- Point Movement Generator
|
//----- Point Movement Generator
|
||||||
template<class T>
|
template<class T>
|
||||||
|
|||||||
@@ -24,6 +24,7 @@
|
|||||||
#include "World.h"
|
#include "World.h"
|
||||||
#include "MoveSplineInit.h"
|
#include "MoveSplineInit.h"
|
||||||
#include "MoveSpline.h"
|
#include "MoveSpline.h"
|
||||||
|
#include "Player.h"
|
||||||
|
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
#include "MovementGenerator.h"
|
#include "MovementGenerator.h"
|
||||||
#include "FollowerReference.h"
|
#include "FollowerReference.h"
|
||||||
#include "Timer.h"
|
#include "Timer.h"
|
||||||
|
#include "Unit.h"
|
||||||
|
|
||||||
class TargetedMovementGeneratorBase
|
class TargetedMovementGeneratorBase
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -992,7 +992,7 @@ public:
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool HandleReloadWpCommand(ChatHandler* handler, const char* args)
|
static bool HandleReloadWpCommand(ChatHandler* /*handler*/, const char* args)
|
||||||
{
|
{
|
||||||
if (*args != 'a')
|
if (*args != 'a')
|
||||||
sLog->outString("Re-Loading Waypoints data from 'waypoints_data'");
|
sLog->outString("Re-Loading Waypoints data from 'waypoints_data'");
|
||||||
|
|||||||
@@ -276,7 +276,7 @@ public:
|
|||||||
me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
|
me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void JustDied(Unit* killer)
|
void JustDied(Unit* /*killer*/)
|
||||||
{
|
{
|
||||||
summons.DespawnAll();
|
summons.DespawnAll();
|
||||||
|
|
||||||
@@ -285,8 +285,8 @@ public:
|
|||||||
|
|
||||||
Talk(SAY_DEATH);
|
Talk(SAY_DEATH);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SpellHitTarget(Unit* target, const SpellInfo* spell)
|
void SpellHitTarget(Unit* /*target*/, const SpellInfo* spell)
|
||||||
{
|
{
|
||||||
if (spell->Id == SPELL_RITUAL_STRIKE_EFF_1 && Phase != NORMAL && Phase != SVALADEAD)
|
if (spell->Id == SPELL_RITUAL_STRIKE_EFF_1 && Phase != NORMAL && Phase != SVALADEAD)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -17,6 +17,9 @@
|
|||||||
|
|
||||||
//! TODO - Boss not scripted, just ported required spellscript from core
|
//! TODO - Boss not scripted, just ported required spellscript from core
|
||||||
|
|
||||||
|
#include "ScriptMgr.h"
|
||||||
|
#include "SpellScript.h"
|
||||||
|
|
||||||
enum Spells
|
enum Spells
|
||||||
{
|
{
|
||||||
SPELL_POSITIVE_CHARGE = 39090,
|
SPELL_POSITIVE_CHARGE = 39090,
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
#include "HMACSHA1.h"
|
#include "HMACSHA1.h"
|
||||||
#include "BigNumber.h"
|
#include "BigNumber.h"
|
||||||
|
#include "Common.h"
|
||||||
|
|
||||||
HmacHash::HmacHash(uint32 len, uint8 *seed)
|
HmacHash::HmacHash(uint32 len, uint8 *seed)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user