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

N64: Fixed sync settings not being passed to the plugins as a result of changing the fields to properties. Jabo setting are now passed.

This commit is contained in:
pjgat09 2014-07-20 16:00:56 +00:00
parent 631d4d625d
commit 65345077a8
5 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ using System.ComponentModel;
using Newtonsoft.Json;
using BizHawk.Emulation.Common;
using System.Reflection;
namespace BizHawk.Emulation.Cores.Nintendo.N64
{
@ -340,11 +341,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
{
//TODO: deal witn the game depedent settings
var dictionary = new Dictionary<string, object>();
var members = this.GetType().GetFields();
var members = this.GetType().GetMembers();
foreach (var member in members)
{
var field = this.GetType().GetField(member.Name).GetValue(this);
dictionary.Add(member.Name, field);
if (member.MemberType == MemberTypes.Property)
{
var field = this.GetType().GetProperty(member.Name).GetValue(this, null);
dictionary.Add(member.Name, field);
}
}
return dictionary;

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

@ -3,6 +3,7 @@ using System.ComponentModel;
using Newtonsoft.Json;
using BizHawk.Emulation.Common;
using System.Reflection;
namespace BizHawk.Emulation.Cores.Nintendo.N64
{
@ -288,11 +289,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
{
//TODO: deal witn the game depedent settings
var dictionary = new Dictionary<string, object>();
var members = this.GetType().GetFields();
var members = this.GetType().GetMembers();
foreach (var member in members)
{
var field = this.GetType().GetField(member.Name).GetValue(this);
dictionary.Add(member.Name, field);
if (member.MemberType == MemberTypes.Property)
{
var field = this.GetType().GetProperty(member.Name).GetValue(this, null);
dictionary.Add(member.Name, field);
}
}
return dictionary;

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

@ -3,6 +3,7 @@ using System.ComponentModel;
using Newtonsoft.Json;
using BizHawk.Emulation.Common;
using System.Reflection;
namespace BizHawk.Emulation.Cores.Nintendo.N64
{
@ -43,11 +44,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
{
//TODO: deal witn the game depedent settings
var dictionary = new Dictionary<string, object>();
var members = this.GetType().GetFields();
var members = this.GetType().GetMembers();
foreach (var member in members)
{
var field = this.GetType().GetField(member.Name).GetValue(this);
dictionary.Add(member.Name, field);
if (member.MemberType == MemberTypes.Property)
{
var field = this.GetType().GetProperty(member.Name).GetValue(this, null);
dictionary.Add(member.Name, field);
}
}
return dictionary;

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

@ -3,6 +3,7 @@ using System.ComponentModel;
using Newtonsoft.Json;
using BizHawk.Emulation.Common;
using System.Reflection;
namespace BizHawk.Emulation.Cores.Nintendo.N64
{
@ -376,11 +377,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
{
//TODO: deal witn the game depedent settings
var dictionary = new Dictionary<string, object>();
var members = this.GetType().GetFields();
var members = this.GetType().GetMembers();
foreach (var member in members)
{
var field = this.GetType().GetField(member.Name).GetValue(this);
dictionary.Add(member.Name, field);
if (member.MemberType == MemberTypes.Property)
{
var field = this.GetType().GetProperty(member.Name).GetValue(this, null);
dictionary.Add(member.Name, field);
}
}
return dictionary;

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

@ -487,6 +487,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64.NativeApi
{
m64pConfigOpenSection("Video-Glide64mk2", ref video_plugin_section);
}
else if (video_settings.Plugin == PluginType.JABO)
{
m64pConfigOpenSection("Video-Jabo", ref video_plugin_section);
}
else
{
return;