Skip to content

Drop old BSNES #4183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Drop old BSNES #4183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f72995
Remove `snes` Lua library (only affected old BSNES) in favour of `emu`
YoshiRulz Jan 10, 2025
41faf25
Remove most of (old) BSNES' managed source and callsites
YoshiRulz Apr 8, 2025
23238a8
Remove (old) BSNES' unmanaged source and the binary
YoshiRulz Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .github/workflows/waterbox-cores.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ jobs:
Assets/dll/faust.wbx.zst
Assets/dll/gpgx.wbx.zst
Assets/dll/hyper.wbx.zst
Assets/dll/libsnes.wbx.zst
Assets/dll/melonDS.wbx.zst
Assets/dll/ngp.wbx.zst
Assets/dll/pcfx.wbx.zst
Expand Down
Binary file removed Assets/dll/libsnes.wbx.zst
View file
Open in desktop
Binary file not shown.
19 changes: 0 additions & 19 deletions src/BizHawk.Client.Common/Api/Classes/EmulationApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
using BizHawk.Emulation.Cores.Nintendo.BSNES;
using BizHawk.Emulation.Cores.Nintendo.NES;
using BizHawk.Emulation.Cores.Consoles.Nintendo.NDS;
using BizHawk.Emulation.Cores.Nintendo.SNES;
using BizHawk.Emulation.Cores.PCEngine;
using BizHawk.Emulation.Cores.Sega.MasterSystem;
using BizHawk.Emulation.Cores.WonderSwan;
Expand Down Expand Up @@ -195,7 +194,6 @@ public void SetLagCount(int count)

