ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move joypad lua library to common, and move some stuff to Global in order to do so

This commit is contained in:
adelikat 2013-11-01 22:56:55 +00:00
parent 0eaf6bd33c
commit a3e306e18d
31 changed files with 485 additions and 485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.Common/BizHawk.Client.Common.csproj
View File

@ -104,6 +104,7 @@
<Compile Include="lua\EmuLuaLibrary.Bit.cs" /> <Compile Include="lua\EmuLuaLibrary.Bit.cs" />
<Compile Include="lua\EmuLuaLibrary.Emu.cs" /> <Compile Include="lua\EmuLuaLibrary.Emu.cs" />
<Compile Include="lua\EmuLuaLibrary.Events.cs" /> <Compile Include="lua\EmuLuaLibrary.Events.cs" />
<Compile Include="lua\EmuLuaLibrary.Joypad.cs" />
<Compile Include="lua\EmuLuaLibrary.MainMemory.cs" /> <Compile Include="lua\EmuLuaLibrary.MainMemory.cs" />
<Compile Include="lua\EmuLuaLibrary.Memory.cs" /> <Compile Include="lua\EmuLuaLibrary.Memory.cs" />
<Compile Include="lua\EmuLuaLibrary.Movie.cs" /> <Compile Include="lua\EmuLuaLibrary.Movie.cs" />

15
BizHawk.Client.Common/Global.cs
View File

@ -55,5 +55,20 @@ namespace BizHawk.Client.Common
} }
public static DiscHopper DiscHopper = new DiscHopper(); public static DiscHopper DiscHopper = new DiscHopper();
/// <summary>
/// provides an opportunity to mutate the player's input in an autohold style
/// </summary>
public static StickyXORAdapter StickyXORAdapter = new StickyXORAdapter();
/// <summary>
/// Forces any controller button to Off, useful for things like Joypad.Set
/// </summary>
public static ForceOffAdaptor ForceOffAdaptor = new ForceOffAdaptor();
/// <summary>
/// fire off one-frame logical button clicks here. useful for things like ti-83 virtual pad and reset buttons
/// </summary>
public static ClickyVirtualPadController ClickyVirtualPadController = new ClickyVirtualPadController();
} }
} }

31
BizHawk.MultiClient/tools/Lua/Libraries/EmuLuaLibrary.Joypad.cs → BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
View File

@ -1,8 +1,7 @@
using System; using System;
using LuaInterface; using LuaInterface;
using BizHawk.Client.Common;
namespace BizHawk.MultiClient namespace BizHawk.Client.Common
{ {
public class JoypadLuaLibrary : LuaLibraryBase public class JoypadLuaLibrary : LuaLibraryBase
{ {
@ -111,24 +110,24 @@ namespace BizHawk.MultiClient
{ {
if (controller == null) //Force On if (controller == null) //Force On
{ {
GlobalWinF.ClickyVirtualPadController.Click(button.ToString()); Global.ClickyVirtualPadController.Click(button.ToString());
GlobalWinF.ForceOffAdaptor.SetSticky(button.ToString(), false); Global.ForceOffAdaptor.SetSticky(button.ToString(), false);
} }
else else
{ {
GlobalWinF.ClickyVirtualPadController.Click("P" + controller + " " + button); Global.ClickyVirtualPadController.Click("P" + controller + " " + button);
GlobalWinF.ForceOffAdaptor.SetSticky("P" + controller + " " + button, false); Global.ForceOffAdaptor.SetSticky("P" + controller + " " + button, false);
} }
} }
else if (theValue == false) //Force off else if (theValue == false) //Force off
{ {
if (controller == null) if (controller == null)
{ {
GlobalWinF.ForceOffAdaptor.SetSticky(button.ToString(), true); Global.ForceOffAdaptor.SetSticky(button.ToString(), true);
} }
else else
{ {
GlobalWinF.ForceOffAdaptor.SetSticky("P" + controller + " " + button, true); Global.ForceOffAdaptor.SetSticky("P" + controller + " " + button, true);
} }
} }
else else
@ -136,11 +135,11 @@ namespace BizHawk.MultiClient
//Turn everything off //Turn everything off
if (controller == null) if (controller == null)
{ {
GlobalWinF.ForceOffAdaptor.SetSticky(button.ToString(), false); Global.ForceOffAdaptor.SetSticky(button.ToString(), false);
} }
else else
{ {
GlobalWinF.ForceOffAdaptor.SetSticky("P" + controller + " " + button, false); Global.ForceOffAdaptor.SetSticky("P" + controller + " " + button, false);
} }
} }
} }
@ -148,13 +147,13 @@ namespace BizHawk.MultiClient
{ {
if (controller == null) if (controller == null)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(button.ToString(), true); Global.StickyXORAdapter.SetSticky(button.ToString(), true);
GlobalWinF.ForceOffAdaptor.SetSticky(button.ToString(), false); Global.ForceOffAdaptor.SetSticky(button.ToString(), false);
} }
else else
{ {
GlobalWinF.StickyXORAdapter.SetSticky("P" + controller + " " + button, true); Global.StickyXORAdapter.SetSticky("P" + controller + " " + button, true);
GlobalWinF.ForceOffAdaptor.SetSticky("P" + controller + " " + button, false); Global.ForceOffAdaptor.SetSticky("P" + controller + " " + button, false);
} }
} }
} }
@ -177,11 +176,11 @@ namespace BizHawk.MultiClient
float theValue = float.Parse(theValueStr); float theValue = float.Parse(theValueStr);
if (controller == null) if (controller == null)
{ {
GlobalWinF.StickyXORAdapter.SetFloat(name.ToString(), theValue); Global.StickyXORAdapter.SetFloat(name.ToString(), theValue);
} }
else else
{ {
GlobalWinF.StickyXORAdapter.SetFloat("P" + controller + " " + name, theValue); Global.StickyXORAdapter.SetFloat("P" + controller + " " + name, theValue);
} }
} }
catch { } catch { }

1
BizHawk.MultiClient/BizHawk.MultiClient.csproj
View File

@ -449,7 +449,6 @@
<Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Forms.cs" /> <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Forms.cs" />
<Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Gui.cs" /> <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Gui.cs" />
<Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Input.cs" /> <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Input.cs" />
<Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Joypad.cs" />
<Compile Include="tools\Lua\Libraries\EmuLuaLibrary.NES.cs" /> <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.NES.cs" />
<Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Savestate.cs" /> <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.Savestate.cs" />
<Compile Include="tools\Lua\Libraries\EmuLuaLibrary.SNES.cs" /> <Compile Include="tools\Lua\Libraries\EmuLuaLibrary.SNES.cs" />

2
BizHawk.MultiClient/DisplayManager/DisplayManager.cs
View File

