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

Update with framework structural changes.

Browse Source
This commit is contained in:
Dean Herbert 2017-02-26 20:45:41 +09:00
parent 0014208782
commit 686372a7f9
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
6 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 7c7edc0c3f4504c179e050ac98dc9ca2831602c9 Subproject commit 7cad7cf48b2ae9f16cac503d46bd0ea801e7561f

3
osu.Desktop.Tests/BenchmarkTest.cs
View File

@ -25,8 +25,7 @@ namespace osu.Desktop.Tests
Ruleset.Register(new ManiaRuleset()); Ruleset.Register(new ManiaRuleset());
Ruleset.Register(new CatchRuleset()); Ruleset.Register(new CatchRuleset());
host.Add(new Benchmark()); host.Run(new Benchmark());
host.Run();
} }
} }
} }

5
osu.Desktop.VisualTests/Program.cs
View File

@ -27,10 +27,9 @@ namespace osu.Desktop.VisualTests
Ruleset.Register(new CatchRuleset()); Ruleset.Register(new CatchRuleset());
if (benchmark) if (benchmark)
host.Add(new Benchmark()); host.Run(new Benchmark());
else else
host.Add(new VisualTestGame()); host.Run(new VisualTestGame());
host.Run();
} }
} }
} }

3
osu.Desktop/Program.cs
View File

@ -46,8 +46,7 @@ namespace osu.Desktop
Ruleset.Register(new ManiaRuleset()); Ruleset.Register(new ManiaRuleset());
Ruleset.Register(new CatchRuleset()); Ruleset.Register(new CatchRuleset());
host.Add(new OsuGameDesktop(args)); host.Run(new OsuGameDesktop(args));
host.Run();
} }
return 0; return 0;
} }

3
osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Desktop.Platform; using osu.Framework.Desktop.Platform;
using osu.Framework.Platform; using osu.Framework.Platform;
@ -66,7 +67,7 @@ namespace osu.Game.Tests.Beatmaps.IO
private OsuGameBase loadOsu(GameHost host) private OsuGameBase loadOsu(GameHost host)
{ {
var osu = new OsuGameBase(); var osu = new OsuGameBase();
host.Add(osu); Task.Run(() => host.Run(osu));
while (!osu.IsLoaded) while (!osu.IsLoaded)
Thread.Sleep(1); Thread.Sleep(1);

8
osu.Game/Overlays/MusicController.cs
View File

@ -78,6 +78,8 @@ namespace osu.Game.Overlays
private void load(OsuGameBase osuGame, OsuConfigManager config, BeatmapDatabase beatmaps, AudioManager audio, private void load(OsuGameBase osuGame, OsuConfigManager config, BeatmapDatabase beatmaps, AudioManager audio,
TextureStore textures, OsuColour colours) TextureStore textures, OsuColour colours)
{ {
game = osuGame;
unicodeString = config.GetUnicodeString; unicodeString = config.GetUnicodeString;
Children = new Drawable[] Children = new Drawable[]
@ -322,12 +324,6 @@ namespace osu.Game.Overlays
updateDisplay(current, isNext ? TransformDirection.Next : TransformDirection.Prev); updateDisplay(current, isNext ? TransformDirection.Next : TransformDirection.Prev);
} }
protected override void Load(Framework.Game game)
{
this.game = game;
base.Load(game);
}
Action pendingBeatmapSwitch; Action pendingBeatmapSwitch;
private void updateDisplay(WorkingBeatmap beatmap, TransformDirection direction) private void updateDisplay(WorkingBeatmap beatmap, TransformDirection direction)