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

kill more psp, and remove some methods from coreComm that were only used by the former psp core

This commit is contained in:
adelikat 2020-03-14 15:14:31 -05:00
parent 9825963261
commit d8d12cac8b
6 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,6 @@ using BizHawk.Emulation.Cores.Nintendo.GBHawkLink4x;
using BizHawk.Emulation.Cores.Nintendo.SNES;
using BizHawk.Emulation.Cores.PCEngine;
using BizHawk.Emulation.Cores.Sega.GGHawkLink;
using BizHawk.Emulation.Cores.Sony.PSP;
using BizHawk.Emulation.Cores.Sony.PSX;
using BizHawk.Emulation.Cores.Computers.SinclairSpectrum;
using BizHawk.Emulation.Cores.Arcades.MAME;
@ -565,9 +564,6 @@ namespace BizHawk.Client.Common
nextEmulator = new Saturnus(nextComm, new[] { disc }, Deterministic,
(Saturnus.Settings)GetCoreSettings<Saturnus>(), (Saturnus.SyncSettings)GetCoreSyncSettings<Saturnus>());
break;
case "PSP":
nextEmulator = new PSP(nextComm, file.Name);
break;
case "PSX":
nextEmulator = new Octoshock(nextComm, new List<Disc>(new[] { disc }), new List<string>(new[] { Path.GetFileNameWithoutExtension(path) }), null, GetCoreSettings<Octoshock>(), GetCoreSyncSettings<Octoshock>());
if (game.IsRomStatusBad() || game.Status == RomStatus.NotInDatabase)

2
BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs
View File

@ -7,7 +7,6 @@ using BizHawk.Emulation.Cores.Nintendo.SNES;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
using BizHawk.Emulation.Cores.Nintendo.SNES9X;
using BizHawk.Emulation.Cores.Consoles.Sega.gpgx;
using BizHawk.Emulation.Cores.Sony.PSP;
using BizHawk.Emulation.Cores.Arcades.MAME;
using BizHawk.Emulation.Cores.Nintendo.GBA;
using BizHawk.Emulation.Cores.Sega.MasterSystem;
@ -30,7 +29,6 @@ namespace BizHawk.Client.EmuHawk.CoreExtensions
QuickNES _ => Properties.Resources.QuickNes,
LibsnesCore _ => Properties.Resources.bsnes,
GPGX _ => Properties.Resources.genplus,
PSP _ => Properties.Resources.ppsspp,
Gameboy _ => Properties.Resources.gambatte,
Snes9x _ => Properties.Resources.snes9x,
MAME _ => Properties.Resources.mame,

2
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -86,8 +86,6 @@ namespace BizHawk.Client.EmuHawk
{
return new CoreComm(ShowMessageCoreComm, NotifyCoreComm)
{
ReleaseGLContext = o => GLManager.ReleaseGLContext(o),
RequestGLContext = (major, minor, forward) => GLManager.CreateGLContext(major, minor, forward),
ActivateGLContext = gl => GLManager.Activate((GLManager.ContextRef)gl),
DeactivateGLContext = () => GLManager.Deactivate()
};

1
BizHawk.Client.EmuHawk/Properties/Resources.cs
View File

@ -142,7 +142,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
internal static readonly Bitmap placeholder_bitmap = ReadEmbeddedBitmap("placeholder_bitmap");
internal static readonly Icon poke_MultiSize = ReadEmbeddedIcon("poke");
internal static readonly Bitmap poke = ReadEmbeddedBitmap("poke");
internal static readonly Bitmap ppsspp = ReadEmbeddedBitmap("ppsspp");
internal static readonly Icon Previous_MultiSize = ReadEmbeddedIcon("Previous");
internal static readonly Bitmap Previous = ReadEmbeddedBitmap("Previous");
internal static readonly Icon QuickNes_MultiSize = ReadEmbeddedIcon("QuickNes");

BIN
BizHawk.Client.EmuHawk/images/ppsspp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 841 B

2
BizHawk.Emulation.Common/CoreComms.cs
View File

@ -45,8 +45,6 @@ namespace BizHawk.Emulation.Common
/// </summary>
public Action<string> Notify { get; }
public Func<int, int, bool, object> RequestGLContext { get; set; }
public Action<object> ReleaseGLContext { get; set; }
public Action<object> ActivateGLContext { get; set; }
public Action DeactivateGLContext { get; set; } // this shouldn't be necessary.. frontend should be changing context before it does anything.. but for now..
}