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

Capture BoardName parameter into movies. Also fix NES imports to set platform to NES for FDS movies, and instead set the BoardName to FDS

This commit is contained in:
adelikat 2013-08-24 20:11:41 +00:00
parent 4ef73eb676
commit dde1169325
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.MultiClient/MainForm.Movie.cs
View File

@ -84,8 +84,7 @@ namespace BizHawk.MultiClient
public void PlayMovie() public void PlayMovie()
{ {
PlayMovie p = new PlayMovie(); new PlayMovie().ShowDialog();
p.ShowDialog();
} }
public void RecordMovie() public void RecordMovie()
@ -104,8 +103,7 @@ namespace BizHawk.MultiClient
if (result != DialogResult.Yes) if (result != DialogResult.Yes)
return; return;
} }
RecordMovie r = new RecordMovie(); new RecordMovie().ShowDialog();
r.ShowDialog();
} }
public void PlayMovieFromBeginning() public void PlayMovieFromBeginning()

1
BizHawk.MultiClient/movie/MovieHeader.cs
View File

@ -27,6 +27,7 @@ namespace BizHawk.MultiClient
public const string SHA1 = "SHA1"; public const string SHA1 = "SHA1";
public const string FIRMWARESHA1 = "FirmwareSHA1"; public const string FIRMWARESHA1 = "FirmwareSHA1";
public const string PAL = "PAL"; public const string PAL = "PAL";
public const string BOARDNAME = "BoardName";
//Gameboy Settings that affect sync //Gameboy Settings that affect sync
public const string GB_FORCEDMG = "Force_DMG_Mode"; public const string GB_FORCEDMG = "Force_DMG_Mode";

10
BizHawk.MultiClient/movie/MovieImport.cs
View File

@ -708,7 +708,8 @@ namespace BizHawk.MultiClient
controllers["P" + player + " " + buttons[button]] = !controllers["P" + player + " " + buttons[button]]; controllers["P" + player + " " + buttons[button]] = !controllers["P" + player + " " + buttons[button]];
} }
} }
m.Header.SetHeaderLine(MovieHeader.PLATFORM, fds ? "FDS" : "NES"); m.Header.SetHeaderLine(MovieHeader.PLATFORM, "NES");
if (fds) { m.Header.SetHeaderLine(MovieHeader.BOARDNAME, "FDS"); }
m.Header.SetHeaderLine(MovieHeader.FOURSCORE, fourscore.ToString()); m.Header.SetHeaderLine(MovieHeader.FOURSCORE, fourscore.ToString());
r.Close(); r.Close();
fs.Close(); fs.Close();
@ -756,13 +757,16 @@ namespace BizHawk.MultiClient
if (((flags >> 5) & 0x1) != 0) if (((flags >> 5) & 0x1) != 0)
{ {
FDS = true; FDS = true;
m.Header.SetHeaderLine(MovieHeader.PLATFORM, "FDS"); m.Header.SetHeaderLine(MovieHeader.BOARDNAME, "FDS");
} }
else else
{ {
FDS = false; FDS = false;
m.Header.SetHeaderLine(MovieHeader.PLATFORM, "NES");
} }
m.Header.SetHeaderLine(MovieHeader.PLATFORM, "NES");
// bit 6: uses controller 2 // bit 6: uses controller 2
bool controller2 = (((flags >> 6) & 0x1) != 0); bool controller2 = (((flags >> 6) & 0x1) != 0);
// bit 7: uses controller 1 // bit 7: uses controller 1

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

@ -76,6 +76,11 @@ namespace BizHawk.MultiClient
MovieToRecord.Header.SetHeaderLine(MovieHeader.GAMENAME, "NULL"); MovieToRecord.Header.SetHeaderLine(MovieHeader.GAMENAME, "NULL");
} }
if (Global.Emulator.BoardName != null)
{
MovieToRecord.Header.SetHeaderLine(MovieHeader.BOARDNAME, Global.Emulator.BoardName);
}
if (Global.Emulator is Gameboy) if (Global.Emulator is Gameboy)
{ {
MovieToRecord.Header.SetHeaderLine(MovieHeader.GB_FORCEDMG, Global.Config.GB_ForceDMG.ToString()); MovieToRecord.Header.SetHeaderLine(MovieHeader.GB_FORCEDMG, Global.Config.GB_ForceDMG.ToString());