AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-29 08:32:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #404 from videoerror/master

Browse Source 
Made inventory switching re-bindable and fixed CRTL selecting in inventory screen closing inventory screen.
This commit is contained in:
Goodlyay 2017-04-05 21:48:08 -07:00 committed by GitHub
commit 6aba57f185
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ClassicalSharp/2D/Screens/Inventory/InventoryScreen.Input.cs
View File

@ -48,7 +48,7 @@ namespace ClassicalSharp.Gui.Screens {
return true; return true;
} }
bool hotbar = game.IsKeyDown(Key.AltLeft) || game.IsKeyDown(Key.AltRight); bool hotbar = game.Input.ControlDown;
if (!hotbar) if (!hotbar)
game.Gui.SetNewScreen(null); game.Gui.SetNewScreen(null);
} }

8
ClassicalSharp/2D/Screens/Menu/KeyBindingsScreens.cs
View File

@ -120,12 +120,12 @@ namespace ClassicalSharp.Gui.Screens {
public override void Init() { public override void Init() {
base.Init(); base.Init();
left = new KeyBind[3]; left = new KeyBind[4];
left[0] = KeyBind.ExtInput; left[1] = KeyBind.HideFps; left[2] = KeyBind.HideGui; left[0] = KeyBind.ExtInput; left[1] = KeyBind.HideFps; left[2] = KeyBind.HideGui; left[3] = KeyBind.HotbarSwitching;
right = new KeyBind[4]; right = new KeyBind[4];
right[0] = KeyBind.Screenshot; right[1] = KeyBind.Fullscreen; right[2] = KeyBind.AxisLines; right[3] = KeyBind.Autorotate; right[0] = KeyBind.Screenshot; right[1] = KeyBind.Fullscreen; right[2] = KeyBind.AxisLines; right[3] = KeyBind.Autorotate;
leftDesc = new string[] { "Show ext input", "Hide FPS", "Hide gui" }; leftDesc = new string[] { "Show ext input", "Hide FPS", "Hide gui", "Hotbar switching" };
rightDesc = new string[] { "Screenshot", "Fullscreen", "Show axis lines", "Toggle auto-rotate" }; rightDesc = new string[] { "Screenshot", "Fullscreen", "Show axis lines", "Toggle auto-rotate", };
title = "Other controls"; title = "Other controls";
leftPage = (g, w) => g.Gui.SetNewScreen(new HacksKeyBindingsScreen(g)); leftPage = (g, w) => g.Gui.SetNewScreen(new HacksKeyBindingsScreen(g));

2
ClassicalSharp/2D/Widgets/HotbarWidget.cs
View File

@ -120,7 +120,7 @@ namespace ClassicalSharp.Gui.Widgets {
// a) user presses alt then number // a) user presses alt then number
// b) user presses alt // b) user presses alt
// thus we only do case b) if case a) did not happen // thus we only do case b) if case a) did not happen
if (!(key == Key.AltLeft || key == Key.AltRight)) return false; if (!(key == game.Input.Keys[KeyBind.HotbarSwitching])) return false;
if (altHandled) { altHandled = false; return true; } // handled already if (altHandled) { altHandled = false; return true; } // handled already
// Alternate between first and second row // Alternate between first and second row

13
ClassicalSharp/Game/KeyMap.cs
View File

@ -10,8 +10,8 @@ namespace ClassicalSharp {
Forward, Back, Left, Right, Jump, Respawn, SetSpawn, Chat, Forward, Back, Left, Right, Jump, Respawn, SetSpawn, Chat,
Inventory, ToggleFog, SendChat, PauseOrExit, PlayerList, Inventory, ToggleFog, SendChat, PauseOrExit, PlayerList,
Speed, NoClip, Fly, FlyUp, FlyDown, ExtInput, HideFps, Speed, NoClip, Fly, FlyUp, FlyDown, ExtInput, HideFps,
Screenshot, Fullscreen, ThirdPerson, HideGui, AxisLines, HotbarSwitching, Screenshot, Fullscreen, ThirdPerson, HideGui, AxisLines,
ZoomScrolling, HalfSpeed, MouseLeft, MouseMiddle, MouseRight, Autorotate, ZoomScrolling, HalfSpeed, MouseLeft, MouseMiddle, MouseRight, Autorotate
#pragma warning restore 1591 #pragma warning restore 1591
} }
@ -34,17 +34,16 @@ namespace ClassicalSharp {
public KeyMap() { public KeyMap() {
// We can't use enum array initaliser because this causes problems when building with mono // We can't use enum array initaliser because this causes problems when building with mono
// and running on default .NET (https://bugzilla.xamarin.com/show_bug.cgi?id=572) // and running on default .NET (https://bugzilla.xamarin.com/show_bug.cgi?id=572)
keys = new Key[31]; keys = new Key[32];
keys[0] = Key.W; keys[1] = Key.S; keys[2] = Key.A; keys[3] = Key.D; keys[0] = Key.W; keys[1] = Key.S; keys[2] = Key.A; keys[3] = Key.D;
keys[4] = Key.Space; keys[5] = Key.R; keys[6] = Key.Enter; keys[7] = Key.T; keys[4] = Key.Space; keys[5] = Key.R; keys[6] = Key.Enter; keys[7] = Key.T;
keys[8] = Key.B; keys[9] = Key.F; keys[10] = Key.Enter; keys[8] = Key.B; keys[9] = Key.F; keys[10] = Key.Enter;
keys[11] = Key.Escape; keys[12] = Key.Tab; keys[13] = Key.ShiftLeft; keys[11] = Key.Escape; keys[12] = Key.Tab; keys[13] = Key.ShiftLeft;
keys[14] = Key.X; keys[15] = Key.Z; keys[16] = Key.Q; keys[14] = Key.X; keys[15] = Key.Z; keys[16] = Key.Q;
keys[17] = Key.E; keys[18] = Key.AltLeft; keys[19] = Key.F3; keys[17] = Key.E; keys[18] = Key.AltLeft; keys[19] = Key.F3;
keys[20] = Key.F12; keys[21] = Key.F11; keys[22] = Key.F5; keys[20] = Key.AltLeft; keys[21] = Key.F12; keys[22] = Key.F11; keys[23] = Key.F5;
keys[23] = Key.F1; keys[24] = Key.F7; keys[25] = Key.C; keys[24] = Key.F1; keys[25] = Key.F7; keys[26] = Key.C; keys[27] = Key.ControlLeft;
keys[26] = Key.ControlLeft; keys[28] = Key.Unknown; keys[29] = Key.Unknown; keys[30] = Key.Unknown; keys[31] = Key.F6;
keys[27] = Key.Unknown; keys[28] = Key.Unknown; keys[29] = Key.Unknown; keys[30] = Key.F6;
defaultKeys = new Key[keys.Length]; defaultKeys = new Key[keys.Length];
for (int i = 0; i < defaultKeys.Length; i++) for (int i = 0; i < defaultKeys.Length; i++)