Core/Misc: fixed more deprecation warnings
This commit is contained in:
1 parent
083fb2da32
commit
d6801c5dc4
9 files changed
+31
-36
No files matched your search
+3
-3
@@ -423,7 +423,7 @@ struct boss_nefarians_end : public BossAI
|
||||
if (events.IsInPhase(PHASE_TWO) && !_elevatorLowered)
|
||||
instance->SetData(DATA_RESET_ELEVATOR, events.GetTimeUntilEvent(EVENT_ELEVATOR_LOWERED));
|
||||
else if (GameObject* transport = GetElevator())
|
||||
transport->SetGoState(GOState(GO_STATE_TRANSPORT_ACTIVE + TRANSPORT_STOP_FRAME_RAISED));
|
||||
transport->SetGoState(GOState(GO_STATE_TRANSPORT_ACTIVE + AsUnderlyingType(TRANSPORT_STOP_FRAME_RAISED)));
|
||||
|
||||
if (Creature* onyxia = instance->GetCreature(DATA_ONYXIA))
|
||||
if (onyxia->IsAlive())
|
||||
@@ -891,7 +891,7 @@ private:
|
||||
events.ScheduleEvent(EVENT_SAY_PHASE_THREE, 14s + 700ms);
|
||||
events.ScheduleEvent(EVENT_PREPARE_LANDING, 15s + 500ms, 0, PHASE_THREE);
|
||||
if (GameObject* elevator = GetElevator())
|
||||
elevator->SetGoState(GOState(GO_STATE_TRANSPORT_ACTIVE + TRANSPORT_STOP_FRAME_RAISED));
|
||||
elevator->SetGoState(GOState(GO_STATE_TRANSPORT_ACTIVE + AsUnderlyingType(TRANSPORT_STOP_FRAME_RAISED)));
|
||||
|
||||
for (ObjectGuid guid : summons)
|
||||
{
|
||||
@@ -1118,7 +1118,7 @@ struct npc_nefarians_end_lord_victor_nefarius : public PassiveAI
|
||||
break;
|
||||
case EVENT_RAISE_ELEVATOR:
|
||||
if (GameObject* elevator = _instance->GetGameObject(DATA_BLACKWING_ELEVATOR_ONYXIA))
|
||||
elevator->SetGoState(GOState(GO_STATE_TRANSPORT_ACTIVE + TRANSPORT_STOP_FRAME_RAISED));
|
||||
elevator->SetGoState(GOState(GO_STATE_TRANSPORT_ACTIVE + AsUnderlyingType(TRANSPORT_STOP_FRAME_RAISED)));
|
||||
break;
|
||||
case EVENT_CAST_TRANSFORM_VISUAL:
|
||||
if (Creature* stalker = me->FindNearestCreature(NPC_INVISIBLE_STALKER_CATACLYSM_BOSS, 1.0f))
|
||||
|
||||
@@ -314,7 +314,7 @@ enum Sounds
|
||||
MUSIC_ID_OUTRO = 26600
|
||||
};
|
||||
|
||||
enum Data
|
||||
enum Data : uint8
|
||||
{
|
||||
// Deathwing
|
||||
DATA_PLAYERS_ON_PLATFORM = 0,
|
||||
@@ -353,7 +353,7 @@ enum PhaseGroups
|
||||
};
|
||||
|
||||
// Using own types to avoid order dependencies in header file
|
||||
enum DragonAspectForLimb
|
||||
enum DragonAspectForLimb : uint8
|
||||
{
|
||||
DRAGON_ASPECT_YSERA = 0,
|
||||
DRAGON_ASPECT_KALECGOS = 1,
|
||||
@@ -557,7 +557,7 @@ struct boss_madness_of_deathwing : public BossAI
|
||||
|
||||
void SetData(uint32 type, uint32 data) override
|
||||
{
|
||||
if (type < DATA_PLAYERS_ON_PLATFORM + MAX_DRAGON_ASPECTS)
|
||||
if (type < uint32(AsUnderlyingType(DATA_PLAYERS_ON_PLATFORM) + AsUnderlyingType(MAX_DRAGON_ASPECTS)))
|
||||
{
|
||||
uint8 dragonAspect = std::max<uint8>(0, type - DATA_PLAYERS_ON_PLATFORM);
|
||||
_playersAtAspects[dragonAspect] = data;
|
||||
|
||||
@@ -199,10 +199,10 @@ struct go_end_time_time_transit_device : public GameObjectAI
|
||||
return false;
|
||||
|
||||
if (player->GetAreaId() != AREA_ID_ENTRYWAY_OF_TIME)
|
||||
AddGossipItemFor(player, GOSSIP_MENU_ID_SELECT_YOUR_DESTINATION, GOSSIP_INDEX_TELEPORT_TO_ENTRYWAY_OF_TIME, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + GOSSIP_INDEX_TELEPORT_TO_ENTRYWAY_OF_TIME);
|
||||
AddGossipItemFor(player, GOSSIP_MENU_ID_SELECT_YOUR_DESTINATION, GOSSIP_INDEX_TELEPORT_TO_ENTRYWAY_OF_TIME, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + AsUnderlyingType(GOSSIP_INDEX_TELEPORT_TO_ENTRYWAY_OF_TIME));
|
||||
|
||||
// @todo: world state based menu generation
|
||||
AddGossipItemFor(player, GOSSIP_MENU_ID_SELECT_YOUR_DESTINATION, GOSSIP_INDEX_TELEPORT_TO_BLUE_DRAGONSHRINE_FIRST_ECHO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + GOSSIP_INDEX_TELEPORT_TO_BLUE_DRAGONSHRINE_FIRST_ECHO);
|
||||
AddGossipItemFor(player, GOSSIP_MENU_ID_SELECT_YOUR_DESTINATION, GOSSIP_INDEX_TELEPORT_TO_BLUE_DRAGONSHRINE_FIRST_ECHO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + AsUnderlyingType(GOSSIP_INDEX_TELEPORT_TO_BLUE_DRAGONSHRINE_FIRST_ECHO));
|
||||
|
||||
SendGossipMenuFor(player, player->GetGossipTextId(GOSSIP_MENU_ID_SELECT_YOUR_DESTINATION, me), me->GetGUID());
|
||||
|
||||
|
||||
Reference in new issue
Block a user