From ca9f34574d2b8d537a49a698e034cb1486bafe7f Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Mon, 21 Mar 2022 21:32:41 +0100 Subject: [PATCH] Core/Misc: fixed a bunch of GCC warnings --- src/server/game/Handlers/QuestHandler.cpp | 2 +- src/server/game/Miscellaneous/SharedDefines.h | 2 +- .../RandomMovementGenerator.cpp | 3 +-- .../Server/Packets/AuthenticationPackets.cpp | 6 +++--- src/server/game/World/World.cpp | 6 +++--- src/server/scripts/Commands/cs_npc.cpp | 2 +- .../zone_hillsbrad_foothills.cpp | 4 ++-- .../Firelands/boss_ragnaros_firelands.cpp | 2 +- src/server/scripts/Spells/spell_druid.cpp | 2 +- src/server/scripts/Spells/spell_generic.cpp | 21 +++++++++---------- 10 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index 89b99b1da3..c6a65716f0 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -90,7 +90,7 @@ void WorldSession::HandleQuestgiverHelloOpcode(WorldPackets::Quest::QuestGiverHe // Stop the npc if moving if (uint32 pause = creature->GetMovementTemplate().GetInteractionPauseTimer()) { - creature->PauseMovement(sWorld->getIntConfig(CONFIG_CREATURE_STOP_FOR_PLAYER)); + creature->PauseMovement(pause); creature->SetHomePosition(creature->GetPosition()); } diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 63e3b06458..850e5517a9 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -296,7 +296,7 @@ inline SpellSchools GetFirstSchoolInMask(SpellSchoolMask mask) return SPELL_SCHOOL_NORMAL; } -enum ItemQualities +enum ItemQualities : uint8 { ITEM_QUALITY_POOR = 0, //GREY ITEM_QUALITY_NORMAL = 1, //WHITE diff --git a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp index b962a20039..62ef760765 100644 --- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp @@ -66,8 +66,7 @@ void RandomMovementGenerator::DoInitialize(Creature* owner) _reference = owner->GetPosition(); owner->StopMoving(); - if (_wanderDistance <= 0.1f) - _wanderDistance = std::max(_wanderDistance = owner->GetRespawnRadius(), 0.1f); + _wanderDistance = std::max(owner->GetRespawnRadius(), 0.1f); // Retail seems to let a creature walk 2 up to 10 splines before triggering a pause _wanderSteps = urand(2, 10); diff --git a/src/server/game/Server/Packets/AuthenticationPackets.cpp b/src/server/game/Server/Packets/AuthenticationPackets.cpp index 43fa22f646..1d59f747f5 100644 --- a/src/server/game/Server/Packets/AuthenticationPackets.cpp +++ b/src/server/game/Server/Packets/AuthenticationPackets.cpp @@ -337,9 +337,9 @@ WorldPacket const* WorldPackets::Auth::ConnectTo::Write() HmacSha1 hmacHash(64, WherePacketHmac); hmacHash.UpdateData(address, 16); - hmacHash.UpdateData((uint8* const)&addressType, 4); - hmacHash.UpdateData((uint8* const)&port, 2); - hmacHash.UpdateData((uint8* const)Haiku.c_str(), 73); + hmacHash.UpdateData(reinterpret_cast(&addressType), 4); + hmacHash.UpdateData(reinterpret_cast(&port), 2); + hmacHash.UpdateData(reinterpret_cast(Haiku.c_str()), 73); hmacHash.UpdateData(PiDigits, 142); hmacHash.UpdateData(&Payload.XorMagic, 1); hmacHash.Finalize(); diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 293ae2e1f2..f4fbbf8864 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -513,7 +513,7 @@ void World::LoadConfigSettings(bool reload) m_defaultDbcLocale = LocaleConstant(sConfigMgr->GetIntDefault("DBC.Locale", 0)); - if (m_defaultDbcLocale >= TOTAL_LOCALES || m_defaultDbcLocale < LOCALE_enUS || m_defaultDbcLocale == LOCALE_NONE) + if (m_defaultDbcLocale >= TOTAL_LOCALES || m_defaultDbcLocale == LOCALE_NONE) { TC_LOG_ERROR("server.loading", "Incorrect DBC.Locale! Must be >= 0 and < %d and not %d (set to 0)", TOTAL_LOCALES, LOCALE_NONE); m_defaultDbcLocale = LOCALE_enUS; @@ -1258,9 +1258,9 @@ void World::LoadConfigSettings(bool reload) m_bool_configs[CONFIG_BG_XP_FOR_KILL] = sConfigMgr->GetBoolDefault("Battleground.GiveXPForKills", false); m_int_configs[CONFIG_RATED_BATTLEGROUND_ENABLE] = sConfigMgr->GetIntDefault ("RatedBattleground.Enable", 0); - if (m_int_configs[CONFIG_RATED_BATTLEGROUND_ENABLE] < 0 || m_int_configs[CONFIG_RATED_BATTLEGROUND_ENABLE] > 3) + if (m_int_configs[CONFIG_RATED_BATTLEGROUND_ENABLE] > 3) { - TC_LOG_ERROR("server.loading", "RatedBattleground.Enable (%d) must be >= 0 and <= 3. Using 0 instead.", m_int_configs[CONFIG_RATED_BATTLEGROUND_ENABLE]); + TC_LOG_ERROR("server.loading", "RatedBattleground.Enable (%d) must be in a range between 0 and 3. Using 0 instead.", m_int_configs[CONFIG_RATED_BATTLEGROUND_ENABLE]); m_int_configs[CONFIG_RATED_BATTLEGROUND_ENABLE] = 0; } m_int_configs[CONFIG_RATED_BATTLEGROUND_REWARD] = sConfigMgr->GetIntDefault ("RatedBattleground.Reward", 40000); diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 6d20880d50..858d333155 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -1589,7 +1589,7 @@ public: if (!name) name = "Unknown item"; handler->PSendSysMessage(alternateString ? LANG_COMMAND_NPC_SHOWLOOT_ENTRY_2 : LANG_COMMAND_NPC_SHOWLOOT_ENTRY, - itemCount, ItemQualityColors[itemTemplate ? itemTemplate->GetQuality() : ITEM_QUALITY_POOR], itemId, name, itemId); + itemCount, ItemQualityColors[itemTemplate ? itemTemplate->GetQuality() : static_cast(ITEM_QUALITY_POOR)], itemId, name, itemId); } static void _IterateNotNormalLootMap(ChatHandler* handler, NotNormalLootItemMap const& map, std::vector const& items) { diff --git a/src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp b/src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp index 6770c7478f..c8e879edfc 100644 --- a/src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp +++ b/src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp @@ -490,8 +490,8 @@ struct npc_brazie_the_bonatist_vehicle : public VehicleAI case EVENT_CREATE_GHOUL: { // The tutorial quest only spawns zombies in the center lane - uint8 index = _currentLevel == LEVEL_TUTORIAL ? CENTER_ZOMBIE_LANE_INDEX : urand(0, MAX_TARGET_POSITIONS - 1); - Position pos = SpitterTargetPositions[index]; + uint8 index = _currentLevel == LEVEL_TUTORIAL ? static_cast(CENTER_ZOMBIE_LANE_INDEX) : static_cast(urand(0, MAX_TARGET_POSITIONS - 1)); + Position const& pos = SpitterTargetPositions[index]; float angle = pos.GetAngle(GoalStalkerPositions[index]); uint32 spellId = 0; diff --git a/src/server/scripts/Kalimdor/Firelands/boss_ragnaros_firelands.cpp b/src/server/scripts/Kalimdor/Firelands/boss_ragnaros_firelands.cpp index 35d0345036..0f4853eb21 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_ragnaros_firelands.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_ragnaros_firelands.cpp @@ -744,7 +744,7 @@ struct boss_ragnaros_firelands : public BossAI events.Repeat(1min); break; case EVENT_ENGULFING_FLAMES: - DoCastAOE(IsHeroic() ? SPELL_WORLD_IN_FLAMES : SPELL_ENGULFING_FLAMES, CastSpellExtraArgs().AddSpellBP0(urand(0, 2))); + DoCastAOE(IsHeroic() ? SPELL_WORLD_IN_FLAMES : static_cast(SPELL_ENGULFING_FLAMES), CastSpellExtraArgs().AddSpellBP0(urand(0, 2))); Talk(IsHeroic() ? SAY_ANNOUNCE_WORLD_IN_FLAMES : SAY_ANNOUNCE_ENGULFING_FLAMES); events.Repeat(events.IsInPhase(PHASE_TWO) ? 1min : 30s); break; diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 56d9251638..9876e7daa1 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -340,7 +340,7 @@ class spell_dru_eclipse_mastery_driver_passive : public AuraScript target->CastSpell(target, SPELL_DRUID_EUPHORIA_MANA_ENERGIZE, CastSpellExtraArgs().AddSpellBP0(euphoria->GetAmount())); // T11 Bonus - if (AuraEffect const* t11Bonus = target->GetAuraEffect(SPELL_DRUID_ITEM_T11_BALANCE_4P_BONUS, EFFECT_0)) + if (target->GetAuraEffect(SPELL_DRUID_ITEM_T11_BALANCE_4P_BONUS, EFFECT_0)) target->CastSpell(target, SPELL_DRUID_ASTRAL_ALIGNMENT, CastSpellExtraArgs().AddSpellMod(SPELLVALUE_AURA_STACK, 3)); } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index f751f1453c..68919bba20 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -4522,19 +4522,18 @@ class spell_gen_blink : public SpellScriptLoader void HandleDummy(SpellEffIndex /*effIndex*/) { - if (Unit* target = GetHitUnit()) + Unit* caster = GetCaster(); + if (!caster || !caster->IsCreature()) + return; + + Creature* creature = caster->ToCreature(); + if (Unit* target = creature->GetThreatManager().GetCurrentVictim()) { - if (Creature* caster = GetCaster()->ToCreature()) + creature->GetThreatManager().ResetThreat(target); + if (creature->IsAIEnabled()) { - if (Unit* target = caster->GetThreatManager().GetCurrentVictim()) - { - caster->GetThreatManager().ResetThreat(target); - if (caster->IsAIEnabled()) - { - caster->CastSpell(target, SPELL_BLINK_TARGET, true); - caster->AI()->AttackStart(target); - } - } + creature->CastSpell(target, SPELL_BLINK_TARGET, true); + creature->AI()->AttackStart(target); } } }