@ -591,7 +591,7 @@ namespace BizHawk.MultiClient
{ {
StringBuilder disp = new StringBuilder("Held: "); StringBuilder disp = new StringBuilder("Held: ");
foreach (string s in GlobalWinF.StickyXORAdapter.CurrentStickies) foreach (string s in Global.StickyXORAdapter.CurrentStickies)
{ {
disp.Append(s); disp.Append(s);
disp.Append(' '); disp.Append(' ');

15
BizHawk.MultiClient/GlobalWinF.cs
View File

@ -25,28 +25,13 @@ namespace BizHawk.MultiClient
public static UD_LR_ControllerAdapter UD_LR_ControllerAdapter = new UD_LR_ControllerAdapter(); public static UD_LR_ControllerAdapter UD_LR_ControllerAdapter = new UD_LR_ControllerAdapter();
/// <summary>
/// provides an opportunity to mutate the player's input in an autohold style
/// </summary>
public static StickyXORAdapter StickyXORAdapter = new StickyXORAdapter();
public static AutoFireStickyXORAdapter AutofireStickyXORAdapter = new AutoFireStickyXORAdapter(); public static AutoFireStickyXORAdapter AutofireStickyXORAdapter = new AutoFireStickyXORAdapter();
/// <summary>
/// Forces any controller button to Off, useful for things like Joypad.Set
/// </summary>
public static ForceOffAdaptor ForceOffAdaptor = new ForceOffAdaptor();
/// <summary> /// <summary>
/// will OR together two IControllers /// will OR together two IControllers
/// </summary> /// </summary>
public static ORAdapter OrControllerAdapter = new ORAdapter(); public static ORAdapter OrControllerAdapter = new ORAdapter();
/// <summary>
/// fire off one-frame logical button clicks here. useful for things like ti-83 virtual pad and reset buttons
/// </summary>
public static ClickyVirtualPadController ClickyVirtualPadController = new ClickyVirtualPadController();
public static SimpleController MovieOutputController = new SimpleController(); public static SimpleController MovieOutputController = new SimpleController();
public static Controller ClientControls; public static Controller ClientControls;

28
BizHawk.MultiClient/MainForm.cs
View File

@ -677,12 +677,12 @@ namespace BizHawk.MultiClient
GlobalWinF.ClientControls.LatchFromPhysical(GlobalWinF.HotkeyCoalescer); GlobalWinF.ClientControls.LatchFromPhysical(GlobalWinF.HotkeyCoalescer);
Global.ActiveController.LatchFromPhysical(GlobalWinF.ControllerInputCoalescer); Global.ActiveController.LatchFromPhysical(GlobalWinF.ControllerInputCoalescer);
Global.ActiveController.OR_FromLogical(GlobalWinF.ClickyVirtualPadController); Global.ActiveController.OR_FromLogical(Global.ClickyVirtualPadController);
Global.AutoFireController.LatchFromPhysical(GlobalWinF.ControllerInputCoalescer); Global.AutoFireController.LatchFromPhysical(GlobalWinF.ControllerInputCoalescer);
if (GlobalWinF.ClientControls["Autohold"]) if (GlobalWinF.ClientControls["Autohold"])
{ {
GlobalWinF.StickyXORAdapter.MassToggleStickyState(Global.ActiveController.PressedButtons); Global.StickyXORAdapter.MassToggleStickyState(Global.ActiveController.PressedButtons);
GlobalWinF.AutofireStickyXORAdapter.MassToggleStickyState(Global.AutoFireController.PressedButtons); GlobalWinF.AutofireStickyXORAdapter.MassToggleStickyState(Global.AutoFireController.PressedButtons);
} }
else if (GlobalWinF.ClientControls["Autofire"]) else if (GlobalWinF.ClientControls["Autofire"])
@ -946,7 +946,7 @@ namespace BizHawk.MultiClient
{ {
if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished) if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
{ {
GlobalWinF.ClickyVirtualPadController.Click(button); Global.ClickyVirtualPadController.Click(button);
GlobalWinF.OSD.AddMessage(msg); GlobalWinF.OSD.AddMessage(msg);
} }
} }
@ -1048,7 +1048,7 @@ namespace BizHawk.MultiClient
// allow propogating controls that are in the current controller definition but not in the prebaked one // allow propogating controls that are in the current controller definition but not in the prebaked one
// these two lines shouldn't be required anymore under the new system? // these two lines shouldn't be required anymore under the new system?
Global.ActiveController.ForceType(new ControllerDefinition(Global.Emulator.ControllerDefinition)); Global.ActiveController.ForceType(new ControllerDefinition(Global.Emulator.ControllerDefinition));
GlobalWinF.ClickyVirtualPadController.Type = new ControllerDefinition(Global.Emulator.ControllerDefinition); Global.ClickyVirtualPadController.Type = new ControllerDefinition(Global.Emulator.ControllerDefinition);
RewireInputChain(); RewireInputChain();
} }
@ -1060,13 +1060,13 @@ namespace BizHawk.MultiClient
GlobalWinF.OrControllerAdapter.SourceOr = Global.AutoFireController; GlobalWinF.OrControllerAdapter.SourceOr = Global.AutoFireController;
GlobalWinF.UD_LR_ControllerAdapter.Source = GlobalWinF.OrControllerAdapter; GlobalWinF.UD_LR_ControllerAdapter.Source = GlobalWinF.OrControllerAdapter;
GlobalWinF.StickyXORAdapter.Source = GlobalWinF.UD_LR_ControllerAdapter; Global.StickyXORAdapter.Source = GlobalWinF.UD_LR_ControllerAdapter;
GlobalWinF.AutofireStickyXORAdapter.Source = GlobalWinF.StickyXORAdapter; GlobalWinF.AutofireStickyXORAdapter.Source = Global.StickyXORAdapter;
Global.MultitrackRewiringControllerAdapter.Source = GlobalWinF.AutofireStickyXORAdapter; Global.MultitrackRewiringControllerAdapter.Source = GlobalWinF.AutofireStickyXORAdapter;
GlobalWinF.ForceOffAdaptor.Source = Global.MultitrackRewiringControllerAdapter; Global.ForceOffAdaptor.Source = Global.MultitrackRewiringControllerAdapter;
Global.MovieInputSourceAdapter.Source = GlobalWinF.ForceOffAdaptor; Global.MovieInputSourceAdapter.Source = Global.ForceOffAdaptor;
Global.ControllerOutput.Source = Global.MovieOutputHardpoint; Global.ControllerOutput.Source = Global.MovieOutputHardpoint;
Global.Emulator.Controller = Global.ControllerOutput; Global.Emulator.Controller = Global.ControllerOutput;
@ -1660,8 +1660,8 @@ namespace BizHawk.MultiClient
CaptureRewindState(); CaptureRewindState();
GlobalWinF.StickyXORAdapter.ClearStickies(); Global.StickyXORAdapter.ClearStickies();
GlobalWinF.StickyXORAdapter.ClearStickyFloats(); Global.StickyXORAdapter.ClearStickyFloats();
GlobalWinF.AutofireStickyXORAdapter.ClearStickies(); GlobalWinF.AutofireStickyXORAdapter.ClearStickies();
RewireSound(); RewireSound();
@ -1956,7 +1956,7 @@ namespace BizHawk.MultiClient
private void ClearAutohold() private void ClearAutohold()
{ {
GlobalWinF.StickyXORAdapter.ClearStickies(); Global.StickyXORAdapter.ClearStickies();
GlobalWinF.AutofireStickyXORAdapter.ClearStickies(); GlobalWinF.AutofireStickyXORAdapter.ClearStickies();
VirtualPadForm1.ClearVirtualPadHolds(); VirtualPadForm1.ClearVirtualPadHolds();
GlobalWinF.OSD.AddMessage("Autohold keys cleared"); GlobalWinF.OSD.AddMessage("Autohold keys cleared");
@ -2260,7 +2260,7 @@ namespace BizHawk.MultiClient
UpdateToolsBefore(); UpdateToolsBefore();
} }
GlobalWinF.ClickyVirtualPadController.FrameTick(); Global.ClickyVirtualPadController.FrameTick();
runloop_fps++; runloop_fps++;
//client input-related duties //client input-related duties
@ -3399,7 +3399,7 @@ namespace BizHawk.MultiClient
{ {
if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished) if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
{ {
GlobalWinF.ClickyVirtualPadController.Click("Reset"); Global.ClickyVirtualPadController.Click("Reset");
GlobalWinF.OSD.AddMessage("Reset button pressed."); GlobalWinF.OSD.AddMessage("Reset button pressed.");
} }
} }
@ -3412,7 +3412,7 @@ namespace BizHawk.MultiClient
{ {
if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished) if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
{ {
GlobalWinF.ClickyVirtualPadController.Click("Power"); Global.ClickyVirtualPadController.Click("Power");
GlobalWinF.OSD.AddMessage("Power button pressed."); GlobalWinF.OSD.AddMessage("Power button pressed.");
} }
} }

100
BizHawk.MultiClient/tools/TI83/TI83KeyPad.cs
View File

@ -124,247 +124,247 @@ namespace BizHawk.MultiClient
private void button42_Click(object sender, EventArgs e) private void button42_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("ENTER"); Global.ClickyVirtualPadController.Click("ENTER");
} }
private void button43_Click(object sender, EventArgs e) private void button43_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("DASH"); Global.ClickyVirtualPadController.Click("DASH");
} }
private void button39_Click(object sender, EventArgs e) private void button39_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("2"); Global.ClickyVirtualPadController.Click("2");
} }
private void ONE_Click(object sender, EventArgs e) private void ONE_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("1"); Global.ClickyVirtualPadController.Click("1");
} }
private void THREE_Click(object sender, EventArgs e) private void THREE_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("3"); Global.ClickyVirtualPadController.Click("3");
} }
private void FOUR_Click(object sender, EventArgs e) private void FOUR_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("4"); Global.ClickyVirtualPadController.Click("4");
} }
private void FIVE_Click(object sender, EventArgs e) private void FIVE_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("5"); Global.ClickyVirtualPadController.Click("5");
} }
private void SIX_Click(object sender, EventArgs e) private void SIX_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("6"); Global.ClickyVirtualPadController.Click("6");
} }
private void SEVEN_Click(object sender, EventArgs e) private void SEVEN_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("7"); Global.ClickyVirtualPadController.Click("7");
} }
private void EIGHT_Click(object sender, EventArgs e) private void EIGHT_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("8"); Global.ClickyVirtualPadController.Click("8");
} }
private void NINE_Click(object sender, EventArgs e) private void NINE_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("9"); Global.ClickyVirtualPadController.Click("9");
} }
private void ON_Click(object sender, EventArgs e) private void ON_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("ON"); Global.ClickyVirtualPadController.Click("ON");
} }
private void STO_Click(object sender, EventArgs e) private void STO_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("STO"); Global.ClickyVirtualPadController.Click("STO");
} }
private void PLUS_Click(object sender, EventArgs e) private void PLUS_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("PLUS"); Global.ClickyVirtualPadController.Click("PLUS");
} }
private void LN_Click(object sender, EventArgs e) private void LN_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("LN"); Global.ClickyVirtualPadController.Click("LN");
} }
private void MINUS_Click(object sender, EventArgs e) private void MINUS_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("MINUS"); Global.ClickyVirtualPadController.Click("MINUS");
} }
private void LOG_Click(object sender, EventArgs e) private void LOG_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("LOG"); Global.ClickyVirtualPadController.Click("LOG");
} }
private void MULTIPLY_Click(object sender, EventArgs e) private void MULTIPLY_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("MULTIPLY"); Global.ClickyVirtualPadController.Click("MULTIPLY");
} }
private void button26_Click(object sender, EventArgs e) private void button26_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("SQUARED"); Global.ClickyVirtualPadController.Click("SQUARED");
} }
private void button25_Click(object sender, EventArgs e) private void button25_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("COMMA"); Global.ClickyVirtualPadController.Click("COMMA");
} }
private void button24_Click(object sender, EventArgs e) private void button24_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("PARAOPEN"); Global.ClickyVirtualPadController.Click("PARAOPEN");
} }
private void button23_Click(object sender, EventArgs e) private void button23_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("PARACLOSE"); Global.ClickyVirtualPadController.Click("PARACLOSE");
} }
private void button22_Click(object sender, EventArgs e) private void button22_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("DIVIDE"); Global.ClickyVirtualPadController.Click("DIVIDE");
} }
private void button17_Click(object sender, EventArgs e) private void button17_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("NEG1"); Global.ClickyVirtualPadController.Click("NEG1");
} }
private void button18_Click(object sender, EventArgs e) private void button18_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("SIN"); Global.ClickyVirtualPadController.Click("SIN");
} }
private void button19_Click(object sender, EventArgs e) private void button19_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("COS"); Global.ClickyVirtualPadController.Click("COS");
} }
private void button20_Click(object sender, EventArgs e) private void button20_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("TAN"); Global.ClickyVirtualPadController.Click("TAN");
} }
private void button21_Click(object sender, EventArgs e) private void button21_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("EXP"); Global.ClickyVirtualPadController.Click("EXP");
} }
private void button12_Click(object sender, EventArgs e) private void button12_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("MATH"); Global.ClickyVirtualPadController.Click("MATH");
} }
private void button13_Click(object sender, EventArgs e) private void button13_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("MATRIX"); Global.ClickyVirtualPadController.Click("MATRIX");
} }
private void button14_Click(object sender, EventArgs e) private void button14_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("PRGM"); Global.ClickyVirtualPadController.Click("PRGM");
} }
private void button15_Click(object sender, EventArgs e) private void button15_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("VARS"); Global.ClickyVirtualPadController.Click("VARS");
} }
private void button16_Click(object sender, EventArgs e) private void button16_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("CLEAR"); Global.ClickyVirtualPadController.Click("CLEAR");
} }
private void button11_Click(object sender, EventArgs e) private void button11_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("ALPHA"); Global.ClickyVirtualPadController.Click("ALPHA");
} }
private void button4_Click(object sender, EventArgs e) private void button4_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("X"); Global.ClickyVirtualPadController.Click("X");
} }
private void button10_Click(object sender, EventArgs e) private void button10_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("STAT"); Global.ClickyVirtualPadController.Click("STAT");
} }
private void button5_Click(object sender, EventArgs e) private void button5_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("2ND"); Global.ClickyVirtualPadController.Click("2ND");
} }
private void button2_Click(object sender, EventArgs e) private void button2_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("MODE"); Global.ClickyVirtualPadController.Click("MODE");
} }
private void button3_Click(object sender, EventArgs e) private void button3_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("DEL"); Global.ClickyVirtualPadController.Click("DEL");
} }
private void button47_Click(object sender, EventArgs e) private void button47_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("LEFT"); Global.ClickyVirtualPadController.Click("LEFT");
} }
private void button49_Click(object sender, EventArgs e) private void button49_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("DOWN"); Global.ClickyVirtualPadController.Click("DOWN");
} }
private void button48_Click(object sender, EventArgs e) private void button48_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("RIGHT"); Global.ClickyVirtualPadController.Click("RIGHT");
} }
private void button50_Click(object sender, EventArgs e) private void button50_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("UP"); Global.ClickyVirtualPadController.Click("UP");
} }
private void button1_Click(object sender, EventArgs e) private void button1_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("Y"); Global.ClickyVirtualPadController.Click("Y");
} }
private void button6_Click(object sender, EventArgs e) private void button6_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("WINDOW"); Global.ClickyVirtualPadController.Click("WINDOW");
} }
private void button7_Click(object sender, EventArgs e) private void button7_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("ZOOM"); Global.ClickyVirtualPadController.Click("ZOOM");
} }
private void button8_Click(object sender, EventArgs e) private void button8_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("TRACE"); Global.ClickyVirtualPadController.Click("TRACE");
} }
private void button9_Click(object sender, EventArgs e) private void button9_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("GRAPH"); Global.ClickyVirtualPadController.Click("GRAPH");
} }
private void PERIOD_Click(object sender, EventArgs e) private void PERIOD_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("DOT"); Global.ClickyVirtualPadController.Click("DOT");
} }
private void showHotkToolStripMenuItem_Click(object sender, EventArgs e) private void showHotkToolStripMenuItem_Click(object sender, EventArgs e)
@ -383,7 +383,7 @@ namespace BizHawk.MultiClient
private void ZERO_Click(object sender, EventArgs e) private void ZERO_Click(object sender, EventArgs e)
{ {
GlobalWinF.ClickyVirtualPadController.Click("0"); Global.ClickyVirtualPadController.Click("0");
} }
} }
} }

