diff options
| author | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-07-18 20:42:28 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-23 22:02:03 +0100 |
| commit | ad340466d09ae6de8adc20949f433772cb016b54 (patch) | |
| tree | 99127eb685dab4aa1aa90e79cbba958bf6dea80e /src/server/game/Conditions/ConditionMgr.cpp | |
| parent | fda8a09766bf733ccf97743ea5b884c900f44c28 (diff) | |
Misc: Use [[fallthrough]] attribute instead of comment to mark intentional fallthroughs (#25054)
Related: #25006
(cherry picked from commit 85b5b842ca6c05d4e51081e6c3282940a80f3761)
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 490881071ec..929d9ec0275 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -2155,7 +2155,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const TC_LOG_ERROR("sql.sql", "%s has invalid state mask (%u), skipped.", cond->ToString(true).c_str(), cond->ConditionValue2); return false; } - /* fallthrough */ + [[fallthrough]]; case CONDITION_QUESTREWARDED: case CONDITION_QUESTTAKEN: case CONDITION_QUEST_NONE: @@ -2274,7 +2274,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const case CONDITION_OBJECT_ENTRY_GUID_LEGACY: cond->ConditionType = CONDITION_OBJECT_ENTRY_GUID; cond->ConditionValue1 = Trinity::Legacy::ConvertLegacyTypeID(Trinity::Legacy::TypeID(cond->ConditionValue1)); - /* fallthrough */ + [[fallthrough]]; case CONDITION_OBJECT_ENTRY_GUID: { switch (cond->ConditionValue1) @@ -2341,7 +2341,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond) const case CONDITION_TYPE_MASK_LEGACY: cond->ConditionType = CONDITION_TYPE_MASK; cond->ConditionValue1 = Trinity::Legacy::ConvertLegacyTypeMask(cond->ConditionValue1); - /* fallthrough */ + [[fallthrough]]; case CONDITION_TYPE_MASK: { if (!cond->ConditionValue1 || (cond->ConditionValue1 & ~(TYPEMASK_UNIT | TYPEMASK_PLAYER | TYPEMASK_GAMEOBJECT | TYPEMASK_CORPSE))) |