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

Movies - fix bug where rerecord count value was getting added as a comment on load

This commit is contained in:
andres.delikat 2011-09-24 16:09:40 +00:00
parent 6a23ed18e1
commit edb40f4087
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BizHawk.MultiClient/MainForm.cs
View File

@ -1004,10 +1004,10 @@ namespace BizHawk.MultiClient
game.AddOption("SuperSysCard");
if ((game["NeedSuperSysCard"]) && game["SuperSysCard"] == false)
MessageBox.Show("This game requires a version 3.0 System card and won't run with the system card you've selected. Try selecting a 3.0 System Card in Config->Paths->PC Engine.");
if (Global.Config.PceSpriteLimit) game.AddOption("ForceSpriteLimit");
if (Global.Config.PceEqualizeVolume) game.AddOption("EqualizeVolumes");
if (Global.Config.PceArcadeCardRewindHack) game.AddOption("ArcadeRewindHack");
if (Global.Config.PceSpriteLimit) game.AddOption("ForceSpriteLimit");
if (Global.Config.PceEqualizeVolume) game.AddOption("EqualizeVolumes");
if (Global.Config.PceArcadeCardRewindHack) game.AddOption("ArcadeRewindHack");
nextEmulator = new PCEngine(game, disc, rom.RomData);
break;
@ -1025,17 +1025,17 @@ namespace BizHawk.MultiClient
if (Global.Config.SmsEnableFM) game.AddOption("UseFM");
if (Global.Config.SmsAllowOverlock) game.AddOption("AllowOverclock");
if (Global.Config.SmsForceStereoSeparation) game.AddOption("ForceStereo");
if (Global.Config.SmsSpriteLimit) game.AddOption("SpriteLimit");
if (Global.Config.SmsSpriteLimit) game.AddOption("SpriteLimit");
nextEmulator = new SMS(game, rom.RomData);
break;
case "GG":
if (Global.Config.SmsAllowOverlock) game.AddOption("AllowOverclock");
if (Global.Config.SmsSpriteLimit) game.AddOption("SpriteLimit");
if (Global.Config.SmsSpriteLimit) game.AddOption("SpriteLimit");
nextEmulator = new SMS(game, rom.RomData);
break;
case "PCE":
case "SGX":
if (Global.Config.PceSpriteLimit) game.AddOption("ForceSpriteLimit");
if (Global.Config.PceSpriteLimit) game.AddOption("ForceSpriteLimit");
nextEmulator = new PCEngine(game, rom.RomData);
break;
case "GEN":

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

@ -208,6 +208,7 @@ namespace BizHawk.MultiClient
using (StreamReader sr = file.OpenText())
{
string str = "";
string rerecordStr = "";
while ((str = sr.ReadLine()) != null)
{
@ -219,10 +220,10 @@ namespace BizHawk.MultiClient
if (str.Contains(MovieHeader.RERECORDS))
{
str = ParseHeader(str, MovieHeader.RERECORDS);
rerecordStr = ParseHeader(str, MovieHeader.RERECORDS);
try
{
Rerecords = int.Parse(str);
Rerecords = int.Parse(rerecordStr);
}
catch
{