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

Make mupen-style lag a setting not a sync-setting

This commit is contained in:
adelikat 2014-08-03 13:06:53 +00:00
parent cf75851e50
commit da3f9db018
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1787,8 +1787,8 @@ namespace BizHawk.Client.EmuHawk
N64CircularAnalogRangeMenuItem.Checked = Global.Config.N64UseCircularAnalogConstraint; N64CircularAnalogRangeMenuItem.Checked = Global.Config.N64UseCircularAnalogConstraint;
var ss = (N64SyncSettings)Global.Emulator.GetSyncSettings(); var s = (N64Settings)Global.Emulator.GetSettings();
MupenStyleLagMenuItem.Checked = ss.UseMupenStyleLag; MupenStyleLagMenuItem.Checked = s.UseMupenStyleLag;
} }
private void N64PluginSettingsMenuItem_Click(object sender, EventArgs e) private void N64PluginSettingsMenuItem_Click(object sender, EventArgs e)
@ -1831,9 +1831,9 @@ namespace BizHawk.Client.EmuHawk
private void MupenStyleLagMenuItem_Click(object sender, EventArgs e) private void MupenStyleLagMenuItem_Click(object sender, EventArgs e)
{ {
var ss = (N64SyncSettings)Global.Emulator.GetSyncSettings(); var s = (N64Settings)Global.Emulator.GetSettings();
ss.UseMupenStyleLag ^= true; s.UseMupenStyleLag ^= true;
Global.Emulator.PutSyncSettings(ss); Global.Emulator.PutSettings(s);
} }
#endregion #endregion

4
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
View File

@ -240,7 +240,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
{ {
get get
{ {
if (_syncSettings.UseMupenStyleLag) if (_settings.UseMupenStyleLag)
{ {
return !IsVIFrame; return !IsVIFrame;
} }
@ -250,7 +250,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
set set
{ {
if (_syncSettings.UseMupenStyleLag) if (_settings.UseMupenStyleLag)
{ {
IsVIFrame = !value; IsVIFrame = !value;
} }

4
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64Settings.cs
View File

@ -5,12 +5,16 @@
public int VideoSizeX = 320; public int VideoSizeX = 320;
public int VideoSizeY = 240; public int VideoSizeY = 240;
public bool UseMupenStyleLag { get; set; }
public N64Settings Clone() public N64Settings Clone()
{ {
return new N64Settings return new N64Settings
{ {
VideoSizeX = VideoSizeX, VideoSizeX = VideoSizeX,
VideoSizeY = VideoSizeY, VideoSizeY = VideoSizeY,
UseMupenStyleLag = UseMupenStyleLag
}; };
} }
} }

2
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64SyncSettings.cs
View File

@ -29,8 +29,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
JaboPlugin = new N64JaboPluginSettings(); JaboPlugin = new N64JaboPluginSettings();
} }
public bool UseMupenStyleLag { get; set; }
public CoreType Core { get; set; } public CoreType Core { get; set; }
public RspType Rsp { get; set; } public RspType Rsp { get; set; }
public PluginType VideoPlugin { get; set; } public PluginType VideoPlugin { get; set; }