From cc4c0ed69342e435e0248eeb6483fd2069def40e Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Thu, 1 Nov 2012 17:06:14 +0000
Subject: [PATCH] Fix C64 rom loading
---
BizHawk.MultiClient/MainForm.cs | 3 ++-
BizHawk.MultiClient/movie/InputAdapters.cs | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 9df6df928e..b9ab2621bd 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -1366,7 +1366,7 @@ namespace BizHawk.MultiClient
if (path == null) return false;
using (var file = new HawkFile())
{
- string[] romExtensions = new string[] { "SMS", "SMC", "SFC", "PCE", "SGX", "GG", "SG", "BIN", "GEN", "MD", "SMD", "GB", "NES", "FDS", "ROM", "INT", "GBC", "UNF", "A78", "C64" };
+ string[] romExtensions = new string[] { "SMS", "SMC", "SFC", "PCE", "SGX", "GG", "SG", "BIN", "GEN", "MD", "SMD", "GB", "NES", "FDS", "ROM", "INT", "GBC", "UNF", "A78", "CRT" };
//lets not use this unless we need to
//file.NonArchiveExtensions = romExtensions;
@@ -1647,6 +1647,7 @@ namespace BizHawk.MultiClient
break;
case "C64":
C64 c64 = new C64(game, rom.RomData); //TODO: need to load in BIOSes?
+ nextEmulator = c64;
break;
}
}
diff --git a/BizHawk.MultiClient/movie/InputAdapters.cs b/BizHawk.MultiClient/movie/InputAdapters.cs
index b2d4cf61d8..bcff06021a 100644
--- a/BizHawk.MultiClient/movie/InputAdapters.cs
+++ b/BizHawk.MultiClient/movie/InputAdapters.cs
@@ -400,6 +400,11 @@ namespace BizHawk.MultiClient
{
return "|.|";
}
+ if (ControlType == "Atari 7800 Basic Controller")
+ {
+ return "|.|"; //TODO
+ }
+
else if (ControlType == "SNES Controller")
{
return GetSNESControllersAsMnemonic();