Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-05-23 15:22:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use only 1 script component per Entity

Browse Source 
Serialization won't make sense if we allow two of the same component like that
This commit is contained in:
David Markowitz 2023-06-12 04:13:06 -07:00
parent f9ac0a9dec
commit d224a86e93
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dGame/Entity.cpp
View File

@ -269,11 +269,13 @@ void Entity::Initialize() {
AddComponent<PlayerForcedMovementComponent>(); AddComponent<PlayerForcedMovementComponent>();
break; break;
case eReplicaComponentType::SCRIPT: { case eReplicaComponentType::SCRIPT: {
AddComponent<ScriptComponent>(ScriptComponent::GetScriptName(this, componentId)); std::string script;
if (m_TemplateID == LOT_ZONE_CONTROL) { if (m_TemplateID == LOT_ZONE_CONTROL) {
const auto zoneScript = ScriptComponent::GetZoneScriptName(componentId); script = ScriptComponent::GetZoneScriptName(componentId);
if (!zoneScript.empty()) AddComponent<ScriptComponent>(zoneScript); } else {
script = ScriptComponent::GetScriptName(this, componentId);
} }
AddComponent<ScriptComponent>(script); // Technically this should check for if the script name is empty and not create a component if it is.
break; break;
} }
case eReplicaComponentType::BOUNCER: case eReplicaComponentType::BOUNCER:

2
dScripts/ScriptComponent.cpp
View File

@ -10,7 +10,7 @@
#include "CDZoneTableTable.h" #include "CDZoneTableTable.h"
#include "dZoneManager.h" #include "dZoneManager.h"
ScriptComponent::ScriptComponent(Entity* parent, std::string scriptName) : Component(parent) { ScriptComponent::ScriptComponent(Entity* parent, const std::string& scriptName) : Component(parent) {
SetScript(scriptName); SetScript(scriptName);
} }

2
dScripts/ScriptComponent.h
View File

@ -21,7 +21,7 @@ class ScriptComponent : public Component {
public: public:
inline static const eReplicaComponentType ComponentType = eReplicaComponentType::SCRIPT; inline static const eReplicaComponentType ComponentType = eReplicaComponentType::SCRIPT;
ScriptComponent(Entity* parent, std::string scriptName); ScriptComponent(Entity* parent, const std::string& scriptName);
void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags); void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags);