RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-21 13:07:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mode icon not being updated for correct ruleset

Browse Source
This commit is contained in:
smoogipoo 2018-12-27 18:16:17 +09:00
parent 9a5630b3d5
commit eaba9e1378
6 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
View File

@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Rulesets;
using osuTK; using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
@ -16,15 +17,16 @@ namespace osu.Game.Beatmaps.Drawables
{ {
public class DifficultyIcon : DifficultyColouredContainer public class DifficultyIcon : DifficultyColouredContainer
{ {
private readonly BeatmapInfo beatmap; private readonly RulesetInfo ruleset;
public DifficultyIcon(BeatmapInfo beatmap) public DifficultyIcon(BeatmapInfo beatmap, RulesetInfo ruleset = null)
: base(beatmap) : base(beatmap)
{ {
if (beatmap == null) if (beatmap == null)
throw new ArgumentNullException(nameof(beatmap)); throw new ArgumentNullException(nameof(beatmap));
this.beatmap = beatmap; this.ruleset = ruleset ?? beatmap.Ruleset;
Size = new Vector2(20); Size = new Vector2(20);
} }
@ -58,7 +60,7 @@ namespace osu.Game.Beatmaps.Drawables
Origin = Anchor.Centre, Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
// the null coalesce here is only present to make unit tests work (ruleset dlls aren't copied correctly for testing at the moment) // the null coalesce here is only present to make unit tests work (ruleset dlls aren't copied correctly for testing at the moment)
Icon = beatmap.Ruleset?.CreateInstance().CreateIcon() ?? new SpriteIcon { Icon = FontAwesome.fa_question_circle_o } Icon = ruleset?.CreateInstance().CreateIcon() ?? new SpriteIcon { Icon = FontAwesome.fa_question_circle_o }
} }
}; };
} }

4
osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
View File

@ -9,6 +9,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Online.Chat; using osu.Game.Online.Chat;
using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer;
using osu.Game.Rulesets;
using osuTK; using osuTK;
namespace osu.Game.Screens.Multi.Components namespace osu.Game.Screens.Multi.Components
@ -16,7 +17,7 @@ namespace osu.Game.Screens.Multi.Components
public class BeatmapTypeInfo : CompositeDrawable public class BeatmapTypeInfo : CompositeDrawable
{ {
public readonly IBindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>(); public readonly IBindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
public readonly IBindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
public readonly IBindable<GameType> Type = new Bindable<GameType>(); public readonly IBindable<GameType> Type = new Bindable<GameType>();
public BeatmapTypeInfo() public BeatmapTypeInfo()
@ -56,6 +57,7 @@ namespace osu.Game.Screens.Multi.Components
}; };
modeTypeInfo.Beatmap.BindTo(Beatmap); modeTypeInfo.Beatmap.BindTo(Beatmap);
modeTypeInfo.Ruleset.BindTo(Ruleset);
modeTypeInfo.Type.BindTo(Type); modeTypeInfo.Type.BindTo(Type);
beatmapTitle.Beatmap.BindTo(Beatmap); beatmapTitle.Beatmap.BindTo(Beatmap);

5
osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables; using osu.Game.Beatmaps.Drawables;
using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer;
using osu.Game.Rulesets;
using osuTK; using osuTK;
namespace osu.Game.Screens.Multi.Components namespace osu.Game.Screens.Multi.Components
@ -19,6 +20,7 @@ namespace osu.Game.Screens.Multi.Components
private readonly Container rulesetContainer; private readonly Container rulesetContainer;
public readonly IBindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>(); public readonly IBindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
public readonly IBindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
public readonly IBindable<GameType> Type = new Bindable<GameType>(); public readonly IBindable<GameType> Type = new Bindable<GameType>();
public ModeTypeInfo() public ModeTypeInfo()
@ -47,6 +49,7 @@ namespace osu.Game.Screens.Multi.Components
}; };
Beatmap.BindValueChanged(updateBeatmap); Beatmap.BindValueChanged(updateBeatmap);
Ruleset.BindValueChanged(_ => updateBeatmap(Beatmap.Value));
Type.BindValueChanged(v => gameTypeContainer.Child = new DrawableGameType(v) { Size = new Vector2(height) }); Type.BindValueChanged(v => gameTypeContainer.Child = new DrawableGameType(v) { Size = new Vector2(height) });
} }
@ -55,7 +58,7 @@ namespace osu.Game.Screens.Multi.Components
if (beatmap != null) if (beatmap != null)
{ {
rulesetContainer.FadeIn(transition_duration); rulesetContainer.FadeIn(transition_duration);
rulesetContainer.Child = new DifficultyIcon(beatmap) { Size = new Vector2(height) }; rulesetContainer.Child = new DifficultyIcon(beatmap, Ruleset.Value) { Size = new Vector2(height) };
} }
else else
rulesetContainer.FadeOut(transition_duration); rulesetContainer.FadeOut(transition_duration);

