I hope this works

This commit is contained in:
David Markowitz
2023-06-06 20:48:30 -07:00
parent 716a5fcf37
commit ea9d0d8592
25 changed files with 1024 additions and 1014 deletions

View File

@@ -114,10 +114,10 @@ void Trade::Complete() {
if (entityA == nullptr || entityB == nullptr) return;
auto* inventoryA = entityA->GetComponent<InventoryComponent>();
auto* inventoryB = entityB->GetComponent<InventoryComponent>();
auto* missionsA = entityA->GetComponent<MissionComponent>();
auto* missionsB = entityB->GetComponent<MissionComponent>();
auto inventoryA = entityA->GetComponent<InventoryComponent>();
auto inventoryB = entityB->GetComponent<InventoryComponent>();
auto missionsA = entityA->GetComponent<MissionComponent>();
auto missionsB = entityB->GetComponent<MissionComponent>();
auto* characterA = entityA->GetCharacter();
auto* characterB = entityB->GetCharacter();
@@ -214,12 +214,12 @@ void Trade::SendUpdateToOther(LWOOBJID participant) {
std::vector<TradeItem> items{};
auto* inventoryComponent = self->GetComponent<InventoryComponent>();
auto inventoryComponent = self->GetComponent<InventoryComponent>();
if (inventoryComponent == nullptr) return;
for (const auto tradeItem : itemIds) {
auto* item = inventoryComponent->FindItemById(tradeItem.itemId);
auto item = inventoryComponent->FindItemById(tradeItem.itemId);
if (item == nullptr) return;