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

make multihawk compile, not sure what happened here, maybe a bad merge?

This commit is contained in:
adelikat 2016-11-13 11:01:27 -06:00
parent be93e78dd5
commit 20fb060c65
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BizHawk.Client.MultiHawk/Mainform.cs
View File

@ -65,12 +65,12 @@ namespace BizHawk.Client.MultiHawk
// we could background thread this later instead if we wanted to be real clever // we could background thread this later instead if we wanted to be real clever
NES.BootGodDB.GetDatabaseBytes = () => NES.BootGodDB.GetDatabaseBytes = () =>
{ {
string xmlPath = Path.Combine( PathManager.GetExeDirectoryAbsolute(), "gamedb", "NesCarts.xml" ); string xmlPath = Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "NesCarts.xml");
string x7zPath = Path.Combine( PathManager.GetExeDirectoryAbsolute(), "gamedb", "NesCarts.7z" ); string x7zPath = Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "NesCarts.7z");
bool loadXml = File.Exists( xmlPath ); bool loadXml = File.Exists(xmlPath);
using ( var NesCartFile = new HawkFile( loadXml ? xmlPath : x7zPath ) ) using (var NesCartFile = new HawkFile(loadXml ? xmlPath : x7zPath))
{ {
if ( !loadXml ) { NesCartFile.BindFirst(); } if (!loadXml) { NesCartFile.BindFirst(); }
return NesCartFile return NesCartFile
.GetStream() .GetStream()
.ReadAllBytes(); .ReadAllBytes();
@ -104,6 +104,7 @@ namespace BizHawk.Client.MultiHawk
{ {
Location = new Point(Global.Config.MainWndx, Global.Config.MainWndy); Location = new Point(Global.Config.MainWndx, Global.Config.MainWndy);
} }
};
} }
private static bool StateErrorAskUser(string title, string message) private static bool StateErrorAskUser(string title, string message)