diff options
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 32 | ||||
| -rwxr-xr-x | src/server/game/Entities/Player/Player.h | 16 |
2 files changed, 31 insertions, 17 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index d7e27420076..eb7208ceb46 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -7302,7 +7302,7 @@ void Player::_LoadCurrency(PreparedQueryResult result) uint16 currencyID = fields[0].GetUInt16(); CurrencyTypesEntry const* currency = sCurrencyTypesStore.LookupEntry(currencyID); - if(!currencyID) + if (!currencyID) continue; PlayerCurrency cur; @@ -7310,7 +7310,7 @@ void Player::_LoadCurrency(PreparedQueryResult result) cur.weekCount = fields[1].GetUInt32(); cur.totalCount = fields[2].GetUInt32(); - m_currencies.insert(PlayerCurrenciesMap::value_type(currencyID, cur)); + _currencyStorage.insert(PlayerCurrenciesMap::value_type(currencyID, cur)); } while (result->NextRow()); } @@ -7318,7 +7318,7 @@ void Player::_LoadCurrency(PreparedQueryResult result) void Player::_SaveCurrency(SQLTransaction& trans) { PreparedStatement* stmt = NULL; - for (PlayerCurrenciesMap::iterator itr = m_currencies.begin(); itr != m_currencies.end(); ++itr) + for (PlayerCurrenciesMap::iterator itr = _currencyStorage.begin(); itr != _currencyStorage.end(); ++itr) { CurrencyTypesEntry const* entry = sCurrencyTypesStore.LookupEntry(itr->first); if (!entry) // should never happen @@ -7352,8 +7352,8 @@ void Player::_SaveCurrency(SQLTransaction& trans) void Player::SendNewCurrency(uint32 id) const { - PlayerCurrenciesMap::const_iterator itr = m_currencies.find(id); - if (itr == m_currencies.end()) + PlayerCurrenciesMap::const_iterator itr = _currencyStorage.find(id); + if (itr == _currencyStorage.end()) return; ByteBuffer currencyData; @@ -7392,10 +7392,10 @@ void Player::SendNewCurrency(uint32 id) const void Player::SendCurrencies() const { ByteBuffer currencyData; - WorldPacket packet(SMSG_INIT_CURRENCY, 4 + m_currencies.size()*(5*4 + 1)); - packet.WriteBits(m_currencies.size(), 23); + WorldPacket packet(SMSG_INIT_CURRENCY, 4 + _currencyStorage.size()*(5*4 + 1)); + packet.WriteBits(_currencyStorage.size(), 23); - for (PlayerCurrenciesMap::const_iterator itr = m_currencies.begin(); itr != m_currencies.end(); ++itr) + for (PlayerCurrenciesMap::const_iterator itr = _currencyStorage.begin(); itr != _currencyStorage.end(); ++itr) { CurrencyTypesEntry const* entry = sCurrencyTypesStore.LookupEntry(itr->first); if (!entry) // should never happen @@ -7429,14 +7429,14 @@ void Player::SendCurrencies() const uint32 Player::GetCurrency(uint32 id) const { - PlayerCurrenciesMap::const_iterator itr = m_currencies.find(id); - return itr != m_currencies.end() ? itr->second.totalCount : 0; + PlayerCurrenciesMap::const_iterator itr = _currencyStorage.find(id); + return itr != _currencyStorage.end() ? itr->second.totalCount : 0; } bool Player::HasCurrency(uint32 id, uint32 count) const { - PlayerCurrenciesMap::const_iterator itr = m_currencies.find(id); - return itr != m_currencies.end() && itr->second.totalCount >= count; + PlayerCurrenciesMap::const_iterator itr = _currencyStorage.find(id); + return itr != _currencyStorage.end() && itr->second.totalCount >= count; } void Player::ModifyCurrency(uint32 id, int32 count, bool printLog/* = true*/) @@ -7450,15 +7450,15 @@ void Player::ModifyCurrency(uint32 id, int32 count, bool printLog/* = true*/) int32 precision = currency->Flags & CURRENCY_FLAG_HIGH_PRECISION ? 100 : 1; uint32 oldTotalCount = 0; uint32 oldWeekCount = 0; - PlayerCurrenciesMap::iterator itr = m_currencies.find(id); - if (itr == m_currencies.end()) + PlayerCurrenciesMap::iterator itr = _currencyStorage.find(id); + if (itr == _currencyStorage.end()) { PlayerCurrency cur; cur.state = PLAYERCURRENCY_NEW; cur.totalCount = 0; cur.weekCount = 0; - m_currencies[id] = cur; - itr = m_currencies.find(id); + _currencyStorage[id] = cur; + itr = _currencyStorage.find(id); } else { diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 219880df7f5..bf3d061d21e 100755 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1341,11 +1341,25 @@ class Player : public Unit, public GridObject<Player> void AddRefundReference(uint32 it); void DeleteRefundReference(uint32 it); + /// send initialization of new currency for client void SendNewCurrency(uint32 id) const; + /// send full data about all currencies to client void SendCurrencies() const; + /// return count of currency witch has plr uint32 GetCurrency(uint32 id) const; + /// return presence related currency bool HasCurrency(uint32 id, uint32 count) const; + /// @todo: not understand why it subtract from total count and for what it used. It should be remove and replaced by ModifyCurrency void SetCurrency(uint32 id, uint32 count, bool printLog = true); + + /** + * @name ModifyCurrency + * @brief Change specific currency and send result to client + + * @param id currency entry from CurrencyTypes.dbc + * @param count integer value for adding/removing curent currency + * @param printLog used on SMSG_UPDATE_CURRENCY + */ void ModifyCurrency(uint32 id, int32 count, bool printLog = true); void ApplyEquipCooldown(Item* pItem); @@ -2752,7 +2766,7 @@ class Player : public Unit, public GridObject<Player> Item* m_items[PLAYER_SLOTS_COUNT]; uint32 m_currentBuybackSlot; - PlayerCurrenciesMap m_currencies; + PlayerCurrenciesMap _currencyStorage; uint32 _GetCurrencyWeekCap(const CurrencyTypesEntry* currency) const; VoidStorageItem* _voidStorageItems[VOID_STORAGE_MAX_SLOT]; |