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

NES - remove some more unnecessary partial class usage

This commit is contained in:
adelikat 2015-01-19 13:38:08 +00:00
parent 4c47ef2f3f
commit 2e737e66be
4 changed files with 174 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/config/NES/NESGraphicsConfig.cs
View File

@ -99,7 +99,7 @@ namespace BizHawk.Client.EmuHawk
if (palette != null && palette.Exists) if (palette != null && palette.Exists)
{ {
var data = NES.Palettes.Load_FCEUX_Palette(HawkFile.ReadAllBytes(palette.Name)); var data = Palettes.Load_FCEUX_Palette(HawkFile.ReadAllBytes(palette.Name));
if (showmsg) GlobalWin.OSD.AddMessage("Palette file loaded: " + palette.Name); if (showmsg) GlobalWin.OSD.AddMessage("Palette file loaded: " + palette.Name);
return data; return data;
} }
@ -111,7 +111,7 @@ namespace BizHawk.Client.EmuHawk
else // no filename: interpret this as "reset to default" else // no filename: interpret this as "reset to default"
{ {
if (showmsg) GlobalWin.OSD.AddMessage("Standard Palette set"); if (showmsg) GlobalWin.OSD.AddMessage("Standard Palette set");
return (int[,])NES.Palettes.QuickNESPalette.Clone(); return (int[,])Palettes.QuickNESPalette.Clone();
} }
} }
else // checkbox unchecked: we're reusing whatever palette was set else // checkbox unchecked: we're reusing whatever palette was set

2
BizHawk.Client.EmuHawk/config/NES/QuickNesConfig.cs
View File

@ -88,7 +88,7 @@ namespace BizHawk.Client.EmuHawk
if (palette != null && palette.Exists) if (palette != null && palette.Exists)
{ {
var data = Emulation.Cores.Nintendo.NES.NES.Palettes.Load_FCEUX_Palette(HawkFile.ReadAllBytes(palette.Name)); var data = Emulation.Cores.Nintendo.NES.Palettes.Load_FCEUX_Palette(HawkFile.ReadAllBytes(palette.Name));
Settings.SetNesHawkPalette(data); Settings.SetNesHawkPalette(data);
SetPaletteImage(); SetPaletteImage();
} }

5
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Palettes.cs
View File

@ -1,7 +1,5 @@
namespace BizHawk.Emulation.Cores.Nintendo.NES namespace BizHawk.Emulation.Cores.Nintendo.NES
{ {
partial class NES
{
public static class Palettes public static class Palettes
{ {
static float[] rtmul = { 1.239f, 0.794f, 1.019f, 0.905f, 1.023f, 0.741f, 0.75f }; static float[] rtmul = { 1.239f, 0.794f, 1.019f, 0.905f, 1.023f, 0.741f, 0.75f };
@ -179,7 +177,4 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
{0, 0, 0}, {0, 0, 0},
}; };
} //class palettes } //class palettes
} //partial class NES
} //namespace } //namespace

1
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/iNES.cs
View File

@ -103,6 +103,5 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
return true; return true;
} }
} }
} }