Add override to functions for code consistency.

Jundarer · Aug 6, 2016 · e9ac235 · e9ac235
1 parent 1218eb9
commit e9ac235
Show file tree

Hide file tree

Showing 21 changed files with 101 additions and 101 deletions.
diff --git a/engine/class_modules/sc_death_knight.cpp b/engine/class_modules/sc_death_knight.cpp
@@ -3119,7 +3119,7 @@ struct bonestorm_t : public death_knight_spell_t
     add_child( heal );
   }
 
-  timespan_t composite_dot_duration( const action_state_t* ) const
+  timespan_t composite_dot_duration( const action_state_t* ) const override
   { return base_tick_time * resource_consumed / 10; }
 };
 
@@ -4805,7 +4805,7 @@ struct soulgorge_t : public death_knight_spell_t
     aoe = -1;
   }
 
-  size_t available_targets( std::vector< player_t* >& tl ) const
+  size_t available_targets( std::vector< player_t* >& tl ) const override
   {
     death_knight_spell_t::available_targets( tl );
 

diff --git a/engine/class_modules/sc_demon_hunter.cpp b/engine/class_modules/sc_demon_hunter.cpp
@@ -4569,7 +4569,7 @@ struct chaos_blades_t : public demon_hunter_buff_t<buff_t>
   }
 
   void execute( int stacks = 1, double value = buff_t::DEFAULT_VALUE(),
-                timespan_t duration = timespan_t::min() )
+                timespan_t duration = timespan_t::min() ) override
   {
     buff_t::execute( stacks, value, duration );
 
@@ -7057,7 +7057,7 @@ struct anger_of_the_halfgiants_t : public scoped_action_callback_t<T>
   {
   }
 
-  void manipulate( T* action, const special_effect_t& e )
+  void manipulate( T* action, const special_effect_t& e ) override
   {
     action -> energize_die_sides += e.driver() -> effectN( 1 ).base_value();
   }

diff --git a/engine/class_modules/sc_druid.cpp b/engine/class_modules/sc_druid.cpp
@@ -1108,7 +1108,7 @@ struct incarnation_moonkin_buff_t : public druid_buff_t< buff_t >
       .add_invalidate( CACHE_PLAYER_DAMAGE_MULTIPLIER ) )
   {}
 
-  void expire_override( int stacks, timespan_adl_barrier::timespan_t duration )
+  void expire_override( int stacks, timespan_adl_barrier::timespan_t duration ) override
   {
     druid_buff_t<buff_t>::expire_override( stacks, duration );
 
@@ -1159,7 +1159,7 @@ struct celestial_alignment_buff_t : public druid_buff_t < buff_t >
                           .add_invalidate( CACHE_PLAYER_DAMAGE_MULTIPLIER ) )
   {}
 
-  void expire_override( int stacks, timespan_adl_barrier::timespan_t duration )
+  void expire_override( int stacks, timespan_adl_barrier::timespan_t duration ) override
   {
     druid_buff_t<buff_t>::expire_override( stacks, duration );
 
@@ -1455,15 +1455,15 @@ struct druid_attack_t : public druid_action_t< Base >
     }
   }
 
-  virtual void impact( action_state_t* s )
+  void impact( action_state_t* s ) override
   {
     ab::impact( s );
 
     if ( ab::result_is_hit( s -> result ) && ! ab::special )
       trigger_clearcasting();
   }
 
-  virtual void tick( dot_t* d )
+  void tick( dot_t* d ) override
   {
     ab::tick( d );
 
@@ -1482,7 +1482,7 @@ struct druid_attack_t : public druid_action_t< Base >
       return ab::target_armor( t );
   }
 
-  virtual double composite_target_multiplier( player_t* t ) const
+  double composite_target_multiplier( player_t* t ) const override
   {
     double tm = ab::composite_target_multiplier( t );
 
@@ -2141,7 +2141,7 @@ struct cat_attack_t : public druid_attack_t < melee_attack_t >
     return tc;
   }
 
