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

remove some DGB/GB3x/GB4x remnants

This commit is contained in:
CasualPokePlayer 2021-11-21 17:21:13 -08:00
parent 83a5632759
commit e0ffd45983
8 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.sln.DotSettings
View File

@ -78,13 +78,13 @@
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CRC/@EntryIndexedValue">CRC</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CRC/@EntryIndexedValue">CRC</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DB/@EntryIndexedValue">DB</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DB/@EntryIndexedValue">DB</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DC/@EntryIndexedValue">DC</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DC/@EntryIndexedValue">DC</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DGB/@EntryIndexedValue">DGB</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DMG/@EntryIndexedValue">DMG</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DMG/@EntryIndexedValue">DMG</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DS/@EntryIndexedValue">DS</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DS/@EntryIndexedValue">DS</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DX/@EntryIndexedValue">DX</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DX/@EntryIndexedValue">DX</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GB/@EntryIndexedValue">GB</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GB/@EntryIndexedValue">GB</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GBA/@EntryIndexedValue">GBA</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GBA/@EntryIndexedValue">GBA</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GBC/@EntryIndexedValue">GBC</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GBC/@EntryIndexedValue">GBC</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GBL/@EntryIndexedValue">GBL</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GG/@EntryIndexedValue">GG</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GG/@EntryIndexedValue">GG</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GL/@EntryIndexedValue">GL</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GPGX/@EntryIndexedValue">GPGX</s:String> <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GPGX/@EntryIndexedValue">GPGX</s:String>

4
ExternalToolProjects/DATParser/DATParserBase.cs
View File

@ -189,7 +189,7 @@ namespace BizHawk.DATTool
PCFX, PCFX,
PCECD, PCECD,
GB, GB,
DGB, GBL,
AppleII, AppleII,
C64, C64,
ZXSpectrum, ZXSpectrum,
@ -215,8 +215,6 @@ namespace BizHawk.DATTool
NGP, NGP,
ChannelF, ChannelF,
VEC, VEC,
GB3x,
GB4x,
O2, O2,
MSX, MSX,
NDS NDS

6
src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -135,9 +135,9 @@
<Compile Update="config/GB/ColorChooserForm.cs" SubType="Form" /> <Compile Update="config/GB/ColorChooserForm.cs" SubType="Form" />
<Compile Update="config/GB/ColorChooserForm.Designer.cs" DependentUpon="ColorChooserForm.cs" /> <Compile Update="config/GB/ColorChooserForm.Designer.cs" DependentUpon="ColorChooserForm.cs" />
<EmbeddedResource Update="config/GB/ColorChooserForm.resx" DependentUpon="ColorChooserForm.cs" /> <EmbeddedResource Update="config/GB/ColorChooserForm.resx" DependentUpon="ColorChooserForm.cs" />
<Compile Update="config/GB/DGBPrefs.cs" SubType="Form" /> <Compile Update="config\GB\GBLPrefs.cs" SubType="Form" />
<Compile Update="config/GB/DGBPrefs.Designer.cs" DependentUpon="DGBPrefs.cs" /> <Compile Update="config\GB\GBLPrefs.Designer.cs" DependentUpon="GBLPrefs.cs" />
<EmbeddedResource Update="config/GB/DGBPrefs.resx" DependentUpon="DGBPrefs.cs" /> <EmbeddedResource Update="config\GB\GBLPrefs.resx" DependentUpon="GBLPrefs.cs" />
<Compile Update="config/GB/GBPrefControl.cs" SubType="UserControl" /> <Compile Update="config/GB/GBPrefControl.cs" SubType="UserControl" />
<Compile Update="config/GB/GBPrefControl.Designer.cs" DependentUpon="GBPrefControl.cs" /> <Compile Update="config/GB/GBPrefControl.Designer.cs" DependentUpon="GBPrefControl.cs" />
<EmbeddedResource Update="config/GB/GBPrefControl.resx" DependentUpon="GBPrefControl.cs" /> <EmbeddedResource Update="config/GB/GBPrefControl.resx" DependentUpon="GBPrefControl.cs" />

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

@ -1749,7 +1749,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (Emulator is GambatteLink gambatte) if (Emulator is GambatteLink gambatte)
{ {
DGBPrefs.DoDGBPrefsDialog(this, Config, Game, MovieSession, gambatte); GBLPrefs.DoGBLPrefsDialog(this, Config, Game, MovieSession, gambatte);
} }
} }

6
src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.Designer.cs → src/BizHawk.Client.EmuHawk/config/GB/GBLPrefs.Designer.cs generated
View File

