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

update plugin description with angrylion in mind, bring back RSP plugin options (although only GLideN64 can actually use either), fix tabbing issue in controller designer

This commit is contained in:
CasualPokePlayer 2022-03-18 15:35:38 -07:00
parent 31b30210b3
commit 7c50d9285f
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/BizHawk.Client.EmuHawk/config/N64/N64ControllerSettingControl.Designer.cs generated
View File

@ -49,10 +49,10 @@
this.PakTypeDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.PakTypeDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.PakTypeDropdown.FormattingEnabled = true; this.PakTypeDropdown.FormattingEnabled = true;
this.PakTypeDropdown.Items.AddRange(new object[] { this.PakTypeDropdown.Items.AddRange(new object[] {
"None", "None",
"Memory Card", "Memory Card",
"Rumble Pak", "Rumble Pak",
"Transfer Pak"}); "Transfer Pak"});
this.PakTypeDropdown.Location = new System.Drawing.Point(160, 0); this.PakTypeDropdown.Location = new System.Drawing.Point(160, 0);
this.PakTypeDropdown.Name = "PakTypeDropdown"; this.PakTypeDropdown.Name = "PakTypeDropdown";
this.PakTypeDropdown.Size = new System.Drawing.Size(121, 21); this.PakTypeDropdown.Size = new System.Drawing.Size(121, 21);

6
src/BizHawk.Client.EmuHawk/config/N64/N64VideoPluginconfig.Designer.cs generated
View File

@ -160,7 +160,7 @@
this.label49.Location = new System.Drawing.Point(206, 13); this.label49.Location = new System.Drawing.Point(206, 13);
this.label49.Name = "label49"; this.label49.Name = "label49";
this.label49.Text = "Rsp Plugin"; this.label49.Text = "Rsp Plugin";
this.label49.Visible = false; this.label49.Visible = true;
// //
// RspTypeDropdown // RspTypeDropdown
// //
@ -174,7 +174,7 @@
this.RspTypeDropdown.Name = "RspTypeDropdown"; this.RspTypeDropdown.Name = "RspTypeDropdown";
this.RspTypeDropdown.Size = new System.Drawing.Size(136, 21); this.RspTypeDropdown.Size = new System.Drawing.Size(136, 21);
this.RspTypeDropdown.TabIndex = 17; this.RspTypeDropdown.TabIndex = 17;
this.RspTypeDropdown.Visible = false; this.RspTypeDropdown.Visible = true;
// //
// label48 // label48
// //
@ -199,7 +199,7 @@
// //
this.label47.Location = new System.Drawing.Point(10, 115); this.label47.Location = new System.Drawing.Point(10, 115);
this.label47.Name = "label47"; this.label47.Name = "label47";
this.label47.Text = "(GLideN64 is the newest plugin and has the highest compatibility)"; this.label47.Text = "(GLideN64 is good for performance, while Angrylion has the best compatibility)";
// //
// label2 // label2
// //

22
src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
View File

@ -102,22 +102,22 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
} }
string rsp; string rsp;
switch (_syncSettings.Rsp) if (_syncSettings.VideoPlugin is PluginType.GLideN64) // GLideN64 can use either HLE or LLE RSP
{ {
default: rsp = _syncSettings.Rsp switch
case N64SyncSettings.RspType.Rsp_Hle: {
rsp = "mupen64plus-rsp-hle.dll"; N64SyncSettings.RspType.Rsp_cxd4 => "mupen64plus-rsp-cxd4-sse2.dll",
break; _ => "mupen64plus-rsp-hle.dll",
//case N64SyncSettings.RspType.Rsp_cxd4: };
// rsp = "mupen64plus-rsp-cxd4.dll";
// break;
} }
else if (_syncSettings.VideoPlugin is PluginType.Angrylion) // Angrylion can only use LLE RSP
// angrylion needs LLE RSP
if (_syncSettings.VideoPlugin is PluginType.Angrylion)
{ {
rsp = "mupen64plus-rsp-cxd4-sse2.dll"; rsp = "mupen64plus-rsp-cxd4-sse2.dll";
} }
else // the rest can only use HLE RSP
{
rsp = "mupen64plus-rsp-hle.dll";
}
api.AttachPlugin(mupen64plusApi.m64p_plugin_type.M64PLUGIN_RSP, rsp); api.AttachPlugin(mupen64plusApi.m64p_plugin_type.M64PLUGIN_RSP, rsp);

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

@ -98,8 +98,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
[Description("Hle")] [Description("Hle")]
Rsp_Hle = 0, Rsp_Hle = 0,
//[Description("cxd4 LLE")] [Description("cxd4 LLE")]
//Rsp_cxd4 = 2 Rsp_cxd4 = 2
} }
} }