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

Replace allowTrackAdjustmentsStack with a Dictionary

Browse Source
This commit is contained in:
AbstractQbit
2021-09-14 21:14:24 +03:00
parent 01d2f4f17a
commit bd18c581c1
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
osu.Game/OsuGame.cs
View File

@ -1094,21 +1094,13 @@ namespace osu.Game
// set AllowTrackAdjustments if new screen defines it, inherit otherwise
if (newScreen is IOsuScreen newOsuScreen && newOsuScreen.AllowTrackAdjustments.HasValue)
{
allowTrackAdjustmentsStack.Push(newOsuScreen.AllowTrackAdjustments.Value);
Logger.Log($"Screen's AllowTrackAdjustments explicit → {allowTrackAdjustmentsStack.First()}");
}
else if (allowTrackAdjustmentsStack.Any())
{
allowTrackAdjustmentsStack.Push(allowTrackAdjustmentsStack.First());
Logger.Log($"Screen's AllowTrackAdjustments inherit → {allowTrackAdjustmentsStack.First()}");
}
allowTrackAdjustmentsDict[newScreen] = newOsuScreen.AllowTrackAdjustments.Value;
else if (allowTrackAdjustmentsDict.ContainsKey(lastScreen))
allowTrackAdjustmentsDict[newScreen] = allowTrackAdjustmentsDict[lastScreen];
else
{
allowTrackAdjustmentsStack.Push(false);
}
allowTrackAdjustmentsDict[newScreen] = true;
MusicController.AllowTrackAdjustments = allowTrackAdjustmentsStack.First();
MusicController.AllowTrackAdjustments = allowTrackAdjustmentsDict[newScreen];
}
private void screenExited(IScreen lastScreen, IScreen newScreen)
@ -1116,18 +1108,15 @@ namespace osu.Game
ScreenChanged(lastScreen, newScreen);
Logger.Log($"Screen changed ← {newScreen}");
allowTrackAdjustmentsDict.Remove(lastScreen);
if (newScreen == null)
Exit();
if (allowTrackAdjustmentsStack.Count > 1)
{
allowTrackAdjustmentsStack.Pop();
MusicController.AllowTrackAdjustments = allowTrackAdjustmentsStack.First();
Logger.Log($"Screen's AllowTrackAdjustments return ← {allowTrackAdjustmentsStack.First()}");
}
else
MusicController.AllowTrackAdjustments = allowTrackAdjustmentsDict[newScreen];
}
private readonly Stack<bool> allowTrackAdjustmentsStack = new Stack<bool>();
private readonly Dictionary<IScreen, bool> allowTrackAdjustmentsDict = new Dictionary<IScreen, bool>();
IBindable<bool> ILocalUserPlayInfo.IsPlaying => LocalUserPlaying;
}