mirror of
https://github.com/ppy/osu
synced 2025-01-01 11:52:20 +00:00
fixed missed bit and comments
This commit is contained in:
parent
847b63066b
commit
bb1ed387ef
@ -422,7 +422,7 @@ namespace osu.Game.Rulesets.Catch.UI
|
|||||||
|
|
||||||
caughtObjectContainer.Clear(false);
|
caughtObjectContainer.Clear(false);
|
||||||
|
|
||||||
//use the already returned PoolableDrawables for new objects
|
// Use the already returned PoolableDrawables for new objects
|
||||||
var droppedObjects = caughtObjects.Select(getDroppedObject).ToArray();
|
var droppedObjects = caughtObjects.Select(getDroppedObject).ToArray();
|
||||||
|
|
||||||
droppedObjectTarget.AddRange(droppedObjects);
|
droppedObjectTarget.AddRange(droppedObjects);
|
||||||
@ -435,9 +435,11 @@ namespace osu.Game.Rulesets.Catch.UI
|
|||||||
{
|
{
|
||||||
caughtObjectContainer.Remove(caughtObject, false);
|
caughtObjectContainer.Remove(caughtObject, false);
|
||||||
|
|
||||||
droppedObjectTarget.Add(getDroppedObject(caughtObject));
|
var droppedObject = getDroppedObject(caughtObject);
|
||||||
|
|
||||||
applyDropAnimation(caughtObject, animation);
|
droppedObjectTarget.Add(droppedObject);
|
||||||
|
|
||||||
|
applyDropAnimation(droppedObject, animation);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void applyDropAnimation(Drawable d, DroppedObjectAnimation animation)
|
private void applyDropAnimation(Drawable d, DroppedObjectAnimation animation)
|
||||||
@ -457,7 +459,7 @@ namespace osu.Game.Rulesets.Catch.UI
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
//define lifetime start for dropped objects to be disposed correctly when rewinding replay
|
// Define lifetime start for dropped objects to be disposed correctly when rewinding replay
|
||||||
d.LifetimeStart = Clock.CurrentTime;
|
d.LifetimeStart = Clock.CurrentTime;
|
||||||
d.Expire();
|
d.Expire();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user