public object? GetSettings() => Emulator switch // (select) cores A-Z by value of `CoreAttribute.CoreName`
{
LibsnesCore snes => snes.GetSettings(),
WonderSwan ws => ws.GetSettings(),
GPGX gpgx => gpgx.GetSettings(),
NDS nds => nds.GetSettings(),
Expand All @@ -208,7 +206,6 @@ public void SetLagCount(int count)

public PutSettingsDirtyBits PutSettings(object settings) => Emulator switch // (select) cores A-Z by value of `CoreAttribute.CoreName`
{
LibsnesCore snes => snes.PutSettings((LibsnesCore.SnesSettings) settings),
WonderSwan ws => ws.PutSettings((WonderSwan.Settings) settings),
GPGX gpgx => gpgx.PutSettings((GPGX.GPGXSettings) settings),
NDS nds => nds.PutSettings((NDS.NDSSettings) settings),
Expand All @@ -223,19 +220,6 @@ public void SetRenderPlanes(params bool[] args)
{
static bool GetSetting(bool[] settings, int index) => index >= settings.Length || settings[index];
// (select) cores A-Z by value of `CoreAttribute.CoreName`
void SetLibsnes(LibsnesCore core)
{
var s = core.GetSettings();
s.ShowBG1_0 = s.ShowBG1_1 = GetSetting(args, 0);
s.ShowBG2_0 = s.ShowBG2_1 = GetSetting(args, 1);
s.ShowBG3_0 = s.ShowBG3_1 = GetSetting(args, 2);
s.ShowBG4_0 = s.ShowBG4_1 = GetSetting(args, 3);
s.ShowOBJ_0 = GetSetting(args, 4);
s.ShowOBJ_1 = GetSetting(args, 5);
s.ShowOBJ_2 = GetSetting(args, 6);
s.ShowOBJ_3 = GetSetting(args, 7);
core.PutSettings(s);
}
void SetBsnes(ISettable<BsnesCore.SnesSettings, BsnesCore.SnesSyncSettings> settingsProvider)
{
var s = settingsProvider.GetSettings();
Expand Down Expand Up @@ -319,9 +303,6 @@ void SetSnes9x(Snes9x core)
// (select) cores A-Z by value of `CoreAttribute.CoreName`
switch (Emulator)
{
case LibsnesCore snes:
SetLibsnes(snes);
break;
case BsnesCore bsnes:
SetBsnes(bsnes);
break;
Expand Down
25 changes: 2 additions & 23 deletions src/BizHawk.Client.Common/RomLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
using BizHawk.Emulation.Cores;
using BizHawk.Emulation.Cores.Libretro;
using BizHawk.Emulation.Cores.Nintendo.Sameboy;
using BizHawk.Emulation.Cores.Nintendo.SNES;
using BizHawk.Emulation.Cores.Sony.PSX;
using BizHawk.Emulation.Cores.Arcades.MAME;
using BizHawk.Emulation.DiscSystem;
Expand Down Expand Up @@ -709,28 +708,8 @@ private bool LoadXML(string path, CoreComm nextComm, HawkFile file, string force
}
catch (Exception ex)
{
try
{
// need to get rid of this hack at some point
rom = new RomGame(file);
game = rom.GameInfo;
game.System = VSystemID.Raw.SNES;
nextEmulator = new LibsnesCore(
game,
null,
rom.FileData,
Path.GetDirectoryName(path.SubstringBefore('|')),
nextComm,
GetCoreSettings<LibsnesCore, LibsnesCore.SnesSettings>(),
GetCoreSyncSettings<LibsnesCore, LibsnesCore.SnesSyncSettings>()
);
return true;
}
catch
{
DoLoadErrorCallback(ex.ToString(), VSystemID.Raw.GBL, LoadErrorType.Xml);
return false;
}
DoLoadErrorCallback(ex.ToString(), VSystemID.Raw.GBL, LoadErrorType.Xml);
return false;
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/BizHawk.Client.Common/config/Config.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class Config
([ VSystemID.Raw.GBL ],
[ CoreNames.GambatteLink, CoreNames.GBHawkLink, CoreNames.GBHawkLink3x, CoreNames.GBHawkLink4x ]),
([ VSystemID.Raw.SGB ],
[ CoreNames.Gambatte, CoreNames.Bsnes115, CoreNames.SubBsnes115, CoreNames.Bsnes ]),
[ CoreNames.Gambatte, CoreNames.Bsnes115, CoreNames.SubBsnes115 ]),
([ VSystemID.Raw.N64 ],
[ CoreNames.Mupen64Plus, CoreNames.Ares64 ]),
([ VSystemID.Raw.NES ],
Expand All @@ -47,7 +47,7 @@ public class Config
([ VSystemID.Raw.SMS, VSystemID.Raw.GG, VSystemID.Raw.SG ],
[ CoreNames.Gpgx, CoreNames.SMSHawk ]),
([ VSystemID.Raw.SNES ],
[ CoreNames.Snes9X, CoreNames.Bsnes115, CoreNames.SubBsnes115, CoreNames.Faust, CoreNames.Bsnes ]),
[ CoreNames.Snes9X, CoreNames.Bsnes115, CoreNames.SubBsnes115, CoreNames.Faust ]),
([ VSystemID.Raw.TI83 ],
[ CoreNames.Emu83, CoreNames.TI83Hawk ]),
};
Expand Down
151 changes: 0 additions & 151 deletions src/BizHawk.Client.Common/lua/LuaHelperLibs/SNESLuaLibrary.cs
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions src/BizHawk.Client.EmuHawk/Extensions/CoreExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES;
using BizHawk.Emulation.Cores.Nintendo.BSNES;
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;
Expand All @@ -28,7 +27,7 @@ public static Bitmap Icon(this IEmulator core)
// (select) cores A-Z by value of `CoreAttribute.CoreName`
return core switch
{
BsnesCore or LibsnesCore or SubBsnesCore => Properties.Resources.Bsnes,
BsnesCore or SubBsnesCore => Properties.Resources.Bsnes,
Gameboy => Properties.Resources.Gambatte,
GPGX => Properties.Resources.GenPlus,
MAME => Properties.Resources.Mame,
Expand Down
Loading