Skip to content

Commit e7fefc8

Browse files
authored
Merge pull request #32084 from bdach/huh-swell-ticks
Do not give swell ticks any visual representation
2 parents 820821d + c82cf40 commit e7fefc8

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwellTick.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
#nullable disable
55

66
using JetBrains.Annotations;
7-
using osu.Framework.Graphics;
87
using osu.Framework.Input.Events;
9-
using osu.Game.Rulesets.Taiko.Skinning.Default;
108
using osu.Game.Skinning;
119

1210
namespace osu.Game.Rulesets.Taiko.Objects.Drawables
@@ -25,8 +23,6 @@ public DrawableSwellTick([CanBeNull] SwellTick hitObject)
2523
{
2624
}
2725

28-
protected override void UpdateInitialTransforms() => this.FadeOut();
29-
3026
public void TriggerResult(bool hit)
3127
{
3228
HitObject.StartTime = Time.Current;
@@ -43,7 +39,6 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
4339

4440
public override bool OnPressed(KeyBindingPressEvent<TaikoAction> e) => false;
4541

46-
protected override SkinnableDrawable CreateMainPiece() => new SkinnableDrawable(new TaikoSkinComponentLookup(TaikoSkinComponents.DrumRollTick),
47-
_ => new TickPiece());
42+
protected override SkinnableDrawable CreateMainPiece() => null;
4843
}
4944
}

osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,13 @@ protected virtual void RecreatePieces()
154154
if (MainPiece != null)
155155
Content.Remove(MainPiece, true);
156156

157-
Content.Add(MainPiece = CreateMainPiece());
157+
MainPiece = CreateMainPiece();
158+
159+
if (MainPiece != null)
160+
Content.Add(MainPiece);
158161
}
159162

163+
[CanBeNull]
160164
protected abstract SkinnableDrawable CreateMainPiece();
161165
}
162166
}

0 commit comments

Comments
 (0)