h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 19:22:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #613 from ppy/peppy/general-fixes

Browse Source 
Peppy/general fixes
This commit is contained in:
Dan Balasescu 2017-04-10 10:53:33 +09:00 committed by GitHub
commit d2a889d2bb
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 45e75163b272b7aa023afec7801ea079aba4ee69
Subproject commit 7ac3dbff3615fb410da1e330e6379b53a41292b6

8
osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs
View File

@ -42,14 +42,14 @@ namespace osu.Game.Modes.Osu
{
if (mouseDisabled.Value)
{
mouse.PressedButtons.Remove(MouseButton.Left);
mouse.PressedButtons.Remove(MouseButton.Right);
mouse.SetPressed(MouseButton.Left, false);
mouse.SetPressed(MouseButton.Right, false);
}
if (leftViaKeyboard)
mouse.PressedButtons.Add(MouseButton.Left);
mouse.SetPressed(MouseButton.Left, true);
if (rightViaKeyboard)
mouse.PressedButtons.Add(MouseButton.Right);
mouse.SetPressed(MouseButton.Right, true);
}
}
}

4
osu.Game/Modes/Replays/FramedReplayInputHandler.cs
View File

@ -136,7 +136,7 @@ namespace osu.Game.Modes.Replays
public ReplayMouseState(Vector2 position, IEnumerable<MouseButton> list)
{
Position = position;
list.ForEach(b => PressedButtons.Add(b));
list.ForEach(b => SetPressed(b, true));
}
}
@ -148,4 +148,4 @@ namespace osu.Game.Modes.Replays
}
}
}
}
}