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

View File

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

View File

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

View File

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

View File

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