aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/AI/ScriptedAI/ScriptedCreature.cpp2
-rw-r--r--src/server/game/AI/ScriptedAI/ScriptedCreature.h4
-rw-r--r--src/server/game/Conditions/ConditionMgr.cpp6
-rw-r--r--src/server/game/Entities/Player/Player.cpp16
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp15
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp8
-rw-r--r--src/server/game/Instances/InstanceScript.cpp2
-rw-r--r--src/server/game/Maps/Map.cpp10
-rw-r--r--src/server/game/Server/Protocol/Handlers/QuestHandler.cpp4
-rw-r--r--src/server/game/Spells/Spell.cpp4
-rw-r--r--src/server/game/Spells/SpellMgr.cpp2
11 files changed, 68 insertions, 5 deletions
diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
index 34bcfdd2a38..318a7cf61c4 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
@@ -599,6 +599,8 @@ bool BossAI::CheckBoundary(Unit *who)
if (me->GetPositionX() - me->GetPositionY() < itr->second)
return false;
break;
+ default:
+ break;
}
}
diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.h b/src/server/game/AI/ScriptedAI/ScriptedCreature.h
index d5ae414a31e..bf24ead82ad 100644
--- a/src/server/game/AI/ScriptedAI/ScriptedCreature.h
+++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.h
@@ -188,6 +188,8 @@ struct ScriptedAI : public CreatureAI
return normal5;
case DUNGEON_DIFFICULTY_HEROIC:
return heroic10;
+ default:
+ break;
}
return heroic10;
@@ -202,6 +204,8 @@ struct ScriptedAI : public CreatureAI
return normal10;
case RAID_DIFFICULTY_25MAN_NORMAL:
return normal25;
+ default:
+ break;
}
return normal25;
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index 8bb94456300..e165ec70848 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -178,6 +178,8 @@ bool Condition::Meets(Player * player, Unit* targetOverride)
case CONDITION_SOURCE_TYPE_SPELL:
sendErrorMsg = true;
break;
+ default:
+ break;
}
bool refMeets = false;
@@ -466,6 +468,8 @@ void ConditionMgr::LoadConditions(bool isReload)
case CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION:
bIsDone = addToGossipMenuItems(cond);
break;
+ default:
+ break;
}
if (!bIsDone)
@@ -1212,6 +1216,8 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
case CONDITION_AREAID:
case CONDITION_INSTANCE_DATA:
break;
+ default:
+ break;
}
return true;
}
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 4a1bab14cd1..de1bc8788ff 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -2229,6 +2229,8 @@ void Player::Regenerate(Powers power)
case POWER_HAPPINESS:
case POWER_HEALTH:
break;
+ default:
+ break;
}
// Mana regen calculated in Player::UpdateManaRegen()
@@ -5499,6 +5501,8 @@ void Player::ApplyRatingMod(CombatRating cr, int32 value, bool apply)
ApplyCastTimePercentMod(RatingChange,apply);
break;
}
+ default:
+ break;
}
UpdateRating(cr);
@@ -5831,6 +5835,8 @@ void Player::UpdateWeaponSkill (WeaponAttackType attType)
UpdateSkill(tmpitem->GetSkill(), weapon_skill_gain);
break;
}
+ default:
+ break;
}
UpdateAllCritPercentages();
}
@@ -7187,6 +7193,8 @@ void Player::DuelComplete(DuelCompleteType type)
duel->opponent->CastSpell(duel->opponent, 52994, true);
}
break;
+ default:
+ break;
}
//Remove Duel Flag object
@@ -8305,6 +8313,8 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
case MASTER_LOOT:
group->MasterLoot(loot, go);
break;
+ default:
+ break;
}
}
}
@@ -18118,7 +18128,9 @@ void Player::_SaveSkills(SQLTransaction& trans)
trans->PAppend("UPDATE character_skills SET value = '%u',max = '%u'WHERE guid = '%u' AND skill = '%u' ",
value, max, GetGUIDLow(), itr->first);
break;
- };
+ default:
+ break;
+ }
itr->second.uState = SKILL_UNCHANGED;
++itr;
@@ -20976,6 +20988,8 @@ void Player::SendTransferAborted(uint32 mapid, TransferAbortReason reason, uint8
// these are the ONLY cases that have an extra argument in the packet!!!
data << uint8(arg);
break;
+ default:
+ break;
}
GetSession()->SendPacket(&data);
}
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 85b1836a329..470deccbccc 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -629,6 +629,8 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
}
case RANGED_ATTACK:
break;
+ default:
+ break;
}
}
@@ -3312,6 +3314,7 @@ uint32 Unit::GetWeaponSkillValue (WeaponAttackType attType, Unit const* target)
case BASE_ATTACK: value += uint32(this->ToPlayer()->GetRatingBonusValue(CR_WEAPON_SKILL_MAINHAND)); break;
case OFF_ATTACK: value += uint32(this->ToPlayer()->GetRatingBonusValue(CR_WEAPON_SKILL_OFFHAND)); break;
case RANGED_ATTACK: value += uint32(this->ToPlayer()->GetRatingBonusValue(CR_WEAPON_SKILL_RANGED)); break;
+ default: break;
}
}
else
@@ -8895,9 +8898,13 @@ bool Unit::HandleOverrideClassScriptAuraProc(Unit *pVictim, uint32 /*damage*/, A
case POWER_RAGE: triggered_spell_id = 48541; break;
case POWER_ENERGY: triggered_spell_id = 48540; break;
case POWER_RUNIC_POWER: triggered_spell_id = 48543; break;
+ default:
+ break;
}
break;
}
+ default:
+ break;
}
// not processed
@@ -13022,6 +13029,8 @@ bool Unit::HandleStatModifier(UnitMods unitMod, UnitModifierType modifierType, f
case TOTAL_PCT:
m_auraModifiersGroup[unitMod][modifierType] += (apply ? amount : -amount) / 100.0f;
break;
+ default:
+ break;
}
if (!CanModifyStats())
@@ -13389,6 +13398,8 @@ uint32 Unit::GetCreatePowers(Powers power) const
case POWER_RUNIC_POWER: return 1000;
case POWER_RUNE: return 0;
case POWER_HEALTH: return 0;
+ default:
+ break;
}
return 0;
@@ -16226,6 +16237,8 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form)
return 864;
case FORM_SPIRITOFREDEMPTION:
return 16031;
+ default:
+ break;
}
return 0;
}
@@ -16504,6 +16517,8 @@ void Unit::BuildMovementPacket(ByteBuffer *data) const
const_cast<Unit*>(this)->AddUnitMovementFlag(MOVEMENTFLAG_FORWARD | MOVEMENTFLAG_SPLINE_ENABLED);
}
break;
+ default:
+ break;
}
*data << uint32(GetUnitMovementFlags()); // movement flags
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 247cbdeb6b1..bc834d1b53b 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -69,6 +69,7 @@ std::string GetScriptsTableNameByType(ScriptsType type)
case SCRIPTS_EVENT: res = "event_scripts"; break;
case SCRIPTS_WAYPOINT: res = "waypoint_scripts"; break;
case SCRIPTS_GOSSIP: res = "gossip_scripts"; break;
+ default: break;
}
return res;
}
@@ -85,6 +86,7 @@ ScriptMapMap* GetScriptsMapByType(ScriptsType type)
case SCRIPTS_EVENT: res = &sEventScripts; break;
case SCRIPTS_WAYPOINT: res = &sWaypointScripts; break;
case SCRIPTS_GOSSIP: res = &sGossipScripts; break;
+ default: break;
}
return res;
}
@@ -240,6 +242,8 @@ bool SpellClickInfo::IsFitToRequirements(Player const* player, Creature const *
if (!player->IsInPartyWith(summoner))
return false;
break;
+ default:
+ break;
}
return true;
@@ -4874,6 +4878,8 @@ void ObjectMgr::LoadScripts(ScriptsType type)
}
break;
}
+ default:
+ break;
}
if (scripts->find(tmp.id) == scripts->end())
@@ -8876,6 +8882,8 @@ void ObjectMgr::CheckScripts(ScriptsType type, std::set<int32>& ids)
if (ids.find(itrM->second.dataint) != ids.end())
ids.erase(itrM->second.dataint);
}
+ default:
+ break;
}
}
}
diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp
index e5258c0fedd..e881128f049 100644
--- a/src/server/game/Instances/InstanceScript.cpp
+++ b/src/server/game/Instances/InstanceScript.cpp
@@ -95,6 +95,8 @@ void InstanceScript::UpdateMinionState(Creature *minion, EncounterState state)
else if (!minion->getVictim())
minion->AI()->DoZoneInCombat();
break;
+ default:
+ break;
}
}
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 700b18951cd..824717453da 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -2055,10 +2055,12 @@ void Map::RemoveAllObjectsInRemoveList()
switch(obj->GetTypeId())
{
- case TYPEID_UNIT:
- if (!obj->ToCreature()->isPet())
- SwitchGridContainers(obj->ToCreature(), on);
- break;
+ case TYPEID_UNIT:
+ if (!obj->ToCreature()->isPet())
+ SwitchGridContainers(obj->ToCreature(), on);
+ break;
+ default:
+ break;
}
}
diff --git a/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp b/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp
index ace517677e9..3b0bbebedc8 100644
--- a/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/QuestHandler.cpp
@@ -214,6 +214,8 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket & recv_data)
case TYPEID_GAMEOBJECT:
sScriptMgr.OnQuestAccept(_player, ((GameObject*)pObject), qInfo);
break;
+ default:
+ break;
}
_player->PlayerTalkClass->CloseGossip();
@@ -322,6 +324,8 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode(WorldPacket & recv_data)
_player->PlayerTalkClass->SendQuestGiverQuestDetails(nextquest,guid,true);
}
break;
+ default:
+ break;
}
}
else
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 9ccba54abae..812576a5493 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -2571,6 +2571,8 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
case TYPEID_PLAYER:
m_targets.setUnitTarget((Unit*)result);
break;
+ default:
+ break;
}
}
else
@@ -6900,6 +6902,8 @@ bool Spell::IsValidSingleTargetEffect(Unit const* target, Targets type) const
return m_caster->IsInRaidWith(target);
case TARGET_UNIT_TARGET_PUPPET:
return target->HasUnitTypeMask(UNIT_MASK_PUPPET) && m_caster == target->GetOwner();
+ default:
+ break;
}
return true;
}
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 43599c40ca2..d959f2f0136 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -3522,6 +3522,8 @@ void SpellMgr::LoadSpellCustomAttr()
spellInfo->Targets |= TARGET_FLAG_UNIT;
count++;
break;
+ default:
+ break;
}
}