mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-11-20 10:45:27 +00:00
refactor(entity): each component type has an allocator, as the client
DoObjectComponentLoad walks the client's load order and calls the type's allocator from a table, like ObjectLoader2, instead of one 76-case switch. Components with rules of their own have a static Allocator (the client's LWOxComponent::Allocator); the rest share a registry allocator. The load state moves to ObjectLoadState.h so the allocators can take it. Construction bytes are identical for all 15,962 LOTs. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -8,6 +8,9 @@
|
||||
#include "CheatDetection.h"
|
||||
#include "UserManager.h"
|
||||
#include "CDMissionsTable.h"
|
||||
#include "Entity.h"
|
||||
#include "ObjectLoadState.h"
|
||||
#include "ProximityMonitorComponent.h"
|
||||
|
||||
AchievementVendorComponent::AchievementVendorComponent(Entity* parent, const int32_t componentID) : BaseVendorComponent(parent, componentID) {
|
||||
}
|
||||
@@ -83,3 +86,11 @@ void AchievementVendorComponent::RefreshInventory(bool isCreation) {
|
||||
SetHasStandardCostItems(true);
|
||||
Game::entityManager->SerializeEntity(m_Parent);
|
||||
}
|
||||
|
||||
void AchievementVendorComponent::Allocator(Entity& entity, ObjectLoadState& state) {
|
||||
const auto achievementVendorID = state.GetComponentID(eReplicaComponentType::ACHIEVEMENT_VENDOR, -1);
|
||||
if (achievementVendorID > -1) {
|
||||
if (!entity.HasComponent(eReplicaComponentType::PROXIMITY_MONITOR)) entity.AddComponent<ProximityMonitorComponent>(-1);
|
||||
entity.AddComponent<AchievementVendorComponent>(achievementVendorID);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,11 +6,16 @@
|
||||
#include <set>
|
||||
#include <map>
|
||||
|
||||
struct ObjectLoadState;
|
||||
|
||||
class Entity;
|
||||
|
||||
class AchievementVendorComponent final : public BaseVendorComponent {
|
||||
public:
|
||||
static constexpr eReplicaComponentType ComponentType = eReplicaComponentType::ACHIEVEMENT_VENDOR;
|
||||
|
||||
// The client's allocator for this type (ObjectLoader2::DoObjectComponentLoad calls it in load order)
|
||||
static void Allocator(Entity& entity, ObjectLoadState& state);
|
||||
AchievementVendorComponent(Entity* parent, const int32_t componentID);
|
||||
|
||||
void LoadDataFromTemplate() override;
|
||||
|
||||
@@ -13,6 +13,9 @@
|
||||
#include "MissionComponent.h"
|
||||
#include "User.h"
|
||||
#include "UserManager.h"
|
||||
#include "Entity.h"
|
||||
#include "ObjectLoadState.h"
|
||||
#include "ProximityMonitorComponent.h"
|
||||
|
||||
DonationVendorComponent::DonationVendorComponent(Entity* parent, const int32_t componentID) : BaseVendorComponent(parent, componentID) {
|
||||
}
|
||||
@@ -108,3 +111,11 @@ void DonationVendorComponent::ConfirmDonation(Entity& player) {
|
||||
}
|
||||
characterComponent->SetCurrentInteracting(LWOOBJID_EMPTY);
|
||||
}
|
||||
|
||||
void DonationVendorComponent::Allocator(Entity& entity, ObjectLoadState& state) {
|
||||
const auto donationVendorID = state.GetComponentID(eReplicaComponentType::DONATION_VENDOR, -1);
|
||||
if (donationVendorID > -1) {
|
||||
if (!entity.HasComponent(eReplicaComponentType::PROXIMITY_MONITOR)) entity.AddComponent<ProximityMonitorComponent>(-1);
|
||||
entity.AddComponent<DonationVendorComponent>(donationVendorID);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,11 +4,16 @@
|
||||
#include "BaseVendorComponent.h"
|
||||
#include "eReplicaComponentType.h"
|
||||
|
||||
struct ObjectLoadState;
|
||||
|
||||
class Entity;
|
||||
|
||||
class DonationVendorComponent final : public BaseVendorComponent {
|
||||
public:
|
||||
static constexpr eReplicaComponentType ComponentType = eReplicaComponentType::DONATION_VENDOR;
|
||||
|
||||
// The client's allocator for this type (ObjectLoader2::DoObjectComponentLoad calls it in load order)
|
||||
static void Allocator(Entity& entity, ObjectLoadState& state);
|
||||
DonationVendorComponent(Entity* parent, const int32_t componentID);
|
||||
|
||||
void LoadConfigData() override;
|
||||
|
||||
13
dGame/dComponents/Vendor/VendorComponent.cpp
vendored
Normal file
13
dGame/dComponents/Vendor/VendorComponent.cpp
vendored
Normal file
@@ -0,0 +1,13 @@
|
||||
#include "VendorComponent.h"
|
||||
#include "Entity.h"
|
||||
#include "ObjectLoadState.h"
|
||||
#include "ProximityMonitorComponent.h"
|
||||
|
||||
void VendorComponent::Allocator(Entity& entity, ObjectLoadState& state) {
|
||||
const auto vendorID = state.GetComponentID(eReplicaComponentType::VENDOR);
|
||||
// The vendor allocators add a proximity monitor first when there is none
|
||||
if (vendorID > 0) {
|
||||
if (!entity.HasComponent(eReplicaComponentType::PROXIMITY_MONITOR)) entity.AddComponent<ProximityMonitorComponent>(-1);
|
||||
entity.AddComponent<VendorComponent>(vendorID);
|
||||
}
|
||||
}
|
||||
5
dGame/dComponents/Vendor/VendorComponent.h
vendored
5
dGame/dComponents/Vendor/VendorComponent.h
vendored
@@ -3,6 +3,8 @@
|
||||
|
||||
#include "BaseVendorComponent.h"
|
||||
|
||||
struct ObjectLoadState;
|
||||
|
||||
/**
|
||||
* A vendor (16), as the client's LWOVendorComponent: a BaseVendorComponent.
|
||||
*/
|
||||
@@ -10,6 +12,9 @@ class VendorComponent final : public BaseVendorComponent {
|
||||
public:
|
||||
static constexpr eReplicaComponentType ComponentType = eReplicaComponentType::VENDOR;
|
||||
|
||||
// The client's allocator for this type (ObjectLoader2::DoObjectComponentLoad calls it in load order)
|
||||
static void Allocator(Entity& entity, ObjectLoadState& state);
|
||||
|
||||
VendorComponent(Entity* parent, const int32_t componentID) : BaseVendorComponent(parent, componentID) {}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user