h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 10:03:05 +08:00
Code Issues Releases Wiki Activity

Make stuff compile again (but StarCounter hits assertions).

Browse Source
This commit is contained in:
Dean Herbert 2016-10-12 16:11:40 +09:00
parent e800649633
commit 61d5c7c56d
6 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Graphics/UserInterface/AlternativeComboCounter.cs
View File

@ -3,6 +3,7 @@
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Framework;
using osu.Framework.Graphics.Transformations; using osu.Framework.Graphics.Transformations;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -29,9 +30,10 @@ namespace osu.Game.Graphics.UserInterface
IsRollingContinuous = false; IsRollingContinuous = false;
} }
public override void Load() public override void Load(BaseGame game)
{ {
base.Load(); base.Load(game);
countSpriteText.Hide(); countSpriteText.Hide();
OriginalColour = Colour; OriginalColour = Colour;
} }

6
osu.Game/Graphics/UserInterface/NumericRollingCounter.cs
View File

@ -1,6 +1,7 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>. //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using System; using System;
@ -31,9 +32,10 @@ namespace osu.Game.Graphics.UserInterface
} }
} }
public override void Load() public override void Load(BaseGame game)
{ {
base.Load(); base.Load(game);
Children = new Drawable[] Children = new Drawable[]
{ {
countSpriteText = new SpriteText countSpriteText = new SpriteText

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

@ -1,4 +1,5 @@
using osu.Framework.Graphics; using osu.Framework;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Transformations; using osu.Framework.Graphics.Transformations;
using System; using System;
@ -109,9 +110,9 @@ namespace osu.Game.Graphics.UserInterface
); );
} }
public override void Load() public override void Load(BaseGame game)
{ {
base.Load(); base.Load(game);
removeTransforms(transformType); removeTransforms(transformType);
if (Count == null) if (Count == null)
ResetCount(); ResetCount();

6
osu.Game/Graphics/UserInterface/ScoreCounter.cs
View File

@ -1,6 +1,7 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>. //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -16,9 +17,10 @@ namespace osu.Game.Graphics.UserInterface
/// </summary> /// </summary>
public uint LeadingZeroes = 0; public uint LeadingZeroes = 0;
public override void Load() public override void Load(BaseGame game)
{ {
base.Load(); base.Load(game);
countSpriteText.FixedWidth = true; countSpriteText.FixedWidth = true;
} }

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

@ -1,6 +1,7 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>. //Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations; using osu.Framework.Graphics.Transformations;
using System; using System;
@ -30,9 +31,10 @@ namespace osu.Game.Graphics.UserInterface
IsRollingContinuous = false; IsRollingContinuous = false;
} }
public override void Load() public override void Load(BaseGame game)
{ {
base.Load(); base.Load(game);
countSpriteText.Alpha = 0; countSpriteText.Alpha = 0;
Add(popOutSpriteText = new SpriteText Add(popOutSpriteText = new SpriteText
{ {

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

@ -2,6 +2,7 @@
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK; using OpenTK;
using osu.Framework;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Transformations; using osu.Framework.Graphics.Transformations;
@ -52,9 +53,9 @@ namespace osu.Game.Graphics.UserInterface
StopRolling(); StopRolling();
} }
public override void Load() public override void Load(BaseGame game)
{ {
base.Load(); base.Load(game);
Children = new Drawable[] Children = new Drawable[]
{ {
@ -79,6 +80,8 @@ namespace osu.Game.Graphics.UserInterface
Alpha = (i == 0) ? 1.0f : MinStarAlpha, Alpha = (i == 0) ? 1.0f : MinStarAlpha,
Position = new Vector2((StarSize + StarSpacing) * i + (StarSize + StarSpacing) / 2, 0), Position = new Vector2((StarSize + StarSpacing) * i + (StarSize + StarSpacing) / 2, 0),
}; };
//todo: user Container<T> once we have it.
stars.Add(star); stars.Add(star);
starContainer.Add(star); starContainer.Add(star);
} }