Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Misc: fixed more deprecation warnings

Browse Source
This commit is contained in:
Ovahlord committed 2023-07-07 23:52:15 +02:00
1 parent 083fb2da32
commit d6801c5dc4
9 files changed
+31 -36
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
+4 -4
View File
@@ -313,7 +313,7 @@ void BattlegroundBFG::_NodeOccupied(uint8 node, Team team)
uint8 capturedNodes = 0;
for (uint8 i = 0; i < BG_BFG_DYNAMIC_NODES_COUNT; ++i)
if (m_Nodes[i] == GetTeamIndexByTeamId(team) + BG_BFG_NODE_TYPE_OCCUPIED && !m_NodeTimers[i])
if (m_Nodes[i] == uint32(GetTeamIndexByTeamId(team)) + BG_BFG_NODE_TYPE_OCCUPIED && !m_NodeTimers[i])
++capturedNodes;
if (capturedNodes >= 5)
@@ -407,7 +407,7 @@ void BattlegroundBFG::EventPlayerClickedOnFlag(Player* source, GameObject* /*tar
{
UpdatePlayerScore(source, SCORE_BASES_ASSAULTED, 1);
m_prevNodes[node] = m_Nodes[node];
m_Nodes[node] = teamIndex + BG_BFG_NODE_TYPE_CONTESTED;
m_Nodes[node] = uint8(teamIndex) + BG_BFG_NODE_TYPE_CONTESTED;
// burn current contested banner
_DelBanner(node, BG_BFG_NODE_TYPE_CONTESTED, !teamIndex);
// create new contested banner
@@ -425,7 +425,7 @@ void BattlegroundBFG::EventPlayerClickedOnFlag(Player* source, GameObject* /*tar
{
UpdatePlayerScore(source, SCORE_BASES_DEFENDED, 1);
m_prevNodes[node] = m_Nodes[node];
m_Nodes[node] = teamIndex + BG_BFG_NODE_TYPE_OCCUPIED;
m_Nodes[node] = uint8(teamIndex) + BG_BFG_NODE_TYPE_OCCUPIED;
// burn current contested banner
_DelBanner(node, BG_BFG_NODE_TYPE_CONTESTED, !teamIndex);
// create new occupied banner
@@ -446,7 +446,7 @@ void BattlegroundBFG::EventPlayerClickedOnFlag(Player* source, GameObject* /*tar
{
UpdatePlayerScore(source, SCORE_BASES_ASSAULTED, 1);
m_prevNodes[node] = m_Nodes[node];
m_Nodes[node] = teamIndex + BG_BFG_NODE_TYPE_CONTESTED;
m_Nodes[node] = uint8(teamIndex) + BG_BFG_NODE_TYPE_CONTESTED;
// burn current occupied banner
_DelBanner(node, BG_BFG_NODE_TYPE_OCCUPIED, !teamIndex);
// create new contested banner
src/server/game/Entities/Object/Position.h
-5
View File
@@ -60,11 +60,6 @@ private:
public:
bool operator==(Position const& a) const;
inline bool operator!=(Position const& a) const
{
return !(operator==(a));
}
void Relocate(float x, float y)
{
m_positionX = x; m_positionY = y;
src/server/game/Entities/Player/Player.cpp
+6 -6
View File
@@ -2536,8 +2536,8 @@ void Player::InitStatsForLevel(bool reapplyMods)
// set armor (resistance 0) to original value (create_agility*2)
SetArmor(int32(m_createStats[STAT_AGILITY]*2));
SetFloatValue(UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE + SPELL_SCHOOL_NORMAL, 0.0f);
SetFloatValue(UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE + SPELL_SCHOOL_NORMAL, 0.0f);
SetFloatValue(UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE + AsUnderlyingType(SPELL_SCHOOL_NORMAL), 0.0f);
SetFloatValue(UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE + AsUnderlyingType(SPELL_SCHOOL_NORMAL), 0.0f);
// set other resistance to original value (0)
for (uint8 i = 1; i < MAX_SPELL_SCHOOL; ++i)
{
@@ -4950,7 +4950,7 @@ void Player::GetDodgeFromAgility(float &diminishing, float &nondiminishing) cons
if (!dodgeRatio || playerClass > MAX_CLASSES)
return;
float baseAgility = GetCreateStat(STAT_AGILITY) * GetPctModifierValue(UnitMods(UNIT_MOD_STAT_START + STAT_AGILITY), BASE_PCT);
float baseAgility = GetCreateStat(STAT_AGILITY) * GetPctModifierValue(UnitMods(UNIT_MOD_STAT_START + AsUnderlyingType(STAT_AGILITY)), BASE_PCT);
float bonusAgility = GetStat(STAT_AGILITY) - baseAgility;
// calculate diminishing (green in char screen) and non-diminishing (white) contribution
@@ -4993,7 +4993,7 @@ float Player::GetRatingMultiplier(CombatRating cr) const
float Player::GetRatingBonusValue(CombatRating cr) const
{
float baseResult = float(GetUInt32Value(PLAYER_FIELD_COMBAT_RATING_1 + cr)) * GetRatingMultiplier(cr);
float baseResult = float(GetUInt32Value(PLAYER_FIELD_COMBAT_RATING_1 + AsUnderlyingType(cr))) * GetRatingMultiplier(cr);
if (cr != CR_RESILIENCE_PLAYER_DAMAGE_TAKEN)
return baseResult;
return float(1.0f - pow(0.99f, baseResult)) * 100.0f;
@@ -5081,7 +5081,7 @@ void Player::UpdateRating(CombatRating cr)
amount += int32(CalculatePct(GetStat(Stats((*i)->GetMiscValueB())), (*i)->GetAmount()));
if (amount < 0)
amount = 0;
SetUInt32Value(PLAYER_FIELD_COMBAT_RATING_1 + cr, uint32(amount));
SetUInt32Value(PLAYER_FIELD_COMBAT_RATING_1 + AsUnderlyingType(cr), uint32(amount));
bool affectStats = CanModifyStats();
@@ -19910,7 +19910,7 @@ void Player::_SaveStats(CharacterDatabaseTransaction& trans) const
stmt->setUInt32(index++, GetUInt32Value(UNIT_FIELD_ATTACK_POWER));
stmt->setUInt32(index++, GetUInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER));
stmt->setUInt32(index++, GetBaseSpellPowerBonus());
stmt->setUInt32(index++, GetUInt32Value(PLAYER_FIELD_COMBAT_RATING_1 + CR_RESILIENCE_PLAYER_DAMAGE_TAKEN));
stmt->setUInt32(index++, GetUInt32Value(PLAYER_FIELD_COMBAT_RATING_1 + AsUnderlyingType(CR_RESILIENCE_PLAYER_DAMAGE_TAKEN)));
trans->Append(stmt);
}
src/server/game/Entities/Unit/StatSystem.cpp
+2 -2
View File
@@ -1232,14 +1232,14 @@ void Guardian::UpdateDamagePhysical(WeaponAttackType attType)
//force of nature
if (GetEntry() == ENTRY_TREANT)
{
int32 spellDmg = int32(m_owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + SPELL_SCHOOL_NATURE)) + m_owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG + SPELL_SCHOOL_NATURE);
int32 spellDmg = int32(m_owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + AsUnderlyingType(SPELL_SCHOOL_NATURE))) + m_owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG + AsUnderlyingType(SPELL_SCHOOL_NATURE));
if (spellDmg > 0)
bonusDamage = spellDmg * 0.09f;
}
//greater fire elemental
else if (GetEntry() == ENTRY_FIRE_ELEMENTAL)
{
int32 spellDmg = int32(m_owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + SPELL_SCHOOL_FIRE)) + m_owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG + SPELL_SCHOOL_FIRE);
int32 spellDmg = int32(m_owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS + AsUnderlyingType(SPELL_SCHOOL_FIRE))) + m_owner->GetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG + AsUnderlyingType(SPELL_SCHOOL_FIRE));
if (spellDmg > 0)
bonusDamage = spellDmg * 0.4f;
}
src/server/game/Entities/Unit/Unit.cpp
+8 -8
View File
@@ -4762,8 +4762,8 @@ void Unit::UpdateResistanceBuffModsMod(SpellSchools school)
modPos *= factor;
modNeg *= factor;
SetFloatValue(UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE + school, modPos);
SetFloatValue(UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE + school, modNeg);
SetFloatValue(UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE + AsUnderlyingType(school), modPos);
SetFloatValue(UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE + AsUnderlyingType(school), modNeg);
}
void Unit::InitStatBuffMods()
@@ -4829,8 +4829,8 @@ void Unit::UpdateStatBuffMod(Stats stat)
modPos *= factor;
modNeg *= factor;
SetFloatValue(UNIT_FIELD_POSSTAT0 + stat, modPos);
SetFloatValue(UNIT_FIELD_NEGSTAT0 + stat, modNeg);
SetFloatValue(UNIT_FIELD_POSSTAT0 + AsUnderlyingType(stat), modPos);
SetFloatValue(UNIT_FIELD_NEGSTAT0 + AsUnderlyingType(stat), modNeg);
}
void Unit::_RegisterDynObject(DynamicObject* dynObj)
@@ -6681,7 +6681,7 @@ float Unit::SpellCritChanceDone(SpellInfo const* spellInfo, SpellSchoolMask scho
crit_chance = 0.0f;
// For other schools
else if (GetTypeId() == TYPEID_PLAYER)
crit_chance = GetFloatValue(PLAYER_SPELL_CRIT_PERCENTAGE1 + GetFirstSchoolInMask(schoolMask));
crit_chance = GetFloatValue(PLAYER_SPELL_CRIT_PERCENTAGE1 + uint32(GetFirstSchoolInMask(schoolMask)));
else
{
crit_chance = (float)m_baseSpellCritChance;
@@ -8219,7 +8219,7 @@ float Unit::GetPowerRegen(Powers powerType, bool isInCombat) const
uint32 Unit::GetAttackTime(WeaponAttackType att) const
{
float f_BaseAttackTime = GetFloatValue(UNIT_FIELD_BASEATTACKTIME + att) / m_modAttackSpeedPct[att];
float f_BaseAttackTime = GetFloatValue(UNIT_FIELD_BASEATTACKTIME + AsUnderlyingType(att)) / m_modAttackSpeedPct[att];
return (uint32)f_BaseAttackTime;
}
@@ -10579,7 +10579,7 @@ void ApplyPercentModFloatVar(float& var, float val, bool apply)
void Unit::ApplyAttackTimePercentMod(WeaponAttackType att, float val, bool apply)
{
float amount = GetFloatValue(UNIT_FIELD_BASEATTACKTIME + att);
float amount = GetFloatValue(UNIT_FIELD_BASEATTACKTIME + AsUnderlyingType(att));
float hasteAmount = GetTypeId() == TYPEID_PLAYER ? GetFloatValue(PLAYER_FIELD_MOD_HASTE) : 0.f;
float rangedHasteAmount = GetTypeId() == TYPEID_PLAYER ? GetFloatValue(PLAYER_FIELD_MOD_RANGED_HASTE) : 0.f;
@@ -10611,7 +10611,7 @@ void Unit::ApplyAttackTimePercentMod(WeaponAttackType att, float val, bool apply
}
}
SetFloatValue(UNIT_FIELD_BASEATTACKTIME + att, amount);
SetFloatValue(UNIT_FIELD_BASEATTACKTIME + AsUnderlyingType(att), amount);
if (GetTypeId() == TYPEID_PLAYER)
{
src/server/game/Server/WorldPacket.cpp
+3 -3
View File
@@ -31,7 +31,7 @@ void WorldPacket::Compress(z_stream* compressionStream)
return;
}
uint32 opcode = uncompressedOpcode | COMPRESSED_OPCODE_MASK;
uint32 opcode = uncompressedOpcode | AsUnderlyingType(COMPRESSED_OPCODE_MASK);
uint32 size = wpos();
uint32 destsize = compressBound(size);
@@ -56,13 +56,13 @@ void WorldPacket::Compress(z_stream* compressionStream, WorldPacket const* sourc
ASSERT(source != this);
OpcodeServer uncompressedOpcode = OpcodeServer(source->GetOpcode());
if (uncompressedOpcode & COMPRESSED_OPCODE_MASK)
if (uncompressedOpcode & AsUnderlyingType(COMPRESSED_OPCODE_MASK))
{
TC_LOG_ERROR("network", "Packet with opcode 0x%04X is already compressed!", uncompressedOpcode);
return;
}
OpcodeServer opcode = OpcodeServer(uncompressedOpcode | COMPRESSED_OPCODE_MASK);
OpcodeServer opcode = OpcodeServer(uncompressedOpcode | AsUnderlyingType(COMPRESSED_OPCODE_MASK));
uint32 size = source->size();
uint32 destsize = compressBound(size);
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp
+3 -3
View File
@@ -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))
src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp
+3 -3
View File
@@ -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;
src/server/scripts/Kalimdor/CavernsOfTime/EndTime/end_time.cpp
+2 -2
View File
@@ -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());