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

Start of MultiTrack.

This commit is contained in:
kylethomson 2011-06-16 01:18:16 +00:00
parent c9c5f030d7
commit 18fe637193
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,6 +154,7 @@
<Compile Include="movie\MovieConvert.cs" /> <Compile Include="movie\MovieConvert.cs" />
<Compile Include="movie\MovieHeader.cs" /> <Compile Include="movie\MovieHeader.cs" />
<Compile Include="movie\MovieLog.cs" /> <Compile Include="movie\MovieLog.cs" />
<Compile Include="movie\MultitrackRecording.cs" />
<Compile Include="MruStack.cs" /> <Compile Include="MruStack.cs" />
<Compile Include="NameStateForm.cs"> <Compile Include="NameStateForm.cs">
<SubType>Form</SubType> <SubType>Form</SubType>

1
BizHawk.MultiClient/Global.cs
View File

@ -22,5 +22,6 @@ namespace BizHawk.MultiClient
public static Controller NESControls; public static Controller NESControls;
public static Controller ActiveController; public static Controller ActiveController;
public static Controller NullControls; public static Controller NullControls;
public static MultitrackRecording MultiTrack;
} }
} }

28
BizHawk.MultiClient/Input/ControllerBinding.cs
View File

@ -186,14 +186,26 @@ namespace BizHawk.MultiClient
input.Append("|"); input.Append("|");
for (int player = 1; player < 6; player++) for (int player = 1; player < 6; player++)
{ {
input.Append(IsPressed("P" + player + " Up") ? "U" : "."); if (!Global.MultiTrack.isActive)
input.Append(IsPressed("P" + player + " Down") ? "D" : "."); {
input.Append(IsPressed("P" + player + " Left") ? "L" : "."); input.Append(IsPressed("P" + player.ToString() + " Up") ? "U" : ".");
input.Append(IsPressed("P" + player + " Right") ? "R" : "."); input.Append(IsPressed("P" + player.ToString() + " Down") ? "D" : ".");
input.Append(IsPressed("P" + player + " B1") ? "1" : "."); input.Append(IsPressed("P" + player.ToString() + " Left") ? "L" : ".");
input.Append(IsPressed("P" + player + " B2") ? "2" : "."); input.Append(IsPressed("P" + player.ToString() + " Right") ? "R" : ".");
input.Append(IsPressed("P" + player + " Run") ? "R" : "."); input.Append(IsPressed("P" + player.ToString() + " B1") ? "1" : ".");
input.Append(IsPressed("P" + player + " Select") ? "S" : "."); input.Append(IsPressed("P" + player.ToString() + " B2") ? "2" : ".");
input.Append(IsPressed("P" + player.ToString() + " Run") ? "R" : ".");
input.Append(IsPressed("P" + player.ToString() + " Select") ? "S" : ".");
input.Append("|");
}
input.Append(IsPressed("P" + player.ToString() + " Up") ? "U" : ".");
input.Append(IsPressed("P" + player.ToString() + " Down") ? "D" : ".");
input.Append(IsPressed("P" + player.ToString() + " Left") ? "L" : ".");
input.Append(IsPressed("P" + player.ToString() + " Right") ? "R" : ".");
input.Append(IsPressed("P" + player.ToString() + " B1") ? "1" : ".");
input.Append(IsPressed("P" + player.ToString() + " B2") ? "2" : ".");
input.Append(IsPressed("P" + player.ToString() + " Run") ? "R" : ".");
input.Append(IsPressed("P" + player.ToString() + " Select") ? "S" : ".");
input.Append("|"); input.Append("|");
} }
return input.ToString(); return input.ToString();

2
BizHawk.MultiClient/config/InputConfig.cs
View File

@ -37,7 +37,7 @@ namespace BizHawk.MultiClient
InitializeComponent(); InitializeComponent();
Labels = new ArrayList(); Labels = new ArrayList();
TextBoxes = new ArrayList(); TextBoxes = new ArrayList();
Changed = false; Changed = false;
} }
private string TruncateButtonMapping(string button) private string TruncateButtonMapping(string button)