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

new setting system: misc cleanup

This commit is contained in:
goyuken 2013-12-23 21:54:10 +00:00
parent 2558e76b5d
commit 50e3691181
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BizHawk.Client.Common/config/Config.cs
View File

@ -451,10 +451,6 @@ namespace BizHawk.Client.Common
public int PCEBGViewerWndy = -1; public int PCEBGViewerWndy = -1;
public int PCEBGViewerRefreshRate = 16; public int PCEBGViewerRefreshRate = 16;
// SMS Graphics settings
public bool SMSDispBG = true;
public bool SMSDispOBJ = true;
// Coleco Settings // Coleco Settings
public bool ColecoSkipBiosIntro = false; public bool ColecoSkipBiosIntro = false;
@ -640,6 +636,9 @@ namespace BizHawk.Client.Common
public bool SmsSpriteLimit = false; public bool SmsSpriteLimit = false;
public bool GGShowClippedRegions = false; public bool GGShowClippedRegions = false;
public bool GGHighlightActiveDisplayRegion = false; public bool GGHighlightActiveDisplayRegion = false;
// SMS Graphics settings
public bool SMSDispBG = true;
public bool SMSDispOBJ = true;
// PCEngine Settings // PCEngine Settings
//public bool PceSpriteLimit = false; //public bool PceSpriteLimit = false;

2
BizHawk.Client.EmuHawk/config/GB/GBPrefControl.Designer.cs generated
View File

@ -40,8 +40,10 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.propertyGrid1.Location = new System.Drawing.Point(3, 3); this.propertyGrid1.Location = new System.Drawing.Point(3, 3);
this.propertyGrid1.Name = "propertyGrid1"; this.propertyGrid1.Name = "propertyGrid1";
this.propertyGrid1.PropertySort = System.Windows.Forms.PropertySort.Alphabetical;
this.propertyGrid1.Size = new System.Drawing.Size(318, 276); this.propertyGrid1.Size = new System.Drawing.Size(318, 276);
this.propertyGrid1.TabIndex = 0; this.propertyGrid1.TabIndex = 0;
this.propertyGrid1.ToolbarVisible = false;
// //
// buttonDefaults // buttonDefaults
// //

8
BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs
View File

@ -196,7 +196,8 @@ namespace BizHawk.Emulation.Cores.PCEngine
Cpu.WriteMemory21 = WriteMemoryPopulous; Cpu.WriteMemory21 = WriteMemoryPopulous;
} }
if (Settings.SpriteLimit || game.NotInDatabase) // the gamedb can force sprite limit on, ignoring settings
if (Settings.SpriteLimit || game["ForceSpriteLimit"] || game.NotInDatabase)
{ {
VDC1.PerformSpriteLimit = true; VDC1.PerformSpriteLimit = true;
if (VDC2 != null) if (VDC2 != null)
@ -209,7 +210,8 @@ namespace BizHawk.Emulation.Cores.PCEngine
PSG.MaxVolume = int.Parse(game.OptionValue("PsgVol")); PSG.MaxVolume = int.Parse(game.OptionValue("PsgVol"));
if (game["AdpcmVol"]) if (game["AdpcmVol"])
ADPCM.MaxVolume = int.Parse(game.OptionValue("AdpcmVol")); ADPCM.MaxVolume = int.Parse(game.OptionValue("AdpcmVol"));
if (Settings.EqualizeVolume || (game.NotInDatabase && TurboCD)) // the gamedb can also force equalizevolumes on
if (Settings.EqualizeVolume || game["EqualizeVolumes"] || (game.NotInDatabase && TurboCD))
SoundMixer.EqualizeVolumes(); SoundMixer.EqualizeVolumes();
// Ok, yes, HBlankPeriod's only purpose is game-specific hax. // Ok, yes, HBlankPeriod's only purpose is game-specific hax.
@ -628,7 +630,7 @@ namespace BizHawk.Emulation.Cores.PCEngine
public PCESettings Settings = new PCESettings(); public PCESettings Settings = new PCESettings();
public object GetSettings() { return Settings.Clone(); } public object GetSettings() { return Settings.Clone(); }
public object GetSyncSettings() { return null; } public object GetSyncSettings() { return null; }
public bool PutSettings(object o) public bool PutSettings(object o)
{ {