diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-04-26 01:25:50 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-04-26 01:25:50 +0200 |
| commit | 7272508cb4b51ec5591b6f0e542ea29091db7546 (patch) | |
| tree | 8116597f80245ecd0a7e0b0d70e82647cb3175ce /src/server/game/Entities | |
| parent | 70c2b4e5baeed0034bbde1fe345267b2b1c2154f (diff) | |
Core: Fix clang 10 warnings
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Object/Position.h | 9 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/server/game/Entities/Object/Position.h b/src/server/game/Entities/Object/Position.h index f247c7fb860..3268000121b 100644 --- a/src/server/game/Entities/Object/Position.h +++ b/src/server/game/Entities/Object/Position.h @@ -60,6 +60,12 @@ private: float m_orientation; public: + Position& operator=(Position const& loc) + { + Relocate(loc); + return *this; + } + bool operator==(Position const &a) const; inline bool operator!=(Position const &a) const @@ -242,9 +248,6 @@ public: WorldLocation(uint32 mapId, Position const& position) : Position(position), m_mapId(mapId) { } - WorldLocation(WorldLocation const& loc) - : Position(loc), m_mapId(loc.GetMapId()) { } - void WorldRelocate(WorldLocation const& loc) { m_mapId = loc.GetMapId(); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 5f2199d9f52..ecae26fae8f 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -23180,7 +23180,7 @@ bool Player::BuyItemFromVendorSlot(ObjectGuid vendorguid, uint32 vendorslot, uin uint64 price = 0; if (crItem->IsGoldRequired(pProto) && pProto->GetBuyPrice() > 0) //Assume price cannot be negative (do not know why it is int32) { - float buyPricePerItem = float(pProto->GetBuyPrice()) / pProto->GetBuyCount(); + double buyPricePerItem = double(pProto->GetBuyPrice()) / pProto->GetBuyCount(); uint64 maxCount = MAX_MONEY_AMOUNT / buyPricePerItem; if ((uint64)count > maxCount) { |