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

Merge natt's sync setting changes back, some ugliness needs to be cleaned up

This commit is contained in:
adelikat 2013-12-25 19:47:44 +00:00
parent db5684b4db
commit c23a61e0e6
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
BizHawk.Client.Common/RomLoader.cs
View File

@ -28,6 +28,22 @@ namespace BizHawk.Client.Common
{ {
public class RomLoader public class RomLoader
{ {
#region Duplicate code to mainform, need to refactor!
object __SyncSettingsHack = null;
object GetCoreSyncSettings<T>()
where T : IEmulator
{
// if movie 2.0 was finished, this is where you'd decide whether to get a settings object
// from a config file or from the movie file
// since all we have right now is movie 1.0, we get silly hacks instead
return __SyncSettingsHack ?? Global.Config.GetCoreSyncSettings<T>();
}
#endregion
#region SNES specific stuff - clean up or move elsewhere #region SNES specific stuff - clean up or move elsewhere
private readonly Dictionary<string, string> _snesPrepared = new Dictionary<string, string>(); private readonly Dictionary<string, string> _snesPrepared = new Dictionary<string, string>();
@ -395,7 +411,7 @@ namespace BizHawk.Client.Common
var gbl = new GambatteLink(nextComm, L, XMLG.Assets["LeftRom"], R, XMLG.Assets["RightRom"], var gbl = new GambatteLink(nextComm, L, XMLG.Assets["LeftRom"], R, XMLG.Assets["RightRom"],
Global.Config.GetCoreSettings<GambatteLink>(), Global.Config.GetCoreSettings<GambatteLink>(),
Global.Config.GetCoreSyncSettings<GambatteLink>()); GetCoreSyncSettings<GambatteLink>());
nextEmulator = gbl; nextEmulator = gbl;
// other stuff todo // other stuff todo
@ -449,7 +465,7 @@ namespace BizHawk.Client.Common
case "A26": case "A26":
nextEmulator = new Atari2600(nextComm, game, rom.FileData, nextEmulator = new Atari2600(nextComm, game, rom.FileData,
Global.Config.GetCoreSettings<Atari2600>(), Global.Config.GetCoreSettings<Atari2600>(),
Global.Config.GetCoreSyncSettings<Atari2600>()); GetCoreSyncSettings<Atari2600>());
break; break;
case "PCE": case "PCE":
case "PCECD": case "PCECD":
@ -476,7 +492,7 @@ namespace BizHawk.Client.Common
{ {
var gb = new Gameboy(nextComm, game, rom.FileData, var gb = new Gameboy(nextComm, game, rom.FileData,
Global.Config.GetCoreSettings<Gameboy>(), Global.Config.GetCoreSettings<Gameboy>(),
Global.Config.GetCoreSyncSettings<Gameboy>()); GetCoreSyncSettings<Gameboy>());
nextEmulator = gb; nextEmulator = gb;
} }
else else
@ -502,9 +518,8 @@ namespace BizHawk.Client.Common
break; break;
case "Coleco": case "Coleco":
{ {
throw new Exception("Natt needs to refactor this!"); var c = new ColecoVision(nextComm, game, rom.RomData, GetCoreSyncSettings<ColecoVision>());
//var c = new ColecoVision(nextComm, game, rom.RomData, Global.Config.ColecoSkipBiosIntro); nextEmulator = c;
//nextEmulator = c;
} }
break; break;
case "INTV": case "INTV":