Change RomDirectory to RomPath in RomAsset

for the current (only) usecase, this fixes failures when "RomAsset.Name" is not equal to the name of the rom on disk
This commit is contained in:
Morilli 2022-04-24 03:52:03 +02:00
parent 8f663feda5
commit 14984aea2d
4 changed files with 5 additions and 5 deletions

View File

@ -29,7 +29,7 @@ namespace BizHawk.Client.Common
public byte[] RomData { get; set; }
public byte[] FileData { get; set; }
public string Extension { get; set; }
public string RomDirectory { get; set; }
public string RomPath { get; set; }
public GameInfo Game { get; set; }
}
private class CoreInventoryParameters : ICoreInventoryParameters
@ -482,7 +482,7 @@ namespace BizHawk.Client.Common
RomData = rom.RomData,
FileData = rom.FileData,
Extension = rom.Extension,
RomDirectory = file.Directory,
RomPath = file.FullPathWithoutMember,
Game = game
}
},

View File

@ -19,7 +19,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.BSNES
var ser = new BasicServiceProvider(this);
ServiceProvider = ser;
this._romPath = Path.Combine(loadParameters.Roms[0].RomDirectory, loadParameters.Game.Name);
this._romPath = Path.ChangeExtension(loadParameters.Roms[0].RomPath, null);
CoreComm = loadParameters.Comm;
_settings = loadParameters.Settings ?? new SnesSettings();
_syncSettings = loadParameters.SyncSettings ?? new SnesSyncSettings();

View File

@ -26,7 +26,7 @@ namespace BizHawk.Emulation.Cores
public byte[] RomData { get; set; }
public byte[] FileData { get; set; }
public string Extension { get; set; }
public string RomDirectory { get; set; }
public string RomPath { get; set; }
public GameInfo Game { get; set; }
}

View File

@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Cores
byte[] RomData { get; }
byte[] FileData { get; }
string Extension { get; }
public string RomDirectory { get; }
public string RomPath { get; }
/// <summary>
/// GameInfo for this individual asset. Doesn't make sense a lot of the time;
/// only use this if your individual rom assets are full proper games when considered alone.