Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-23 05:57:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finish header re-ordering

Browse Source
This commit is contained in:
David Markowitz 2023-06-17 18:41:51 -07:00
parent 1bdec00a61
commit e180430ede
1 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
dGame/dEntity/Entity.h
View File

@ -269,9 +269,6 @@ public:
// Update // Update
void UpdateXMLDoc(tinyxml2::XMLDocument* doc); void UpdateXMLDoc(tinyxml2::XMLDocument* doc);
void Update(float deltaTime); void Update(float deltaTime);
/**
* Utility
*/
//Retroactively corrects the model vault size due to incorrect initialization in a previous patch. //Retroactively corrects the model vault size due to incorrect initialization in a previous patch.
void RetroactiveVaultSize(); void RetroactiveVaultSize();
@ -343,54 +340,42 @@ public:
protected: protected:
LWOOBJID m_ObjectID; LWOOBJID m_ObjectID;
LWOOBJID m_SpawnerID;
LWOOBJID m_OwnerOverride;
uint32_t m_SpawnerNodeID;
LOT m_TemplateID; LOT m_TemplateID;
std::vector<LDFBaseData*> m_Settings;
std::vector<LDFBaseData*> m_NetworkSettings;
NiPoint3 m_DefaultPosition; NiPoint3 m_DefaultPosition;
NiQuaternion m_DefaultRotation; NiQuaternion m_DefaultRotation;
float m_Scale; float m_Scale;
int8_t m_Observers;
Spawner* m_Spawner; eGameMasterLevel m_GMLevel;
LWOOBJID m_SpawnerID;
bool m_HasSpawnerNodeID;
uint32_t m_SpawnerNodeID;
Character* m_Character;
Entity* m_ParentEntity; //For spawners and the like Entity* m_ParentEntity; //For spawners and the like
std::vector<Entity*> m_ChildEntities; Entity* m_ScheduleKiller;
eGameMasterLevel m_GMLevel; Spawner* m_Spawner;
std::vector<std::string> m_Groups; Character* m_Character;
bool m_HasSpawnerNodeID;
bool m_ShouldDestroyAfterUpdate;
bool m_PlayerIsReadyForUpdates;
bool m_IsGhostingCandidate;
bool m_IsParentChildDirty;
uint16_t m_NetworkID; uint16_t m_NetworkID;
std::vector<std::function<void()>> m_DieCallbacks;
std::vector<std::function<void(Entity*)>> m_PhantomCollisionCallbacks;
std::unordered_map<eReplicaComponentType, ComponentPtr> m_Components; std::unordered_map<eReplicaComponentType, ComponentPtr> m_Components;
std::vector<std::unique_ptr<EntityTimer>> m_Timers; std::vector<std::unique_ptr<EntityTimer>> m_Timers;
std::vector<std::unique_ptr<EntityTimer>> m_PendingTimers; std::vector<std::unique_ptr<EntityTimer>> m_PendingTimers;
std::vector<std::unique_ptr<EntityCallbackTimer>> m_CallbackTimers; std::vector<std::unique_ptr<EntityCallbackTimer>> m_CallbackTimers;
std::vector<LDFBaseData*> m_Settings;
bool m_ShouldDestroyAfterUpdate; std::vector<LDFBaseData*> m_NetworkSettings;
std::vector<Entity*> m_ChildEntities;
LWOOBJID m_OwnerOverride; std::vector<std::string> m_Groups;
std::vector<std::function<void()>> m_DieCallbacks;
Entity* m_ScheduleKiller; std::vector<std::function<void(Entity*)>> m_PhantomCollisionCallbacks;
bool m_PlayerIsReadyForUpdates;
bool m_IsGhostingCandidate;
int8_t m_Observers;
bool m_IsParentChildDirty;
/*
* Collision
*/
std::vector<LWOOBJID> m_TargetsInPhantom; std::vector<LWOOBJID> m_TargetsInPhantom;
static const std::vector<ComponentWhitelist> m_ComponentWhitelists; static const std::vector<ComponentWhitelist> m_ComponentWhitelists;