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

-Fixed NES movie mnemonics. 

--.FM2 is no longer a valid movie extension, so it is no longer counted as such in IsValidMovieExtension.
-Reused the code from PCE controller setting for NES.
-Seem to support 4 controllers for the NES now.
-General code cleanups.

TODO:
-Input from the 3rd and 4th controllers doesn't seem to be polled properly. Figure out what's wrong here.
-The copypasta from PCE to NES could probably be made into one function. The same could be said about many other portions of this code...DRY.
-Now that the mnemonics are fixed, I will have to write a proper converter for FM2.
--Once this is done, I will try the same for PCE, even if it can currently run natively.
---Once this is done, IsValidMovieExtension might as well be removed in favor of only accepting .TAS files and converting everything else.
This commit is contained in:
brandman211 2012-02-14 04:28:47 +00:00
parent 8e241067e6
commit a38afd4fb2
2 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.MultiClient/MainForm.cs
View File

@ -725,7 +725,6 @@ namespace BizHawk.MultiClient
switch (ext.ToUpper())
{
case ".TAS": //Bizhawk
case ".FM2": //FCUEX
case ".MC2": //PCEjin
return true;
default:

65
BizHawk.MultiClient/movie/InputAdapters.cs
View File

@ -216,7 +216,7 @@ namespace BizHawk.MultiClient
{
input.Append("."); //TODO: some kind of command key, since reset isn't used (adelikat: unimplmented command was
input.Append("|");
for (int player = 1; player < 6; player++)
for (int player = 1; player <= 5; player++)
{
input.Append(IsBasePressed("P" + player.ToString() + " Up") ? "U" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " Down") ? "D" : ".");
@ -253,14 +253,14 @@ namespace BizHawk.MultiClient
input.Append(IsBasePressed("Reset") ? "r" :
Global.Emulator.IsLagFrame ? "L" : ".");
input.Append("|");
for (int player = 1; player <= 2; player++)
for (int player = 1; player <= 4; player++)
{
input.Append(IsBasePressed("P" + player.ToString() + " Right") ? "R" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " Left") ? "L" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " Down") ? "D" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " Up") ? "U" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " Start") ? "S" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " Down") ? "D" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " Left") ? "L" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " Right") ? "R" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " Select") ? "s" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " Start") ? "S" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " B") ? "B" : ".");
input.Append(IsBasePressed("P" + player.ToString() + " A") ? "A" : ".");
input.Append("|");
@ -523,10 +523,9 @@ namespace BizHawk.MultiClient
if (ControlType == "PC Engine Controller")
{
for (int i = 1; i < 6; i++)
for (int i = 1; i <= 5; i++)
{
int playerNum = i;
int srcindex = (playerNum - 1) * 9;
int srcindex = (i - 1) * 9;
if (mnemonic.Length <= srcindex + 9)
{
Force("P" + i + " Up", false);
@ -554,28 +553,34 @@ namespace BizHawk.MultiClient
if (ControlType == "NES Controls")
{
if (mnemonic.Length < 10) return;
if (mnemonic.Length < 2) return;
Force("Reset", mnemonic[1] != '.' && mnemonic[1] != '0' && mnemonic[1] != 'L');
int ctr = 3;
Force("P1 Right", c[ctr++]);
Force("P1 Left", c[ctr++]);
Force("P1 Down", c[ctr++]);
Force("P1 Up", c[ctr++]);
Force("P1 Start", c[ctr++]);
Force("P1 Select", c[ctr++]);
Force("P1 B", c[ctr++]);
Force("P1 A", c[ctr++]);
if (mnemonic.Length < 20) return;
ctr = 12;
Force("P2 Right", c[ctr++]);
Force("P2 Left", c[ctr++]);
Force("P2 Down", c[ctr++]);
Force("P2 Up", c[ctr++]);
Force("P2 Start", c[ctr++]);
Force("P2 Select", c[ctr++]);
Force("P2 B", c[ctr++]);
Force("P2 A", c[ctr++]);
for (int i = 1; i <= 4; i++)
{
int srcindex = (i - 1) * 9;
if (mnemonic.Length <= srcindex + 9)
{
Force("P" + i + " Up", false);
Force("P" + i + " Down", false);
Force("P" + i + " Left", false);
Force("P" + i + " Right", false);
Force("P" + i + " Select", false);
Force("P" + i + " Start", false);
Force("P" + i + " B", false);
Force("P" + i + " A", false);
}
else
{
Force("P" + i + " Up", c[srcindex + 3]);
Force("P" + i + " Down", c[srcindex + 4]);
Force("P" + i + " Left", c[srcindex + 5]);
Force("P" + i + " Right", c[srcindex + 6]);
Force("P" + i + " Select", c[srcindex + 7]);
Force("P" + i + " Start", c[srcindex + 8]);
Force("P" + i + " B", c[srcindex + 9]);
Force("P" + i + " A", c[srcindex + 10]);
}
}
}