20
BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26.cs
View File

@ -148,15 +148,15 @@ namespace BizHawk.MultiClient
{ {
if (Global.Emulator.SystemId != "A26" && Global.Emulator.SystemId != "C64") return; if (Global.Emulator.SystemId != "A26" && Global.Emulator.SystemId != "C64") return;
if (sender == PU) if (sender == PU)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked);
else if (sender == PD) else if (sender == PD)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked);
else if (sender == PL) else if (sender == PL)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked);
else if (sender == PR) else if (sender == PR)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked);
else if (sender == B1) else if (sender == B1)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Button", B1.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Button", B1.Checked);
} }
public override void Clear() public override void Clear()
@ -164,11 +164,11 @@ namespace BizHawk.MultiClient
if (Global.Emulator.SystemId != "A26" && Global.Emulator.SystemId != "C64") return; if (Global.Emulator.SystemId != "A26" && Global.Emulator.SystemId != "C64") return;
if (PU.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", false); if (PU.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Up", false);
if (PD.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", false); if (PD.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Down", false);
if (PL.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", false); if (PL.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Left", false);
if (PR.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", false); if (PR.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Right", false);
if (B1.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " B", false); if (B1.Checked) Global.StickyXORAdapter.SetSticky(Controller + " B", false);
PU.Checked = false; PU.Checked = false;
PD.Checked = false; PD.Checked = false;

8
BizHawk.MultiClient/tools/VirtualPads/VirtualPadA26Control.cs
View File

@ -103,7 +103,7 @@ namespace BizHawk.MultiClient
if (Global.Emulator.SystemId != "A26") return; if (Global.Emulator.SystemId != "A26") return;
else if (sender == B1) else if (sender == B1)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Reset", B1.Checked); Global.StickyXORAdapter.SetSticky("Reset", B1.Checked);
if (B1.Checked) if (B1.Checked)
{ {
B1.BackColor = Color.Pink; B1.BackColor = Color.Pink;
@ -115,7 +115,7 @@ namespace BizHawk.MultiClient
} }
else if (sender == B2) else if (sender == B2)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Select", B2.Checked); Global.StickyXORAdapter.SetSticky("Select", B2.Checked);
if (B2.Checked) if (B2.Checked)
{ {
B2.BackColor = Color.Pink; B2.BackColor = Color.Pink;
@ -131,8 +131,8 @@ namespace BizHawk.MultiClient
{ {
if (Global.Emulator.SystemId != "A26") return; if (Global.Emulator.SystemId != "A26") return;
if (B1.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Reset", false); if (B1.Checked) Global.StickyXORAdapter.SetSticky("Reset", false);
if (B2.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Pause", false); if (B2.Checked) Global.StickyXORAdapter.SetSticky("Pause", false);
B1.Checked = false; B1.Checked = false;
B2.Checked = false; B2.Checked = false;

24
BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78.cs
View File

@ -79,27 +79,27 @@ namespace BizHawk.MultiClient
} }
else if (sender == PU) else if (sender == PU)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked);
} }
else if (sender == PD) else if (sender == PD)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked);
} }
else if (sender == PL) else if (sender == PL)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked);
} }
else if (sender == PR) else if (sender == PR)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked);
} }
else if (sender == B1) else if (sender == B1)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Trigger", B1.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Trigger", B1.Checked);
} }
else if (sender == B2) else if (sender == B2)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Trigger 2", B2.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Trigger 2", B2.Checked);
} }
} }
@ -108,12 +108,12 @@ namespace BizHawk.MultiClient
if (Global.Emulator.SystemId != "A78") return; if (Global.Emulator.SystemId != "A78") return;
if (PU.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", false); if (PU.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Up", false);
if (PD.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", false); if (PD.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Down", false);
if (PL.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", false); if (PL.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Left", false);
if (PR.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", false); if (PR.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Right", false);
if (B1.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Trigger", false); if (B1.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Trigger", false);
if (B2.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Trigger 2", false); if (B2.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Trigger 2", false);
PU.Checked = false; PU.Checked = false;

16
BizHawk.MultiClient/tools/VirtualPads/VirtualPadA78Control.cs
View File

