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

Look at where the error is - This is what I need to access.

This commit is contained in:
kylethomson 2011-06-16 01:35:42 +00:00
parent 445be7ca24
commit a4fe9754c0
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,7 +186,7 @@ namespace BizHawk.MultiClient
input.Append("|"); input.Append("|");
for (int player = 1; player < 6; player++) for (int player = 1; player < 6; player++)
{ {
if (!Global.MultiTrack.isActive) if (!Global.MultiTrack.isActive || (Global.MultiTrack.CurrentPlayer == player) || Global.MultiTrack.RecordAll)
{ {
input.Append(IsPressed("P" + player.ToString() + " Up") ? "U" : "."); input.Append(IsPressed("P" + player.ToString() + " Up") ? "U" : ".");
input.Append(IsPressed("P" + player.ToString() + " Down") ? "D" : "."); input.Append(IsPressed("P" + player.ToString() + " Down") ? "D" : ".");
@ -198,15 +198,21 @@ namespace BizHawk.MultiClient
input.Append(IsPressed("P" + player.ToString() + " Select") ? "S" : "."); input.Append(IsPressed("P" + player.ToString() + " Select") ? "S" : ".");
input.Append("|"); input.Append("|");
} }
input.Append(IsPressed("P" + player.ToString() + " Up") ? "U" : "."); else
input.Append(IsPressed("P" + player.ToString() + " Down") ? "D" : "."); {
input.Append(IsPressed("P" + player.ToString() + " Left") ? "L" : "."); if (Global.Emulator.Frame < MainForm.InputLog.Log.Length())
input.Append(IsPressed("P" + player.ToString() + " Right") ? "R" : "."); {
input.Append(IsPressed("P" + player.ToString() + " B1") ? "1" : "."); //Use old frame
input.Append(IsPressed("P" + player.ToString() + " B2") ? "2" : "."); }
input.Append(IsPressed("P" + player.ToString() + " Run") ? "R" : "."); else
input.Append(IsPressed("P" + player.ToString() + " Select") ? "S" : "."); {
input.Append("|"); //Add blank frame
for (int buttoncount = 0; buttoncount < 8; buttoncount++);
input.Append(".");
input.Append("|");
}
}
} }
return input.ToString(); return input.ToString();
} }

7
BizHawk.MultiClient/movie/Movie.cs
View File

@ -10,7 +10,7 @@ namespace BizHawk.MultiClient
public class Movie public class Movie
{ {
private MovieHeader Header = new MovieHeader(); private MovieHeader Header = new MovieHeader();
private MovieLog Log = new MovieLog(); public MovieLog Log = new MovieLog();
private bool IsText = true; private bool IsText = true;
private string Filename; private string Filename;
@ -80,8 +80,9 @@ namespace BizHawk.MultiClient
public void GetMnemonic() public void GetMnemonic()
{ {
if (MovieMode == MOVIEMODE.RECORD) if (MovieMode == MOVIEMODE.RECORD)
{ {
if (Global.Emulator.Frame < Log.Length()) //DON'T TRUNCATE! MESSES WITH MULTITRACK!
if (Global.Emulator.Frame < Log.Length())
{ {
Log.Truncate(Global.Emulator.Frame); Log.Truncate(Global.Emulator.Frame);
} }

5
BizHawk.MultiClient/movie/MultitrackRecording.cs
View File

@ -7,7 +7,8 @@ namespace BizHawk.MultiClient
{ {
public class MultitrackRecording public class MultitrackRecording
{ {
public bool isActive; public bool isActive;
public bool[] RecordingPlayer; public int CurrentPlayer;
public bool RecordAll;
} }
} }