@ -1,6 +1,6 @@
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {
partial class DGBPrefs partial class GBLPrefs
{ {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.
@ -163,7 +163,7 @@
this.buttonOK.Text = "OK"; this.buttonOK.Text = "OK";
this.buttonOK.UseVisualStyleBackColor = true; this.buttonOK.UseVisualStyleBackColor = true;
// //
// DGBPrefs // GBLPrefs
// //
this.AcceptButton = this.buttonOK; this.AcceptButton = this.buttonOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -173,7 +173,7 @@
this.Controls.Add(this.buttonOK); this.Controls.Add(this.buttonOK);
this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
this.Name = "DGBPrefs"; this.Name = "GBLPrefs";
this.Text = "Gameboy Link Settings"; this.Text = "Gameboy Link Settings";
this.tabControl1.ResumeLayout(false); this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false); this.tabPage1.ResumeLayout(false);

8
src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.cs → src/BizHawk.Client.EmuHawk/config/GB/GBLPrefs.cs
View File

@ -5,7 +5,7 @@ using BizHawk.Emulation.Cores.Nintendo.Gameboy;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {
public partial class DGBPrefs : Form, IDialogParent public partial class GBLPrefs : Form, IDialogParent
{ {
private readonly Config _config; private readonly Config _config;
private readonly IGameInfo _game; private readonly IGameInfo _game;
@ -13,7 +13,7 @@ namespace BizHawk.Client.EmuHawk
public IDialogController DialogController { get; } public IDialogController DialogController { get; }
private DGBPrefs(IDialogController dialogController, Config config, IGameInfo game, IMovieSession movieSession) private GBLPrefs(IDialogController dialogController, Config config, IGameInfo game, IMovieSession movieSession)
{ {
_config = config; _config = config;
_game = game; _game = game;
@ -48,12 +48,12 @@ namespace BizHawk.Client.EmuHawk
private bool SyncSettingsChanged => gbPrefControl1.SyncSettingsChanged || gbPrefControl2.SyncSettingsChanged || gbPrefControl3.SyncSettingsChanged || gbPrefControl4.SyncSettingsChanged; private bool SyncSettingsChanged => gbPrefControl1.SyncSettingsChanged || gbPrefControl2.SyncSettingsChanged || gbPrefControl3.SyncSettingsChanged || gbPrefControl4.SyncSettingsChanged;
public static void DoDGBPrefsDialog(IMainFormForConfig mainForm, Config config, IGameInfo game, IMovieSession movieSession, GambatteLink gambatte) public static void DoGBLPrefsDialog(IMainFormForConfig mainForm, Config config, IGameInfo game, IMovieSession movieSession, GambatteLink gambatte)
{ {
var s = gambatte.GetSettings(); var s = gambatte.GetSettings();
var ss = gambatte.GetSyncSettings(); var ss = gambatte.GetSyncSettings();
using var dlg = new DGBPrefs(mainForm.DialogController, config, game, movieSession); using var dlg = new GBLPrefs(mainForm.DialogController, config, game, movieSession);
dlg.PutSettings(s, ss); dlg.PutSettings(s, ss);
dlg.gbPrefControl1.ColorGameBoy = gambatte.IsCGBMode(0); dlg.gbPrefControl1.ColorGameBoy = gambatte.IsCGBMode(0);

0
src/BizHawk.Client.EmuHawk/config/GB/DGBPrefs.resx → src/BizHawk.Client.EmuHawk/config/GB/GBLPrefs.resx
View File

8
src/BizHawk.Emulation.Cores/Consoles/Nintendo/Gameboy/GambatteLink.IStatable.cs
View File

@ -11,12 +11,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
{ {
public void SaveStateText(TextWriter writer) public void SaveStateText(TextWriter writer)
{ {
ser.Serialize(writer, new DGBSerialized(this)); ser.Serialize(writer, new GBLSerialized(this));
} }
public void LoadStateText(TextReader reader) public void LoadStateText(TextReader reader)
{ {
var s = (DGBSerialized)ser.Deserialize(reader, typeof(DGBSerialized)); var s = (GBLSerialized)ser.Deserialize(reader, typeof(GBLSerialized));
if (s.NumCores != _numCores) if (s.NumCores != _numCores)
{ {
throw new InvalidOperationException("Core number mismatch!"); throw new InvalidOperationException("Core number mismatch!");
@ -86,7 +86,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
private readonly JsonSerializer ser = new JsonSerializer { Formatting = Formatting.Indented }; private readonly JsonSerializer ser = new JsonSerializer { Formatting = Formatting.Indented };
private class DGBSerialized private class GBLSerialized
{ {
public int NumCores; public int NumCores;
public TextState<Gameboy.TextStateData>[] LinkedStates; public TextState<Gameboy.TextStateData>[] LinkedStates;
@ -103,7 +103,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
public bool LinkSpaced; public bool LinkSpaced;
public bool LinkSpaceSignal; public bool LinkSpaceSignal;
public DGBSerialized(GambatteLink linkcore) public GBLSerialized(GambatteLink linkcore)
{ {
if (linkcore == null) if (linkcore == null)
{ {