diff options
author | Shauren <shauren.trinity@gmail.com> | 2016-05-11 16:52:39 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2016-05-11 16:52:39 +0200 |
commit | c9ba5ce591a8b4ef5dc0e73d0ce107b6acf5e969 (patch) | |
tree | 87471ceff7b6d91a8fc0c499fea20d0bf7648a07 /src | |
parent | cccdbf4755f189f93cbca42ba632d71f40c02318 (diff) |
Core/Misc: Warning fixes (/W4)
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/BlackMarket/BlackMarketMgr.h | 4 | ||||
-rw-r--r-- | src/server/game/Maps/MapManager.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/BlackMarket/BlackMarketMgr.h b/src/server/game/BlackMarket/BlackMarketMgr.h index b386991e2af..3c71b43199d 100644 --- a/src/server/game/BlackMarket/BlackMarketMgr.h +++ b/src/server/game/BlackMarket/BlackMarketMgr.h @@ -78,8 +78,8 @@ public: BlackMarketTemplate const* GetTemplate() const; int32 GetMarketId() const { return _marketId; } - uint32 GetCurrentBid() const { return _currentBid; } - void SetCurrentBid(uint32 bid) { _currentBid = bid; } + uint64 GetCurrentBid() const { return _currentBid; } + void SetCurrentBid(uint64 bid) { _currentBid = bid; } int32 GetNumBids() const { return _numBids; } void SetNumBids(int32 numBids) { _numBids = numBids; } diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h index a7fdc37d324..91a26c29150 100644 --- a/src/server/game/Maps/MapManager.h +++ b/src/server/game/Maps/MapManager.h @@ -126,9 +126,9 @@ class TC_GAME_API MapManager template<typename Worker> void DoForAllMapsWithMapId(uint32 mapId, Worker&& worker); - uint32 IncreaseScheduledScriptsCount() { return ++_scheduledScripts; } - uint32 DecreaseScheduledScriptCount() { return --_scheduledScripts; } - uint32 DecreaseScheduledScriptCount(size_t count) { return _scheduledScripts -= count; } + void IncreaseScheduledScriptsCount() { ++_scheduledScripts; } + void DecreaseScheduledScriptCount() { --_scheduledScripts; } + void DecreaseScheduledScriptCount(std::size_t count) { _scheduledScripts -= count; } bool IsScriptScheduled() const { return _scheduledScripts > 0; } private: @@ -157,7 +157,7 @@ class TC_GAME_API MapManager MapUpdater m_updater; // atomic op counter for active scripts amount - std::atomic<uint32> _scheduledScripts; + std::atomic<std::size_t> _scheduledScripts; }; template<typename Worker> |