Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-11-14 07:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(component): the zone control object constructs as on live

Browse Source 
Minigame control (50) is an activity component in the client
(LWOMinigameComponent) and is made from the registry, so the zone control
object (LOT 2365, registry id 0) has one; it sends what an activity sends
(dirty, no players), not a fixed 0x40000000 (which nothing sent: the old
id > 0 check never made it). The zone's script on that object is server
only: the client makes no script component for it, so it sends nothing.
DLU's zone control construction now equals live's byte for byte (209
captures, e.g. GruntMonkey world2); the decoder reads 50 as an activity.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-10-01 14:29:02 -05:00
parent 0e611bc76c
commit 0138d45c58
7 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dGame/Entity.cpp
View File

@@ -585,7 +585,8 @@ void Entity::Initialize() {
if (zoneData != nullptr) {
const int32_t zoneScriptID = zoneData->scriptID;
CDScriptComponent zoneScriptData = scriptCompTable->GetByID(zoneScriptID);
AddComponent<ScriptComponent>(zoneScriptID, zoneScriptData.script_name, true, false);
// A server script only: the client has no script component on the zone control object (live sent none)
AddComponent<ScriptComponent>(zoneScriptID, zoneScriptData.script_name, false, false);
}
}
break;
@@ -797,8 +798,9 @@ void Entity::Initialize() {
break;
}
case eReplicaComponentType::MINI_GAME_CONTROL: {
const auto minigameControlID = compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::MINI_GAME_CONTROL);
if (minigameControlID > 0) {
// The client makes it from the registry (the zone control object's id is 0)
const auto minigameControlID = compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::MINI_GAME_CONTROL, -1);
if (minigameControlID > -1) {
AddComponent<MiniGameControlComponent>(minigameControlID);
}
break;

1
dGame/dComponents/CMakeLists.txt
View File

@@ -47,7 +47,6 @@ set(DGAME_DCOMPONENTS_SOURCES
"TriggerComponent.cpp"
"HavokVehiclePhysicsComponent.cpp"
"VendorComponent.cpp"
"MiniGameControlComponent.cpp"
"ScriptComponent.cpp"
)

5
dGame/dComponents/MiniGameControlComponent.cpp
View File

@@ -1,5 +0,0 @@
#include "MiniGameControlComponent.h"
void MiniGameControlComponent::Serialize(RakNet::BitStream& outBitStream, bool isConstruction) {
outBitStream.Write<uint32_t>(0x40000000);
}

11
dGame/dComponents/MiniGameControlComponent.h
View File

@@ -1,15 +1,18 @@
#ifndef __MINIGAMECONTROLCOMPONENT__H__
#define __MINIGAMECONTROLCOMPONENT__H__
#include "Component.h"
#include "ActivityComponent.h"
#include "eReplicaComponentType.h"
class MiniGameControlComponent final : public Component {
/**
* Minigame control (50), the zone control object's: an activity component as in the client (LWOMinigameComponent),
* which also sends what an activity sends.
*/
class MiniGameControlComponent final : public ActivityComponent {
public:
static constexpr eReplicaComponentType ComponentType = eReplicaComponentType::MINI_GAME_CONTROL;
MiniGameControlComponent(Entity* parent, const int32_t componentID) : Component(parent, componentID) {}
void Serialize(RakNet::BitStream& outBitStream, bool isConstruction);
MiniGameControlComponent(Entity* parent, const int32_t componentID) : ActivityComponent(parent, componentID) {}
};
#endif //!__MINIGAMECONTROLCOMPONENT__H__

2
dGame/dComponents/ScriptComponent.cpp
View File

@@ -20,6 +20,8 @@ ScriptComponent::ScriptComponent(Entity* parent, const int32_t componentID, cons
}
void ScriptComponent::Serialize(RakNet::BitStream& outBitStream, bool bIsInitialUpdate) {
// A server-only script (the zone control object's) sends nothing: the client made no script component for it
if (!m_Serialized) return;
if (bIsInitialUpdate) {
const auto& networkSettings = m_Parent->GetNetworkSettings();
auto hasNetworkSettings = !networkSettings.values.empty();

4
dGame/dComponents/ScriptComponent.h
View File

@@ -35,7 +35,7 @@ public:
CppScripts::Script* const GetScript();
/**
* Sets whether the entity should be serialized, unused
* Sets whether the component is serialized (false: a server-only script the client has no component for)
* @param var whether the entity should be serialized
*/
void SetSerialized(const bool var) { m_Serialized = var; }
@@ -69,7 +69,7 @@ private:
CppScripts::Script* m_Script;
/**
* Whether or not the comp should be serialized, unused
* Whether the component is serialized (false: a server-only script the client has no component for)
*/
bool m_Serialized;

3
dGame/dUtilities/ReplicaDecoder.cpp
View File

@@ -690,7 +690,8 @@ namespace {
}
j["effects"] = effects;
} },
{ MINI_GAME_CONTROL, [](Reader& r, json& j, bool, const auto&) { j["value"] = r.Get<uint32_t>(); } },
// An activity component (LWOMinigameComponent), as the scripted activity
{ MINI_GAME_CONTROL, [](Reader& r, json& j, bool, const auto&) { if (r.Bit()) j["players"] = ActivityPlayers(r); } },
};
return readers;
}