Fixed build without PCH
This commit is contained in:
@@ -21,6 +21,7 @@
|
|||||||
#include "Vehicle.h"
|
#include "Vehicle.h"
|
||||||
#include "Player.h"
|
#include "Player.h"
|
||||||
#include "Log.h"
|
#include "Log.h"
|
||||||
|
#include "ObjectAccessor.h"
|
||||||
|
|
||||||
void WorldSession::HandleDismissControlledVehicle(WorldPacket &recv_data)
|
void WorldSession::HandleDismissControlledVehicle(WorldPacket &recv_data)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
#include "ObjectMgr.h"
|
#include "ObjectMgr.h"
|
||||||
#include "ScriptMgr.h"
|
#include "ScriptMgr.h"
|
||||||
#include "ScriptedCreature.h"
|
#include "ScriptedCreature.h"
|
||||||
#include "SpellScript.h"
|
|
||||||
#include "SpellAuraEffects.h"
|
#include "SpellAuraEffects.h"
|
||||||
#include "icecrown_citadel.h"
|
#include "icecrown_citadel.h"
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
#include "ObjectMgr.h"
|
#include "ObjectMgr.h"
|
||||||
#include "ScriptMgr.h"
|
#include "ScriptMgr.h"
|
||||||
#include "ScriptedCreature.h"
|
#include "ScriptedCreature.h"
|
||||||
#include "SpellScript.h"
|
|
||||||
#include "Spell.h"
|
#include "Spell.h"
|
||||||
#include "SpellAuraEffects.h"
|
#include "SpellAuraEffects.h"
|
||||||
#include "icecrown_citadel.h"
|
#include "icecrown_citadel.h"
|
||||||
|
|||||||
@@ -19,7 +19,6 @@
|
|||||||
#include "ScriptMgr.h"
|
#include "ScriptMgr.h"
|
||||||
#include "ScriptedCreature.h"
|
#include "ScriptedCreature.h"
|
||||||
#include "ScriptedGossip.h"
|
#include "ScriptedGossip.h"
|
||||||
#include "SpellScript.h"
|
|
||||||
#include "SpellAuras.h"
|
#include "SpellAuras.h"
|
||||||
#include "icecrown_citadel.h"
|
#include "icecrown_citadel.h"
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
#include "ObjectMgr.h"
|
#include "ObjectMgr.h"
|
||||||
#include "ScriptMgr.h"
|
#include "ScriptMgr.h"
|
||||||
#include "ScriptedCreature.h"
|
#include "ScriptedCreature.h"
|
||||||
#include "SpellScript.h"
|
|
||||||
#include "SpellAuras.h"
|
#include "SpellAuras.h"
|
||||||
#include "icecrown_citadel.h"
|
#include "icecrown_citadel.h"
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
#include "ObjectMgr.h"
|
#include "ObjectMgr.h"
|
||||||
#include "ScriptMgr.h"
|
#include "ScriptMgr.h"
|
||||||
#include "ScriptedCreature.h"
|
#include "ScriptedCreature.h"
|
||||||
#include "SpellScript.h"
|
|
||||||
#include "PoolMgr.h"
|
#include "PoolMgr.h"
|
||||||
#include "Group.h"
|
#include "Group.h"
|
||||||
#include "icecrown_citadel.h"
|
#include "icecrown_citadel.h"
|
||||||
|
|||||||
@@ -18,10 +18,9 @@
|
|||||||
#include "ObjectMgr.h"
|
#include "ObjectMgr.h"
|
||||||
#include "ScriptMgr.h"
|
#include "ScriptMgr.h"
|
||||||
#include "ScriptedCreature.h"
|
#include "ScriptedCreature.h"
|
||||||
#include "SpellScript.h"
|
|
||||||
#include "SpellAuras.h"
|
#include "SpellAuras.h"
|
||||||
#include "icecrown_citadel.h"
|
|
||||||
#include "MapManager.h"
|
#include "MapManager.h"
|
||||||
|
#include "icecrown_citadel.h"
|
||||||
|
|
||||||
enum ScriptTexts
|
enum ScriptTexts
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
#include "ObjectMgr.h"
|
#include "ObjectMgr.h"
|
||||||
#include "ScriptMgr.h"
|
#include "ScriptMgr.h"
|
||||||
#include "ScriptedCreature.h"
|
#include "ScriptedCreature.h"
|
||||||
#include "SpellScript.h"
|
|
||||||
#include "SpellAuraEffects.h"
|
#include "SpellAuraEffects.h"
|
||||||
#include "Group.h"
|
#include "Group.h"
|
||||||
#include "Spell.h"
|
#include "Spell.h"
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
#include "ObjectMgr.h"
|
#include "ObjectMgr.h"
|
||||||
#include "ScriptMgr.h"
|
#include "ScriptMgr.h"
|
||||||
#include "ScriptedCreature.h"
|
#include "ScriptedCreature.h"
|
||||||
#include "SpellScript.h"
|
|
||||||
#include "SpellAuras.h"
|
#include "SpellAuras.h"
|
||||||
#include "icecrown_citadel.h"
|
#include "icecrown_citadel.h"
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
#include "ObjectMgr.h"
|
#include "ObjectMgr.h"
|
||||||
#include "ScriptMgr.h"
|
#include "ScriptMgr.h"
|
||||||
#include "ScriptedCreature.h"
|
#include "ScriptedCreature.h"
|
||||||
#include "SpellScript.h"
|
|
||||||
#include "SpellAuraEffects.h"
|
#include "SpellAuraEffects.h"
|
||||||
#include "icecrown_citadel.h"
|
#include "icecrown_citadel.h"
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
#include "ObjectMgr.h"
|
#include "ObjectMgr.h"
|
||||||
#include "ScriptMgr.h"
|
#include "ScriptMgr.h"
|
||||||
#include "ScriptedCreature.h"
|
#include "ScriptedCreature.h"
|
||||||
#include "SpellScript.h"
|
|
||||||
#include "SpellAuraEffects.h"
|
#include "SpellAuraEffects.h"
|
||||||
#include "icecrown_citadel.h"
|
#include "icecrown_citadel.h"
|
||||||
|
|
||||||
@@ -367,7 +366,7 @@ class npc_rotting_frost_giant : public CreatureScript
|
|||||||
events.Reset();
|
events.Reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
void UpdateAI(const uint32 diff)
|
void UpdateAI(uint32 const diff)
|
||||||
{
|
{
|
||||||
if (!UpdateVictim())
|
if (!UpdateVictim())
|
||||||
return;
|
return;
|
||||||
@@ -426,7 +425,7 @@ class npc_frost_freeze_trap : public CreatureScript
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void DoAction(const int32 action)
|
void DoAction(int32 const action)
|
||||||
{
|
{
|
||||||
switch (action)
|
switch (action)
|
||||||
{
|
{
|
||||||
@@ -443,7 +442,7 @@ class npc_frost_freeze_trap : public CreatureScript
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void UpdateAI(const uint32 diff)
|
void UpdateAI(uint32 const diff)
|
||||||
{
|
{
|
||||||
events.Update(diff);
|
events.Update(diff);
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,10 @@
|
|||||||
#ifndef ICECROWN_CITADEL_H_
|
#ifndef ICECROWN_CITADEL_H_
|
||||||
#define ICECROWN_CITADEL_H_
|
#define ICECROWN_CITADEL_H_
|
||||||
|
|
||||||
|
#include "SpellScript.h"
|
||||||
|
|
||||||
#define ICCScriptName "instance_icecrown_citadel"
|
#define ICCScriptName "instance_icecrown_citadel"
|
||||||
|
|
||||||
uint32 const EncounterCount = 12;
|
uint32 const EncounterCount = 12;
|
||||||
uint32 const WeeklyNPCs = 7;
|
uint32 const WeeklyNPCs = 7;
|
||||||
uint32 const MaxHeroicAttempts = 50;
|
uint32 const MaxHeroicAttempts = 50;
|
||||||
|
|||||||
@@ -21,6 +21,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "DBCFileLoader.h"
|
#include "DBCFileLoader.h"
|
||||||
|
#include "Errors.h"
|
||||||
|
|
||||||
DBCFileLoader::DBCFileLoader()
|
DBCFileLoader::DBCFileLoader()
|
||||||
{
|
{
|
||||||
@@ -162,7 +163,6 @@ uint32 DBCFileLoader::GetFormatRecordSize(const char* format, int32* index_pos)
|
|||||||
ASSERT(false && "Attempted to load DBC files that do not have field types that match what is in the core. Check DBCfmt.h or your DBC files.");
|
ASSERT(false && "Attempted to load DBC files that do not have field types that match what is in the core. Check DBCfmt.h or your DBC files.");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
sLog->outErrorDb("%c", format[x]);
|
|
||||||
ASSERT(false && "Unknown field format character in DBCfmt.h");
|
ASSERT(false && "Unknown field format character in DBCfmt.h");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user