-  virtual double action_multiplier() const
+  double action_multiplier() const override
   {
     double am = base_t::action_multiplier();
 
@@ -2155,7 +2155,7 @@ struct cat_attack_t : public druid_attack_t < melee_attack_t >
     return am;
   }
 
-  virtual double composite_persistent_multiplier( const action_state_t* s ) const
+  double composite_persistent_multiplier( const action_state_t* s ) const override
   {
     double pm = base_t::composite_persistent_multiplier( s );
 
@@ -3198,7 +3198,7 @@ struct mangle_t : public bear_attack_t
     base_multiplier *= 1.0 + player -> artifact.vicious_bites.percent();
   }
 
-  double composite_energize_amount( const action_state_t* s ) const
+  double composite_energize_amount( const action_state_t* s ) const override
   {
     double em = bear_attack_t::composite_energize_amount( s );
 
@@ -3217,7 +3217,7 @@ struct mangle_t : public bear_attack_t
     bear_attack_t::update_ready( cd );
   }
 
-  virtual double composite_target_multiplier( player_t* t ) const
+  double composite_target_multiplier( player_t* t ) const override
   {
     double tm = bear_attack_t::composite_target_multiplier( t );
 
@@ -3398,7 +3398,7 @@ struct cenarion_ward_t : public druid_heal_t
     p() -> buff.cenarion_ward -> trigger();
   }
 
