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

Pizza: Fix trying to load a CGB rom in SGB causing the universe to explode

This commit is contained in:
nattthebear 2017-07-09 14:42:37 -04:00
parent e1d0ea2bcb
commit 924515c69d
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,7 @@ namespace BizHawk.Client.Common
Type = type; Type = type;
} }
public RomErrorArgs(string message, string systemId, string path, bool? det, LoadErrorType type) public RomErrorArgs(string message, string systemId, string path, bool? det, LoadErrorType type)
: this(message, systemId, type) : this(message, systemId, type)
{ {
Deterministic = det; Deterministic = det;
@ -327,7 +327,7 @@ namespace BizHawk.Client.Common
Console.WriteLine("No ROM to Load"); Console.WriteLine("No ROM to Load");
return false; return false;
} }
// if not libretro: // if not libretro:
// do extension checknig // do extension checknig
ext = file.Extension.ToLowerInvariant(); ext = file.Extension.ToLowerInvariant();
@ -478,7 +478,7 @@ namespace BizHawk.Client.Common
case DiscType.SonyPSP: case DiscType.SonyPSP:
game.System = "PSP"; game.System = "PSP";
break; break;
default: default:
case DiscType.SonyPSX: case DiscType.SonyPSX:
game.System = "PSX"; game.System = "PSX";
break; break;
@ -680,11 +680,11 @@ namespace BizHawk.Client.Common
game = rom.GameInfo; game = rom.GameInfo;
game.System = "SNES"; game.System = "SNES";
var snes = new LibsnesCore(game, romData, xmlData, nextComm, GetCoreSettings<LibsnesCore>(), GetCoreSyncSettings<LibsnesCore>()); var snes = new LibsnesCore(game, romData, xmlData, nextComm, GetCoreSettings<LibsnesCore>(), GetCoreSyncSettings<LibsnesCore>());
nextEmulator = snes; nextEmulator = snes;
} }
catch catch
{ {
DoLoadErrorCallback(ex.ToString(), "DGB", LoadErrorType.XML); DoLoadErrorCallback(ex.ToString(), "DGB", LoadErrorType.XML);
return false; return false;
@ -851,29 +851,18 @@ namespace BizHawk.Client.Common
} }
else else
{ {
try if (Global.Config.SGB_UseBsnes)
{ {
game.System = "SNES"; game.System = "SNES";
game.AddOption("SGB"); game.AddOption("SGB");
if (Global.Config.SGB_UseBsnes) var snes = new LibsnesCore(game, rom.FileData, null, nextComm, GetCoreSettings<LibsnesCore>(), GetCoreSyncSettings<LibsnesCore>());
{ nextEmulator = snes;
var snes = new LibsnesCore(game, rom.FileData, null, nextComm, GetCoreSettings<LibsnesCore>(), GetCoreSyncSettings<LibsnesCore>());
nextEmulator = snes;
}
else
{
core = CoreInventory.Instance["SGB", "Pizza Boy"];
}
} }
catch else
{ {
// failed to load SGB bios or game does not support SGB mode. core = CoreInventory.Instance["SGB", "Pizza Boy"];
// To avoid catch-22, disable SGB mode
Global.Config.GB_AsSGB = false;
throw;
} }
} }
break; break;
case "A78": case "A78":
var gamedbpath = Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "EMU7800.csv"); var gamedbpath = Path.Combine(PathManager.GetExeDirectoryAbsolute(), "gamedb", "EMU7800.csv");
@ -961,7 +950,7 @@ namespace BizHawk.Client.Common
{ {
DoMessageCallback("Unable to use quicknes, using NESHawk instead"); DoMessageCallback("Unable to use quicknes, using NESHawk instead");
} }
return LoadRom(path, nextComm, true, recursiveCount + 1); return LoadRom(path, nextComm, true, recursiveCount + 1);
} }
else if (ex is MissingFirmwareException) else if (ex is MissingFirmwareException)
@ -970,7 +959,9 @@ namespace BizHawk.Client.Common
} }
else if (ex is CGBNotSupportedException) else if (ex is CGBNotSupportedException)
{ {
// Note: GB as SGB was set to false by this point, otherwise we would want to do it here // failed to load SGB bios or game does not support SGB mode.
// To avoid catch-22, disable SGB mode
Global.Config.GB_AsSGB = false;
DoMessageCallback("Failed to load a GB rom in SGB mode. Disabling SGB Mode."); DoMessageCallback("Failed to load a GB rom in SGB mode. Disabling SGB Mode.");
return LoadRom(path, nextComm, false, recursiveCount + 1); return LoadRom(path, nextComm, false, recursiveCount + 1);
} }