mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2024-11-26 15:37:20 +00:00
Update includes
This commit is contained in:
parent
2a8f40f8e8
commit
4d57eff946
@ -3,19 +3,12 @@
|
||||
#include "CDClientManager.h"
|
||||
#include "Game.h"
|
||||
#include "dLogger.h"
|
||||
#include <PacketUtils.h>
|
||||
#include <functional>
|
||||
#include "CDDestructibleComponentTable.h"
|
||||
#include "CDClientDatabase.h"
|
||||
#include <sstream>
|
||||
#include "dServer.h"
|
||||
#include "GameMessages.h"
|
||||
#include "EntityManager.h"
|
||||
#include "dZoneManager.h"
|
||||
#include "Zone.h"
|
||||
#include "Spawner.h"
|
||||
#include "UserManager.h"
|
||||
#include "dpWorld.h"
|
||||
#include "Player.h"
|
||||
#include "LUTriggers.h"
|
||||
#include "User.h"
|
||||
@ -60,7 +53,6 @@
|
||||
#include "ProximityMonitorComponent.h"
|
||||
#include "PropertyEntranceComponent.h"
|
||||
#include "ModelBehaviorComponent.h"
|
||||
#include "ZCompression.h"
|
||||
#include "PetComponent.h"
|
||||
#include "HavokVehiclePhysicsComponent.h"
|
||||
#include "PossessableComponent.h"
|
||||
@ -81,15 +73,9 @@
|
||||
|
||||
// Table includes
|
||||
#include "CDComponentsRegistryTable.h"
|
||||
#include "CDCurrencyTableTable.h"
|
||||
#include "CDMovementAIComponentTable.h"
|
||||
#include "CDProximityMonitorComponentTable.h"
|
||||
#include "CDRebuildComponentTable.h"
|
||||
#include "CDObjectSkillsTable.h"
|
||||
#include "CDObjectsTable.h"
|
||||
#include "CDScriptComponentTable.h"
|
||||
#include "CDSkillBehaviorTable.h"
|
||||
#include "CDZoneTableTable.h"
|
||||
|
||||
const std::vector<ComponentWhitelist> Entity::m_ComponentWhitelists = {
|
||||
{ // Unknown use case
|
||||
|
@ -1,17 +1,13 @@
|
||||
#ifndef __ENTITY__H__
|
||||
#define __ENTITY__H__
|
||||
|
||||
#include <map>
|
||||
#include <functional>
|
||||
#include <typeinfo>
|
||||
#include <type_traits>
|
||||
#include <memory>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
|
||||
#include "dCommonVars.h"
|
||||
#include "NiPoint3.h"
|
||||
#include "NiQuaternion.h"
|
||||
#include "LDFFormat.h"
|
||||
#include "eKillType.h"
|
||||
|
||||
namespace Loot {
|
||||
@ -33,6 +29,7 @@ class Component;
|
||||
class Item;
|
||||
class Character;
|
||||
class EntityCallbackTimer;
|
||||
class LDFBaseData;
|
||||
enum class eTriggerEventType;
|
||||
enum class eGameMasterLevel : uint8_t;
|
||||
enum class eReplicaComponentType : uint32_t;
|
||||
|
@ -4,6 +4,8 @@
|
||||
#error "Include Entity.h instead of Entity.tpp"
|
||||
#endif
|
||||
|
||||
#include "LDFFormat.h"
|
||||
|
||||
// Access definitions
|
||||
template <typename Cmpt>
|
||||
Cmpt* Entity::GetComponent() const {
|
||||
|
@ -183,7 +183,7 @@ void MovingPlatformComponent::StartPathing() {
|
||||
const auto travelNext = subComponent->mWaitTime + travelTime;
|
||||
|
||||
m_ParentEntity->AddCallbackTimer(travelTime, [subComponent, this] {
|
||||
m_ParentEntity>GetScript()->OnWaypointReached(m_ParentEntity, subComponent->mNextWaypointIndex);
|
||||
m_ParentEntity->GetScript()->OnWaypointReached(m_ParentEntity, subComponent->mNextWaypointIndex);
|
||||
});
|
||||
|
||||
m_ParentEntity->AddCallbackTimer(travelNext, [this] {
|
||||
|
Loading…
Reference in New Issue
Block a user