Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable

Conflicts:
	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj

osu.Game/Modes/Objects/BezierApproximator.cs

@@ -8,10 +8,10 @@ namespace osu.Game.Modes.Objects
 {
     public class BezierApproximator
     {
-        private int count;
-        private List<Vector2> controlPoints;
-        private Vector2[] subdivisionBuffer1;
-        private Vector2[] subdivisionBuffer2;
+        private readonly int count;
+        private readonly List<Vector2> controlPoints;
+        private readonly Vector2[] subdivisionBuffer1;
+        private readonly Vector2[] subdivisionBuffer2;
 
         private const float tolerance = 0.25f;
         private const float tolerance_sq = tolerance * tolerance;

osu.Game/Modes/Objects/CircularArcApproximator.cs

@@ -10,9 +10,9 @@ namespace osu.Game.Modes.Objects
 {
     public class CircularArcApproximator
     {
-        private Vector2 a;
-        private Vector2 b;
-        private Vector2 c;
+        private readonly Vector2 a;
+        private readonly Vector2 b;
+        private readonly Vector2 c;
 
         private int amountPoints;
 

osu.Game/Modes/Objects/SliderCurve.cs

@@ -19,8 +19,8 @@ namespace osu.Game.Modes.Objects
 
         public Vector2 Offset;
 
-        private List<Vector2> calculatedPath = new List<Vector2>();
-        private List<double> cumulativeLength = new List<double>();
+        private readonly List<Vector2> calculatedPath = new List<Vector2>();
+        private readonly List<double> cumulativeLength = new List<double>();
 
         private List<Vector2> calculateSubpath(List<Vector2> subControlPoints)
         {

osu.Game/Modes/Ruleset.cs

@@ -21,9 +21,9 @@ namespace osu.Game.Modes
 
     public abstract class Ruleset
     {
-        private static ConcurrentDictionary<PlayMode, Type> availableRulesets = new ConcurrentDictionary<PlayMode, Type>();
+        private static readonly ConcurrentDictionary<PlayMode, Type> available_rulesets = new ConcurrentDictionary<PlayMode, Type>();
 
-        public static IEnumerable<PlayMode> PlayModes => availableRulesets.Keys;
+        public static IEnumerable<PlayMode> PlayModes => available_rulesets.Keys;
 
         public virtual IEnumerable<BeatmapStatistic> GetBeatmapStatistics(WorkingBeatmap beatmap) => new BeatmapStatistic[] { };
 
@@ -35,7 +35,7 @@ namespace osu.Game.Modes
 
         public abstract ScoreProcessor CreateScoreProcessor();
 
-        public static void Register(Ruleset ruleset) => availableRulesets.TryAdd(ruleset.PlayMode, ruleset.GetType());
+        public static void Register(Ruleset ruleset) => available_rulesets.TryAdd(ruleset.PlayMode, ruleset.GetType());
 
         protected abstract PlayMode PlayMode { get; }
 
@@ -49,7 +49,7 @@ namespace osu.Game.Modes
         {
             Type type;
 
-            if (!availableRulesets.TryGetValue(mode, out type))
+            if (!available_rulesets.TryGetValue(mode, out type))
                 return null;
 
             return Activator.CreateInstance(type) as Ruleset;

osu.Game/Modes/UI/HitRenderer.cs

@@ -155,7 +155,7 @@ namespace osu.Game.Modes.UI
         /// </summary>
         protected Playfield<TObject, TJudgement> Playfield;
 
-        private Container content;
+        private readonly Container content;
 
         protected HitRenderer(WorkingBeatmap beatmap)
             : base(beatmap)

osu.Game/Modes/UI/ModIcon.cs

@@ -10,7 +10,8 @@ namespace osu.Game.Modes.UI
 {
     public class ModIcon : Container
     {
-        private TextAwesome modIcon, background;
+        private readonly TextAwesome modIcon;
+        private readonly TextAwesome background;
 
         private float iconSize = 80;
         public float IconSize

osu.Game/Modes/UI/Playfield.cs

@@ -23,7 +23,7 @@ namespace osu.Game.Modes.UI
         internal Container<Drawable> ScaledContent;
 
         protected override Container<Drawable> Content => content;
-        private Container<Drawable> content;
+        private readonly Container<Drawable> content;
 
         /// <summary>
         /// A container for keeping track of DrawableHitObjects.

osu.Game/Modes/UI/StandardHealthDisplay.cs

@@ -15,7 +15,7 @@ namespace osu.Game.Modes.UI
 {
     public class StandardHealthDisplay : HealthDisplay
     {
-        private Container fill;
+        private readonly Container fill;
 
         public StandardHealthDisplay()
         {