From fdae009597336804e0771b92905d1a4dc52bd8f2 Mon Sep 17 00:00:00 2001 From: adelikat Date: Thu, 2 May 2013 04:23:52 +0000 Subject: [PATCH] N64 - fix dpad on the gui side, still doesn't work though --- BizHawk.MultiClient/MainForm.cs | 128 ++++++++++++++++---------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 0908891cb5..efa481cc3a 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -1507,63 +1507,63 @@ namespace BizHawk.MultiClient N64Controls.BindMulti("Power", Global.Config.N64ConsoleButtons.Power); N64Controls.BindMulti("Reset", Global.Config.N64ConsoleButtons.Reset); - N64Controls.BindMulti("P1 Up", Global.Config.N64Controller[0].DPadU); - N64Controls.BindMulti("P1 Left", Global.Config.N64Controller[0].DPadD); - N64Controls.BindMulti("P1 Right", Global.Config.N64Controller[0].DPadL); - N64Controls.BindMulti("P1 Down", Global.Config.N64Controller[0].DPadR); + N64Controls.BindMulti("P1 DPad U", Global.Config.N64Controller[0].DPadU); + N64Controls.BindMulti("P1 DPad L", Global.Config.N64Controller[0].DPadD); + N64Controls.BindMulti("P1 DPad R", Global.Config.N64Controller[0].DPadL); + N64Controls.BindMulti("P1 DPad D", Global.Config.N64Controller[0].DPadR); N64Controls.BindMulti("P1 Start", Global.Config.N64Controller[0].Start); N64Controls.BindMulti("P1 Z", Global.Config.N64Controller[0].Z); N64Controls.BindMulti("P1 B", Global.Config.N64Controller[0].B); N64Controls.BindMulti("P1 A", Global.Config.N64Controller[0].A); - N64Controls.BindMulti("P1 C Up", Global.Config.N64Controller[0].CUp); - N64Controls.BindMulti("P1 C Down", Global.Config.N64Controller[0].CDown); - N64Controls.BindMulti("P1 C Left", Global.Config.N64Controller[0].CLeft); - N64Controls.BindMulti("P1 C Right", Global.Config.N64Controller[0].CRight); + N64Controls.BindMulti("P1 C DPad U", Global.Config.N64Controller[0].CUp); + N64Controls.BindMulti("P1 C DPad D", Global.Config.N64Controller[0].CDown); + N64Controls.BindMulti("P1 C DPad L", Global.Config.N64Controller[0].CLeft); + N64Controls.BindMulti("P1 C DPad R", Global.Config.N64Controller[0].CRight); N64Controls.BindMulti("P1 L", Global.Config.N64Controller[0].L); N64Controls.BindMulti("P1 R", Global.Config.N64Controller[0].R); - N64Controls.BindMulti("P2 Up", Global.Config.N64Controller[1].DPadU); - N64Controls.BindMulti("P2 Left", Global.Config.N64Controller[1].DPadD); - N64Controls.BindMulti("P2 Right", Global.Config.N64Controller[1].DPadL); - N64Controls.BindMulti("P2 Down", Global.Config.N64Controller[1].DPadR); + N64Controls.BindMulti("P2 DPad U", Global.Config.N64Controller[1].DPadU); + N64Controls.BindMulti("P2 DPad L", Global.Config.N64Controller[1].DPadD); + N64Controls.BindMulti("P2 DPad R", Global.Config.N64Controller[1].DPadL); + N64Controls.BindMulti("P2 DPad D", Global.Config.N64Controller[1].DPadR); N64Controls.BindMulti("P2 Start", Global.Config.N64Controller[1].Start); N64Controls.BindMulti("P2 Z", Global.Config.N64Controller[1].Z); N64Controls.BindMulti("P2 B", Global.Config.N64Controller[1].B); N64Controls.BindMulti("P2 A", Global.Config.N64Controller[1].A); - N64Controls.BindMulti("P2 C Up", Global.Config.N64Controller[1].CUp); - N64Controls.BindMulti("P2 C Down", Global.Config.N64Controller[1].CDown); - N64Controls.BindMulti("P2 C Left", Global.Config.N64Controller[1].CLeft); - N64Controls.BindMulti("P2 C Right", Global.Config.N64Controller[1].CRight); + N64Controls.BindMulti("P2 C DPad U", Global.Config.N64Controller[1].CUp); + N64Controls.BindMulti("P2 C DPad D", Global.Config.N64Controller[1].CDown); + N64Controls.BindMulti("P2 C DPad L", Global.Config.N64Controller[1].CLeft); + N64Controls.BindMulti("P2 C DPad R", Global.Config.N64Controller[1].CRight); N64Controls.BindMulti("P2 L", Global.Config.N64Controller[1].L); N64Controls.BindMulti("P2 R", Global.Config.N64Controller[1].R); - N64Controls.BindMulti("P3 Up", Global.Config.N64Controller[2].DPadU); - N64Controls.BindMulti("P3 Left", Global.Config.N64Controller[2].DPadD); - N64Controls.BindMulti("P3 Right", Global.Config.N64Controller[2].DPadL); - N64Controls.BindMulti("P3 Down", Global.Config.N64Controller[2].DPadR); + N64Controls.BindMulti("P3 DPad U", Global.Config.N64Controller[2].DPadU); + N64Controls.BindMulti("P3 DPad L", Global.Config.N64Controller[2].DPadD); + N64Controls.BindMulti("P3 DPad R", Global.Config.N64Controller[2].DPadL); + N64Controls.BindMulti("P3 DPad D", Global.Config.N64Controller[2].DPadR); N64Controls.BindMulti("P3 Start", Global.Config.N64Controller[2].Start); N64Controls.BindMulti("P3 Z", Global.Config.N64Controller[2].Z); N64Controls.BindMulti("P3 B", Global.Config.N64Controller[2].B); N64Controls.BindMulti("P3 A", Global.Config.N64Controller[2].A); - N64Controls.BindMulti("P3 C Up", Global.Config.N64Controller[2].CUp); - N64Controls.BindMulti("P3 C Down", Global.Config.N64Controller[2].CDown); - N64Controls.BindMulti("P3 C Left", Global.Config.N64Controller[2].CLeft); - N64Controls.BindMulti("P3 C Right", Global.Config.N64Controller[2].CRight); + N64Controls.BindMulti("P3 C DPad U", Global.Config.N64Controller[2].CUp); + N64Controls.BindMulti("P3 C DPad D", Global.Config.N64Controller[2].CDown); + N64Controls.BindMulti("P3 C DPad L", Global.Config.N64Controller[2].CLeft); + N64Controls.BindMulti("P3 C DPad R", Global.Config.N64Controller[2].CRight); N64Controls.BindMulti("P3 L", Global.Config.N64Controller[2].L); N64Controls.BindMulti("P3 R", Global.Config.N64Controller[2].R); - N64Controls.BindMulti("P4 Up", Global.Config.N64Controller[3].DPadU); - N64Controls.BindMulti("P4 Left", Global.Config.N64Controller[3].DPadD); - N64Controls.BindMulti("P4 Right", Global.Config.N64Controller[3].DPadL); - N64Controls.BindMulti("P4 Down", Global.Config.N64Controller[3].DPadR); + N64Controls.BindMulti("P4 DPad U", Global.Config.N64Controller[3].DPadU); + N64Controls.BindMulti("P4 DPad L", Global.Config.N64Controller[3].DPadD); + N64Controls.BindMulti("P4 DPad R", Global.Config.N64Controller[3].DPadL); + N64Controls.BindMulti("P4 DPad D", Global.Config.N64Controller[3].DPadR); N64Controls.BindMulti("P4 Start", Global.Config.N64Controller[3].Start); N64Controls.BindMulti("P4 Z", Global.Config.N64Controller[3].Z); N64Controls.BindMulti("P4 B", Global.Config.N64Controller[3].B); N64Controls.BindMulti("P4 A", Global.Config.N64Controller[3].A); - N64Controls.BindMulti("P4 C Up", Global.Config.N64Controller[3].CUp); - N64Controls.BindMulti("P4 C Down", Global.Config.N64Controller[3].CDown); - N64Controls.BindMulti("P4 C Left", Global.Config.N64Controller[3].CLeft); - N64Controls.BindMulti("P4 C Right", Global.Config.N64Controller[3].CRight); + N64Controls.BindMulti("P4 C DPad U", Global.Config.N64Controller[3].CUp); + N64Controls.BindMulti("P4 C DPad D", Global.Config.N64Controller[3].CDown); + N64Controls.BindMulti("P4 C DPad L", Global.Config.N64Controller[3].CLeft); + N64Controls.BindMulti("P4 C DPad R", Global.Config.N64Controller[3].CRight); N64Controls.BindMulti("P4 L", Global.Config.N64Controller[3].L); N64Controls.BindMulti("P4 R", Global.Config.N64Controller[3].R); @@ -1571,63 +1571,63 @@ namespace BizHawk.MultiClient var N64AControls = new AutofireController(N64.N64ControllerDefinition); - N64AControls.BindMulti("P1 Up", Global.Config.N64AutoController[0].DPadU); - N64AControls.BindMulti("P1 Left", Global.Config.N64AutoController[0].DPadD); - N64AControls.BindMulti("P1 Right", Global.Config.N64AutoController[0].DPadL); - N64AControls.BindMulti("P1 Down", Global.Config.N64AutoController[0].DPadR); + N64AControls.BindMulti("P1 DPad U", Global.Config.N64AutoController[0].DPadU); + N64AControls.BindMulti("P1 DPad L", Global.Config.N64AutoController[0].DPadD); + N64AControls.BindMulti("P1 DPad R", Global.Config.N64AutoController[0].DPadL); + N64AControls.BindMulti("P1 DPad D", Global.Config.N64AutoController[0].DPadR); N64AControls.BindMulti("P1 Start", Global.Config.N64AutoController[0].Start); N64AControls.BindMulti("P1 Z", Global.Config.N64AutoController[0].Z); N64AControls.BindMulti("P1 B", Global.Config.N64AutoController[0].B); N64AControls.BindMulti("P1 A", Global.Config.N64AutoController[0].A); - N64AControls.BindMulti("P1 C Up", Global.Config.N64AutoController[0].CUp); - N64AControls.BindMulti("P1 C Down", Global.Config.N64AutoController[0].CDown); - N64AControls.BindMulti("P1 C Left", Global.Config.N64AutoController[0].CLeft); - N64AControls.BindMulti("P1 C Right", Global.Config.N64AutoController[0].CRight); + N64AControls.BindMulti("P1 C DPad U", Global.Config.N64AutoController[0].CUp); + N64AControls.BindMulti("P1 C DPad D", Global.Config.N64AutoController[0].CDown); + N64AControls.BindMulti("P1 C DPad L", Global.Config.N64AutoController[0].CLeft); + N64AControls.BindMulti("P1 C DPad R", Global.Config.N64AutoController[0].CRight); N64AControls.BindMulti("P1 L", Global.Config.N64AutoController[0].L); N64AControls.BindMulti("P1 R", Global.Config.N64AutoController[0].R); - N64AControls.BindMulti("P2 Up", Global.Config.N64AutoController[1].DPadU); - N64AControls.BindMulti("P2 Left", Global.Config.N64AutoController[1].DPadD); - N64AControls.BindMulti("P2 Right", Global.Config.N64AutoController[1].DPadL); - N64AControls.BindMulti("P2 Down", Global.Config.N64AutoController[1].DPadR); + N64AControls.BindMulti("P2 DPad U", Global.Config.N64AutoController[1].DPadU); + N64AControls.BindMulti("P2 DPad L", Global.Config.N64AutoController[1].DPadD); + N64AControls.BindMulti("P2 DPad R", Global.Config.N64AutoController[1].DPadL); + N64AControls.BindMulti("P2 DPad D", Global.Config.N64AutoController[1].DPadR); N64AControls.BindMulti("P2 Start", Global.Config.N64AutoController[1].Start); N64AControls.BindMulti("P2 Z", Global.Config.N64AutoController[1].Z); N64AControls.BindMulti("P2 B", Global.Config.N64AutoController[1].B); N64AControls.BindMulti("P2 A", Global.Config.N64AutoController[1].A); - N64AControls.BindMulti("P2 C Up", Global.Config.N64AutoController[1].CUp); - N64AControls.BindMulti("P2 C Down", Global.Config.N64AutoController[1].CDown); - N64AControls.BindMulti("P2 C Left", Global.Config.N64AutoController[1].CLeft); - N64AControls.BindMulti("P2 C Right", Global.Config.N64AutoController[1].CRight); + N64AControls.BindMulti("P2 C DPad U", Global.Config.N64AutoController[1].CUp); + N64AControls.BindMulti("P2 C DPad D", Global.Config.N64AutoController[1].CDown); + N64AControls.BindMulti("P2 C DPad L", Global.Config.N64AutoController[1].CLeft); + N64AControls.BindMulti("P2 C DPad R", Global.Config.N64AutoController[1].CRight); N64AControls.BindMulti("P2 L", Global.Config.N64AutoController[1].L); N64AControls.BindMulti("P2 R", Global.Config.N64AutoController[1].R); - N64AControls.BindMulti("P3 Up", Global.Config.N64AutoController[2].DPadU); - N64AControls.BindMulti("P3 Left", Global.Config.N64AutoController[2].DPadD); - N64AControls.BindMulti("P3 Right", Global.Config.N64AutoController[2].DPadL); - N64AControls.BindMulti("P3 Down", Global.Config.N64AutoController[2].DPadR); + N64AControls.BindMulti("P3 DPad U", Global.Config.N64AutoController[2].DPadU); + N64AControls.BindMulti("P3 DPad L", Global.Config.N64AutoController[2].DPadD); + N64AControls.BindMulti("P3 DPad R", Global.Config.N64AutoController[2].DPadL); + N64AControls.BindMulti("P3 DPad D", Global.Config.N64AutoController[2].DPadR); N64AControls.BindMulti("P3 Start", Global.Config.N64AutoController[2].Start); N64AControls.BindMulti("P3 Z", Global.Config.N64AutoController[2].Z); N64AControls.BindMulti("P3 B", Global.Config.N64AutoController[2].B); N64AControls.BindMulti("P3 A", Global.Config.N64AutoController[2].A); - N64AControls.BindMulti("P3 C Up", Global.Config.N64AutoController[2].CUp); - N64AControls.BindMulti("P3 C Down", Global.Config.N64AutoController[2].CDown); - N64AControls.BindMulti("P3 C Left", Global.Config.N64AutoController[2].CLeft); - N64AControls.BindMulti("P3 C Right", Global.Config.N64AutoController[2].CRight); + N64AControls.BindMulti("P3 C DPad U", Global.Config.N64AutoController[2].CUp); + N64AControls.BindMulti("P3 C DPad D", Global.Config.N64AutoController[2].CDown); + N64AControls.BindMulti("P3 C DPad L", Global.Config.N64AutoController[2].CLeft); + N64AControls.BindMulti("P3 C DPad R", Global.Config.N64AutoController[2].CRight); N64AControls.BindMulti("P3 L", Global.Config.N64AutoController[2].L); N64AControls.BindMulti("P3 R", Global.Config.N64AutoController[2].R); - N64AControls.BindMulti("P4 Up", Global.Config.N64AutoController[3].DPadU); - N64AControls.BindMulti("P4 Left", Global.Config.N64AutoController[3].DPadD); - N64AControls.BindMulti("P4 Right", Global.Config.N64AutoController[3].DPadL); - N64AControls.BindMulti("P4 Down", Global.Config.N64AutoController[3].DPadR); + N64AControls.BindMulti("P4 DPad U", Global.Config.N64AutoController[3].DPadU); + N64AControls.BindMulti("P4 DPad L", Global.Config.N64AutoController[3].DPadD); + N64AControls.BindMulti("P4 DPad R", Global.Config.N64AutoController[3].DPadL); + N64AControls.BindMulti("P4 DPad D", Global.Config.N64AutoController[3].DPadR); N64AControls.BindMulti("P4 Start", Global.Config.N64AutoController[3].Start); N64AControls.BindMulti("P4 Z", Global.Config.N64AutoController[3].Z); N64AControls.BindMulti("P4 B", Global.Config.N64AutoController[3].B); N64AControls.BindMulti("P4 A", Global.Config.N64AutoController[3].A); - N64AControls.BindMulti("P4 C Up", Global.Config.N64AutoController[3].CUp); - N64AControls.BindMulti("P4 C Down", Global.Config.N64AutoController[3].CDown); - N64AControls.BindMulti("P4 C Left", Global.Config.N64AutoController[3].CLeft); - N64AControls.BindMulti("P4 C Right", Global.Config.N64AutoController[3].CRight); + N64AControls.BindMulti("P4 C DPad U", Global.Config.N64AutoController[3].CUp); + N64AControls.BindMulti("P4 C DPad D", Global.Config.N64AutoController[3].CDown); + N64AControls.BindMulti("P4 C DPad L", Global.Config.N64AutoController[3].CLeft); + N64AControls.BindMulti("P4 C DPad R", Global.Config.N64AutoController[3].CRight); N64AControls.BindMulti("P4 L", Global.Config.N64AutoController[3].L); N64AControls.BindMulti("P4 R", Global.Config.N64AutoController[3].R);