@ -78,19 +78,19 @@ namespace BizHawk.MultiClient
} }
else if (sender == B1) else if (sender == B1)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Power", B1.Checked); Global.StickyXORAdapter.SetSticky("Power", B1.Checked);
} }
else if (sender == B2) else if (sender == B2)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Reset", B2.Checked); Global.StickyXORAdapter.SetSticky("Reset", B2.Checked);
} }
else if (sender == B3) else if (sender == B3)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Select", B3.Checked); Global.StickyXORAdapter.SetSticky("Select", B3.Checked);
} }
else if (sender == B4) else if (sender == B4)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Pause", B4.Checked); Global.StickyXORAdapter.SetSticky("Pause", B4.Checked);
} }
} }
@ -98,10 +98,10 @@ namespace BizHawk.MultiClient
{ {
if (Global.Emulator.SystemId != "A78") return; if (Global.Emulator.SystemId != "A78") return;
if (B1.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Power", false); if (B1.Checked) Global.StickyXORAdapter.SetSticky("Power", false);
if (B2.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Reset", false); if (B2.Checked) Global.StickyXORAdapter.SetSticky("Reset", false);
if (B3.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Select", false); if (B3.Checked) Global.StickyXORAdapter.SetSticky("Select", false);
if (B4.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Pause", false); if (B4.Checked) Global.StickyXORAdapter.SetSticky("Pause", false);
B1.Checked = false; B1.Checked = false;
B2.Checked = false; B2.Checked = false;

8
BizHawk.MultiClient/tools/VirtualPads/VirtualPadButton.cs
View File

@ -7,11 +7,13 @@ using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using System.Drawing; using System.Drawing;
using BizHawk.Client.Common;
namespace BizHawk.MultiClient namespace BizHawk.MultiClient
{ {
public class VirtualPadButton : CheckBox public class VirtualPadButton : CheckBox
{ {
public string ControllerButton = ""; public string ControllerButton = String.Empty;
private bool _rightClicked = false; private bool _rightClicked = false;
public VirtualPadButton() public VirtualPadButton()
@ -45,7 +47,7 @@ namespace BizHawk.MultiClient
protected void SetSticky() protected void SetSticky()
{ {
GlobalWinF.StickyXORAdapter.SetSticky(ControllerButton, Checked); Global.StickyXORAdapter.SetSticky(ControllerButton, Checked);
if (Checked == false) if (Checked == false)
{ {
@ -93,7 +95,7 @@ namespace BizHawk.MultiClient
ForeColor = Color.Black; ForeColor = Color.Black;
Checked = false; Checked = false;
GlobalWinF.AutofireStickyXORAdapter.SetSticky(ControllerButton, false); GlobalWinF.AutofireStickyXORAdapter.SetSticky(ControllerButton, false);
GlobalWinF.StickyXORAdapter.SetSticky(ControllerButton, false); Global.StickyXORAdapter.SetSticky(ControllerButton, false);
} }
} }
} }

288
BizHawk.MultiClient/tools/VirtualPads/VirtualPadC64Keyboard.cs
View File

@ -21,319 +21,319 @@ namespace BizHawk.MultiClient
} }
else if (sender == KF1) else if (sender == KF1)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key F1", KF1.Checked); Global.StickyXORAdapter.SetSticky("Key F1", KF1.Checked);
} }
else if (sender == KF3) else if (sender == KF3)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key F3", KF3.Checked); Global.StickyXORAdapter.SetSticky("Key F3", KF3.Checked);
} }
else if (sender == KF5) else if (sender == KF5)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key F5", KF5.Checked); Global.StickyXORAdapter.SetSticky("Key F5", KF5.Checked);
} }
else if (sender == KF7) else if (sender == KF7)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key F7", KF7.Checked); Global.StickyXORAdapter.SetSticky("Key F7", KF7.Checked);
} }
else if (sender == KLeftArrow) else if (sender == KLeftArrow)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Left Arrow", KLeftArrow.Checked); Global.StickyXORAdapter.SetSticky("Key Left Arrow", KLeftArrow.Checked);
} }
else if (sender == K1) else if (sender == K1)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key 1", K1.Checked); Global.StickyXORAdapter.SetSticky("Key 1", K1.Checked);
} }
else if (sender == K2) else if (sender == K2)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key 2", K2.Checked); Global.StickyXORAdapter.SetSticky("Key 2", K2.Checked);
} }
else if (sender == K3) else if (sender == K3)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key 3", K3.Checked); Global.StickyXORAdapter.SetSticky("Key 3", K3.Checked);
} }
else if (sender == K4) else if (sender == K4)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key 4", K4.Checked); Global.StickyXORAdapter.SetSticky("Key 4", K4.Checked);
} }
else if (sender == K5) else if (sender == K5)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key 5", K5.Checked); Global.StickyXORAdapter.SetSticky("Key 5", K5.Checked);
} }
else if (sender == K6) else if (sender == K6)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key 6", K6.Checked); Global.StickyXORAdapter.SetSticky("Key 6", K6.Checked);
} }
else if (sender == K7) else if (sender == K7)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key 7", K7.Checked); Global.StickyXORAdapter.SetSticky("Key 7", K7.Checked);
} }
else if (sender == K8) else if (sender == K8)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key 8", K8.Checked); Global.StickyXORAdapter.SetSticky("Key 8", K8.Checked);
} }
else if (sender == K9) else if (sender == K9)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key 9", K9.Checked); Global.StickyXORAdapter.SetSticky("Key 9", K9.Checked);
} }
else if (sender == K0) else if (sender == K0)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key 0", K0.Checked); Global.StickyXORAdapter.SetSticky("Key 0", K0.Checked);
} }
else if (sender == KPlus) else if (sender == KPlus)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Plus", KPlus.Checked); Global.StickyXORAdapter.SetSticky("Key Plus", KPlus.Checked);
} }
else if (sender == KMinus) else if (sender == KMinus)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Minus", KMinus.Checked); Global.StickyXORAdapter.SetSticky("Key Minus", KMinus.Checked);
} }
else if (sender == KPound) else if (sender == KPound)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Pound", KPound.Checked); Global.StickyXORAdapter.SetSticky("Key Pound", KPound.Checked);
} }
else if (sender == KClear) else if (sender == KClear)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Clear/Home", KClear.Checked); Global.StickyXORAdapter.SetSticky("Key Clear/Home", KClear.Checked);
} }
else if (sender == KInsert) else if (sender == KInsert)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Insert/Delete", KInsert.Checked); Global.StickyXORAdapter.SetSticky("Key Insert/Delete", KInsert.Checked);
} }
else if (sender == KCtrl) else if (sender == KCtrl)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Control", KCtrl.Checked); Global.StickyXORAdapter.SetSticky("Key Control", KCtrl.Checked);
} }
else if (sender == KQ) else if (sender == KQ)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Q", KQ.Checked); Global.StickyXORAdapter.SetSticky("Key Q", KQ.Checked);
} }
else if (sender == KW) else if (sender == KW)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key W", KW.Checked); Global.StickyXORAdapter.SetSticky("Key W", KW.Checked);
} }
else if (sender == KE) else if (sender == KE)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key E", KE.Checked); Global.StickyXORAdapter.SetSticky("Key E", KE.Checked);
} }
else if (sender == KR) else if (sender == KR)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key R", KR.Checked); Global.StickyXORAdapter.SetSticky("Key R", KR.Checked);
} }
else if (sender == KT) else if (sender == KT)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key T", KT.Checked); Global.StickyXORAdapter.SetSticky("Key T", KT.Checked);
} }
else if (sender == KY) else if (sender == KY)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Y", KY.Checked); Global.StickyXORAdapter.SetSticky("Key Y", KY.Checked);
} }
else if (sender == KU) else if (sender == KU)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key U", KU.Checked); Global.StickyXORAdapter.SetSticky("Key U", KU.Checked);
} }
else if (sender == KI) else if (sender == KI)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key I", KI.Checked); Global.StickyXORAdapter.SetSticky("Key I", KI.Checked);
} }
else if (sender == KO) else if (sender == KO)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key O", KO.Checked); Global.StickyXORAdapter.SetSticky("Key O", KO.Checked);
} }
else if (sender == KP) else if (sender == KP)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key P", KP.Checked); Global.StickyXORAdapter.SetSticky("Key P", KP.Checked);
} }
else if (sender == KAt) else if (sender == KAt)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key At", KAt.Checked); Global.StickyXORAdapter.SetSticky("Key At", KAt.Checked);
} }
else if (sender == KAsterisk) else if (sender == KAsterisk)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Asterisk", KAsterisk.Checked); Global.StickyXORAdapter.SetSticky("Key Asterisk", KAsterisk.Checked);
} }
else if (sender == KUpArrow) else if (sender == KUpArrow)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Up Arrow", KUpArrow.Checked); Global.StickyXORAdapter.SetSticky("Key Up Arrow", KUpArrow.Checked);
} }
else if (sender == KRST) else if (sender == KRST)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Restore", KRST.Checked); Global.StickyXORAdapter.SetSticky("Key Restore", KRST.Checked);
} }
else if (sender == KRun) else if (sender == KRun)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Run/Stop", KRun.Checked); Global.StickyXORAdapter.SetSticky("Key Run/Stop", KRun.Checked);
} }
else if (sender == KLck) else if (sender == KLck)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Lck", KLck.Checked); Global.StickyXORAdapter.SetSticky("Key Lck", KLck.Checked);
} }
else if (sender == KA) else if (sender == KA)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key A", KA.Checked); Global.StickyXORAdapter.SetSticky("Key A", KA.Checked);
} }
else if (sender == KS) else if (sender == KS)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key S", KS.Checked); Global.StickyXORAdapter.SetSticky("Key S", KS.Checked);
} }
else if (sender == KD) else if (sender == KD)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key D", KD.Checked); Global.StickyXORAdapter.SetSticky("Key D", KD.Checked);
} }
else if (sender == KF) else if (sender == KF)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key F", KF.Checked); Global.StickyXORAdapter.SetSticky("Key F", KF.Checked);
} }
else if (sender == KG) else if (sender == KG)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key G", KG.Checked); Global.StickyXORAdapter.SetSticky("Key G", KG.Checked);
} }
else if (sender == KH) else if (sender == KH)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key H", KH.Checked); Global.StickyXORAdapter.SetSticky("Key H", KH.Checked);
} }
else if (sender == KJ) else if (sender == KJ)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key J", KJ.Checked); Global.StickyXORAdapter.SetSticky("Key J", KJ.Checked);
} }
else if (sender == KK) else if (sender == KK)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key K", KK.Checked); Global.StickyXORAdapter.SetSticky("Key K", KK.Checked);
} }
else if (sender == KL) else if (sender == KL)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key L", KL.Checked); Global.StickyXORAdapter.SetSticky("Key L", KL.Checked);
} }
else if (sender == KColon) else if (sender == KColon)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Colon", KColon.Checked); Global.StickyXORAdapter.SetSticky("Key Colon", KColon.Checked);
} }
else if (sender == KSemicolon) else if (sender == KSemicolon)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Semicolon", KSemicolon.Checked); Global.StickyXORAdapter.SetSticky("Key Semicolon", KSemicolon.Checked);
} }
else if (sender == KEquals) else if (sender == KEquals)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Equal", KEquals.Checked); Global.StickyXORAdapter.SetSticky("Key Equal", KEquals.Checked);
} }
else if (sender == KReturn) else if (sender == KReturn)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Return", KReturn.Checked); Global.StickyXORAdapter.SetSticky("Key Return", KReturn.Checked);
} }
else if (sender == KCommodore) else if (sender == KCommodore)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Commodore", KCommodore.Checked); Global.StickyXORAdapter.SetSticky("Key Commodore", KCommodore.Checked);
} }
else if (sender == KLeftShift) else if (sender == KLeftShift)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Left Shift", KLeftShift.Checked); Global.StickyXORAdapter.SetSticky("Key Left Shift", KLeftShift.Checked);
} }
else if (sender == KZ) else if (sender == KZ)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Z", KZ.Checked); Global.StickyXORAdapter.SetSticky("Key Z", KZ.Checked);
} }
else if (sender == KX) else if (sender == KX)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key X", KX.Checked); Global.StickyXORAdapter.SetSticky("Key X", KX.Checked);
} }
else if (sender == KC) else if (sender == KC)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key C", KC.Checked); Global.StickyXORAdapter.SetSticky("Key C", KC.Checked);
} }
else if (sender == KV) else if (sender == KV)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key V", KV.Checked); Global.StickyXORAdapter.SetSticky("Key V", KV.Checked);
} }
else if (sender == KB) else if (sender == KB)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key B", KB.Checked); Global.StickyXORAdapter.SetSticky("Key B", KB.Checked);
} }
else if (sender == KN) else if (sender == KN)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key N", KN.Checked); Global.StickyXORAdapter.SetSticky("Key N", KN.Checked);
} }
else if (sender == KM) else if (sender == KM)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key M", KM.Checked); Global.StickyXORAdapter.SetSticky("Key M", KM.Checked);
} }
else if (sender == KComma) else if (sender == KComma)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Comma", KComma.Checked); Global.StickyXORAdapter.SetSticky("Key Comma", KComma.Checked);
} }
else if (sender == KSemicolon) else if (sender == KSemicolon)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Semicolon", KSemicolon.Checked); Global.StickyXORAdapter.SetSticky("Key Semicolon", KSemicolon.Checked);
} }
else if (sender == KEquals) else if (sender == KEquals)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Equal", KEquals.Checked); Global.StickyXORAdapter.SetSticky("Key Equal", KEquals.Checked);
} }
else if (sender == KReturn) else if (sender == KReturn)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Return", KReturn.Checked); Global.StickyXORAdapter.SetSticky("Key Return", KReturn.Checked);
} }
else if (sender == KCommodore) else if (sender == KCommodore)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Commodore", KCommodore.Checked); Global.StickyXORAdapter.SetSticky("Key Commodore", KCommodore.Checked);
} }
else if (sender == KLeftShift) else if (sender == KLeftShift)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Left Shift", KLeftShift.Checked); Global.StickyXORAdapter.SetSticky("Key Left Shift", KLeftShift.Checked);
} }
else if (sender == KZ) else if (sender == KZ)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Z", KZ.Checked); Global.StickyXORAdapter.SetSticky("Key Z", KZ.Checked);
} }
else if (sender == KX) else if (sender == KX)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key X", KX.Checked); Global.StickyXORAdapter.SetSticky("Key X", KX.Checked);
} }
else if (sender == KC) else if (sender == KC)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key C", KC.Checked); Global.StickyXORAdapter.SetSticky("Key C", KC.Checked);
} }
else if (sender == KV) else if (sender == KV)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key V", KV.Checked); Global.StickyXORAdapter.SetSticky("Key V", KV.Checked);
} }
else if (sender == KB) else if (sender == KB)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key B", KB.Checked); Global.StickyXORAdapter.SetSticky("Key B", KB.Checked);
} }
else if (sender == KN) else if (sender == KN)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key N", KN.Checked); Global.StickyXORAdapter.SetSticky("Key N", KN.Checked);
} }
else if (sender == KM) else if (sender == KM)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key M", KM.Checked); Global.StickyXORAdapter.SetSticky("Key M", KM.Checked);
} }
else if (sender == KComma) else if (sender == KComma)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Comma", KComma.Checked); Global.StickyXORAdapter.SetSticky("Key Comma", KComma.Checked);
} }
else if (sender == KPeriod) else if (sender == KPeriod)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Period", KPeriod.Checked); Global.StickyXORAdapter.SetSticky("Key Period", KPeriod.Checked);
} }
else if (sender == KSlash) else if (sender == KSlash)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Slash", KSlash.Checked); Global.StickyXORAdapter.SetSticky("Key Slash", KSlash.Checked);
} }
else if (sender == KRightShift) else if (sender == KRightShift)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Right Shift", KRightShift.Checked); Global.StickyXORAdapter.SetSticky("Key Right Shift", KRightShift.Checked);
} }
else if (sender == KCursorUp) else if (sender == KCursorUp)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Cursor Up/Down", KCursorUp.Checked); Global.StickyXORAdapter.SetSticky("Key Cursor Up/Down", KCursorUp.Checked);
} }
else if (sender == KCursorLeft) else if (sender == KCursorLeft)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Cursor Left/Right", KCursorLeft.Checked); Global.StickyXORAdapter.SetSticky("Key Cursor Left/Right", KCursorLeft.Checked);
} }
else if (sender == KSpace) else if (sender == KSpace)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Key Space", KSpace.Checked); Global.StickyXORAdapter.SetSticky("Key Space", KSpace.Checked);
} }
} }
@ -345,71 +345,71 @@ namespace BizHawk.MultiClient
} }
else else
{ {
if (KF1.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key F1", false); if (KF1.Checked) Global.StickyXORAdapter.SetSticky("Key F1", false);
if (KF3.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key F3", false); if (KF3.Checked) Global.StickyXORAdapter.SetSticky("Key F3", false);
if (KF5.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key F5", false); if (KF5.Checked) Global.StickyXORAdapter.SetSticky("Key F5", false);
if (KF7.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key F7", false); if (KF7.Checked) Global.StickyXORAdapter.SetSticky("Key F7", false);
if (KLeftArrow.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Left Arrow", false); if (KLeftArrow.Checked) Global.StickyXORAdapter.SetSticky("Key Left Arrow", false);
if (K1.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key 1", false); if (K1.Checked) Global.StickyXORAdapter.SetSticky("Key 1", false);
if (K2.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key 2", false); if (K2.Checked) Global.StickyXORAdapter.SetSticky("Key 2", false);
if (K3.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key 3", false); if (K3.Checked) Global.StickyXORAdapter.SetSticky("Key 3", false);
if (K4.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key 4", false); if (K4.Checked) Global.StickyXORAdapter.SetSticky("Key 4", false);
if (K5.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key 5", false); if (K5.Checked) Global.StickyXORAdapter.SetSticky("Key 5", false);
if (K6.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key 6", false); if (K6.Checked) Global.StickyXORAdapter.SetSticky("Key 6", false);
if (K7.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key 7", false); if (K7.Checked) Global.StickyXORAdapter.SetSticky("Key 7", false);
if (K8.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key 8", false); if (K8.Checked) Global.StickyXORAdapter.SetSticky("Key 8", false);
if (K9.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key 9", false); if (K9.Checked) Global.StickyXORAdapter.SetSticky("Key 9", false);
if (K0.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Plus", false); if (K0.Checked) Global.StickyXORAdapter.SetSticky("Key Plus", false);
if (KPlus.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Minus", false); if (KPlus.Checked) Global.StickyXORAdapter.SetSticky("Key Minus", false);
if (KMinus.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Pound", false); if (KMinus.Checked) Global.StickyXORAdapter.SetSticky("Key Pound", false);
if (KPound.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Clear/Home", false); if (KPound.Checked) Global.StickyXORAdapter.SetSticky("Key Clear/Home", false);
if (KClear.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Insert/Delete", false); if (KClear.Checked) Global.StickyXORAdapter.SetSticky("Key Insert/Delete", false);
if (KInsert.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Control", false); if (KInsert.Checked) Global.StickyXORAdapter.SetSticky("Key Control", false);
if (KCtrl.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Q", false); if (KCtrl.Checked) Global.StickyXORAdapter.SetSticky("Key Q", false);
if (KQ.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key W", false); if (KQ.Checked) Global.StickyXORAdapter.SetSticky("Key W", false);
if (KW.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key E", false); if (KW.Checked) Global.StickyXORAdapter.SetSticky("Key E", false);
if (KE.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key R", false); if (KE.Checked) Global.StickyXORAdapter.SetSticky("Key R", false);
if (KR.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key T", false); if (KR.Checked) Global.StickyXORAdapter.SetSticky("Key T", false);
if (KT.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Y", false); if (KT.Checked) Global.StickyXORAdapter.SetSticky("Key Y", false);
if (KY.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key U", false); if (KY.Checked) Global.StickyXORAdapter.SetSticky("Key U", false);
if (KU.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key I", false); if (KU.Checked) Global.StickyXORAdapter.SetSticky("Key I", false);
if (KI.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key O", false); if (KI.Checked) Global.StickyXORAdapter.SetSticky("Key O", false);
if (KO.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key P", false); if (KO.Checked) Global.StickyXORAdapter.SetSticky("Key P", false);
if (KP.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key At", false); if (KP.Checked) Global.StickyXORAdapter.SetSticky("Key At", false);
if (KAt.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Asterisk", false); if (KAt.Checked) Global.StickyXORAdapter.SetSticky("Key Asterisk", false);
if (KAsterisk.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Up Arrow", false); if (KAsterisk.Checked) Global.StickyXORAdapter.SetSticky("Key Up Arrow", false);
if (KUpArrow.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Restore", false); if (KUpArrow.Checked) Global.StickyXORAdapter.SetSticky("Key Restore", false);
if (KRST.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Run/Stop", false); if (KRST.Checked) Global.StickyXORAdapter.SetSticky("Key Run/Stop", false);
if (KRun.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Lck", false); if (KRun.Checked) Global.StickyXORAdapter.SetSticky("Key Lck", false);
if (KLck.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key A", false); if (KLck.Checked) Global.StickyXORAdapter.SetSticky("Key A", false);
if (KA.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key S", false); if (KA.Checked) Global.StickyXORAdapter.SetSticky("Key S", false);
if (KS.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key D", false); if (KS.Checked) Global.StickyXORAdapter.SetSticky("Key D", false);
if (KD.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key F", false); if (KD.Checked) Global.StickyXORAdapter.SetSticky("Key F", false);
if (KF.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key G", false); if (KF.Checked) Global.StickyXORAdapter.SetSticky("Key G", false);
if (KG.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key H", false); if (KG.Checked) Global.StickyXORAdapter.SetSticky("Key H", false);
if (KH.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key J", false); if (KH.Checked) Global.StickyXORAdapter.SetSticky("Key J", false);
if (KJ.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key K", false); if (KJ.Checked) Global.StickyXORAdapter.SetSticky("Key K", false);
if (KK.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key L", false); if (KK.Checked) Global.StickyXORAdapter.SetSticky("Key L", false);
if (KL.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Colon", false); if (KL.Checked) Global.StickyXORAdapter.SetSticky("Key Colon", false);
if (KColon.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Semicolon", false); if (KColon.Checked) Global.StickyXORAdapter.SetSticky("Key Semicolon", false);
if (KSemicolon.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Equal", false); if (KSemicolon.Checked) Global.StickyXORAdapter.SetSticky("Key Equal", false);
if (KEquals.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Return", false); if (KEquals.Checked) Global.StickyXORAdapter.SetSticky("Key Return", false);
if (KReturn.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Commodore", false); if (KReturn.Checked) Global.StickyXORAdapter.SetSticky("Key Commodore", false);
if (KCommodore.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Left Shift", false); if (KCommodore.Checked) Global.StickyXORAdapter.SetSticky("Key Left Shift", false);
if (KLeftShift.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Z", false); if (KLeftShift.Checked) Global.StickyXORAdapter.SetSticky("Key Z", false);
if (KZ.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key X", false); if (KZ.Checked) Global.StickyXORAdapter.SetSticky("Key X", false);
if (KX.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key C", false); if (KX.Checked) Global.StickyXORAdapter.SetSticky("Key C", false);
if (KC.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key V", false); if (KC.Checked) Global.StickyXORAdapter.SetSticky("Key V", false);
if (KV.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key B", false); if (KV.Checked) Global.StickyXORAdapter.SetSticky("Key B", false);
if (KB.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key N", false); if (KB.Checked) Global.StickyXORAdapter.SetSticky("Key N", false);
if (KN.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key M", false); if (KN.Checked) Global.StickyXORAdapter.SetSticky("Key M", false);
if (KM.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Comma", false); if (KM.Checked) Global.StickyXORAdapter.SetSticky("Key Comma", false);
if (KComma.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Period", false); if (KComma.Checked) Global.StickyXORAdapter.SetSticky("Key Period", false);
if (KPeriod.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Slash", false); if (KPeriod.Checked) Global.StickyXORAdapter.SetSticky("Key Slash", false);
if (KSlash.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Right Shift", false); if (KSlash.Checked) Global.StickyXORAdapter.SetSticky("Key Right Shift", false);
if (KRightShift.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Cursor Up/Down", false); if (KRightShift.Checked) Global.StickyXORAdapter.SetSticky("Key Cursor Up/Down", false);
if (KCursorUp.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Cursor Left/Right", false); if (KCursorUp.Checked) Global.StickyXORAdapter.SetSticky("Key Cursor Left/Right", false);
if (KCursorLeft.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Key Space", false); if (KCursorLeft.Checked) Global.StickyXORAdapter.SetSticky("Key Space", false);
KF1.Checked = false; KF1.Checked = false;
KF3.Checked = false; KF3.Checked = false;

72
BizHawk.MultiClient/tools/VirtualPads/VirtualPadColeco.cs
View File

@ -109,42 +109,42 @@ namespace BizHawk.MultiClient
{ {
if (Global.Emulator.SystemId != "Coleco") return; if (Global.Emulator.SystemId != "Coleco") return;
if (sender == PU) if (sender == PU)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked);
else if (sender == PD) else if (sender == PD)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked);
else if (sender == PL) else if (sender == PL)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked);
else if (sender == PR) else if (sender == PR)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked);
else if (sender == KeyLeft) else if (sender == KeyLeft)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " L", KeyLeft.Checked); Global.StickyXORAdapter.SetSticky(Controller + " L", KeyLeft.Checked);
else if (sender == KeyRight) else if (sender == KeyRight)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " R", KeyRight.Checked); Global.StickyXORAdapter.SetSticky(Controller + " R", KeyRight.Checked);
else if (sender == KP1) else if (sender == KP1)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key1", KP1.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Key1", KP1.Checked);
else if (sender == KP2) else if (sender == KP2)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key2", KP2.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Key2", KP2.Checked);
else if (sender == KP3) else if (sender == KP3)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key3", KP3.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Key3", KP3.Checked);
else if (sender == KP4) else if (sender == KP4)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key4", KP4.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Key4", KP4.Checked);
else if (sender == KP5) else if (sender == KP5)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key5", KP5.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Key5", KP5.Checked);
else if (sender == KP6) else if (sender == KP6)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key6", KP6.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Key6", KP6.Checked);
else if (sender == KP7) else if (sender == KP7)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key7", KP7.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Key7", KP7.Checked);
else if (sender == KP8) else if (sender == KP8)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key8", KP8.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Key8", KP8.Checked);
else if (sender == KP9) else if (sender == KP9)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key9", KP9.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Key9", KP9.Checked);
else if (sender == KPStar) else if (sender == KPStar)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Star", KPStar.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Star", KPStar.Checked);
else if (sender == KP0) else if (sender == KP0)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key0", KP0.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Key0", KP0.Checked);
else if (sender == KPPound) else if (sender == KPPound)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Pound", KPPound.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Pound", KPPound.Checked);
} }
public void Clear() public void Clear()
@ -152,24 +152,24 @@ namespace BizHawk.MultiClient
if (Global.Emulator.SystemId != "Coleco") return; if (Global.Emulator.SystemId != "Coleco") return;
if (PU.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", false); if (PU.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Up", false);
if (PD.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", false); if (PD.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Down", false);
if (PL.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", false); if (PL.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Left", false);
if (PR.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", false); if (PR.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Right", false);
if (KeyLeft.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " L", false); if (KeyLeft.Checked) Global.StickyXORAdapter.SetSticky(Controller + " L", false);
if (KeyRight.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " R", false); if (KeyRight.Checked) Global.StickyXORAdapter.SetSticky(Controller + " R", false);
if (KP1.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key0", false); if (KP1.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Key0", false);
if (KP2.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key1", false); if (KP2.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Key1", false);
if (KP3.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key2", false); if (KP3.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Key2", false);
if (KP4.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key3", false); if (KP4.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Key3", false);
if (KP5.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key4", false); if (KP5.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Key4", false);
if (KP6.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key5", false); if (KP6.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Key5", false);
if (KP7.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key6", false); if (KP7.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Key6", false);
if (KP8.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key7", false); if (KP8.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Key7", false);
if (KP9.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key8", false); if (KP9.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Key8", false);
if (KPStar.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Key9", false); if (KPStar.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Key9", false);
if (KP0.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Star", false); if (KP0.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Star", false);
if (KPPound.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Pound", false); if (KPPound.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Pound", false);
PU.Checked = false; PU.Checked = false;
PD.Checked = false; PD.Checked = false;

5
BizHawk.MultiClient/tools/VirtualPads/VirtualPadForm.cs
View File

@ -225,9 +225,8 @@ namespace BizHawk.MultiClient
protected override void OnClosed(EventArgs e) protected override void OnClosed(EventArgs e)
{ {
//is this a good idea? Global.StickyXORAdapter.ClearStickies();
GlobalWinF.StickyXORAdapter.ClearStickies(); Global.StickyXORAdapter.ClearStickyFloats();
GlobalWinF.StickyXORAdapter.ClearStickyFloats();
} }
public void ClearVirtualPadHolds() public void ClearVirtualPadHolds()

32
BizHawk.MultiClient/tools/VirtualPads/VirtualPadGB.cs
View File

@ -203,35 +203,35 @@ namespace BizHawk.MultiClient
} }
else if (sender == PU) else if (sender == PU)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Up", PU.Checked); Global.StickyXORAdapter.SetSticky("Up", PU.Checked);
} }
else if (sender == PD) else if (sender == PD)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Down", PD.Checked); Global.StickyXORAdapter.SetSticky("Down", PD.Checked);
} }
else if (sender == PL) else if (sender == PL)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Left", PL.Checked); Global.StickyXORAdapter.SetSticky("Left", PL.Checked);
} }
else if (sender == PR) else if (sender == PR)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Right", PR.Checked); Global.StickyXORAdapter.SetSticky("Right", PR.Checked);
} }
else if (sender == B1) else if (sender == B1)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Select", B1.Checked); Global.StickyXORAdapter.SetSticky("Select", B1.Checked);
} }
else if (sender == B2) else if (sender == B2)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Start", B2.Checked); Global.StickyXORAdapter.SetSticky("Start", B2.Checked);
} }
else if (sender == B3) else if (sender == B3)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("B", B3.Checked); Global.StickyXORAdapter.SetSticky("B", B3.Checked);
} }
else if (sender == B4) else if (sender == B4)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("A", B4.Checked); Global.StickyXORAdapter.SetSticky("A", B4.Checked);
} }
} }
@ -240,14 +240,14 @@ namespace BizHawk.MultiClient
if (Global.Emulator.SystemId != "GB") return; if (Global.Emulator.SystemId != "GB") return;
if (PU.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Up", false); if (PU.Checked) Global.StickyXORAdapter.SetSticky("Up", false);
if (PD.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Down", false); if (PD.Checked) Global.StickyXORAdapter.SetSticky("Down", false);
if (PL.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Left", false); if (PL.Checked) Global.StickyXORAdapter.SetSticky("Left", false);
if (PR.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Right", false); if (PR.Checked) Global.StickyXORAdapter.SetSticky("Right", false);
if (B1.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Select", false); if (B1.Checked) Global.StickyXORAdapter.SetSticky("Select", false);
if (B2.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Start", false); if (B2.Checked) Global.StickyXORAdapter.SetSticky("Start", false);
if (B3.Checked) GlobalWinF.StickyXORAdapter.SetSticky("B", false); if (B3.Checked) Global.StickyXORAdapter.SetSticky("B", false);
if (B4.Checked) GlobalWinF.StickyXORAdapter.SetSticky("A", false); if (B4.Checked) Global.StickyXORAdapter.SetSticky("A", false);
PU.Checked = false; PU.Checked = false;
PD.Checked = false; PD.Checked = false;

40
BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBA.cs
View File

@ -231,41 +231,41 @@ namespace BizHawk.MultiClient
{ {
if (Global.Emulator.SystemId != "GBA") return; if (Global.Emulator.SystemId != "GBA") return;
if (sender == PU) if (sender == PU)
GlobalWinF.StickyXORAdapter.SetSticky("Up", PU.Checked); Global.StickyXORAdapter.SetSticky("Up", PU.Checked);
else if (sender == PD) else if (sender == PD)
GlobalWinF.StickyXORAdapter.SetSticky("Down", PD.Checked); Global.StickyXORAdapter.SetSticky("Down", PD.Checked);
else if (sender == PL) else if (sender == PL)
GlobalWinF.StickyXORAdapter.SetSticky("Left", PL.Checked); Global.StickyXORAdapter.SetSticky("Left", PL.Checked);
else if (sender == PR) else if (sender == PR)
GlobalWinF.StickyXORAdapter.SetSticky("Right", PR.Checked); Global.StickyXORAdapter.SetSticky("Right", PR.Checked);
else if (sender == B1) else if (sender == B1)
GlobalWinF.StickyXORAdapter.SetSticky("Select", B1.Checked); Global.StickyXORAdapter.SetSticky("Select", B1.Checked);
else if (sender == B2) else if (sender == B2)
GlobalWinF.StickyXORAdapter.SetSticky("Start", B2.Checked); Global.StickyXORAdapter.SetSticky("Start", B2.Checked);
else if (sender == B3) else if (sender == B3)
GlobalWinF.StickyXORAdapter.SetSticky("B", B3.Checked); Global.StickyXORAdapter.SetSticky("B", B3.Checked);
else if (sender == B4) else if (sender == B4)
GlobalWinF.StickyXORAdapter.SetSticky("A", B4.Checked); Global.StickyXORAdapter.SetSticky("A", B4.Checked);
else if (sender == B5) else if (sender == B5)
GlobalWinF.StickyXORAdapter.SetSticky("L", B5.Checked); Global.StickyXORAdapter.SetSticky("L", B5.Checked);
else if (sender == B6) else if (sender == B6)
GlobalWinF.StickyXORAdapter.SetSticky("R", B6.Checked); Global.StickyXORAdapter.SetSticky("R", B6.Checked);
} }
public override void Clear() public override void Clear()
{ {
if (Global.Emulator.SystemId != "GBA") return; if (Global.Emulator.SystemId != "GBA") return;
if (PU.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Up", false); if (PU.Checked) Global.StickyXORAdapter.SetSticky("Up", false);
if (PD.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Down", false); if (PD.Checked) Global.StickyXORAdapter.SetSticky("Down", false);
if (PL.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Left", false); if (PL.Checked) Global.StickyXORAdapter.SetSticky("Left", false);
if (PR.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Right", false); if (PR.Checked) Global.StickyXORAdapter.SetSticky("Right", false);
if (B1.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Select", false); if (B1.Checked) Global.StickyXORAdapter.SetSticky("Select", false);
if (B2.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Start", false); if (B2.Checked) Global.StickyXORAdapter.SetSticky("Start", false);
if (B3.Checked) GlobalWinF.StickyXORAdapter.SetSticky("B", false); if (B3.Checked) Global.StickyXORAdapter.SetSticky("B", false);
if (B4.Checked) GlobalWinF.StickyXORAdapter.SetSticky("A", false); if (B4.Checked) Global.StickyXORAdapter.SetSticky("A", false);
if (B5.Checked) GlobalWinF.StickyXORAdapter.SetSticky("L", false); if (B5.Checked) Global.StickyXORAdapter.SetSticky("L", false);
if (B6.Checked) GlobalWinF.StickyXORAdapter.SetSticky("R", false); if (B6.Checked) Global.StickyXORAdapter.SetSticky("R", false);
PU.Checked = false; PU.Checked = false;
PD.Checked = false; PD.Checked = false;

4
BizHawk.MultiClient/tools/VirtualPads/VirtualPadGBControl.cs
View File

@ -95,7 +95,7 @@ namespace BizHawk.MultiClient
} }
else if (sender == B1) else if (sender == B1)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Power", B1.Checked); Global.StickyXORAdapter.SetSticky("Power", B1.Checked);
if (B1.Checked) if (B1.Checked)
{ {
B1.BackColor = Color.Pink; B1.BackColor = Color.Pink;
@ -114,7 +114,7 @@ namespace BizHawk.MultiClient
return; return;
} }
if (B1.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Power", false); if (B1.Checked) Global.StickyXORAdapter.SetSticky("Power", false);
B1.Checked = false; B1.Checked = false;
} }

32
BizHawk.MultiClient/tools/VirtualPads/VirtualPadGen3Button.cs
View File

@ -195,35 +195,35 @@ namespace BizHawk.MultiClient
{ {
if (Global.Emulator.SystemId != "GEN") return; if (Global.Emulator.SystemId != "GEN") return;
if (sender == PU) if (sender == PU)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked);
else if (sender == PD) else if (sender == PD)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked);
else if (sender == PL) else if (sender == PL)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked);
else if (sender == PR) else if (sender == PR)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked);
else if (sender == B1) else if (sender == B1)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " C", B1.Checked); Global.StickyXORAdapter.SetSticky(Controller + " C", B1.Checked);
else if (sender == B2) else if (sender == B2)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Start", B2.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Start", B2.Checked);
else if (sender == B3) else if (sender == B3)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " B", B3.Checked); Global.StickyXORAdapter.SetSticky(Controller + " B", B3.Checked);
else if (sender == B4) else if (sender == B4)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " A", B4.Checked); Global.StickyXORAdapter.SetSticky(Controller + " A", B4.Checked);
} }
public override void Clear() public override void Clear()
{ {
if (Global.Emulator.SystemId != "GEN") return; if (Global.Emulator.SystemId != "GEN") return;
if (PU.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", false); if (PU.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Up", false);
if (PD.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", false); if (PD.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Down", false);
if (PL.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", false); if (PL.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Left", false);
if (PR.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", false); if (PR.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Right", false);
if (B1.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " C", false); if (B1.Checked) Global.StickyXORAdapter.SetSticky(Controller + " C", false);
if (B2.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Start", false); if (B2.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Start", false);
if (B3.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " B", false); if (B3.Checked) Global.StickyXORAdapter.SetSticky(Controller + " B", false);
if (B4.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " A", false); if (B4.Checked) Global.StickyXORAdapter.SetSticky(Controller + " A", false);
PU.Checked = false; PU.Checked = false;
PD.Checked = false; PD.Checked = false;

4
BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64.cs
View File

@ -167,8 +167,8 @@ namespace BizHawk.MultiClient
{ {
int? x = hasValue ? X : (int?)null; int? x = hasValue ? X : (int?)null;
int? y = hasValue ? Y : (int?)null; int? y = hasValue ? Y : (int?)null;
GlobalWinF.StickyXORAdapter.SetFloat(Controller + " X Axis", x); Global.StickyXORAdapter.SetFloat(Controller + " X Axis", x);
GlobalWinF.StickyXORAdapter.SetFloat(Controller + " Y Axis", y); Global.StickyXORAdapter.SetFloat(Controller + " Y Axis", y);
AnalogControl1.X = X; AnalogControl1.X = X;
AnalogControl1.Y = Y; AnalogControl1.Y = Y;

6
BizHawk.MultiClient/tools/VirtualPads/VirtualPadN64Control.cs
View File

@ -118,7 +118,7 @@ namespace BizHawk.MultiClient
} }
else if (sender == B1) else if (sender == B1)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Power", B1.Checked); Global.StickyXORAdapter.SetSticky("Power", B1.Checked);
if (B1.Checked) if (B1.Checked)
B1.BackColor = Color.Pink; B1.BackColor = Color.Pink;
else else
@ -126,7 +126,7 @@ namespace BizHawk.MultiClient
} }
else if (sender == B2) else if (sender == B2)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Reset", B2.Checked); Global.StickyXORAdapter.SetSticky("Reset", B2.Checked);
if (B2.Checked) if (B2.Checked)
B2.BackColor = Color.Pink; B2.BackColor = Color.Pink;
else else
@ -141,7 +141,7 @@ namespace BizHawk.MultiClient
B1.Checked = false; B1.Checked = false;
B2.Checked = false; B2.Checked = false;
GlobalWinF.StickyXORAdapter.SetSticky("Reset", false); Global.StickyXORAdapter.SetSticky("Reset", false);
} }
} }
} }

32
BizHawk.MultiClient/tools/VirtualPads/VirtualPadNES.cs
View File

@ -198,35 +198,35 @@ namespace BizHawk.MultiClient
{ {
if (Global.Emulator.SystemId != "NES") return; if (Global.Emulator.SystemId != "NES") return;
if (sender == PU) if (sender == PU)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked);
else if (sender == PD) else if (sender == PD)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked);
else if (sender == PL) else if (sender == PL)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked);
else if (sender == PR) else if (sender == PR)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked);
else if (sender == B1) else if (sender == B1)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Select", B1.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Select", B1.Checked);
else if (sender == B2) else if (sender == B2)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Start", B2.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Start", B2.Checked);
else if (sender == B3) else if (sender == B3)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " B", B3.Checked); Global.StickyXORAdapter.SetSticky(Controller + " B", B3.Checked);
else if (sender == B4) else if (sender == B4)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " A", B4.Checked); Global.StickyXORAdapter.SetSticky(Controller + " A", B4.Checked);
} }
public override void Clear() public override void Clear()
{ {
if (Global.Emulator.SystemId != "NES") return; if (Global.Emulator.SystemId != "NES") return;
if (PU.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", false); if (PU.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Up", false);
if (PD.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", false); if (PD.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Down", false);
if (PL.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", false); if (PL.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Left", false);
if (PR.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", false); if (PR.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Right", false);
if (B1.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Select", false); if (B1.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Select", false);
if (B2.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Start", false); if (B2.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Start", false);
if (B3.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " B", false); if (B3.Checked) Global.StickyXORAdapter.SetSticky(Controller + " B", false);
if (B4.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " A", false); if (B4.Checked) Global.StickyXORAdapter.SetSticky(Controller + " A", false);
PU.Checked = false; PU.Checked = false;
PD.Checked = false; PD.Checked = false;

6
BizHawk.MultiClient/tools/VirtualPads/VirtualPadNESControl.cs
View File

@ -118,7 +118,7 @@ namespace BizHawk.MultiClient
} }
else if (sender == B1) else if (sender == B1)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Power", B1.Checked); Global.StickyXORAdapter.SetSticky("Power", B1.Checked);
if (B1.Checked) if (B1.Checked)
B1.BackColor = Color.Pink; B1.BackColor = Color.Pink;
else else
@ -126,7 +126,7 @@ namespace BizHawk.MultiClient
} }
else if (sender == B2) else if (sender == B2)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Reset", B2.Checked); Global.StickyXORAdapter.SetSticky("Reset", B2.Checked);
if (B2.Checked) if (B2.Checked)
B2.BackColor = Color.Pink; B2.BackColor = Color.Pink;
else else
@ -141,7 +141,7 @@ namespace BizHawk.MultiClient
B1.Checked = false; B1.Checked = false;
B2.Checked = false; B2.Checked = false;
GlobalWinF.StickyXORAdapter.SetSticky("Reset", false); Global.StickyXORAdapter.SetSticky("Reset", false);
} }
} }
} }

32
BizHawk.MultiClient/tools/VirtualPads/VirtualPadPCE.cs
View File

@ -198,35 +198,35 @@ namespace BizHawk.MultiClient
{ {
if (Global.Emulator.SystemId != "PCE") return; if (Global.Emulator.SystemId != "PCE") return;
if (sender == PU) if (sender == PU)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked);
else if (sender == PD) else if (sender == PD)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked);
else if (sender == PL) else if (sender == PL)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked);
else if (sender == PR) else if (sender == PR)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked);
else if (sender == B1) else if (sender == B1)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Select", B1.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Select", B1.Checked);
else if (sender == B2) else if (sender == B2)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Run", B2.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Run", B2.Checked);
else if (sender == B3) else if (sender == B3)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " B2", B3.Checked); Global.StickyXORAdapter.SetSticky(Controller + " B2", B3.Checked);
else if (sender == B4) else if (sender == B4)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " B1", B4.Checked); Global.StickyXORAdapter.SetSticky(Controller + " B1", B4.Checked);
} }
public override void Clear() public override void Clear()
{ {
if (Global.Emulator.SystemId != "PCE" && Global.Emulator.SystemId != "PCECD" && Global.Emulator.SystemId != "SGX") return; if (Global.Emulator.SystemId != "PCE" && Global.Emulator.SystemId != "PCECD" && Global.Emulator.SystemId != "SGX") return;
if (PU.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", false); if (PU.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Up", false);
if (PD.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", false); if (PD.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Down", false);
if (PL.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", false); if (PL.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Left", false);
if (PR.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", false); if (PR.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Right", false);
if (B1.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Select", false); if (B1.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Select", false);
if (B2.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Run", false); if (B2.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Run", false);
if (B3.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " B2", false); if (B3.Checked) Global.StickyXORAdapter.SetSticky(Controller + " B2", false);
if (B4.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " B1", false); if (B4.Checked) Global.StickyXORAdapter.SetSticky(Controller + " B1", false);
PU.Checked = false; PU.Checked = false;
PD.Checked = false; PD.Checked = false;

24
BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMS.cs
View File

@ -169,29 +169,29 @@ namespace BizHawk.MultiClient
if (Global.Emulator.SystemId != "SMS" && Global.Emulator.SystemId != "GG" && Global.Emulator.SystemId != "SG") return; if (Global.Emulator.SystemId != "SMS" && Global.Emulator.SystemId != "GG" && Global.Emulator.SystemId != "SG") return;
if (sender == PU) if (sender == PU)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked);
else if (sender == PD) else if (sender == PD)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked);
else if (sender == PL) else if (sender == PL)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked);
else if (sender == PR) else if (sender == PR)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked);
else if (sender == B1) else if (sender == B1)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " B1", B1.Checked); Global.StickyXORAdapter.SetSticky(Controller + " B1", B1.Checked);
else if (sender == B2) else if (sender == B2)
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " B2", B2.Checked); Global.StickyXORAdapter.SetSticky(Controller + " B2", B2.Checked);
} }
public override void Clear() public override void Clear()
{ {
if (Global.Emulator.SystemId != "SMS" && Global.Emulator.SystemId != "GG" && Global.Emulator.SystemId != "SG") return; if (Global.Emulator.SystemId != "SMS" && Global.Emulator.SystemId != "GG" && Global.Emulator.SystemId != "SG") return;
if (PU.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", false); if (PU.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Up", false);
if (PD.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", false); if (PD.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Down", false);
if (PL.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", false); if (PL.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Left", false);
if (PR.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", false); if (PR.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Right", false);
if (B1.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " B1", false); if (B1.Checked) Global.StickyXORAdapter.SetSticky(Controller + " B1", false);
if (B2.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " B2", false); if (B2.Checked) Global.StickyXORAdapter.SetSticky(Controller + " B2", false);
PU.Checked = false; PU.Checked = false;
PD.Checked = false; PD.Checked = false;

8
BizHawk.MultiClient/tools/VirtualPads/VirtualPadSMSControl.cs
View File

@ -104,7 +104,7 @@ namespace BizHawk.MultiClient
else if (sender == B1) else if (sender == B1)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Pause", B1.Checked); Global.StickyXORAdapter.SetSticky("Pause", B1.Checked);
if (B1.Checked) if (B1.Checked)
B1.BackColor = Color.Pink; B1.BackColor = Color.Pink;
else else
@ -112,7 +112,7 @@ namespace BizHawk.MultiClient
} }
else if (sender == B2) else if (sender == B2)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Reset", B2.Checked); Global.StickyXORAdapter.SetSticky("Reset", B2.Checked);
if (B2.Checked) if (B2.Checked)
B2.BackColor = Color.Pink; B2.BackColor = Color.Pink;
else else
@ -124,8 +124,8 @@ namespace BizHawk.MultiClient
{ {
if (Global.Emulator.SystemId != "SMS" && Global.Emulator.SystemId != "GG" && Global.Emulator.SystemId != "SG") return; if (Global.Emulator.SystemId != "SMS" && Global.Emulator.SystemId != "GG" && Global.Emulator.SystemId != "SG") return;
if (B1.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Pause", false); if (B1.Checked) Global.StickyXORAdapter.SetSticky("Pause", false);
if (B2.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Reset", false); if (B2.Checked) Global.StickyXORAdapter.SetSticky("Reset", false);
B1.Checked = false; B1.Checked = false;
B2.Checked = false; B2.Checked = false;

48
BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNES.cs
View File

@ -267,52 +267,52 @@ namespace BizHawk.MultiClient
} }
else if (sender == PU) else if (sender == PU)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked);
} }
else if (sender == PD) else if (sender == PD)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked);
} }
else if (sender == PL) else if (sender == PL)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked);
} }
else if (sender == PR) else if (sender == PR)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked);
} }
else if (sender == B1) else if (sender == B1)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Select", B1.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Select", B1.Checked);
} }
else if (sender == B2) else if (sender == B2)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Start", B2.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Start", B2.Checked);
} }
else if (sender == B3) else if (sender == B3)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " B", B3.Checked); Global.StickyXORAdapter.SetSticky(Controller + " B", B3.Checked);
} }
else if (sender == B4) else if (sender == B4)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " A", B4.Checked); Global.StickyXORAdapter.SetSticky(Controller + " A", B4.Checked);
} }
else if (sender == B5) else if (sender == B5)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " X", B5.Checked); Global.StickyXORAdapter.SetSticky(Controller + " X", B5.Checked);
} }
else if (sender == B6) else if (sender == B6)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Y", B6.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Y", B6.Checked);
} }
else if (sender == B7) else if (sender == B7)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " L", B7.Checked); Global.StickyXORAdapter.SetSticky(Controller + " L", B7.Checked);
} }
else if (sender == B8) else if (sender == B8)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " R", B8.Checked); Global.StickyXORAdapter.SetSticky(Controller + " R", B8.Checked);
} }
} }
@ -324,18 +324,18 @@ namespace BizHawk.MultiClient
} }
else else
{ {
if (PU.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", false); if (PU.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Up", false);
if (PD.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", false); if (PD.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Down", false);
if (PL.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", false); if (PL.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Left", false);
if (PR.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", false); if (PR.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Right", false);
if (B1.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Select", false); if (B1.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Select", false);
if (B2.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Start", false); if (B2.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Start", false);
if (B3.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " B", false); if (B3.Checked) Global.StickyXORAdapter.SetSticky(Controller + " B", false);
if (B4.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " A", false); if (B4.Checked) Global.StickyXORAdapter.SetSticky(Controller + " A", false);
if (B5.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " X", false); if (B5.Checked) Global.StickyXORAdapter.SetSticky(Controller + " X", false);
if (B6.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Y", false); if (B6.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Y", false);
if (B7.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " L", false); if (B7.Checked) Global.StickyXORAdapter.SetSticky(Controller + " L", false);
if (B8.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " R", false); if (B8.Checked) Global.StickyXORAdapter.SetSticky(Controller + " R", false);
PU.Checked = false; PU.Checked = false;
PD.Checked = false; PD.Checked = false;

8
BizHawk.MultiClient/tools/VirtualPads/VirtualPadSNESControl.cs
View File

@ -128,7 +128,7 @@ namespace BizHawk.MultiClient
} }
else if (sender == B1) else if (sender == B1)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Power", B1.Checked); Global.StickyXORAdapter.SetSticky("Power", B1.Checked);
if (B1.Checked) if (B1.Checked)
{ {
B1.BackColor = Color.Pink; B1.BackColor = Color.Pink;
@ -140,7 +140,7 @@ namespace BizHawk.MultiClient
} }
else if (sender == B2) else if (sender == B2)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Reset", B2.Checked); Global.StickyXORAdapter.SetSticky("Reset", B2.Checked);
if (B2.Checked) if (B2.Checked)
{ {
B2.BackColor = Color.Pink; B2.BackColor = Color.Pink;
@ -160,8 +160,8 @@ namespace BizHawk.MultiClient
} }
else else
{ {
if (B1.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Reset", false); if (B1.Checked) Global.StickyXORAdapter.SetSticky("Reset", false);
if (B2.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Power", false); if (B2.Checked) Global.StickyXORAdapter.SetSticky("Power", false);
B1.Checked = false; B1.Checked = false;
B2.Checked = false; B2.Checked = false;

52
BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturn.cs
View File

@ -83,23 +83,23 @@ namespace BizHawk.MultiClient
{ {
if (Global.Emulator.SystemId != "SAT") return; if (Global.Emulator.SystemId != "SAT") return;
if (PU.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", false); if (PU.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Up", false);
if (PD.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", false); if (PD.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Down", false);
if (PL.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", false); if (PL.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Left", false);
if (PR.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", false); if (PR.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Right", false);
if (BStart.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Start", false); if (BStart.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Start", false);
if (BX.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " X", false); if (BX.Checked) Global.StickyXORAdapter.SetSticky(Controller + " X", false);
if (BY.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Y", false); if (BY.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Y", false);
if (BZ.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Z", false); if (BZ.Checked) Global.StickyXORAdapter.SetSticky(Controller + " Z", false);
if (BA.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " A", false); if (BA.Checked) Global.StickyXORAdapter.SetSticky(Controller + " A", false);
if (BB.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " B", false); if (BB.Checked) Global.StickyXORAdapter.SetSticky(Controller + " B", false);
if (BC.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " C", false); if (BC.Checked) Global.StickyXORAdapter.SetSticky(Controller + " C", false);
if (BL.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " L", false); if (BL.Checked) Global.StickyXORAdapter.SetSticky(Controller + " L", false);
if (BR.Checked) GlobalWinF.StickyXORAdapter.SetSticky(Controller + " R", false); if (BR.Checked) Global.StickyXORAdapter.SetSticky(Controller + " R", false);
PU.Checked = false; PU.Checked = false;
PD.Checked = false; PD.Checked = false;
@ -145,55 +145,55 @@ namespace BizHawk.MultiClient
} }
else if (sender == PU) else if (sender == PU)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Up", PU.Checked);
} }
else if (sender == PD) else if (sender == PD)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Down", PD.Checked);
} }
else if (sender == PL) else if (sender == PL)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Left", PL.Checked);
} }
else if (sender == PR) else if (sender == PR)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Right", PR.Checked);
} }
else if (sender == BStart) else if (sender == BStart)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Start", BStart.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Start", BStart.Checked);
} }
else if (sender == BX) else if (sender == BX)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " X", BX.Checked); Global.StickyXORAdapter.SetSticky(Controller + " X", BX.Checked);
} }
else if (sender == BY) else if (sender == BY)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Y", BY.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Y", BY.Checked);
} }
else if (sender == BZ) else if (sender == BZ)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " Z", BZ.Checked); Global.StickyXORAdapter.SetSticky(Controller + " Z", BZ.Checked);
} }
else if (sender == BA) else if (sender == BA)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " A", BA.Checked); Global.StickyXORAdapter.SetSticky(Controller + " A", BA.Checked);
} }
else if (sender == BB) else if (sender == BB)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " B", BB.Checked); Global.StickyXORAdapter.SetSticky(Controller + " B", BB.Checked);
} }
else if (sender == BC) else if (sender == BC)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " C", BC.Checked); Global.StickyXORAdapter.SetSticky(Controller + " C", BC.Checked);
} }
else if (sender == BL) else if (sender == BL)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " L", BL.Checked); Global.StickyXORAdapter.SetSticky(Controller + " L", BL.Checked);
} }
else if (sender == BR) else if (sender == BR)
{ {
GlobalWinF.StickyXORAdapter.SetSticky(Controller + " R", BR.Checked); Global.StickyXORAdapter.SetSticky(Controller + " R", BR.Checked);
} }
} }
} }

8
BizHawk.MultiClient/tools/VirtualPads/VirtualPadSaturnControl.cs
View File

@ -79,11 +79,11 @@ namespace BizHawk.MultiClient
} }
else if (sender == B1) else if (sender == B1)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Power", B1.Checked); Global.StickyXORAdapter.SetSticky("Power", B1.Checked);
} }
else if (sender == B2) else if (sender == B2)
{ {
GlobalWinF.StickyXORAdapter.SetSticky("Reset", B2.Checked); Global.StickyXORAdapter.SetSticky("Reset", B2.Checked);
} }
} }
@ -91,8 +91,8 @@ namespace BizHawk.MultiClient
{ {
if (Global.Emulator.SystemId != "SAT") return; if (Global.Emulator.SystemId != "SAT") return;
if (B1.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Power", false); if (B1.Checked) Global.StickyXORAdapter.SetSticky("Power", false);
if (B2.Checked) GlobalWinF.StickyXORAdapter.SetSticky("Reset", false); if (B2.Checked) Global.StickyXORAdapter.SetSticky("Reset", false);
B1.Checked = false; B1.Checked = false;
B2.Checked = false; B2.Checked = false;