Core/Misc: build fixes

Merges #24550
This commit is contained in:
Shauren
2020-05-03 14:53:18 +02:00
parent e27d7049c3
commit d1572327d2
7 changed files with 20 additions and 5 deletions

View File

@@ -18,6 +18,7 @@
#include "GameObjectAI.h"
#include "CreatureAI.h"
#include "GameObject.h"
#include "QuestDef.h"
//GameObjectAI::GameObjectAI(GameObject* g) : go(g) { }
int GameObjectAI::Permissible(const GameObject* go)
@@ -27,6 +28,11 @@ int GameObjectAI::Permissible(const GameObject* go)
return PERMIT_BASE_NO;
}
uint32 GameObjectAI::GetDialogStatus(Player* /*player*/)
{
return DIALOG_STATUS_SCRIPTED_NO_STATUS;
}
NullGameObjectAI::NullGameObjectAI(GameObject* g) : GameObjectAI(g) { }
int NullGameObjectAI::Permissible(GameObject const* /*go*/)

View File

@@ -19,10 +19,11 @@
#define TRINITY_GAMEOBJECTAI_H
#include "Define.h"
#include "QuestDef.h"
#include <list>
class GameObject;
class Player;
class Quest;
class SpellInfo;
class Unit;
@@ -63,7 +64,7 @@ class TC_GAME_API GameObjectAI
virtual void QuestReward(Player* /*player*/, Quest const* /*quest*/, uint32 /*opt*/) { }
// Called when the dialog status between a player and the gameobject is requested.
virtual uint32 GetDialogStatus(Player* /*player*/) { return DIALOG_STATUS_SCRIPTED_NO_STATUS; }
virtual uint32 GetDialogStatus(Player* player);
virtual void Destroyed(Player* /*player*/, uint32 /*eventId*/) { }
virtual void Damaged(Player* /*player*/, uint32 /*eventId*/) { }

View File

@@ -20,6 +20,7 @@
#include "CreatureAIImpl.h"
#include "MotionMaster.h"
#include "Player.h"
#include "QuestDef.h"
#include "Spell.h"
#include "SpellAuraEffects.h"
#include "SpellAuras.h"
@@ -241,6 +242,11 @@ void UnitAI::FillAISpellInfo()
}
}
uint32 UnitAI::GetDialogStatus(Player* /*player*/)
{
return DIALOG_STATUS_SCRIPTED_NO_STATUS;
}
ThreatManager& UnitAI::GetThreatManager()
{
return me->getThreatManager();

View File

@@ -22,7 +22,6 @@
#include "EventMap.h"
#include "ObjectGuid.h"
#include "ThreatManager.h"
#include "QuestDef.h"
#define CAST_AI(a, b) (dynamic_cast<a*>(b))
#define ENSURE_AI(a,b) (EnsureAI<a>(b))
@@ -293,8 +292,7 @@ class TC_GAME_API UnitAI
virtual void OnGameEvent(bool /*start*/, uint16 /*eventId*/) { }
// Called when the dialog status between a player and the creature is requested.
virtual uint32 GetDialogStatus(Player* /*player*/) { return DIALOG_STATUS_SCRIPTED_NO_STATUS; }
virtual uint32 GetDialogStatus(Player* player);
private:
UnitAI(UnitAI const& right) = delete;

View File

@@ -18,6 +18,8 @@
#ifndef DEF_SUNKEN_TEMPLE_H
#define DEF_SUNKEN_TEMPLE_H
#include "CreatureAIImpl.h"
#define STScriptName "instance_sunken_temple"
#define DataHeader "ST"

View File

@@ -30,6 +30,7 @@ EndContentData */
#include "ScriptMgr.h"
#include "GameObject.h"
#include "InstanceScript.h"
#include "Map.h"
#include "MotionMaster.h"
#include "ObjectAccessor.h"
#include "Player.h"

View File

@@ -22,6 +22,7 @@
#include "InstanceScript.h"
#include "MotionMaster.h"
#include "ObjectAccessor.h"
#include "Player.h"
#include "ScriptedCreature.h"
#include "ScriptedGossip.h"
#include "SpellInfo.h"