sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into dependency-injection

Browse Source 
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/OsuGameMode.cs
#	osu.Game/GameModes/Play/Player.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Overlays/MusicController.cs
#	osu.Game/Overlays/Options/EditorSection.cs
#	osu.Game/Overlays/Options/Input/MouseOptions.cs
#	osu.Game/Overlays/Options/Online/InGameChatOptions.cs
#	osu.Game/Overlays/Options/SkinSection.cs
This commit is contained in:
Dean Herbert
2016-11-12 19:44:16 +09:00
parent 0d4560a054 646fe5c5f4
commit cc0f61f545
82 changed files with 688 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/GameModes/Play/PlaySongSelect.cs
View File

@ -126,17 +126,15 @@ namespace osu.Game.GameModes.Play
};
}
[Initializer]
private void Load(BeatmapDatabase beatmaps, AudioManager audio, BaseGame game)
[BackgroundDependencyLoader(permitNulls: true)]
private void load(BeatmapDatabase beatmaps, AudioManager audio, OsuGame game)
{
// TODO: Load(..., [PermitNull] OsuGame osuGame) or some such
var osuGame = game as OsuGame;
if (osuGame != null)
if (game != null)
{
playMode = osuGame.PlayMode;
playMode = game.PlayMode;
playMode.ValueChanged += playMode_ValueChanged;
// Temporary:
scrollContainer.Padding = new MarginPadding { Top = osuGame.Toolbar.Height };
scrollContainer.Padding = new MarginPadding { Top = ToolbarPadding };
}
if (database == null)