From 55145ff7ba376352d4bd757ed5170ddd84c630ea Mon Sep 17 00:00:00 2001 From: SaxxonPike Date: Thu, 4 Jul 2019 12:46:28 -0500 Subject: [PATCH] C64: The T64 format was never supported, but at least make the core aware of it --- .../Computers/Commodore64/C64FormatFinder.cs | 2 +- BizHawk.Emulation.Cores/Computers/Commodore64/Media/Tape.cs | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/C64FormatFinder.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/C64FormatFinder.cs index f8d975c5c7..ac3df6e62f 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/C64FormatFinder.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/C64FormatFinder.cs @@ -27,7 +27,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64 return C64Format.G64; } - if (header.StartsWith("C64S tape image ")) + if (header.StartsWith("C64S tape image ") || header.StartsWith("C64 tape image f")) { return C64Format.T64; } diff --git a/BizHawk.Emulation.Cores/Computers/Commodore64/Media/Tape.cs b/BizHawk.Emulation.Cores/Computers/Commodore64/Media/Tape.cs index 9113eeb59a..529b893b09 100644 --- a/BizHawk.Emulation.Cores/Computers/Commodore64/Media/Tape.cs +++ b/BizHawk.Emulation.Cores/Computers/Commodore64/Media/Tape.cs @@ -97,6 +97,11 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64.Media result = new Tape(version, tapeFile, 20, tapeFile.Length); } + else if (Encoding.ASCII.GetString(tapeFile, 0, 0x12) == "C64 tape image file") + { + throw new Exception("The T64 format is not yet supported."); + } + return result; }