-Changed the PCE mnemonics.

This commit is contained in:
brandman211 2012-02-18 15:49:44 +00:00
parent a6a81bb76a
commit 9fb0393b7f
1 changed files with 9 additions and 15 deletions

View File

@ -101,7 +101,7 @@ namespace BizHawk.MultiClient
public IController Source; public IController Source;
public IController SourceOr; public IController SourceOr;
public ControllerDefinition Type { get { return Source.Type; } set { throw new InvalidOperationException(); } } public ControllerDefinition Type { get { return Source.Type; } set { throw new InvalidOperationException(); } }
public bool this[string button] public bool this[string button]
{ {
get get
@ -138,7 +138,6 @@ namespace BizHawk.MultiClient
set { throw new InvalidOperationException(); } set { throw new InvalidOperationException(); }
} }
public void SetSticky(string button, bool isSticky) public void SetSticky(string button, bool isSticky)
{ {
if(isSticky) if(isSticky)
@ -222,10 +221,10 @@ namespace BizHawk.MultiClient
input.Append(IsBasePressed("P" + player.ToString() + " Down") ? "D" : "."); input.Append(IsBasePressed("P" + player.ToString() + " Down") ? "D" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " Left") ? "L" : "."); input.Append(IsBasePressed("P" + player.ToString() + " Left") ? "L" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " Right") ? "R" : "."); input.Append(IsBasePressed("P" + player.ToString() + " Right") ? "R" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " B1") ? "1" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " B2") ? "2" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " Run") ? "R" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " Select") ? "S" : "."); input.Append(IsBasePressed("P" + player.ToString() + " Select") ? "S" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " Run") ? "R" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " B2") ? "2" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " B1") ? "1" : ".");
input.Append("|"); input.Append("|");
} }
@ -431,7 +430,7 @@ namespace BizHawk.MultiClient
WorkingDictionary<string, bool> MyBoolButtons = new WorkingDictionary<string, bool>(); WorkingDictionary<string, bool> MyBoolButtons = new WorkingDictionary<string, bool>();
void Force(string button, bool state) void Force(string button, bool state)
{ {
MyBoolButtons[button] = state; MyBoolButtons[button] = state;
} }
@ -451,7 +450,6 @@ namespace BizHawk.MultiClient
} }
} }
/// <summary> /// <summary>
/// latches one player from the source /// latches one player from the source
/// </summary> /// </summary>
@ -467,7 +465,6 @@ namespace BizHawk.MultiClient
} }
} }
/// <summary> /// <summary>
/// latches all buttons from the provided source /// latches all buttons from the provided source
/// </summary> /// </summary>
@ -479,7 +476,6 @@ namespace BizHawk.MultiClient
} }
} }
/// <summary> /// <summary>
/// latches all buttons from the supplied mnemonic string /// latches all buttons from the supplied mnemonic string
/// </summary> /// </summary>
@ -543,10 +539,10 @@ namespace BizHawk.MultiClient
Force("P" + i + " Down", c[srcindex + 4]); Force("P" + i + " Down", c[srcindex + 4]);
Force("P" + i + " Left", c[srcindex + 5]); Force("P" + i + " Left", c[srcindex + 5]);
Force("P" + i + " Right", c[srcindex + 6]); Force("P" + i + " Right", c[srcindex + 6]);
Force("P" + i + " B1", c[srcindex + 7]); Force("P" + i + " Select", c[srcindex + 7]);
Force("P" + i + " B2", c[srcindex + 8]); Force("P" + i + " Run", c[srcindex + 8]);
Force("P" + i + " Run", c[srcindex + 9]); Force("P" + i + " 2", c[srcindex + 9]);
Force("P" + i + " Select", c[srcindex + 10]); Force("P" + i + " 1", c[srcindex + 10]);
} }
} }
} }
@ -583,7 +579,6 @@ namespace BizHawk.MultiClient
} }
} }
if (ControlType == "Gameboy Controller") if (ControlType == "Gameboy Controller")
{ {
if (mnemonic.Length < 10) return; if (mnemonic.Length < 10) return;
@ -674,7 +669,6 @@ namespace BizHawk.MultiClient
// Forces.Clear(); // Forces.Clear();
// } // }
// public ControllerDefinition Type { get { return Controller.Type; } } // public ControllerDefinition Type { get { return Controller.Type; } }
// public bool this[string button] { get { return IsPressed(button); } } // public bool this[string button] { get { return IsPressed(button); } }