public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-09 00:08:01 +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

18
src/common/Common.h
View File

@@ -42,16 +42,14 @@
#define MAX_NETCLIENT_PACKET_SIZE (32767 - 1) // Client hardcap: int16 with trailing zero space otherwise crash on memory free #define MAX_NETCLIENT_PACKET_SIZE (32767 - 1) // Client hardcap: int16 with trailing zero space otherwise crash on memory free
enum TimeConstants // TimeConstants
{ constexpr auto MINUTE = 60;
MINUTE = 60, constexpr auto HOUR = MINUTE * 60;
HOUR = MINUTE * 60, constexpr auto DAY = HOUR * 24;
DAY = HOUR * 24, constexpr auto WEEK = DAY * 7;
WEEK = DAY * 7, constexpr auto MONTH = DAY * 30;
MONTH = DAY * 30, constexpr auto YEAR = MONTH * 12;
YEAR = MONTH * 12, constexpr auto IN_MILLISECONDS = 1000;
IN_MILLISECONDS = 1000
};
enum AccountTypes enum AccountTypes
{ {

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

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

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

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

4
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
View File

@@ -281,8 +281,8 @@ public:
me->CastSpell(me, me->GetMap()->IsHeroic() ? SPELL_FLAME_SPHERE_PERIODIC_H : SPELL_FLAME_SPHERE_PERIODIC, true); me->CastSpell(me, me->GetMap()->IsHeroic() ? SPELL_FLAME_SPHERE_PERIODIC_H : SPELL_FLAME_SPHERE_PERIODIC, true);
float angle = rand_norm() * 2 * M_PI; float angle = rand_norm() * 2 * M_PI;
float x = me->GetPositionX() + DATA_SPHERE_DISTANCE * cos(angle); float x = me->GetPositionX() + static_cast<float>(DATA_SPHERE_DISTANCE) * cos(angle);
float y = me->GetPositionY() + DATA_SPHERE_DISTANCE * sin(angle); float y = me->GetPositionY() + static_cast<float>(DATA_SPHERE_DISTANCE) * sin(angle);
me->GetMotionMaster()->MovePoint(0, x, y, me->GetPositionZ()); me->GetMotionMaster()->MovePoint(0, x, y, me->GetPositionZ());
} }
} }