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

Allow N64 in official release builds!

This commit is contained in:
adelikat 2013-07-28 22:45:19 +00:00
parent 72c4b98954
commit eb7a022ebe
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.MultiClient/MainForm.cs
View File

@ -26,7 +26,7 @@ namespace BizHawk.MultiClient
{ {
public partial class MainForm : Form public partial class MainForm : Form
{ {
public static bool INTERIM = true; public static bool INTERIM = false;
public const string EMUVERSION = "Version " + VersionInfo.MAINVERSION; public const string EMUVERSION = "Version " + VersionInfo.MAINVERSION;
public const string RELEASEDATE = "March 23, 2013"; public const string RELEASEDATE = "March 23, 2013";
public string CurrentlyOpenRom; public string CurrentlyOpenRom;
@ -1540,8 +1540,6 @@ namespace BizHawk.MultiClient
} }
break; break;
case "N64": case "N64":
if (INTERIM)
{
Global.Game = game; Global.Game = game;
VideoPluginSettings video_settings = N64GenerateVideoSettings(game, hasmovie); VideoPluginSettings video_settings = N64GenerateVideoSettings(game, hasmovie);
int SaveType = 0; int SaveType = 0;
@ -1550,7 +1548,6 @@ namespace BizHawk.MultiClient
SaveType = 1; SaveType = 1;
} }
nextEmulator = new N64(nextComm, game, rom.RomData, video_settings, SaveType); nextEmulator = new N64(nextComm, game, rom.RomData, video_settings, SaveType);
}
break; break;
} }
} }
@ -3177,10 +3174,11 @@ namespace BizHawk.MultiClient
else else
{ {
ofd.Filter = FormatFilter( ofd.Filter = FormatFilter(
"Rom Files", "*.nes;*.fds;*.sms;*.gg;*.sg;*.gb;*.gbc;*.pce;*.sgx;*.bin;*.smd;*.gen;*.md;*.smc;*.sfc;*.a26;*.a78;*.col;*.rom;*.cue;*.sgb;*.xml;%ARCH%", "Rom Files", "*.nes;*.fds;*.sms;*.gg;*.sg;*.gb;*.gbc;*.pce;*.sgx;*.bin;*.smd;*.gen;*.md;*.smc;*.sfc;*.a26;*.a78;*.col;*.rom;*.cue;*.sgb;*.z64;*.v64;*.n64;*.xml;%ARCH%",
"Disc Images", "*.cue", "Disc Images", "*.cue",
"NES", "*.nes;*.fds;%ARCH%", "NES", "*.nes;*.fds;%ARCH%",
"Super NES", "*.smc;*.sfc;*.xml;%ARCH%", "Super NES", "*.smc;*.sfc;*.xml;%ARCH%",
"Nintendo 64", "*.z64;*.v64;*.n64",
"Gameboy", "*.gb;*.gbc;*.sgb;%ARCH%", "Gameboy", "*.gb;*.gbc;*.sgb;%ARCH%",
"Master System", "*.sms;*.gg;*.sg;%ARCH%", "Master System", "*.sms;*.gg;*.sg;%ARCH%",
"PC Engine", "*.pce;*.sgx;*.cue;%ARCH%", "PC Engine", "*.pce;*.sgx;*.cue;%ARCH%",