mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-18 15:58:21 +00:00
Merge branch 'master' into bot-rewrite
This commit is contained in:
@@ -1154,6 +1154,8 @@ public:
|
||||
uint32 GetTraderCount() { return m_trader_count; }
|
||||
void IncrementTraderCount() { m_trader_count += 1; }
|
||||
void DecrementTraderCount() { m_trader_count > 0 ? m_trader_count -= 1 : m_trader_count = 0; }
|
||||
void SetTraderTransactionDate() { m_trader_transaction_date = time(nullptr); }
|
||||
time_t GetTraderTransactionDate() { return m_trader_transaction_date; }
|
||||
|
||||
eqFilterMode GetFilter(eqFilterType filter_id) const { return ClientFilters[filter_id]; }
|
||||
void SetFilter(eqFilterType filter_id, eqFilterMode filter_mode) { ClientFilters[filter_id] = filter_mode; }
|
||||
@@ -1997,6 +1999,7 @@ private:
|
||||
uint8 firstlogon;
|
||||
uint32 mercid; // current merc
|
||||
uint8 mercSlot; // selected merc slot
|
||||
time_t m_trader_transaction_date;
|
||||
uint32 m_trader_count{};
|
||||
uint32 m_buyer_id;
|
||||
uint32 m_barter_time;
|
||||
|
||||
Reference in New Issue
Block a user