sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Apply review changes

Browse Source
This commit is contained in:
Dean Herbert
2019-06-13 17:04:57 +09:00
parent ba475ef6c8
commit eb0f0aefba
10 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
View File

@ -138,7 +138,6 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
}, true);
}
//TODO: use OnClick instead once we have per-button clicks.
protected override bool OnClick(ClickEvent e)
{
if (Team == null || editorInfo != null) return false;
@ -196,8 +195,8 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
return new MenuItem[]
{
new OsuMenuItem("Set as current", MenuItemType.Standard, setCurrent),
new OsuMenuItem("Join with", MenuItemType.Standard, () => ladderEditor.RequestJoin(pairing, false)),
new OsuMenuItem("Join with (loser)", MenuItemType.Standard, () => ladderEditor.RequestJoin(pairing, true)),
new OsuMenuItem("Join with", MenuItemType.Standard, () => ladderEditor.BeginJoin(pairing, false)),
new OsuMenuItem("Join with (loser)", MenuItemType.Standard, () => ladderEditor.BeginJoin(pairing, true)),
new OsuMenuItem("Remove", MenuItemType.Destructive, () => ladderEditor.Remove(pairing)),
};
}

21
osu.Game.Tournament/Screens/Ladder/Components/TournamentProgression.cs
View File

@ -5,15 +5,26 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
{
public class TournamentProgression
{
public int Item1;
public int Item2;
public int SourceID;
public int TargetID;
// migration
public int Item1
{
set => SourceID = value;
}
public int Item2
{
set => TargetID = value;
}
public bool Losers;
public TournamentProgression(int item1, int item2, bool losers = false)
public TournamentProgression(int sourceID, int targetID, bool losers = false)
{
Item1 = item1;
Item2 = item2;
SourceID = sourceID;
TargetID = targetID;
Losers = losers;
}
}