From 22de531ab3b43c1db358a6510b51370d35d22113 Mon Sep 17 00:00:00 2001 From: Jett <55758076+Jettford@users.noreply.github.com> Date: Sat, 11 Dec 2021 13:57:15 +0000 Subject: [PATCH] Changes asked for by Wincent --- dGame/Entity.cpp | 4 ++-- dGame/Entity.h | 4 ++-- dGame/dGameMessages/GameMessages.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dGame/Entity.cpp b/dGame/Entity.cpp index 9f16d456..089452ae 100644 --- a/dGame/Entity.cpp +++ b/dGame/Entity.cpp @@ -1644,7 +1644,7 @@ void Entity::PickupItem(const LWOOBJID& objectID) { droppedLoot.erase(objectID); } -bool Entity::PickupCoins(uint64_t count) { // bool because we are returning whether they can pick up the coins +bool Entity::CanPickupCoins(uint64_t count) { // bool because we are returning whether they can pick up the coins if (!IsPlayer()) return false; auto droppedcoins = static_cast(this)->GetDroppedCoins(); if (count > droppedcoins) { @@ -1655,7 +1655,7 @@ bool Entity::PickupCoins(uint64_t count) { // bool because we are returning whet } } -void Entity::DropCoins(uint64_t count) { +void Entity::RegisterCoinDrop(uint64_t count) { if (!IsPlayer()) return; auto droppedcoins = static_cast(this)->GetDroppedCoins(); droppedcoins += count; diff --git a/dGame/Entity.h b/dGame/Entity.h index 4b83b894..31b2b303 100644 --- a/dGame/Entity.h +++ b/dGame/Entity.h @@ -202,8 +202,8 @@ public: void AddLootItem(const Loot::Info& info); void PickupItem(const LWOOBJID& objectID); - bool PickupCoins(uint64_t count); - void DropCoins(uint64_t count); + bool CanPickupCoins(uint64_t count); + void RegisterCoinDrop(uint64_t count); void ScheduleKillAfterUpdate(Entity* murderer = nullptr); void TriggerEvent(std::string eveneventtID, Entity* optionalTarget = nullptr); diff --git a/dGame/dGameMessages/GameMessages.cpp b/dGame/dGameMessages/GameMessages.cpp index 727c704c..fad5d7de 100644 --- a/dGame/dGameMessages/GameMessages.cpp +++ b/dGame/dGameMessages/GameMessages.cpp @@ -1032,7 +1032,7 @@ void GameMessages::SendDropClientLoot(Entity* entity, const LWOOBJID& sourceID, } if (item == LOT_NULL && currency != 0) { - entity->DropCoins(currency); + entity->RegisterCoinDrop(currency); } if (spawnPos != NiPoint3::ZERO) { @@ -5239,7 +5239,7 @@ void GameMessages::HandlePickupCurrency(RakNet::BitStream* inStream, Entity* ent if (currency == 0) return; auto* ch = entity->GetCharacter(); - if (entity->PickupCoins(currency)) { + if (entity->CanPickupCoins(currency)) { ch->SetCoins(ch->GetCoins() + currency); } }