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

Fix C64 rom loading

This commit is contained in:
adelikat 2012-11-01 17:06:14 +00:00
parent 3858ff9b95
commit cc4c0ed693
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.MultiClient/MainForm.cs
View File

@ -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;
}
}

5
BizHawk.MultiClient/movie/InputAdapters.cs
View File

@ -400,6 +400,11 @@ namespace BizHawk.MultiClient
{
return "|.|";
}
if (ControlType == "Atari 7800 Basic Controller")
{
return "|.|"; //TODO
}
else if (ControlType == "SNES Controller")
{
return GetSNESControllersAsMnemonic();