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

apply Arcade Pit work: "Extract NesCarts.xml for easier modification"

This commit is contained in:
zeromus 2016-11-12 18:18:19 -06:00
parent 3a41cc4531
commit 0b4fc8b6a5
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/gamedb/NesCarts.7z
View File

Binary file not shown.

BIN
Assets/gamedb/NesCarts.xml Normal file
View File

Binary file not shown.

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

@ -134,9 +134,12 @@ namespace BizHawk.Client.EmuHawk
// we could background thread this later instead if we wanted to be real clever
NES.BootGodDB.GetDatabaseBytes = () =>
{
using (var NesCartFile =
new HawkFile(Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "NesCarts.7z")).BindFirst())
string xmlPath = Path.Combine( PathManager.GetExeDirectoryAbsolute(), "gamedb", "NesCarts.xml" );
string x7zPath = Path.Combine( PathManager.GetExeDirectoryAbsolute(), "gamedb", "NesCarts.7z" );
bool loadXml = File.Exists( xmlPath );
using (var NesCartFile = new HawkFile(loadXml ? xmlPath : x7zPath))
{
if (!loadXml) { NesCartFile.BindFirst(); }
return NesCartFile
.GetStream()
.ReadAllBytes();

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

@ -65,13 +65,15 @@ namespace BizHawk.Client.MultiHawk
// we could background thread this later instead if we wanted to be real clever
NES.BootGodDB.GetDatabaseBytes = () =>
{
using (var NesCartFile =
new HawkFile(Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "NesCarts.7z")).BindFirst())
string xmlPath = Path.Combine( PathManager.GetExeDirectoryAbsolute(), "gamedb", "NesCarts.xml" );
string x7zPath = Path.Combine( PathManager.GetExeDirectoryAbsolute(), "gamedb", "NesCarts.7z" );
bool loadXml = File.Exists( xmlPath );
using ( var NesCartFile = new HawkFile( loadXml ? xmlPath : x7zPath ) )
{
if ( !loadXml ) { NesCartFile.BindFirst(); }
return NesCartFile
.GetStream()
.ReadAllBytes();
}
};
Database.LoadDatabase(Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "gamedb.txt"));