Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-06-12 01:34:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Remove pointer usage in trading (#1988)

Browse Source 
* chore: Remove pointer usage in trading

tested that I could still do a trade

* Update TradingManager.h

* remove returned object
This commit is contained in:
David Markowitz
2026-06-09 14:05:21 -07:00
committed by GitHub
parent 93076dc36d
commit bb8f569354
3 changed files with 29 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dGame/TradingManager.h
View File

@@ -2,15 +2,16 @@
#include "Entity.h"
struct TradeItem
{
#include <map>
#include <memory>
struct TradeItem {
LWOOBJID itemId;
LOT itemLot;
uint32_t itemCount;
};
class Trade
{
class Trade {
public:
explicit Trade(LWOOBJID tradeId, LWOOBJID participantA, LWOOBJID participantB);
~Trade();
@@ -50,8 +51,7 @@ private:
};
class TradingManager
{
class TradingManager {
public:
static TradingManager* Instance() {
if (!m_Address) {
@@ -61,16 +61,13 @@ public:
return m_Address;
}
explicit TradingManager();
~TradingManager();
Trade* GetTrade(LWOOBJID tradeId) const;
Trade* GetPlayerTrade(LWOOBJID playerId) const;
const std::unique_ptr<Trade>& GetTrade(LWOOBJID tradeId) const;
const std::unique_ptr<Trade>& GetPlayerTrade(LWOOBJID playerId) const;
void CancelTrade(const LWOOBJID canceller, LWOOBJID tradeId, const bool sendCancelMessage = true);
Trade* NewTrade(LWOOBJID participantA, LWOOBJID participantB);
void NewTrade(LWOOBJID participantA, LWOOBJID participantB);
private:
static TradingManager* m_Address; //For singleton method
std::unordered_map<LWOOBJID, Trade*> trades;
std::unordered_map<LWOOBJID, std::unique_ptr<Trade>> trades;
};