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

Core/Misc: fixed gcc warnings

Browse Source
This commit is contained in:
Ovahlord committed 2020-04-04 20:20:41 +02:00
1 parent 31b86c20e3
commit 77cf10ee5f
29 files changed
+59 -46
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Entities/Player/Player.cpp
+3 -3
View File
@@ -9530,7 +9530,7 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
data << uint32(4882) << uint32(0); // 10 WORLD_STATE_HOR_WAVE_COUNT
}
break;
// No break here, intended.
[[fallthrough]];
default:
data << uint32(0x914) << uint32(0x0); // 7
data << uint32(0x913) << uint32(0x0); // 8
@@ -18668,7 +18668,7 @@ void Player::LoadPetsFromDB(PreparedQueryResult result)
uint8 slot = fields[7].GetUInt8();
uint32 petId = fields[0].GetUInt32();
if (slot < PET_SLOT_FIRST || slot > PET_SLOT_LAST)
if (slot > PET_SLOT_LAST)
{
TC_LOG_ERROR("sql.sql", "Player::LoadPetsFromDB: bad slot %u for pet %u!", slot, petId);
continue;
@@ -24530,7 +24530,7 @@ void Player::UpdateVisibleGameobjectsOrSpellClicks()
SpellClickInfoMapBounds clickPair = sObjectMgr->GetSpellClickInfoMapBounds(obj->GetEntry());
for (SpellClickInfoContainer::const_iterator _itr = clickPair.first; _itr != clickPair.second; ++_itr)
{
if (ConditionContainer const* conds = sConditionMgr->GetConditionsForSpellClickEvent(obj->GetEntry(), _itr->second.spellId))
if (sConditionMgr->GetConditionsForSpellClickEvent(obj->GetEntry(), _itr->second.spellId))
{
obj->BuildValuesUpdateBlockForPlayer(&udata, this);
break;
src/server/game/Entities/Unit/Unit.cpp
+4 -1
View File
@@ -870,6 +870,7 @@ uint32 Unit::DealDamage(Unit* victim, uint32 damage, CleanDamage const* cleanDam
{
case OFF_ATTACK:
rage /= 2;
[[fallthrough]];
case BASE_ATTACK:
RewardRage(rage, true);
break;
@@ -6900,7 +6901,7 @@ float Unit::SpellDamagePctDone(Unit* victim, SpellInfo const* spellProto, Damage
}
// Add SPELL_AURA_MOD_DAMAGE_FROM_MANA percent bonus
if (int32 mana = GetPower(POWER_MANA))
if (getPowerType() == POWER_MANA)
{
int32 masteryBonus = owner->GetTotalAuraModifier(SPELL_AURA_MOD_DAMAGE_FROM_MANA);
float manaPct = 100.f * GetPower(POWER_MANA) / GetMaxPower(POWER_MANA);
@@ -13121,9 +13122,11 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form, uint32 spellId) const
return 37174;
if (getRace() == RACE_WORGEN)
return 37173;
return 15374;
case FORM_GHOSTWOLF:
if (HasAura(58135)) //! Glyph of Arctic Wolf
return 27312;
return 4613;
default:
break;
}
src/server/game/Entities/Vehicle/Vehicle.cpp
+1 -1
View File
@@ -84,7 +84,7 @@ void Vehicle::Install()
_me->setPowerType(POWER_ENERGY);
}
if (Creature* creature = _me->ToCreature())
if (_me->IsCreature())
{
switch (_vehicleInfo->PowerDisplayID[0])
{
src/server/game/Handlers/GuildHandler.cpp
+6 -1
View File
@@ -727,13 +727,18 @@ void WorldSession::HandleGuildSetAchievementTracking(WorldPacket& recvPacket)
guild->HandleSetAchievementTracking(this, achievementIds);
}
void WorldSession::HandleGuildSwitchRank(WorldPacket& recvPacket)
void WorldSession::HandleGuildSwitchRank(WorldPacket& /*recvPacket*/)
{
/*
To-do: handle this
uint32 rank;
bool direction; // if its true, then the rank rises, if no, it goes down
recvPacket >> rank;
direction = recvPacket.ReadBit();
*/
Guild* guild = GetPlayer()->GetGuild();
src/server/game/Handlers/LFGHandler.cpp
-1
View File
@@ -445,7 +445,6 @@ void WorldSession::SendLfgJoinResult(lfg::LfgJoinResultData const& joinData)
WorldPackets::LFG::LFGJoinBlackList& blackList = lfgJoinResult.BlackList.back();
blackList.Guid = it->first;
ObjectGuid playerGuid = it->first;
for (lfg::LfgLockMap::const_iterator itr = it->second.begin(); itr != it->second.end(); ++itr)
{
TC_LOG_TRACE("lfg", "SendLfgJoinResult:: %s DungeonID: %u Lock status: %u Required itemLevel: %u Current itemLevel: %f",
src/server/game/Handlers/NPCHandler.cpp
+1 -1
View File
@@ -418,7 +418,7 @@ void WorldSession::HandleSetPetSlot(WorldPacket& recvData)
return;
}
if (new_slot > PET_SLOT_LAST_STABLE_SLOT || new_slot < PET_SLOT_FIRST_ACTIVE_SLOT)
if (new_slot > PET_SLOT_LAST_STABLE_SLOT)
{
SendStableResult(STABLE_ERR_STABLE);
return;
src/server/game/Handlers/TradeHandler.cpp
+5 -4
View File
@@ -72,11 +72,12 @@ void WorldSession::SendTradeStatus(TradeStatusInfo const& info)
case TRADE_STATUS_NOT_ON_TAPLIST:
data << uint8(info.Slot); // Trade slot; -1 here clears CGTradeInfo::m_tradeMoney
break;
case TRADE_STATUS_CURRENCY: // Not implemented
case TRADE_STATUS_CURRENCY_NOT_TRADABLE: // Not implemented
case TRADE_STATUS_CURRENCY: // Not implemented
case TRADE_STATUS_CURRENCY_NOT_TRADABLE: // Not implemented
// Blizzard never implemented these, you can only trade currency with the field9 & 1 in CurrencyTypes.DBC, and only two test currencies have that flag
data << uint32(0); // Trading Currency Id
data << uint32(0); // Trading Currency Amount
data << uint32(0); // Trading Currency Id
data << uint32(0); // Trading Currency Amount
break;
default:
data.FlushBits();
break;
src/server/game/Spells/Auras/SpellAuraEffects.cpp
+1
View File
@@ -620,6 +620,7 @@ void AuraEffect::CalculatePeriodic(Unit* caster, bool resetPeriodicTimer /*= tru
// 3 spells have no amplitude set
if (!m_amplitude)
m_amplitude = 1 * IN_MILLISECONDS;
[[fallthrough]];
case SPELL_AURA_PERIODIC_DAMAGE:
case SPELL_AURA_PERIODIC_HEAL:
case SPELL_AURA_OBS_MOD_HEALTH:
src/server/game/Spells/Spell.cpp
+2 -2
View File
@@ -1877,7 +1877,7 @@ uint32 Spell::GetSearcherTypeMask(SpellTargetObjectTypes objType, ConditionConta
retMask &= GRID_MAP_TYPE_MASK_PLAYER | GRID_MAP_TYPE_MASK_CREATURE;
break;
}
// No break here
[[fallthrough]];
case TARGET_OBJECT_TYPE_CORPSE:
case TARGET_OBJECT_TYPE_CORPSE_ENEMY:
case TARGET_OBJECT_TYPE_CORPSE_ALLY:
@@ -3496,7 +3496,7 @@ void Spell::_cast(bool skipCheck)
if (aura_effmask)
{
bool const triggered = m_triggeredByAuraSpell != nullptr;
if (DiminishingGroup diminishGroup = m_spellInfo->GetDiminishingReturnsGroupForSpell(triggered))
if (m_spellInfo->GetDiminishingReturnsGroupForSpell(triggered))
{
DiminishingReturnsType type = m_spellInfo->GetDiminishingReturnsGroupType(triggered);
if (type == DRTYPE_ALL || (type == DRTYPE_PLAYER && target->IsAffectedByDiminishingReturns()))
src/server/game/Spells/SpellEffects.cpp
+2 -2
View File
@@ -2527,7 +2527,7 @@ void Spell::EffectTameCreature(SpellEffIndex /*effIndex*/)
if (m_caster->GetTypeId() == TYPEID_PLAYER)
{
pet->SavePetToDB(PET_SAVE_NEW_PET);
if (uint8 slot = pet->GetSlot() <= PET_SLOT_LAST_ACTIVE_SLOT)
if (pet->GetSlot() <= PET_SLOT_LAST_ACTIVE_SLOT)
{
m_caster->ToPlayer()->GetSession()->SendPetAdded(pet->GetSlot(), pet->GetCharmInfo()->GetPetNumber(), creatureTarget->GetEntry(), creatureTarget->getLevel(), pet->GetName());
m_caster->ToPlayer()->PetSpellInitialize();
@@ -3727,7 +3727,7 @@ void Spell::EffectActivateObject(SpellEffIndex effIndex)
break;
case GameObjectActions::OpenAndUnlock:
gameObjTarget->UseDoorOrButton(0, false, m_caster);
// no break
[[fallthrough]];
case GameObjectActions::Unlock:
case GameObjectActions::Lock:
gameObjTarget->ApplyModFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED, action == GameObjectActions::Lock);
src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.cpp
+2 -2
View File
@@ -67,13 +67,13 @@ struct npc_tott_ozumat_vehicle_big : public ScriptedAI
switch (eventId)
{
case EVENT_CHANGE_TO_SHOCK_SEAT:
if (Vehicle* vehicle = me->GetVehicleKit())
if (me->GetVehicleKit())
if (Creature* ozumat = _instance->GetCreature(DATA_OZUMAT_PASSENGER))
ozumat->EnterVehicle(me, SEAT_DEFENSE_SYSTEM);
_events.ScheduleEvent(EVENT_CHANGE_TO_ESCAPE_SEAT, 29s);
break;
case EVENT_CHANGE_TO_ESCAPE_SEAT:
if (Vehicle* vehicle = me->GetVehicleKit())
if (me->GetVehicleKit())
{
if (Creature* ozumat = _instance->GetCreature(DATA_OZUMAT_PASSENGER))
{
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp
+1 -1
View File
@@ -301,7 +301,7 @@ struct boss_jindo_the_godbreaker : public BossAI
summon->CastSpell(summon, SPELL_HAKKARS_CHAINS);
summon->SetReactState(REACT_PASSIVE);
summon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
// no break here
[[fallthrough]];
case NPC_JINDO_THE_GODBREAKER:
case NPC_SPIRIT_OF_HAKKAR:
case NPC_GURUBASHI_SPIRIT:
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
+1 -1
View File
@@ -109,7 +109,7 @@ class boss_salramm : public CreatureScript
break;
case EVENT_EXPLODE_GHOUL2:
events.ScheduleEvent(EVENT_SUMMON_GHOULS, Seconds(4));
// intentional missing break
[[fallthrough]];
case EVENT_EXPLODE_GHOUL1:
Talk(SAY_EXPLODE_GHOUL);
DoCastAOE(SPELL_EXPLODE_GHOUL, true);
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+1 -1
View File
@@ -360,7 +360,7 @@ class npc_chromie_start : public CreatureScript
break;
case GOSSIP_OFFSET_SKIP_1:
AdvanceDungeonFar();
// intentional missing break
[[fallthrough]];
case GOSSIP_OFFSET_TELEPORT:
CloseGossipMenuFor(player);
me->CastSpell(player, SPELL_TELEPORT_PLAYER);
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp
+1 -1
View File
@@ -1098,7 +1098,7 @@ public:
{
std::list<Creature*>::iterator it = nearbyVictims.begin();
std::advance(it, urand(0, nearbyVictims.size()-1));
Emote emote;
Emote emote = EMOTE_ONESHOT_NONE;
switch (urand(0, 3))
{
case 0:
src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp
+1 -1
View File
@@ -561,7 +561,7 @@ struct boss_madness_of_deathwing : public BossAI
void SetData(uint32 type, uint32 data) override
{
if (type >= DATA_PLAYERS_ON_PLATFORM && type < DATA_PLAYERS_ON_PLATFORM + MAX_DRAGON_ASPECTS)
if (type < DATA_PLAYERS_ON_PLATFORM + MAX_DRAGON_ASPECTS)
{
uint8 dragonAspect = std::max<uint8>(0, type - DATA_PLAYERS_ON_PLATFORM);
_playersAtAspects[dragonAspect] = data;
src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
+1
View File
@@ -209,6 +209,7 @@ class instance_halls_of_origination : public InstanceMapScript
case NPC_ALPHA_BEAM:
if (Creature* anraphet = GetCreature(DATA_ANRAPHET))
anraphet->AI()->JustSummoned(creature);
break;
case NPC_CAVE_IN_STALKER:
_anhuurEncounterGUIDs.insert(creature->GetGUID());
if (creature->GetPositionZ() <= 70.0f)
src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp
+1
View File
@@ -167,6 +167,7 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript
case DATA_HIGH_PROPHET_BARIM:
if (state == FAIL)
repenteanceGUIDs.clear();
[[fallthrough]];
case DATA_GENERAL_HUSAM:
case DATA_LOCKMAW_AND_AUGH:
if (state == DONE && IsSiamatEnabled())
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+1 -1
View File
@@ -772,7 +772,7 @@ struct npc_hadronox_foeAI : public ScriptedAI
me->GetMotionMaster()->MovePoint(MOVE_DOWNSTAIRS_2, downstairsMoves2[_mySpawn]);
break;
}
// intentional missing break
[[fallthrough]];
case MOVE_HADRONOX:
case MOVE_HADRONOX_REAL:
{
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_general_zarithrian.cpp
+1 -1
View File
@@ -136,7 +136,7 @@ class boss_general_zarithrian : public CreatureScript
{
case EVENT_SUMMON_ADDS:
Talk(SAY_ADDS);
// no break
[[fallthrough]];
case EVENT_SUMMON_ADDS2:
{
if (Creature* stalker1 = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_ZARITHRIAN_SPAWN_STALKER_1)))
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+1 -1
View File
@@ -160,7 +160,7 @@ class instance_halls_of_reflection : public InstanceMapScript
case NPC_WORLD_TRIGGER:
if (!creature->GetTransport())
break;
// no break
[[fallthrough]];
case NPC_GUNSHIP_CANNON_HORDE:
GunshipCannonGUIDs.insert(creature->GetGUID());
break;
src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
+1 -1
View File
@@ -230,7 +230,7 @@ class boss_lord_marrowgar : public CreatureScript
me->SetSpeedRate(MOVE_RUN, _baseSpeed*3.0f);
Talk(SAY_BONE_STORM);
events.ScheduleEvent(EVENT_BONE_STORM_END, _boneStormDuration+1);
// no break here
[[fallthrough]];
case EVENT_BONE_STORM_MOVE:
{
events.ScheduleEvent(EVENT_BONE_STORM_MOVE, _boneStormDuration/3);
src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+8 -8
View File
@@ -1052,7 +1052,7 @@ class instance_icecrown_citadel : public InstanceMapScript
case DATA_THE_LICH_KING:
if (GetBossState(DATA_PROFESSOR_PUTRICIDE) != DONE)
return false;
// no break
[[fallthrough]];
case DATA_PROFESSOR_PUTRICIDE:
if (GetBossState(DATA_FESTERGUT) != DONE || GetBossState(DATA_ROTFACE) != DONE)
return false;
@@ -1071,7 +1071,7 @@ class instance_icecrown_citadel : public InstanceMapScript
case DATA_THE_LICH_KING:
if (GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) != DONE)
return false;
// no break
[[fallthrough]];
case DATA_BLOOD_QUEEN_LANA_THEL:
if (GetBossState(DATA_BLOOD_PRINCE_COUNCIL) != DONE)
return false;
@@ -1090,7 +1090,7 @@ class instance_icecrown_citadel : public InstanceMapScript
case DATA_THE_LICH_KING:
if (GetBossState(DATA_SINDRAGOSA) != DONE)
return false;
// no break
[[fallthrough]];
case DATA_SINDRAGOSA:
if (GetBossState(DATA_VALITHRIA_DREAMWALKER) != DONE)
return false;
@@ -1116,19 +1116,19 @@ class instance_icecrown_citadel : public InstanceMapScript
case DATA_FESTERGUT:
if (GetBossState(DATA_DEATHBRINGER_SAURFANG) != DONE)
return false;
// no break
[[fallthrough]];
case DATA_DEATHBRINGER_SAURFANG:
if (GetBossState(DATA_ICECROWN_GUNSHIP_BATTLE) != DONE)
return false;
// no break
[[fallthrough]];
case DATA_ICECROWN_GUNSHIP_BATTLE:
if (GetBossState(DATA_LADY_DEATHWHISPER) != DONE)
return false;
// no break
[[fallthrough]];
case DATA_LADY_DEATHWHISPER:
if (GetBossState(DATA_LORD_MARROWGAR) != DONE)
return false;
// no break
[[fallthrough]];
case DATA_LORD_MARROWGAR:
default:
break;
@@ -1253,7 +1253,7 @@ class instance_icecrown_citadel : public InstanceMapScript
case EVENT_ENEMY_GUNSHIP_COMBAT:
if (Creature* captain = source->FindNearestCreature(TeamInInstance == HORDE ? NPC_IGB_HIGH_OVERLORD_SAURFANG : NPC_IGB_MURADIN_BRONZEBEARD, 100.0f))
captain->AI()->DoAction(ACTION_ENEMY_GUNSHIP_TALK);
// no break;
[[fallthrough]];
case EVENT_PLAYERS_GUNSHIP_SPAWN:
case EVENT_PLAYERS_GUNSHIP_COMBAT:
if (GameObject* go = source->ToGameObject())
src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+1 -1
View File
@@ -593,7 +593,7 @@ struct npc_gothik_minion_baseAI : public ScriptedAI
{
case ACTION_GATE_OPENED:
_gateIsOpen = true;
// intentional missing break
[[fallthrough]];
case ACTION_ACQUIRE_TARGET:
if (Player* target = FindEligibleTarget(me, _gateIsOpen))
{
src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
+3 -3
View File
@@ -735,7 +735,7 @@ class boss_leviathan_mk_ii : public CreatureScript
DoCast(me, SPELL_EMERGENCY_MODE);
DoCastAOE(SPELL_EMERGENCY_MODE_TURRET);
events.ScheduleEvent(EVENT_FLAME_SUPPRESSANT_MK, 60000, 0, PHASE_LEVIATHAN_MK_II);
// Missing break intended.
[[fallthrough]];
case DO_START_MKII:
me->SetReactState(REACT_AGGRESSIVE);
events.SetPhase(PHASE_LEVIATHAN_MK_II);
@@ -979,7 +979,7 @@ class boss_vx_001 : public CreatureScript
DoCast(me, SPELL_EMERGENCY_MODE);
events.ScheduleEvent(EVENT_FROST_BOMB, 1000);
events.ScheduleEvent(EVENT_FLAME_SUPPRESSANT_VX, 6000);
// Missing break intended.
[[fallthrough]];
case DO_START_VX001:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_IMMUNE_TO_PC);
me->RemoveAurasDueToSpell(SPELL_FREEZE_ANIM);
@@ -1155,7 +1155,7 @@ class boss_aerial_command_unit : public CreatureScript
fireFigther = true;
DoCast(me, SPELL_EMERGENCY_MODE);
events.ScheduleEvent(EVENT_SUMMON_FIRE_BOTS, 1000, 0, PHASE_AERIAL_COMMAND_UNIT);
// Missing break intended.
[[fallthrough]];
case DO_START_AERIAL:
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_IMMUNE_TO_PC);
me->SetReactState(REACT_AGGRESSIVE);
src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+1 -1
View File
@@ -736,7 +736,7 @@ class instance_violet_hold : public InstanceMapScript
guard->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
}
}
// no break
[[fallthrough]];
default:
if (boss->isDead())
{
src/server/scripts/Northrend/zone_sholazar_basin.cpp
+4 -5
View File
@@ -518,12 +518,10 @@ public:
{
case EVENT_MISS_BIRD:
{
Creature* crunchy = shooter->FindNearestCreature(NPC_CRUNCHY, 30);
Creature* bird = shooter->FindNearestCreature(NPC_THICKBIRD, 30);
Creature* crunchy = shooter->FindNearestCreature(NPC_CRUNCHY, 30.f);
Creature* bird = shooter->FindNearestCreature(NPC_THICKBIRD, 30.f);
if (!bird || !crunchy)
; // fall to EVENT_MISS
else
if (bird && crunchy)
{
shooter->CastSpell(bird, SPELL_MISS_BIRD_APPLE);
bird->CastSpell(bird, SPELL_BIRD_FALL);
@@ -537,6 +535,7 @@ public:
break;
}
[[fallthrough]];
}
case EVENT_MISS:
{
src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+1 -1
View File
@@ -190,7 +190,7 @@ class instance_black_temple : public InstanceMapScript
for (ObjectGuid ashtongueGuid : AshtongueGUIDs)
if (Creature* ashtongue = instance->GetCreature(ashtongueGuid))
ashtongue->SetFaction(FACTION_ASHTONGUE_DEATHSWORN);
// no break
[[fallthrough]];
case DATA_TERON_GOREFIEND:
case DATA_GURTOGG_BLOODBOIL:
case DATA_RELIQUARY_OF_SOULS:
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
+3
View File
@@ -143,10 +143,13 @@ class boss_shattered_executioner : public CreatureScript
{
case 3:
me->RemoveLootMode(LOOT_MODE_HARD_MODE_1);
[[fallthrough]];
case 2:
me->RemoveLootMode(LOOT_MODE_HARD_MODE_2);
[[fallthrough]];
case 1:
me->RemoveLootMode(LOOT_MODE_HARD_MODE_3);
break;
default:
break;
}