sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 01:47:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #338 from EVAST9919/warnings_fixes

Browse Source 
Some Warning Fixes
This commit is contained in:
Dean Herbert 2017-02-09 22:23:47 +09:00 committed by GitHub
commit c5cf6a6909
10 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Modes.Osu/UI/OsuComboCounter.cs
View File

@ -17,7 +17,7 @@ namespace osu.Game.Modes.Osu.UI
protected virtual float PopOutSmallScale => 1.1f; protected virtual float PopOutSmallScale => 1.1f;
protected virtual bool CanPopOutWhileRolling => false; protected virtual bool CanPopOutWhileRolling => false;
public Vector2 PopOutScale = new Vector2(1.6f); public new Vector2 PopOutScale = new Vector2(1.6f);
protected override void LoadComplete() protected override void LoadComplete()
{ {

4
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -105,8 +105,8 @@ namespace osu.Game.Beatmaps
public WorkingBeatmap(BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, BeatmapDatabase database) public WorkingBeatmap(BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, BeatmapDatabase database)
{ {
this.BeatmapInfo = beatmapInfo; BeatmapInfo = beatmapInfo;
this.BeatmapSetInfo = beatmapSetInfo; BeatmapSetInfo = beatmapSetInfo;
this.database = database; this.database = database;
} }

2
osu.Game/Online/API/Requests/GetMessagesRequest.cs
View File

@ -15,7 +15,7 @@ namespace osu.Game.Online.API.Requests
public GetMessagesRequest(List<Channel> channels, long? sinceId) public GetMessagesRequest(List<Channel> channels, long? sinceId)
{ {
this.channels = channels; this.channels = channels;
this.since = sinceId; since = sinceId;
} }
protected override WebRequest CreateWebRequest() protected override WebRequest CreateWebRequest()

2
osu.Game/Online/Chat/Drawables/ChatLine.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Online.Chat.Drawables
public ChatLine(Message message) public ChatLine(Message message)
{ {
this.Message = message; Message = message;
RelativeSizeAxes = Axes.X; RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y; AutoSizeAxes = Axes.Y;

2
osu.Game/Overlays/Options/Sections/GameplaySection.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Options.Sections
{ {
base.Children = new Drawable[] base.Children = new Drawable[]
{ {
new Gameplay.GeneralOptions(), new GeneralOptions(),
new SongSelectOptions(), new SongSelectOptions(),
}; };
} }

7
osu.Game/Overlays/Options/Sections/General/LoginOptions.cs
View File

@ -91,9 +91,6 @@ namespace osu.Game.Overlays.Options.Sections.General
private TextBox password; private TextBox password;
private APIAccess api; private APIAccess api;
private OsuCheckbox saveUsername;
private OsuCheckbox savePassword;
private void performLogin() private void performLogin()
{ {
if (!string.IsNullOrEmpty(username.Text) && !string.IsNullOrEmpty(password.Text)) if (!string.IsNullOrEmpty(username.Text) && !string.IsNullOrEmpty(password.Text))
@ -121,12 +118,12 @@ namespace osu.Game.Overlays.Options.Sections.General
PlaceholderText = "Password", PlaceholderText = "Password",
RelativeSizeAxes = Axes.X RelativeSizeAxes = Axes.X
}, },
saveUsername = new OsuCheckbox new OsuCheckbox
{ {
LabelText = "Remember username", LabelText = "Remember username",
Bindable = config.GetBindable<bool>(OsuConfig.SaveUsername), Bindable = config.GetBindable<bool>(OsuConfig.SaveUsername),
}, },
savePassword = new OsuCheckbox new OsuCheckbox
{ {
LabelText = "Stay logged in", LabelText = "Stay logged in",
Bindable = config.GetBindable<bool>(OsuConfig.SavePassword), Bindable = config.GetBindable<bool>(OsuConfig.SavePassword),

6
osu.Game/Overlays/Options/Sections/Online/InGameChatOptions.cs
View File

@ -10,8 +10,6 @@ namespace osu.Game.Overlays.Options.Sections.Online
{ {
public class InGameChatOptions : OptionsSubsection public class InGameChatOptions : OptionsSubsection
{ {
private OptionTextBox chatIgnoreList;
private OptionTextBox chatHighlightWords;
protected override string Header => "Chat"; protected override string Header => "Chat";
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -40,12 +38,12 @@ namespace osu.Game.Overlays.Options.Sections.Online
Bindable = config.GetBindable<bool>(OsuConfig.BlockNonFriendPM) Bindable = config.GetBindable<bool>(OsuConfig.BlockNonFriendPM)
}, },
new OptionLabel { Text = "Chat ignore list (space-seperated list)" }, new OptionLabel { Text = "Chat ignore list (space-seperated list)" },
chatIgnoreList = new OptionTextBox { new OptionTextBox {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Bindable = config.GetBindable<string>(OsuConfig.IgnoreList) Bindable = config.GetBindable<string>(OsuConfig.IgnoreList)
}, },
new OptionLabel { Text = "Chat highlight words (space-seperated list)" }, new OptionLabel { Text = "Chat highlight words (space-seperated list)" },
chatHighlightWords = new OptionTextBox { new OptionTextBox {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Bindable = config.GetBindable<string>(OsuConfig.HighlightWords) Bindable = config.GetBindable<string>(OsuConfig.HighlightWords)
}, },

5
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Screens.Menu
/// <summary> /// <summary>
/// osu! logo and its attachments (pulsing, visualiser etc.) /// osu! logo and its attachments (pulsing, visualiser etc.)
/// </summary> /// </summary>
public partial class OsuLogo : Container public class OsuLogo : Container
{ {
public Color4 OsuPink = OsuColour.FromHex(@"e967a1"); public Color4 OsuPink = OsuColour.FromHex(@"e967a1");
@ -32,7 +32,6 @@ namespace osu.Game.Screens.Menu
private CircularContainer logoContainer; private CircularContainer logoContainer;
private Container logoBounceContainer; private Container logoBounceContainer;
private Container logoHoverContainer; private Container logoHoverContainer;
private MenuVisualisation vis;
private AudioSample sampleClick; private AudioSample sampleClick;
@ -154,7 +153,7 @@ namespace osu.Game.Screens.Menu
} }
} }
}, },
vis = new MenuVisualisation new MenuVisualisation
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,

4
osu.Game/Screens/Play/KeyCounterKeyboard.cs
View File

@ -17,13 +17,13 @@ namespace osu.Game.Screens.Play
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{ {
if (args.Key == this.Key) IsLit = true; if (args.Key == Key) IsLit = true;
return base.OnKeyDown(state, args); return base.OnKeyDown(state, args);
} }
protected override bool OnKeyUp(InputState state, KeyUpEventArgs args) protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
{ {
if (args.Key == this.Key) IsLit = false; if (args.Key == Key) IsLit = false;
return base.OnKeyUp(state, args); return base.OnKeyUp(state, args);
} }
} }

4
osu.Game/Screens/Play/KeyCounterMouse.cs
View File

@ -20,13 +20,13 @@ namespace osu.Game.Screens.Play
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
{ {
if (args.Button == this.Button) IsLit = true; if (args.Button == Button) IsLit = true;
return base.OnMouseDown(state, args); return base.OnMouseDown(state, args);
} }
protected override bool OnMouseUp(InputState state, MouseUpEventArgs args) protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
{ {
if (args.Button == this.Button) IsLit = false; if (args.Button == Button) IsLit = false;
return base.OnMouseUp(state, args); return base.OnMouseUp(state, args);
} }
} }