diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs index f9e57a4f62..f5b8a903a6 100644 --- a/BizHawk.Client.Common/RomLoader.cs +++ b/BizHawk.Client.Common/RomLoader.cs @@ -409,7 +409,7 @@ namespace BizHawk.Client.Common if (core != null) { // use coreinventory - nextEmulator = core.Create(nextComm, game, rom.RomData, Deterministic, GetCoreSettings(core.Type), GetCoreSyncSettings(core.Type)); + nextEmulator = core.Create(nextComm, game, rom.RomData, rom.FileData, Deterministic, GetCoreSettings(core.Type), GetCoreSyncSettings(core.Type)); } } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs index cc2ee0f2a8..48948697a6 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs @@ -45,7 +45,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 /// Rom that should be loaded /// N64SyncSettings object [CoreConstructor("N64")] - public N64(CoreComm comm, GameInfo game, byte[] rom, object settings, object syncSettings) + public N64(CoreComm comm, GameInfo game, byte[] file, object settings, object syncSettings) { int SaveType = 0; if (game.OptionValue("SaveType") == "EEPROM_16K") @@ -64,7 +64,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 _syncSettings.DisableExpansionSlot = false; } - byte country_code = rom[0x3E]; + byte country_code = file[0x3E]; switch (country_code) { // PAL codes @@ -109,7 +109,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64 //not sure why this works... if we put the plugin initializations in here, we get deadlocks in some SDL initialization. doesnt make sense to me... RunThreadAction(() => { - api = new mupen64plusApi(this, rom, videosettings, SaveType, (int)coreType, _syncSettings.DisableExpansionSlot); + api = new mupen64plusApi(this, file, videosettings, SaveType, (int)coreType, _syncSettings.DisableExpansionSlot); }); // Order is important because the register with the mupen core diff --git a/BizHawk.Emulation.Cores/CoreInventory.cs b/BizHawk.Emulation.Cores/CoreInventory.cs index c7fc7d3e46..316c484412 100644 --- a/BizHawk.Emulation.Cores/CoreInventory.cs +++ b/BizHawk.Emulation.Cores/CoreInventory.cs @@ -73,6 +73,7 @@ namespace BizHawk.Emulation.Cores CoreComm comm, GameInfo game, byte[] rom, + byte[] file, bool deterministic, object settings, object syncsettings @@ -82,6 +83,7 @@ namespace BizHawk.Emulation.Cores bp(o, "comm", comm); bp(o, "game", game); bp(o, "rom", rom); + bp(o, "file", file); bp(o, "deterministic", deterministic); bp(o, "settings", settings); bp(o, "syncsettings", syncsettings);