sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move expire to DrawableHitObject

Browse Source
This commit is contained in:
Dean Herbert
2019-09-12 19:29:08 +09:00
parent 7f2d14416a
commit f21e47d6d2
12 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -153,7 +153,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
if (UseTransformStateManagement)
{
lifetimeStart = null;
LifetimeEnd = double.MaxValue;
double transformTime = HitObject.StartTime - InitialLifetimeOffset;
@ -173,6 +172,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
state.Value = newState;
}
}
if (state.Value != ArmedState.Idle && LifetimeEnd == double.MaxValue)
Expire();
}
else
state.Value = newState;
@ -203,6 +205,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
/// <summary>
/// Apply transforms based on the current <see cref="ArmedState"/>. Previous states are automatically cleared.
/// In the case of a non-idle <see cref="ArmedState"/>, and if <see cref="Drawable.LifetimeEnd"/> was not set during this call, <see cref="Drawable.Expire"/> will be invoked.
/// </summary>
/// <param name="state">The new armed state.</param>
protected virtual void UpdateStateTransforms(ArmedState state)