3
osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
View File

@ -191,8 +191,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components
background.Beatmap.BindTo(bindings.CurrentBeatmap); background.Beatmap.BindTo(bindings.CurrentBeatmap);
modeTypeInfo.Beatmap.BindTo(bindings.CurrentBeatmap); modeTypeInfo.Beatmap.BindTo(bindings.CurrentBeatmap);
beatmapTitle.Beatmap.BindTo(bindings.CurrentBeatmap); modeTypeInfo.Ruleset.BindTo(bindings.CurrentRuleset);
modeTypeInfo.Type.BindTo(bindings.Type); modeTypeInfo.Type.BindTo(bindings.Type);
beatmapTitle.Beatmap.BindTo(bindings.CurrentBeatmap);
participantInfo.Host.BindTo(bindings.Host); participantInfo.Host.BindTo(bindings.Host);
participantInfo.Participants.BindTo(bindings.Participants); participantInfo.Participants.BindTo(bindings.Participants);
participantInfo.ParticipantCount.BindTo(bindings.ParticipantCount); participantInfo.ParticipantCount.BindTo(bindings.ParticipantCount);

3
osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
View File

@ -174,9 +174,10 @@ namespace osu.Game.Screens.Multi.Lounge.Components
participantCount.ParticipantCount.BindTo(bindings.ParticipantCount); participantCount.ParticipantCount.BindTo(bindings.ParticipantCount);
participantCount.MaxParticipants.BindTo(bindings.MaxParticipants); participantCount.MaxParticipants.BindTo(bindings.MaxParticipants);
beatmapTypeInfo.Beatmap.BindTo(bindings.CurrentBeatmap);
beatmapTypeInfo.Ruleset.BindTo(bindings.CurrentRuleset);
beatmapTypeInfo.Type.BindTo(bindings.Type); beatmapTypeInfo.Type.BindTo(bindings.Type);
background.Beatmap.BindTo(bindings.CurrentBeatmap); background.Beatmap.BindTo(bindings.CurrentBeatmap);
beatmapTypeInfo.Beatmap.BindTo(bindings.CurrentBeatmap);
bindings.Status.BindValueChanged(displayStatus); bindings.Status.BindValueChanged(displayStatus);
bindings.Participants.BindValueChanged(p => participantsFlow.ChildrenEnumerable = p.Select(u => new UserTile(u))); bindings.Participants.BindValueChanged(p => participantsFlow.ChildrenEnumerable = p.Select(u => new UserTile(u)));

1
osu.Game/Screens/Multi/Match/Components/Header.cs
View File

@ -112,6 +112,7 @@ namespace osu.Game.Screens.Multi.Match.Components
}; };
beatmapTypeInfo.Beatmap.BindTo(bindings.CurrentBeatmap); beatmapTypeInfo.Beatmap.BindTo(bindings.CurrentBeatmap);
beatmapTypeInfo.Ruleset.BindTo(bindings.CurrentRuleset);
beatmapTypeInfo.Type.BindTo(bindings.Type); beatmapTypeInfo.Type.BindTo(bindings.Type);
background.Beatmap.BindTo(bindings.CurrentBeatmap); background.Beatmap.BindTo(bindings.CurrentBeatmap);
bindings.CurrentMods.BindValueChanged(m => modDisplay.Current.Value = m, true); bindings.CurrentMods.BindValueChanged(m => modDisplay.Current.Value = m, true);