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

uint for ids

Browse Source
This commit is contained in:
Adonais Romero González
2016-10-12 21:03:41 -05:00
parent cd7884f00e
commit bf832ebe71
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Graphics/UserInterface/StandardComboCounter.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Graphics.UserInterface
{ {
protected SpriteText popOutSpriteText; protected SpriteText popOutSpriteText;
protected volatile int scheduledPopOutCurrentId = 0; protected uint scheduledPopOutCurrentId = 0;
public ulong PopOutDuration = 0; public ulong PopOutDuration = 0;
public float PopOutBigScale = 2.0f; public float PopOutBigScale = 2.0f;
@ -84,6 +84,7 @@ namespace osu.Game.Graphics.UserInterface
removeTransforms(typeof(TransformULongCounter)); removeTransforms(typeof(TransformULongCounter));
VisibleCount = newValue; VisibleCount = newValue;
} }
// Also, ignore rollback if already rollbacking
else if (currentValue != 0) else if (currentValue != 0)
transformCount(new TransformULongCounter(Clock), currentValue, newValue); transformCount(new TransformULongCounter(Clock), currentValue, newValue);
} }
@ -113,7 +114,7 @@ namespace osu.Game.Graphics.UserInterface
popOutSpriteText.MoveTo(countSpriteText.Position, PopOutDuration, PopOutEasing); popOutSpriteText.MoveTo(countSpriteText.Position, PopOutDuration, PopOutEasing);
scheduledPopOutCurrentId++; scheduledPopOutCurrentId++;
int newTaskId = scheduledPopOutCurrentId; uint newTaskId = scheduledPopOutCurrentId;
Scheduler.AddDelayed(delegate Scheduler.AddDelayed(delegate
{ {
scheduledPopOutSmall(newTaskId, newValue); scheduledPopOutSmall(newTaskId, newValue);
@ -134,7 +135,7 @@ namespace osu.Game.Graphics.UserInterface
countSpriteText.ScaleTo(1, PopOutDuration, PopOutEasing); countSpriteText.ScaleTo(1, PopOutDuration, PopOutEasing);
} }
protected virtual void scheduledPopOutSmall(int id, ulong newValue) protected virtual void scheduledPopOutSmall(uint id, ulong newValue)
{ {
// Too late; scheduled task invalidated // Too late; scheduled task invalidated
if (id != scheduledPopOutCurrentId) if (id != scheduledPopOutCurrentId)