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

account for new name of PSX controller in controller config, delete standard controller image since we no longer have variable name controllers anyway, fixes #1814

This commit is contained in:
adelikat 2020-01-26 13:27:57 -06:00
parent 51b68bcdf5
commit 3287a0c465
4 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,6 @@ namespace BizHawk.Client.EmuHawk.Properties {
internal static readonly Lazy<Bitmap> NGPController = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.NGPController"));
internal static readonly Lazy<Bitmap> PCEngineController = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.PCEngineController"));
internal static readonly Lazy<Bitmap> psx_dualshock = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.psx_dualshock"));
internal static readonly Lazy<Bitmap> PSX_Original_Controller = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.PSX-Original-Controller"));
internal static readonly Lazy<Bitmap> SaturnController = new Lazy<Bitmap>(() => ReadEmbeddedBitmapAt("images.ControllerImages.SaturnController.jpg"));
internal static readonly Lazy<Bitmap> SMSController = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.SMSController"));
internal static readonly Lazy<Bitmap> SNES_Controller = new Lazy<Bitmap>(() => ReadEmbeddedBitmap("ControllerImages.SNES_Controller"));

3
BizHawk.Client.EmuHawk/config/ControllerConfig.cs
View File

@ -45,8 +45,7 @@ namespace BizHawk.Client.EmuHawk
ControllerImages.Add("WonderSwan Controller", Properties.Resources.WonderSwanColor);
ControllerImages.Add("Lynx Controller", Properties.Resources.Lynx);
ControllerImages.Add("PSX Gamepad Controller", Properties.Resources.PSX_Original_Controller);
ControllerImages.Add("PSX DualShock Controller", Properties.Resources.psx_dualshock);
ControllerImages.Add("PSX Front Panel", Properties.Resources.psx_dualshock);
ControllerImages.Add("Apple IIe Keyboard", Properties.Resources.AppleIIKeyboard);
ControllerImages.Add("VirtualBoy Controller", Properties.Resources.VBoyController);
ControllerImages.Add("NeoGeo Portable Controller", Properties.Resources.NGPController);

BIN
BizHawk.Client.EmuHawk/images/ControllerImages/PSX-Original-Controller.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 78 KiB

2
BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
View File

@ -216,7 +216,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
StudySaveBufferSize();
}
public string SystemId { get { return "PSX"; } }
public string SystemId => "PSX";
public static ControllerDefinition CreateControllerDefinition(SyncSettings syncSettings)
{