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:
parent
4ef73eb676
commit
dde1169325
|
@ -84,8 +84,7 @@ namespace BizHawk.MultiClient
|
|||
|
||||
public void PlayMovie()
|
||||
{
|
||||
PlayMovie p = new PlayMovie();
|
||||
p.ShowDialog();
|
||||
new PlayMovie().ShowDialog();
|
||||
}
|
||||
|
||||
public void RecordMovie()
|
||||
|
@ -104,8 +103,7 @@ namespace BizHawk.MultiClient
|
|||
if (result != DialogResult.Yes)
|
||||
return;
|
||||
}
|
||||
RecordMovie r = new RecordMovie();
|
||||
r.ShowDialog();
|
||||
new RecordMovie().ShowDialog();
|
||||
}
|
||||
|
||||
public void PlayMovieFromBeginning()
|
||||
|
|
|
@ -27,6 +27,7 @@ namespace BizHawk.MultiClient
|
|||
public const string SHA1 = "SHA1";
|
||||
public const string FIRMWARESHA1 = "FirmwareSHA1";
|
||||
public const string PAL = "PAL";
|
||||
public const string BOARDNAME = "BoardName";
|
||||
|
||||
//Gameboy Settings that affect sync
|
||||
public const string GB_FORCEDMG = "Force_DMG_Mode";
|
||||
|
|
|
@ -708,7 +708,8 @@ namespace BizHawk.MultiClient
|
|||
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());
|
||||
r.Close();
|
||||
fs.Close();
|
||||
|
@ -756,13 +757,16 @@ namespace BizHawk.MultiClient
|
|||
if (((flags >> 5) & 0x1) != 0)
|
||||
{
|
||||
FDS = true;
|
||||
m.Header.SetHeaderLine(MovieHeader.PLATFORM, "FDS");
|
||||
m.Header.SetHeaderLine(MovieHeader.BOARDNAME, "FDS");
|
||||
}
|
||||
else
|
||||
{
|
||||
FDS = false;
|
||||
m.Header.SetHeaderLine(MovieHeader.PLATFORM, "NES");
|
||||
|
||||
}
|
||||
|
||||
m.Header.SetHeaderLine(MovieHeader.PLATFORM, "NES");
|
||||
|
||||
// bit 6: uses controller 2
|
||||
bool controller2 = (((flags >> 6) & 0x1) != 0);
|
||||
// bit 7: uses controller 1
|
||||
|
|
|
@ -76,6 +76,11 @@ namespace BizHawk.MultiClient
|
|||
MovieToRecord.Header.SetHeaderLine(MovieHeader.GAMENAME, "NULL");
|
||||
}
|
||||
|
||||
if (Global.Emulator.BoardName != null)
|
||||
{
|
||||
MovieToRecord.Header.SetHeaderLine(MovieHeader.BOARDNAME, Global.Emulator.BoardName);
|
||||
}
|
||||
|
||||
if (Global.Emulator is Gameboy)
|
||||
{
|
||||
MovieToRecord.Header.SetHeaderLine(MovieHeader.GB_FORCEDMG, Global.Config.GB_ForceDMG.ToString());
|
||||
|
|
Loading…
Reference in New Issue