Merge pull request #30326 from jhk2601/barrel_roll_fix

Fix cursor rotating with barrel roll mod active
ppy · Oct 21, 2024 · 22c3a25 · 22c3a25
2 parents 3111844 + 8349226
commit 22c3a25
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs b/osu.Game.Rulesets.Osu/Mods/OsuModBarrelRoll.cs
@@ -2,10 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Osu.UI;
+using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
@@ -25,5 +28,14 @@ public void ApplyToDrawableHitObject(DrawableHitObject d)
                 }
             };
         }
+
+        public override void Update(Playfield playfield)
+        {
+            base.Update(playfield);
+            OsuPlayfield osuPlayfield = (OsuPlayfield)playfield;
+            Debug.Assert(osuPlayfield.Cursor != null);
+
+            osuPlayfield.Cursor.ActiveCursor.Rotation = -CurrentRotation;
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModBarrelRoll.cs b/osu.Game/Rulesets/Mods/ModBarrelRoll.cs
@@ -42,7 +42,7 @@ public abstract class ModBarrelRoll<TObject> : Mod, IUpdatableByPlayfield, IAppl
 
         private PlayfieldAdjustmentContainer playfieldAdjustmentContainer = null!;
 
-        public void Update(Playfield playfield)
+        public virtual void Update(Playfield playfield)
         {
             playfieldAdjustmentContainer.Rotation = CurrentRotation = (Direction.Value == RotationDirection.Counterclockwise ? -1 : 1) * 360 * (float)(playfield.Time.Current / 60000 * SpinSpeed.Value);
         }