-  virtual bool ready()
+  virtual bool ready() override
   {
     if ( target != p() )
     {
@@ -3928,7 +3928,7 @@ struct yseras_gift_t : public druid_heal_t
     return am;
   }
 
-  virtual void execute()
+  virtual void execute() override
   {
     if ( p() -> health_percentage() < 100 )
       target = p();
@@ -4608,7 +4608,7 @@ struct lunar_beam_t : public druid_spell_t
     add_child( damage );
   }
 
-  virtual void execute()
+  virtual void execute() override
   {
     druid_spell_t::execute();
 
@@ -4748,7 +4748,7 @@ struct mark_of_ursol_t : public druid_spell_t
       timespan_t::from_seconds( p() -> buff.guardian_of_elune -> value() );
   }
 
-  virtual void execute()
+  virtual void execute() override
   {
     druid_spell_t::execute();
 
@@ -7940,7 +7940,7 @@ struct wildcat_celerity_t : public scoped_buff_callback_t<buff_t>
     super( DRUID_FERAL, n )
   {}
 
-  void manipulate( buff_t* b, const special_effect_t& e )
+  void manipulate( buff_t* b, const special_effect_t& e ) override
   {
     if ( b -> player -> true_level < 110 )
     {
@@ -7954,7 +7954,7 @@ struct starshards_callback_t : public scoped_actor_callback_t<druid_t>
   starshards_callback_t() : super( DRUID_BALANCE )
   {}
 
-  void manipulate( druid_t* p, const special_effect_t& e )
+  void manipulate( druid_t* p, const special_effect_t& e ) override
   {
     p -> starshards = e.driver() -> effectN( 1 ).average( e.item ) / 100.0;
     p -> active.starshards = new starshards_t( p );
@@ -7983,7 +7983,7 @@ struct stalwart_guardian_callback_t : public scoped_actor_callback_t<druid_t>
     return p -> active.stalwart_guardian -> absorb_size;
   }
 
-  void manipulate( druid_t* p, const special_effect_t& /* e */ )
+  void manipulate( druid_t* p, const special_effect_t& /* e */ ) override
   {
     p -> active.stalwart_guardian = new stalwart_guardian_t( p );
 
@@ -8022,7 +8022,7 @@ struct luffa_wrappings_t : public scoped_action_callback_t<T>
     scoped_action_callback_t<T>( DRUID, name )
   {}
 
-  void manipulate( T* a, const special_effect_t& e )
+  void manipulate( T* a, const special_effect_t& e ) override
   {
     a -> radius *= 1.0 + e.driver() -> effectN( 1 ).percent();
     a -> base_multiplier *= 1.0 + e.driver() -> effectN( 2 ).percent();
@@ -8034,7 +8034,7 @@ struct dual_determination_t : public scoped_action_callback_t<survival_instincts
   dual_determination_t() : super( DRUID, "survival_instincts" )
   {}
 
-  void manipulate( survival_instincts_t* a, const special_effect_t& e )
+  void manipulate( survival_instincts_t* a, const special_effect_t& e ) override
   {
     a -> cooldown -> charges += e.driver() -> effectN( 1 ).base_value();
     a -> base_recharge_multiplier *= 1.0 + e.driver() -> effectN( 2 ).percent();
@@ -8164,7 +8164,7 @@ struct elizes_everlasting_encasement_t : public scoped_action_callback_t<thrash_
   elizes_everlasting_encasement_t() : super( DRUID, "thrash_bear" )
   {}
 
-  void manipulate( thrash_bear_t* a, const special_effect_t& e )
+  void manipulate( thrash_bear_t* a, const special_effect_t& e ) override
   {
     a -> dot_max_stack += e.driver() -> effectN( 1 ).base_value();
   }
@@ -8195,7 +8195,7 @@ struct skysecs_hold_t : public scoped_action_callback_t<frenzied_regeneration_t>
   skysecs_hold_t() : super( DRUID, "frenzied_regeneration_driver" )
   {}
 
-  void manipulate( frenzied_regeneration_t* a, const special_effect_t& e )
+  void manipulate( frenzied_regeneration_t* a, const special_effect_t& e ) override
   {
     a -> skysecs_hold = new skysecs_hold_heal_t( e );
   }

diff --git a/engine/class_modules/sc_hunter.cpp b/engine/class_modules/sc_hunter.cpp
@@ -3003,7 +3003,7 @@ struct aimed_shot_base_t: public hunter_ranged_attack_t
     return m;
   }
 
-  virtual void impact( action_state_t* s )
+  void impact( action_state_t* s ) override
   {
     hunter_ranged_attack_t::impact( s );
 

diff --git a/engine/class_modules/sc_monk.cpp b/engine/class_modules/sc_monk.cpp
@@ -2225,7 +2225,7 @@ struct tiger_palm_t: public monk_melee_attack_t
     spell_power_mod.direct = 0.0;
   }
 
-  virtual double action_multiplier() const
+  double action_multiplier() const override
   {
     double am = monk_melee_attack_t::action_multiplier();
 
@@ -2344,7 +2344,7 @@ struct rising_sun_kick_proc_t : public monk_melee_attack_t
     trigger_gcd = timespan_t::zero();
   }
 
-  bool init_finished()
+  bool init_finished() override
   {
     bool ret = monk_melee_attack_t::init_finished();
     action_t* rsk = player -> find_action( "rising_sun_kick" );
@@ -2365,7 +2365,7 @@ struct rising_sun_kick_proc_t : public monk_melee_attack_t
     return timespan_t::from_millis( 250 );
   }
 
-  virtual double action_multiplier() const
+  double action_multiplier() const override
   {
     double am = monk_melee_attack_t::action_multiplier();
 
@@ -2441,7 +2441,7 @@ struct rising_sun_kick_tornado_kick_t : public monk_melee_attack_t
     return timespan_t::from_millis( 250 );
   }
 
-  virtual double action_multiplier() const
+  double action_multiplier() const override
   {
     double am = monk_melee_attack_t::action_multiplier();
 
@@ -2516,7 +2516,7 @@ struct rising_sun_kick_t: public monk_melee_attack_t
       add_child( rsk_proc );
   }
 
-  virtual double action_multiplier() const
+  double action_multiplier() const override
   {
     double am = monk_melee_attack_t::action_multiplier();
 
@@ -2632,7 +2632,7 @@ struct blackout_kick_totm_proc : public monk_melee_attack_t
     trigger_gcd = timespan_t::zero();
   }
 
-  bool init_finished()
+  bool init_finished() override
   {
     bool ret = monk_melee_attack_t::init_finished();
     action_t* bok = player -> find_action( "blackout_kick" );
@@ -2653,7 +2653,7 @@ struct blackout_kick_totm_proc : public monk_melee_attack_t
     return timespan_t::from_millis( 100 );
   }
 
-  virtual double action_multiplier() const
+  double action_multiplier() const override
   {
     double am = monk_melee_attack_t::action_multiplier();
 
@@ -3624,9 +3624,9 @@ struct touch_of_death_t: public monk_spell_t
     return monk_spell_t::ready();
   }
 
-  virtual double target_armor( player_t* ) const override { return 0; }
+  double target_armor( player_t* ) const override { return 0; }
 
-  virtual double calculate_tick_amount( action_state_t*, double /*dot_multiplier*/ ) const
+  double calculate_tick_amount( action_state_t*, double /*dot_multiplier*/ ) const override
   {
     double amount = p() -> resources.max[RESOURCE_HEALTH];
 

diff --git a/engine/class_modules/sc_paladin.cpp b/engine/class_modules/sc_paladin.cpp
@@ -1074,7 +1074,7 @@ struct bastion_of_light_t : public paladin_spell_t
     use_off_gcd = true;
   }
 
-  virtual void execute()
+  void execute() override
   {
     paladin_spell_t::execute();
 
@@ -2571,7 +2571,7 @@ struct wake_of_ashes_t : public paladin_spell_t
     }
   }
 
-  bool ready()
+  bool ready() override
   {
     if ( ! player -> artifact_enabled() )
     {
@@ -2613,7 +2613,7 @@ struct holy_wrath_t : public paladin_spell_t
     paladin_spell_t::impact( s );
   }
 
-  bool ready()
+  bool ready() override
   {
     if ( p() -> fixed_holy_wrath_health_pct > 0 && p() -> fixed_holy_wrath_health_pct < 100 )
       return paladin_spell_t::ready();

diff --git a/engine/class_modules/sc_priest.cpp b/engine/class_modules/sc_priest.cpp
@@ -1130,7 +1130,7 @@ struct void_tendril_mind_flay_t final : public priest_pet_spell_t
     return timespan_t::from_seconds( 10.0 );
   }
 
-  timespan_t tick_time( const action_state_t* ) const
+  timespan_t tick_time( const action_state_t* ) const override
   {
     return timespan_t::from_seconds( 1.0 );
   }
@@ -2120,7 +2120,7 @@ struct dispersion_t final : public priest_spell_t
     return timespan_t::from_seconds( 6.0 );
   }
 
-  timespan_t tick_time( const action_state_t* ) const
+  timespan_t tick_time( const action_state_t* ) const override
   {
     return timespan_t::from_seconds( 1.0 );
   }
@@ -2303,7 +2303,7 @@ struct void_eruption_t final : public priest_spell_t
     void_bolt = player->find_action( "void_bolt" );
   }
 
-  std::vector<player_t*>& target_list() const
+  std::vector<player_t*>& target_list() const override
   {
     std::vector<player_t*>& tl = priest_spell_t::target_list();
 
@@ -3301,7 +3301,7 @@ struct void_torrent_t final : public priest_spell_t
     return timespan_t::from_seconds( 4.0 );
   }
 
-  timespan_t tick_time( const action_state_t* ) const
+  timespan_t tick_time( const action_state_t* ) const override
   {
     timespan_t t = base_tick_time;
 
@@ -3872,7 +3872,7 @@ struct penance_t final : public priest_spell_t
     tick_action         = new penance_tick_t( p, stats );
   }
 
-  timespan_t tick_time( const action_state_t* ) const
+  timespan_t tick_time( const action_state_t* ) const override
   {
     // Do not haste ticks!
     return base_tick_time;