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

C64 - show mapper info in rom annotation, if rom is a cart

This commit is contained in:
adelikat 2017-05-27 11:57:38 -05:00
parent 5f1b8cdc09
commit be39513b9e
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -570,6 +570,7 @@ namespace BizHawk.Client.Common
nextEmulator = new C64(
nextComm,
xmlGame.Assets.Select(a => a.Value),
GameInfo.NullInstance,
(C64.C64Settings)GetCoreSettings<C64>(),
(C64.C64SyncSettings)GetCoreSyncSettings<C64>());
break;
@ -842,7 +843,7 @@ namespace BizHawk.Client.Common
: nextEmulator = new A7800Hawk(nextComm, game, rom.RomData, gamedbpath);
break;
case "C64":
var c64 = new C64(nextComm, Enumerable.Repeat(rom.RomData, 1), GetCoreSettings<C64>(), GetCoreSyncSettings<C64>());
var c64 = new C64(nextComm, Enumerable.Repeat(rom.RomData, 1), rom.GameInfo, GetCoreSettings<C64>(), GetCoreSyncSettings<C64>());
nextEmulator = c64;
break;
case "GBA":

9
BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using BizHawk.Common.BufferExtensions;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Computers.Commodore64.Cartridge;
using BizHawk.Emulation.Cores.Computers.Commodore64.Media;
@ -15,7 +16,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
isReleased: false)]
public sealed partial class C64 : IEmulator, IRegionable, IBoardInfo
{
public C64(CoreComm comm, IEnumerable<byte[]> roms, object settings, object syncSettings)
public C64(CoreComm comm, IEnumerable<byte[]> roms, GameInfo game, object settings, object syncSettings)
{
PutSyncSettings((C64SyncSettings)syncSettings ?? new C64SyncSettings());
@ -59,6 +60,12 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
_tracer = new TraceBuffer { Header = _board.Cpu.TraceHeader };
ser.Register<ITraceable>(_tracer);
if (_board.CartPort.IsConnected)
{
// There are no multi-cart cart games, so just hardcode .First()
CoreComm.RomStatusDetails = $"{game.Name}\r\nSHA1:{roms.First().HashSHA1()}\r\nMD5:{roms.First().HashMD5()}\r\nMapper Impl \"{_board.CartPort.CartridgeType}\"";
}
}
// Currently we will require at least one rom. If multiple they MUST be all the same media type in the same format