h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-19 04:32:11 +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
Unverified
parent 8c6e3e7e54 862c7c7f3c
commit d2a889d2bb
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu-framework
+1 -1
Submodule osu-framework updated: 45e75163b2...7ac3dbff36
osu.Game.Modes.Osu/OsuKeyConversionInputManager.cs
+4 -4
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);
}
}
}
osu.Game/Modes/Replays/FramedReplayInputHandler.cs
+2 -2
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
}
}
}
}
}