nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-24 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Common): -Wdeprecated-enum-float-conversion warning (#6870)

Browse Source
This commit is contained in:
Francesco Borzì
2021-07-11 18:05:07 +02:00
committed by GitHub
parent 9b3993ba0b
commit d92a2ce58b
4 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
View File

@@ -12,7 +12,6 @@
#include "DatabaseEnv.h"
#include "DBCStores.h"
#include "Item.h"
#include "Language.h"
#include "Logging/Log.h"
#include "ObjectMgr.h"
#include "Player.h"
@@ -22,10 +21,7 @@
#include "WorldSession.h"
#include <vector>
enum eAuctionHouse
{
AH_MINIMUM_DEPOSIT = 100,
};
constexpr auto AH_MINIMUM_DEPOSIT = 100;
AuctionHouseMgr::AuctionHouseMgr()
{
@@ -563,7 +559,7 @@ bool AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player
for (AuctionEntryMap::const_iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end(); ++itr)
{
if (AsyncAuctionListingMgr::IsAuctionListingAllowed() == false) // pussywizard: World::Update is waiting for us...
if (!AsyncAuctionListingMgr::IsAuctionListingAllowed()) // pussywizard: World::Update is waiting for us...
if ((itrcounter++) % 100 == 0) // check condition every 100 iterations
if (avgDiffTracker.getAverage() >= 30 || getMSTimeDiff(World::GetGameTimeMS(), getMSTime()) >= 10) // pussywizard: stop immediately if diff is high or waiting too long
return false;

5
src/server/game/Battlefield/Battlefield.h
View File

@@ -44,10 +44,7 @@ enum BattlefieldSounds
BF_START = 3439
};
enum BattlefieldTimers
{
BATTLEFIELD_OBJECTIVE_UPDATE_INTERVAL = 1000
};
constexpr auto BATTLEFIELD_OBJECTIVE_UPDATE_INTERVAL = 1000;
const uint32 BattlefieldFactions[BG_TEAMS_COUNT] =
{