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

fix bsnes xml loading

This commit is contained in:
zeromus 2015-04-21 23:50:15 +00:00
parent 732bc5389c
commit f94460dc46
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.Client.Common/CoreFileProvider.cs
View File

@ -19,7 +19,7 @@ namespace BizHawk.Client.Common
public string PathSubfile(string fname)
{
return Path.Combine(Path.GetDirectoryName(SubfileDirectory) ?? String.Empty, fname);
return Path.Combine(SubfileDirectory ?? String.Empty, fname);
}
public string DllPath()
@ -110,7 +110,11 @@ namespace BizHawk.Client.Common
// this should go away now
public static void SyncCoreCommInputSignals(CoreComm target)
{
string superhack = null;
if (target.CoreFileProvider != null && target.CoreFileProvider is CoreFileProvider)
superhack = ((CoreFileProvider)target.CoreFileProvider ).SubfileDirectory;
var cfp = new CoreFileProvider(target.ShowMessage);
cfp.SubfileDirectory = superhack;
target.CoreFileProvider = cfp;
cfp.FirmwareManager = Global.FirmwareManager;
}

1
BizHawk.Client.Common/RomGame.cs
View File

@ -51,6 +51,7 @@ namespace BizHawk.Client.Common
// read the entire file into FileData.
FileData = new byte[fileLength];
stream.Position = 0;
stream.Read(FileData, 0, fileLength);
// if there was no header offset, RomData is equivalent to FileData

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

@ -353,8 +353,25 @@ namespace BizHawk.Client.Common
}
catch (Exception ex)
{
DoLoadErrorCallback(ex.ToString(), "DGB", LoadErrorType.XML);
return false;
try
{
// need to get rid of this hack at some point
rom = new RomGame(file);
((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
byte[] romData = null;
byte[] xmlData = rom.FileData;
game = rom.GameInfo;
game.System = "SNES";
var snes = new LibsnesCore(game, romData, Deterministic, xmlData, nextComm, GetCoreSettings<LibsnesCore>(), GetCoreSyncSettings<LibsnesCore>());
nextEmulator = snes;
}
catch
{
DoLoadErrorCallback(ex.ToString(), "DGB", LoadErrorType.XML);
return false;
}
}
}
else // most extensions