From 818ad152cad0d1a28ead4508ba36ac511087d879 Mon Sep 17 00:00:00 2001 From: Aaron Kimbrell Date: Thu, 1 Oct 2026 08:08:11 -0500 Subject: [PATCH] refactor(component): vendors load their stock in LoadDataFromTemplate Co-Authored-By: Claude Opus 5.5 --- dGame/dComponents/AchievementVendorComponent.cpp | 5 +++++ dGame/dComponents/AchievementVendorComponent.h | 2 ++ dGame/dComponents/VendorComponent.cpp | 6 +++++- dGame/dComponents/VendorComponent.h | 2 ++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dGame/dComponents/AchievementVendorComponent.cpp b/dGame/dComponents/AchievementVendorComponent.cpp index ab1faa4fa..992eb4e59 100644 --- a/dGame/dComponents/AchievementVendorComponent.cpp +++ b/dGame/dComponents/AchievementVendorComponent.cpp @@ -10,6 +10,11 @@ #include "CDMissionsTable.h" AchievementVendorComponent::AchievementVendorComponent(Entity* parent, const int32_t componentID) : VendorComponent(parent, componentID) { +} + +// The base vendor's template load, then the achievement vendor's stock +void AchievementVendorComponent::LoadDataFromTemplate() { + VendorComponent::LoadDataFromTemplate(); RefreshInventory(true); }; diff --git a/dGame/dComponents/AchievementVendorComponent.h b/dGame/dComponents/AchievementVendorComponent.h index e8335714d..455db7222 100644 --- a/dGame/dComponents/AchievementVendorComponent.h +++ b/dGame/dComponents/AchievementVendorComponent.h @@ -12,6 +12,8 @@ class AchievementVendorComponent final : public VendorComponent { public: static constexpr eReplicaComponentType ComponentType = eReplicaComponentType::ACHIEVEMENT_VENDOR; AchievementVendorComponent(Entity* parent, const int32_t componentID); + + void LoadDataFromTemplate() override; void RefreshInventory(bool isCreation = false) override; bool SellsItem(Entity* buyer, const LOT lot); diff --git a/dGame/dComponents/VendorComponent.cpp b/dGame/dComponents/VendorComponent.cpp index 5de9e10cc..33c6acf7c 100644 --- a/dGame/dComponents/VendorComponent.cpp +++ b/dGame/dComponents/VendorComponent.cpp @@ -25,8 +25,12 @@ VendorComponent::VendorComponent(Entity* parent, const int32_t componentID) : Co RegisterMsg(&VendorComponent::OnRequestUse); m_HasStandardCostItems = false; m_HasMultiCostItems = false; +} + +// The vendor's constants and its stock (the base's refresh: a derived vendor adds its own after) +void VendorComponent::LoadDataFromTemplate() { SetupConstants(); - RefreshInventory(true); + VendorComponent::RefreshInventory(true); } void VendorComponent::Serialize(RakNet::BitStream& outBitStream, bool bIsInitialUpdate) { diff --git a/dGame/dComponents/VendorComponent.h b/dGame/dComponents/VendorComponent.h index 7eea71d76..c1e377a9e 100644 --- a/dGame/dComponents/VendorComponent.h +++ b/dGame/dComponents/VendorComponent.h @@ -27,6 +27,8 @@ public: static constexpr eReplicaComponentType ComponentType = eReplicaComponentType::VENDOR; VendorComponent(Entity* parent, const int32_t componentID); + void LoadDataFromTemplate() override; + void Serialize(RakNet::BitStream& outBitStream, bool bIsInitialUpdate) override; bool OnRequestUse(GameMessages::RequestUseEvent& event);