This commit is contained in:
David Markowitz
2023-07-15 23:35:58 -07:00
parent 0779f33c2e
commit f76d28584e
6 changed files with 140 additions and 135 deletions

View File

@@ -43,7 +43,7 @@ public:
void ConstructEntity(Entity* entity, const SystemAddress& sysAddr = UNASSIGNED_SYSTEM_ADDRESS, bool skipChecks = false);
void DestructEntity(Entity* entity, const SystemAddress& sysAddr = UNASSIGNED_SYSTEM_ADDRESS);
void SerializeEntity(Entity* entity);
virtual void SerializeEntity(Entity* entity);
void ConstructAllEntities(const SystemAddress& sysAddr);
void DestructAllEntities(const SystemAddress& sysAddr);

View File

@@ -30,7 +30,7 @@ CharacterComponent::CharacterComponent(Entity* parent, Character* character) : C
m_DirtySocialInfo = false;
m_PvpEnabled = false;
m_GMLevel = character->GetGMLevel();
m_GMLevel = character != nullptr ? character->GetGMLevel() : eGameMasterLevel::CIVILIAN;
m_EditorEnabled = false;
m_EditorLevel = m_GMLevel;

View File

@@ -7,6 +7,7 @@
#include "EntityManager.h"
#include "GameMessages.h"
#include "eReplicaComponentType.h"
#include "PropertySelectQueryProperty.h"
/**
* Represents the launch pad that's used to select and browse properties