From 9f23210e7efbea97cda8b56bb73786fb99b8dff3 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 20 Sep 2022 20:39:12 +0900
Subject: [PATCH] Use British-English

---
 .../Skinning/Default/DefaultSmoke.cs            |  2 +-
 .../Skinning/Legacy/LegacySmoke.cs              |  2 +-
 osu.Game.Rulesets.Osu/Skinning/Smoke.cs         | 17 ++++++++---------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
index 6eebd18305..85d1018b7f 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/DefaultSmoke.cs
@@ -41,7 +41,7 @@ protected override void UpdateDrawVariables(IRenderer renderer)
                 fadeOutTime = SmokeStartTime + fade_out_speed * (CurrentTime - (SmokeEndTime + fade_out_delay));
             }
 
-            protected override Color4 PointColor(SmokePoint point)
+            protected override Color4 PointColour(SmokePoint point)
             {
                 var color = Color4.White;
                 color.A = alpha;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
index d8c3ff3521..d3ce294696 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySmoke.cs
@@ -111,7 +111,7 @@ protected override void UpdateDrawVariables(IRenderer renderer)
                 finalFadeOutTime = final_fade_out_speed * (CurrentTime - SmokeEndTime) + SmokeEndTime - initialFadeOutDurationTrunc * (1 + 1 / re_fade_in_speed);
             }
 
-            protected override Color4 PointColor(SmokePoint point)
+            protected override Color4 PointColour(SmokePoint point)
             {
                 var color = Color4.White;
 
diff --git a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
index c07c2f960f..63a370981e 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Smoke.cs
@@ -315,7 +315,6 @@ protected abstract class SmokeDrawNode : TexturedShaderDrawNode
             protected new Smoke Source => (Smoke)base.Source;
 
             protected IVertexBatch<TexturedVertex2D>? QuadBatch;
-
             protected readonly List<SmokePoint> Points = new List<SmokePoint>();
 
             protected float Radius;
@@ -378,11 +377,11 @@ public sealed override void Draw(IRenderer renderer)
                 renderer.PopLocalMatrix();
             }
 
-            protected Color4 ColorAtPosition(Vector2 localPos) => DrawColourInfo.Colour.HasSingleColour
+            protected Color4 ColourAtPosition(Vector2 localPos) => DrawColourInfo.Colour.HasSingleColour
                 ? ((SRGBColour)DrawColourInfo.Colour).Linear
                 : DrawColourInfo.Colour.Interpolate(Vector2.Divide(localPos, DrawSize)).Linear;
 
-            protected abstract Color4 PointColor(SmokePoint point);
+            protected abstract Color4 PointColour(SmokePoint point);
 
             protected abstract float PointScale(SmokePoint point);
 
@@ -407,12 +406,12 @@ private void drawPointQuad(SmokePoint point)
             {
                 Debug.Assert(QuadBatch != null);
 
-                var color = PointColor(point);
+                var colour = PointColour(point);
                 float scale = PointScale(point);
                 var dir = PointDirection(point);
                 var ortho = dir.PerpendicularLeft;
 
-                if (color.A == 0 || scale == 0)
+                if (colour.A == 0 || scale == 0)
                     return;
 
                 var localTopLeft = point.Position + (Radius * scale * (-ortho - dir)) - PositionOffset;
@@ -424,25 +423,25 @@ private void drawPointQuad(SmokePoint point)
                 {
                     Position = localTopLeft,
                     TexturePosition = TextureRect.TopLeft,
-                    Colour = Color4Extensions.Multiply(ColorAtPosition(localTopLeft), color),
+                    Colour = Color4Extensions.Multiply(ColourAtPosition(localTopLeft), colour),
                 });
                 QuadBatch.Add(new TexturedVertex2D
                 {
                     Position = localTopRight,
                     TexturePosition = TextureRect.TopRight,
-                    Colour = Color4Extensions.Multiply(ColorAtPosition(localTopRight), color),
+                    Colour = Color4Extensions.Multiply(ColourAtPosition(localTopRight), colour),
                 });
                 QuadBatch.Add(new TexturedVertex2D
                 {
                     Position = localBotRight,
                     TexturePosition = TextureRect.BottomRight,
-                    Colour = Color4Extensions.Multiply(ColorAtPosition(localBotRight), color),
+                    Colour = Color4Extensions.Multiply(ColourAtPosition(localBotRight), colour),
                 });
                 QuadBatch.Add(new TexturedVertex2D
                 {
                     Position = localBotLeft,
                     TexturePosition = TextureRect.BottomLeft,
-                    Colour = Color4Extensions.Multiply(ColorAtPosition(localBotLeft), color),
+                    Colour = Color4Extensions.Multiply(ColourAtPosition(localBotLeft), colour),
                 });
             }