sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Misc): all GCC warnings (#3457)

Browse Source
This commit is contained in:
Francesco Borzì
2020-09-14 17:31:12 +02:00
committed by GitHub
parent 80b149b218
commit b61ae8abcd
34 changed files with 157 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/SmartScripts/SmartScript.cpp
+6 -4
View File
@@ -149,6 +149,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
sLog->outDebug(LOG_FILTER_DATABASE_AI, "SmartScript::ProcessAction: Invoker: %s (guidlow: %u)", tempInvoker->GetName().c_str(), tempInvoker->GetGUIDLow());
#endif
bool isControlled = e.action.MoveToPos.controlled > 0;
switch (e.GetActionType())
{
case SMART_ACTION_TALK:
@@ -1933,7 +1935,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
randomPoint.m_positionZ,
true,
true,
e.action.MoveToPos.controlled ? MOTION_SLOT_CONTROLLED : MOTION_SLOT_ACTIVE
isControlled ? MOTION_SLOT_CONTROLLED : MOTION_SLOT_ACTIVE
);
}
@@ -1963,7 +1965,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (TransportBase* trans = me->GetDirectTransport())
trans->CalculatePassengerPosition(dest.x, dest.y, dest.z);
me->GetMotionMaster()->MovePoint(e.action.MoveToPos.pointId, dest.x, dest.y, dest.z, true, true, e.action.MoveToPos.controlled ? MOTION_SLOT_CONTROLLED : MOTION_SLOT_ACTIVE);
me->GetMotionMaster()->MovePoint(e.action.MoveToPos.pointId, dest.x, dest.y, dest.z, true, true, isControlled ? MOTION_SLOT_CONTROLLED : MOTION_SLOT_ACTIVE);
}
else // Xinef: we can use dest.x, dest.y, dest.z to make offset
{
@@ -1971,7 +1973,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
target->GetPosition(x, y, z);
if (e.action.MoveToPos.ContactDistance > 0)
target->GetContactPoint(me, x, y, z, e.action.MoveToPos.ContactDistance);
me->GetMotionMaster()->MovePoint(e.action.MoveToPos.pointId, x + e.target.x, y + e.target.y, z + e.target.z, e.action.MoveToPos.controlled ? MOTION_SLOT_CONTROLLED : MOTION_SLOT_ACTIVE);
me->GetMotionMaster()->MovePoint(e.action.MoveToPos.pointId, x + e.target.x, y + e.target.y, z + e.target.z, true, true, isControlled ? MOTION_SLOT_CONTROLLED : MOTION_SLOT_ACTIVE);
}
break;
}
@@ -1986,7 +1988,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
if (IsCreature(*itr))
{
Creature* target = (*itr)->ToCreature();
target->GetMotionMaster()->MovePoint(e.action.MoveToPos.pointId, e.target.x, e.target.y, e.target.z, true, true, e.action.MoveToPos.controlled ? MOTION_SLOT_CONTROLLED : MOTION_SLOT_ACTIVE);
target->GetMotionMaster()->MovePoint(e.action.MoveToPos.pointId, e.target.x, e.target.y, e.target.z, true, true, isControlled ? MOTION_SLOT_CONTROLLED : MOTION_SLOT_ACTIVE);
}
}
src/server/game/Battlegrounds/BattlegroundMgr.cpp
+2 -1
View File
@@ -305,6 +305,7 @@ void BattlegroundMgr::BuildPvpLogDataPacket(WorldPacket* data, Battleground* bg)
*data << uint32(0x00000002); // count of next fields
*data << uint32(((BattlegroundICScore*)itr2->second)->BasesAssaulted); // bases asssulted
*data << uint32(((BattlegroundICScore*)itr2->second)->BasesDefended); // bases defended
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
default:
if (BattlegroundMgr::getBgFromMap.find(bg->GetMapId()) != BattlegroundMgr::getBgFromMap.end())
BattlegroundMgr::getBgFromMap[bg->GetMapId()](data, itr2);
@@ -947,7 +948,7 @@ bool BattlegroundMgr::IsBGWeekend(BattlegroundTypeId bgTypeId)
BattlegroundTypeId BattlegroundMgr::GetRandomBG(BattlegroundTypeId bgTypeId)
{
if (CreateBattlegroundData const* bgTemplate = GetBattlegroundTemplateByTypeId(bgTypeId))
if (GetBattlegroundTemplateByTypeId(bgTypeId))
{
std::vector<BattlegroundTypeId> ids;
ids.reserve(16);
src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
+1
View File
@@ -197,6 +197,7 @@ void BattlegroundAV::HandleQuestComplete(uint32 questid, Player* player)
case AV_QUEST_A_BOSS1:
case AV_QUEST_H_BOSS1:
m_Team_QuestStatus[teamId][4] += 9; //you can turn in 10 or 1 item..
[[fallthrough]];
case AV_QUEST_A_BOSS2:
case AV_QUEST_H_BOSS2:
m_Team_QuestStatus[teamId][4]++;
src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
+8 -2
View File
@@ -813,16 +813,22 @@ bool BattlegroundSA::CanInteractWithObject(uint32 objectId)
{
case BG_SA_TITAN_RELIC:
if (GateStatus[BG_SA_ANCIENT_GATE] != BG_SA_GATE_DESTROYED || GateStatus[BG_SA_YELLOW_GATE] != BG_SA_GATE_DESTROYED)
{
return false;
// no break
}
[[fallthrough]];
case BG_SA_CENTRAL_FLAG:
if (GateStatus[BG_SA_RED_GATE] != BG_SA_GATE_DESTROYED && GateStatus[BG_SA_PURPLE_GATE] != BG_SA_GATE_DESTROYED)
{
return false;
// no break
}
[[fallthrough]];
case BG_SA_LEFT_FLAG:
case BG_SA_RIGHT_FLAG:
if (GateStatus[BG_SA_GREEN_GATE] != BG_SA_GATE_DESTROYED && GateStatus[BG_SA_BLUE_GATE] != BG_SA_GATE_DESTROYED)
{
return false;
}
break;
default:
ABORT();
src/server/game/DungeonFinding/LFGGroupData.cpp
+2 -1
View File
@@ -29,10 +29,11 @@ void LfgGroupData::SetState(LfgState state)
case LFG_STATE_NONE:
m_Dungeon = 0;
m_KicksLeft = LFG_GROUP_MAX_KICKS;
[[fallthrough]];
case LFG_STATE_FINISHED_DUNGEON:
case LFG_STATE_DUNGEON:
m_OldState = state;
// No break on purpose
[[fallthrough]];
default:
m_State = state;
}
src/server/game/DungeonFinding/LFGMgr.cpp
+9
View File
@@ -524,19 +524,28 @@ void LFGMgr::JoinLfg(Player* player, uint8 roles, LfgDungeonSet& dungeons, const
{
case LFG_TYPE_RANDOM:
if (dungeons.size() > 1) // Only allow 1 random dungeon
{
joinData.result = LFG_JOIN_DUNGEON_INVALID;
}
else
{
rDungeonId = (*dungeons.begin());
}
// No break on purpose (Random can only be dungeon or heroic dungeon)
[[fallthrough]];
case LFG_TYPE_HEROIC:
case LFG_TYPE_DUNGEON:
if (isRaid)
{
joinData.result = LFG_JOIN_MIXED_RAID_DUNGEON;
}
isDungeon = true;
break;
case LFG_TYPE_RAID:
if (isDungeon)
{
joinData.result = LFG_JOIN_MIXED_RAID_DUNGEON;
}
isRaid = true;
break;
default:
src/server/game/DungeonFinding/LFGPlayerData.cpp
+2 -2
View File
@@ -30,10 +30,10 @@ void LfgPlayerData::SetState(LfgState state)
m_Roles = 0;
m_SelectedDungeons.clear();
m_Comment = "";
// No break on purpose
[[fallthrough]];
case LFG_STATE_DUNGEON:
m_OldState = state;
// No break on purpose
[[fallthrough]];
default:
m_State = state;
}
src/server/game/Entities/GameObject/GameObject.cpp
+1
View File
@@ -483,6 +483,7 @@ void GameObject::Update(uint32 diff)
}
// NO BREAK for switch (m_lootState)
[[fallthrough]];
}
case GO_READY:
{
src/server/game/Entities/Object/Object.h
+4 -4
View File
@@ -401,10 +401,10 @@ struct Position
Position* m_pos;
};
float m_positionX;
float m_positionY;
float m_positionZ;
float m_orientation;
float m_positionX = 0;
float m_positionY = 0;
float m_positionZ = 0;
float m_orientation = 0;
bool operator==(Position const &a);
src/server/game/Entities/Player/Player.cpp
+4 -5
View File
@@ -10023,7 +10023,7 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
bf->FillInitialWorldStates(data);
break;
}
// No break here, intended.
[[fallthrough]];
default:
data << uint32(0x914) << uint32(0x0); // 7
data << uint32(0x913) << uint32(0x0); // 8
@@ -15823,14 +15823,14 @@ void Player::RewardQuest(Quest const* quest, uint32 reward, Object* questGiver,
for (uint8 i = 0; i < QUEST_ITEM_OBJECTIVES_COUNT; ++i)
{
if (ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(quest->RequiredItemId[i]))
if (sObjectMgr->GetItemTemplate(quest->RequiredItemId[i]))
{
DestroyItemCount(quest->RequiredItemId[i], quest->RequiredItemCount[i], true);
}
}
for (uint8 i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
{
if (ItemTemplate const* itemTemplate = sObjectMgr->GetItemTemplate(quest->ItemDrop[i]))
if (sObjectMgr->GetItemTemplate(quest->ItemDrop[i]))
{
DestroyItemCount(quest->ItemDrop[i], quest->ItemDropQuantity[i], true);
}
@@ -18968,7 +18968,6 @@ void Player::_LoadMailAsynch(PreparedQueryResult result)
{
do
{
bool has_items = false;
Field* fields = result->Fetch();
if (fields[14].GetUInt32() != prevMailID)
{
@@ -18983,7 +18982,7 @@ void Player::_LoadMailAsynch(PreparedQueryResult result)
m->receiver = fields[17].GetUInt32();
m->subject = fields[18].GetString();
m->body = fields[19].GetString();
has_items = fields[20].GetBool();
// has_items = fields[20].GetBool();
m->expire_time = time_t(fields[21].GetUInt32());
m->deliver_time = time_t(fields[22].GetUInt32());
m->money = fields[23].GetUInt32();
src/server/game/Entities/Unit/Unit.cpp
+9 -4
View File
@@ -2912,13 +2912,15 @@ SpellMissInfo Unit::SpellHitResult(Unit* victim, SpellInfo const* spell, bool Ca
case SPELL_DAMAGE_CLASS_NONE:
{
if (spell->SpellFamilyName)
{
return SPELL_MISS_NONE;
}
// Xinef: apply DAMAGE_CLASS_MAGIC conditions to damaging DAMAGE_CLASS_NONE spells
for (uint8 i = EFFECT_0; i < MAX_SPELL_EFFECTS; ++i)
if (spell->Effects[i].Effect && spell->Effects[i].Effect != SPELL_EFFECT_SCHOOL_DAMAGE)
if (spell->Effects[i].ApplyAuraName != SPELL_AURA_PERIODIC_DAMAGE)
return SPELL_MISS_NONE;
// no break intended
[[fallthrough]];
}
case SPELL_DAMAGE_CLASS_MAGIC:
return MagicSpellHitResult(victim, spell);
@@ -6812,6 +6814,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
triggered_spell_id = isWrathSpell ? 48518 : 48517;
break;
}
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
}
case SPELLFAMILY_ROGUE:
{
@@ -8593,6 +8596,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg
target = this;
trigger_spell_id = 22588;
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
}
// Bonus Healing (Crystal Spire of Karabor mace)
case 40971:
@@ -11088,9 +11092,9 @@ float Unit::SpellTakenCritChance(Unit const* caster, SpellInfo const* spellProto
switch ((*i)->GetMiscValue())
{
// Shatter
case 911: modChance+= 16;
case 910: modChance+= 17;
case 849: modChance+= 17;
case 911: modChance+= 16; [[fallthrough]];
case 910: modChance+= 17; [[fallthrough]];
case 849: modChance+= 17;
if (!HasAuraState(AURA_STATE_FROZEN, spellProto, caster))
break;
crit_chance+=modChance;
@@ -11199,6 +11203,7 @@ float Unit::SpellTakenCritChance(Unit const* caster, SpellInfo const* spellProto
}
break;
}
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case SPELL_DAMAGE_CLASS_RANGED:
{
// flat aura mods
src/server/game/Handlers/LFGHandler.cpp
+1 -1
View File
@@ -373,7 +373,7 @@ void WorldSession::SendLfgUpdateParty(lfg::LfgUpdateData const& updateData)
{
case lfg::LFG_UPDATETYPE_ADDED_TO_QUEUE: // Rolecheck Success
queued = true;
// no break on purpose
[[fallthrough]];
case lfg::LFG_UPDATETYPE_PROPOSAL_BEGIN:
join = true;
break;
src/server/game/Handlers/PetHandler.cpp
+1
View File
@@ -647,6 +647,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint16 spellid
if (pet->ToPet())
pet->ToPet()->ClearCastWhenWillAvailable();
pet->ClearInPetCombat();
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case REACT_DEFENSIVE: //recovery
case REACT_AGGRESSIVE: //activete
src/server/game/Server/WorldSession.cpp
+1 -2
View File
@@ -1031,13 +1031,12 @@ void WorldSession::ReadAddonsInfo(WorldPacket &data)
SavedAddon const* savedAddon = AddonMgr::GetAddonInfo(addonName);
if (savedAddon)
{
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
bool match = true;
if (addon.CRC != savedAddon->CRC)
match = false;
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
if (!match)
sLog->outDetail("ADDON: %s was known, but didn't match known CRC (0x%x)!", addon.Name.c_str(), savedAddon->CRC);
else
src/server/game/Spells/Auras/SpellAuraEffects.cpp
+2 -1
View File
@@ -593,6 +593,7 @@ void AuraEffect::CalculatePeriodic(Unit* caster, bool create, bool load)
// 3 spells have no amplitude set
if (!m_amplitude)
m_amplitude = 1 * IN_MILLISECONDS;
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case SPELL_AURA_PERIODIC_DAMAGE:
case SPELL_AURA_PERIODIC_HEAL:
case SPELL_AURA_OBS_MOD_HEALTH:
@@ -3598,7 +3599,7 @@ void AuraEffect::HandleModMechanicImmunity(AuraApplication const* aurApp, uint8
return;
Unit* target = aurApp->GetTarget();
uint32 mechanic;
uint32 mechanic = 0;
switch (GetId())
{
src/server/game/Spells/Auras/SpellAuras.cpp
+2
View File
@@ -1559,6 +1559,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b
case SPELLFAMILY_WARRIOR:
if (!caster)
break;
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case SPELLFAMILY_WARLOCK:
if (!caster)
break;
@@ -2637,6 +2638,7 @@ void UnitAura::FillTargetMap(std::map<Unit*, uint8> & targets, Unit* caster)
}
case SPELL_EFFECT_APPLY_AREA_AURA_PET:
targetList.push_back(GetUnitOwner());
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case SPELL_EFFECT_APPLY_AREA_AURA_OWNER:
{
if (Unit* owner = GetUnitOwner()->GetCharmerOrOwner())
src/server/game/Spells/Spell.cpp
+10 -6
View File
@@ -1366,7 +1366,7 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici
Map* map = m_caster->GetMap();
uint32 mapid = m_caster->GetMapId();
uint32 phasemask = m_caster->GetPhaseMask();
float destx, desty, destz, ground, startx, starty, startz, starto;
float destx, desty, destz = 0, ground, startx, starty, startz, starto;
Position pos;
Position lastpos;
@@ -1379,8 +1379,8 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici
if (!m_caster->HasUnitMovementFlag(MOVEMENTFLAG_FALLING) || (pos.GetPositionZ() - ground < distance))
{
float tstX, tstY, tstZ, prevX, prevY, prevZ;
float tstZ1, tstZ2, tstZ3, destz1, destz2, destz3, srange, srange1, srange2, srange3;
float tstX = 0, tstY = 0, tstZ = 0, prevX = 0, prevY = 0, prevZ = 0;
float tstZ1 = 0, tstZ2 = 0, tstZ3 = 0, destz1 = 0, destz2 = 0, destz3 = 0, srange = 0, srange1 = 0, srange2 = 0, srange3 = 0;
float maxtravelDistZ = 2.65f;
float overdistance = 0.0f;
float totalpath = 0.0f;
@@ -3571,6 +3571,7 @@ void Spell::cancel(bool bySelf)
if (m_caster->ToPlayer()->NeedSendSpectatorData())
ArenaSpectator::SendCommand_Spell(m_caster->FindMap(), m_caster->GetGUID(), "SPE", m_spellInfo->Id, bySelf ? 99998 : 99999);
}
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case SPELL_STATE_DELAYED:
SendInterrupted(0);
// xinef: fixes bugged gcd reset in some cases
@@ -6010,6 +6011,7 @@ SpellCastResult Spell::CheckCast(bool strict)
case SUMMON_CATEGORY_PET:
if (m_caster->GetPetGUID())
return SPELL_FAILED_ALREADY_HAVE_SUMMON;
[[fallthrough]];
case SUMMON_CATEGORY_PUPPET:
if (m_caster->GetCharmGUID())
return SPELL_FAILED_ALREADY_HAVE_CHARM;
@@ -6929,6 +6931,7 @@ SpellCastResult Spell::CheckItems()
return SPELL_FAILED_DONT_REPORT;
}
}
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC:
{
Item* targetItem = m_targets.GetItemTarget();
@@ -7490,8 +7493,9 @@ bool Spell::CheckEffectTarget(Unit const* target, uint32 eff) const
break;
/*case SPELL_EFFECT_CHARGE:
if (MMAP::MMapFactory::IsPathfindingEnabled(m_caster->FindMap()))
break;*/
// else no break intended
break;
[[fallthrough]];
*/
case SPELL_EFFECT_SUMMON_RAF_FRIEND:
if (m_caster->GetTypeId() != TYPEID_PLAYER || target->GetTypeId() != TYPEID_PLAYER)
@@ -8444,7 +8448,7 @@ bool WorldObjectSpellTargetCheck::operator()(WorldObject* target)
case TARGET_CHECK_RAID_CLASS:
if (_referer->getClass() != unitTarget->getClass())
return false;
// nobreak;
[[fallthrough]];
case TARGET_CHECK_RAID:
if (unitTarget->IsTotem())
return false;
src/server/game/Spells/SpellInfo.cpp
+2 -1
View File
@@ -165,7 +165,7 @@ uint32 SpellImplicitTargetInfo::GetExplicitTargetMask(bool& srcSet, bool& dstSet
targetMask = TARGET_FLAG_UNIT_PASSENGER;
break;
case TARGET_CHECK_RAID_CLASS:
// nobreak;
[[fallthrough]];
default:
targetMask = TARGET_FLAG_UNIT;
break;
@@ -2232,6 +2232,7 @@ SpellSpecificType SpellInfo::LoadSpellSpecific() const
/// @workaround For non-stacking tracking spells (We need generic solution)
if (Id == 30645) // Gas Cloud Tracking
return SPELL_SPECIFIC_NORMAL;
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case SPELL_AURA_TRACK_RESOURCES:
case SPELL_AURA_TRACK_STEALTHED:
return SPELL_SPECIFIC_TRACKER;
src/server/game/Spells/SpellMgr.cpp
+12 -2
View File
@@ -2905,6 +2905,7 @@ void SpellMgr::LoadSpellCustomAttr()
spellInfo->Effects[j].ApplyAuraName == SPELL_AURA_PERIODIC_HEALTH_FUNNEL ||
spellInfo->Effects[j].ApplyAuraName == SPELL_AURA_PERIODIC_DUMMY)
continue;
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
default:
if (spellInfo->Effects[j].CalcValue() || ((spellInfo->Effects[j].Effect == SPELL_EFFECT_INTERRUPT_CAST || spellInfo->HasAttribute(SPELL_ATTR0_CU_DONT_BREAK_STEALTH)) && !spellInfo->HasAttribute(SPELL_ATTR0_UNAFFECTED_BY_INVULNERABILITY)))
if (spellInfo->Id != 69649 && spellInfo->Id != 71056 && spellInfo->Id != 71057 && spellInfo->Id != 71058 && spellInfo->Id != 73061 && spellInfo->Id != 73062 && spellInfo->Id != 73063 && spellInfo->Id != 73064) // Sindragosa Frost Breath
@@ -4375,6 +4376,7 @@ void SpellMgr::LoadDbcDataCorrections()
case 57619: // WintergraspDemolisher - Spell Hourl Boulder - EffectRadiusIndex
case 57610: // Cannon (Siege Turret)
spellInfo->EffectRadiusIndex[1] = EFFECT_RADIUS_25_YARDS; // SPELL_EFFECT_WMO_DAMAGE
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case 51422: // WintergraspCannon - Spell Fire Cannon - EffectRadiusIndex
spellInfo->EffectRadiusIndex[0] = EFFECT_RADIUS_10_YARDS; // SPELL_EFFECT_SCHOOL_DAMAGE
break;
@@ -4787,7 +4789,7 @@ void SpellMgr::LoadDbcDataCorrections()
case 56430:
spellInfo->Effect[0] = SPELL_EFFECT_TRIGGER_MISSILE;
spellInfo->EffectTriggerSpell[0] = 56429;
// no break intended
[[fallthrough]];
case 56429:
spellInfo->EffectImplicitTargetA[0] = TARGET_DEST_DEST;
spellInfo->EffectImplicitTargetB[0] = 0;
@@ -5157,7 +5159,7 @@ void SpellMgr::LoadDbcDataCorrections()
spellInfo->EffectImplicitTargetA[1] = TARGET_UNIT_TARGET_ANY;
spellInfo->EffectImplicitTargetB[1] = TARGET_DEST_TARGET_ANY;
spellInfo->Effect[1] = 0;
// no break intended
[[fallthrough]];
case 66317:
spellInfo->Attributes |= SPELL_ATTR0_STOP_ATTACK_TARGET;
spellInfo->AttributesEx |= SPELL_ATTR1_NO_THREAT;
@@ -5254,6 +5256,7 @@ void SpellMgr::LoadDbcDataCorrections()
spellInfo->EffectImplicitTargetA[0] = 6;
spellInfo->EffectImplicitTargetB[0] = 0;
spellInfo->Effect[1] = 0; spellInfo->Effect[2] = 0;
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case 65767: // light surge 0
spellInfo->excludeTargetAuraSpell = 65686;
break;
@@ -5262,6 +5265,7 @@ void SpellMgr::LoadDbcDataCorrections()
spellInfo->EffectImplicitTargetA[0] = 6;
spellInfo->EffectImplicitTargetB[0] = 0;
spellInfo->Effect[1] = 0; spellInfo->Effect[2] = 0;
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case 67274: // light surge 1
spellInfo->excludeTargetAuraSpell = 67222;
break;
@@ -5270,6 +5274,7 @@ void SpellMgr::LoadDbcDataCorrections()
spellInfo->EffectImplicitTargetA[0] = 6;
spellInfo->EffectImplicitTargetB[0] = 0;
spellInfo->Effect[1] = 0; spellInfo->Effect[2] = 0;
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case 67275: // light surge 2
spellInfo->excludeTargetAuraSpell = 67223;
break;
@@ -5278,6 +5283,7 @@ void SpellMgr::LoadDbcDataCorrections()
spellInfo->EffectImplicitTargetA[0] = 6;
spellInfo->EffectImplicitTargetB[0] = 0;
spellInfo->Effect[1] = 0; spellInfo->Effect[2] = 0;
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case 67276: // light surge 3
spellInfo->excludeTargetAuraSpell = 67224;
break;
@@ -5286,6 +5292,7 @@ void SpellMgr::LoadDbcDataCorrections()
spellInfo->EffectImplicitTargetA[0] = 6;
spellInfo->EffectImplicitTargetB[0] = 0;
spellInfo->Effect[1] = 0; spellInfo->Effect[2] = 0;
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case 65769: // dark surge 0
spellInfo->excludeTargetAuraSpell = 65684;
break;
@@ -5294,6 +5301,7 @@ void SpellMgr::LoadDbcDataCorrections()
spellInfo->EffectImplicitTargetA[0] = 6;
spellInfo->EffectImplicitTargetB[0] = 0;
spellInfo->Effect[1] = 0; spellInfo->Effect[2] = 0;
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case 67265: // dark surge 1
spellInfo->excludeTargetAuraSpell = 67176;
break;
@@ -5302,6 +5310,7 @@ void SpellMgr::LoadDbcDataCorrections()
spellInfo->EffectImplicitTargetA[0] = 6;
spellInfo->EffectImplicitTargetB[0] = 0;
spellInfo->Effect[1] = 0; spellInfo->Effect[2] = 0;
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case 67266: // dark surge 2
spellInfo->excludeTargetAuraSpell = 67177;
break;
@@ -5310,6 +5319,7 @@ void SpellMgr::LoadDbcDataCorrections()
spellInfo->EffectImplicitTargetA[0] = 6;
spellInfo->EffectImplicitTargetB[0] = 0;
spellInfo->Effect[1] = 0; spellInfo->Effect[2] = 0;
[[fallthrough]]; // TODO: Not sure whether the fallthrough was a mistake (forgetting a break) or intended. This should be double-checked.
case 67267: // dark surge 3
spellInfo->excludeTargetAuraSpell = 67178;
break;
src/server/game/Weather/Weather.cpp
+2 -1
View File
@@ -210,6 +210,7 @@ bool Weather::UpdateWeather()
if (!sWorld->SendZoneMessage(m_zone, &data))
return false;
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
///- Log the event
char const* wthstr;
switch (state)
@@ -255,7 +256,7 @@ bool Weather::UpdateWeather()
wthstr = "fine";
break;
}
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
sLog->outDetail("Change the weather of zone %u to %s.", m_zone, wthstr);
#endif
sScriptMgr->OnWeatherChange(this, state, m_grade);