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

add a "SNES with Snes9x" menu item, only visisble in developer builds

This commit is contained in:
adelikat 2014-07-28 23:58:52 +00:00
parent d219573594
commit c1e866c9c9
5 changed files with 355 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,7 +305,12 @@ namespace BizHawk.Client.Common
switch (game.System) switch (game.System)
{ {
case "SNES": case "SNES":
if (true) if (Global.Config.SNES_InSnes9x)
{
var snes = new Emulation.Cores.Nintendo.SNES9X.Snes9x(nextComm, rom.FileData);
nextEmulator = snes;
}
else
{ {
// need to get rid of this hack at some point // need to get rid of this hack at some point
((CoreFileProvider)nextComm.CoreFileProvider).SubfileDirectory = Path.GetDirectoryName(path.Replace("|", String.Empty)); // Dirty hack to get around archive filenames (since we are just getting the directory path, it is safe to mangle the filename ((CoreFileProvider)nextComm.CoreFileProvider).SubfileDirectory = Path.GetDirectoryName(path.Replace("|", String.Empty)); // Dirty hack to get around archive filenames (since we are just getting the directory path, it is safe to mangle the filename
@ -315,11 +320,6 @@ namespace BizHawk.Client.Common
var xmlData = isXml ? rom.FileData : null; var xmlData = isXml ? rom.FileData : null;
snes.Load(game, romData, Deterministic, xmlData); snes.Load(game, romData, Deterministic, xmlData);
} }
else
{
var snes = new Emulation.Cores.Nintendo.SNES9X.Snes9x(nextComm, rom.FileData);
nextEmulator = snes;
}
break; break;
case "SMS": case "SMS":

1
BizHawk.Client.Common/config/Config.cs
View File

@ -604,6 +604,7 @@ namespace BizHawk.Client.Common
// it hasn't been absorbed into the new system // it hasn't been absorbed into the new system
public bool GB_AsSGB = false; public bool GB_AsSGB = false;
public bool NES_InQuickNES = true; public bool NES_InQuickNES = true;
public bool SNES_InSnes9x = true;
// LuaWriter Settings // LuaWriter Settings
public int LuaDefaultTextColor = -16777216; public int LuaDefaultTextColor = -16777216;

668
BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

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

@ -844,6 +844,9 @@ namespace BizHawk.Client.EmuHawk
{ {
GBInSGBMenuItem.Checked = Global.Config.GB_AsSGB; GBInSGBMenuItem.Checked = Global.Config.GB_AsSGB;
NesInQuickNESMenuItem.Checked = Global.Config.NES_InQuickNES; NesInQuickNESMenuItem.Checked = Global.Config.NES_InQuickNES;
SnesWithSnes9xMenuItem.Checked = Global.Config.SNES_InSnes9x;
SnesWithSnes9xMenuItem.Visible = VersionInfo.DeveloperBuild;
} }
private void ControllersMenuItem_Click(object sender, EventArgs e) private void ControllersMenuItem_Click(object sender, EventArgs e)
@ -1025,6 +1028,12 @@ namespace BizHawk.Client.EmuHawk
FlagNeedsReboot(); FlagNeedsReboot();
} }
private void SnesWithSnes9xMenuItem_Click(object sender, EventArgs e)
{
Global.Config.SNES_InSnes9x ^= true;
FlagNeedsReboot();
}
private void N64VideoPluginSettingsMenuItem_Click(object sender, EventArgs e) private void N64VideoPluginSettingsMenuItem_Click(object sender, EventArgs e)
{ {
N64PluginSettingsMenuItem_Click(sender, e); N64PluginSettingsMenuItem_Click(sender, e);

2
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -3436,7 +3436,5 @@ namespace BizHawk.Client.EmuHawk
{ {
_master = null; _master = null;
} }
} }
} }