sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove JudgementResultEntry

Browse Source 
It is not needed anymore as TimeAbsolute is stored raw.
This commit is contained in:
ekrctb
2023-01-27 19:35:44 +09:00
parent e3a5c233e9
commit 27578c48f5
2 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Rulesets/UI/Playfield.cs
View File

@ -99,7 +99,7 @@ namespace osu.Game.Rulesets.UI
private readonly HitObjectEntryManager entryManager = new HitObjectEntryManager();
private readonly Stack<JudgementResultEntry> judgementResults;
private readonly Stack<HitObjectLifetimeEntry> judgedEntries;
/// <summary>
/// Creates a new <see cref="Playfield"/>.
@ -118,7 +118,7 @@ namespace osu.Game.Rulesets.UI
entryManager.OnEntryAdded += onEntryAdded;
entryManager.OnEntryRemoved += onEntryRemoved;
judgementResults = new Stack<JudgementResultEntry>();
judgedEntries = new Stack<HitObjectLifetimeEntry>();
}
[BackgroundDependencyLoader]
@ -258,8 +258,8 @@ namespace osu.Game.Rulesets.UI
}
// When rewinding, revert future judgements in the reverse order.
while (judgementResults.Count > 0 && Time.Current < judgementResults.Peek().Time)
revertResult(judgementResults.Pop());
while (judgedEntries.Count > 0 && Time.Current < judgedEntries.Peek().Result.AsNonNull().TimeAbsolute)
revertResult(judgedEntries.Pop());
}
/// <summary>
@ -453,17 +453,19 @@ namespace osu.Game.Rulesets.UI
private void onNewResult(DrawableHitObject drawable, JudgementResult result)
{
// Not using result.TimeAbsolute because that might change and also there is a potential precision issue.
judgementResults.Push(new JudgementResultEntry(drawable.Entry.AsNonNull(), result));
Debug.Assert(result != null && drawable.Entry?.Result == result);
judgedEntries.Push(drawable.Entry.AsNonNull());
NewResult?.Invoke(drawable, result);
}
private void revertResult(JudgementResultEntry entry)
private void revertResult(HitObjectLifetimeEntry entry)
{
var result = entry.Result;
Debug.Assert(result != null);
RevertResult?.Invoke(result);
entry.HitObjectEntry.OnRevertResult();
entry.OnRevertResult();
result.Reset();
}