bnes - remove the force determinism setting (hack) since it is no longer relevant
This commit is contained in:
parent
9eb2fcc34c
commit
8c40d2908c
|
@ -32,14 +32,12 @@
|
||||||
this.btnCancel = new System.Windows.Forms.Button();
|
this.btnCancel = new System.Windows.Forms.Button();
|
||||||
this.cbDoubleSize = new System.Windows.Forms.CheckBox();
|
this.cbDoubleSize = new System.Windows.Forms.CheckBox();
|
||||||
this.lblDoubleSize = new System.Windows.Forms.Label();
|
this.lblDoubleSize = new System.Windows.Forms.Label();
|
||||||
this.cbForceDeterminism = new System.Windows.Forms.CheckBox();
|
|
||||||
this.label3 = new System.Windows.Forms.Label();
|
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
//
|
//
|
||||||
// btnOk
|
// btnOk
|
||||||
//
|
//
|
||||||
this.btnOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
this.btnOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.btnOk.Location = new System.Drawing.Point(136, 193);
|
this.btnOk.Location = new System.Drawing.Point(136, 117);
|
||||||
this.btnOk.Name = "btnOk";
|
this.btnOk.Name = "btnOk";
|
||||||
this.btnOk.Size = new System.Drawing.Size(75, 23);
|
this.btnOk.Size = new System.Drawing.Size(75, 23);
|
||||||
this.btnOk.TabIndex = 0;
|
this.btnOk.TabIndex = 0;
|
||||||
|
@ -51,7 +49,7 @@
|
||||||
//
|
//
|
||||||
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
|
||||||
this.btnCancel.Location = new System.Drawing.Point(217, 193);
|
this.btnCancel.Location = new System.Drawing.Point(217, 117);
|
||||||
this.btnCancel.Name = "btnCancel";
|
this.btnCancel.Name = "btnCancel";
|
||||||
this.btnCancel.Size = new System.Drawing.Size(75, 23);
|
this.btnCancel.Size = new System.Drawing.Size(75, 23);
|
||||||
this.btnCancel.TabIndex = 1;
|
this.btnCancel.TabIndex = 1;
|
||||||
|
@ -79,25 +77,6 @@
|
||||||
this.lblDoubleSize.Text = "Some games are changing the resolution constantly (e.g. SD3) so this option can f" +
|
this.lblDoubleSize.Text = "Some games are changing the resolution constantly (e.g. SD3) so this option can f" +
|
||||||
"orce the SNES output to stay double-size always. NOTE: The Accuracy core runs as" +
|
"orce the SNES output to stay double-size always. NOTE: The Accuracy core runs as" +
|
||||||
" if this is selected.\r\n";
|
" if this is selected.\r\n";
|
||||||
//
|
|
||||||
// cbForceDeterminism
|
|
||||||
//
|
|
||||||
this.cbForceDeterminism.AutoSize = true;
|
|
||||||
this.cbForceDeterminism.Location = new System.Drawing.Point(19, 102);
|
|
||||||
this.cbForceDeterminism.Name = "cbForceDeterminism";
|
|
||||||
this.cbForceDeterminism.Size = new System.Drawing.Size(113, 17);
|
|
||||||
this.cbForceDeterminism.TabIndex = 8;
|
|
||||||
this.cbForceDeterminism.Text = "Force Determinism";
|
|
||||||
this.cbForceDeterminism.UseVisualStyleBackColor = true;
|
|
||||||
//
|
|
||||||
// label3
|
|
||||||
//
|
|
||||||
this.label3.Location = new System.Drawing.Point(38, 126);
|
|
||||||
this.label3.Name = "label3";
|
|
||||||
this.label3.Size = new System.Drawing.Size(251, 41);
|
|
||||||
this.label3.TabIndex = 9;
|
|
||||||
this.label3.Text = "Guarantee deterministic emulation by savestating every frame. Don\'t TAS without i" +
|
|
||||||
"t! Only ~75% of runs sync without it, but speed boost is ~30%.";
|
|
||||||
//
|
//
|
||||||
// SNESOptions
|
// SNESOptions
|
||||||
//
|
//
|
||||||
|
@ -105,9 +84,7 @@
|
||||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
this.CancelButton = this.btnCancel;
|
this.CancelButton = this.btnCancel;
|
||||||
this.ClientSize = new System.Drawing.Size(304, 228);
|
this.ClientSize = new System.Drawing.Size(304, 152);
|
||||||
this.Controls.Add(this.label3);
|
|
||||||
this.Controls.Add(this.cbForceDeterminism);
|
|
||||||
this.Controls.Add(this.lblDoubleSize);
|
this.Controls.Add(this.lblDoubleSize);
|
||||||
this.Controls.Add(this.cbDoubleSize);
|
this.Controls.Add(this.cbDoubleSize);
|
||||||
this.Controls.Add(this.btnCancel);
|
this.Controls.Add(this.btnCancel);
|
||||||
|
@ -130,7 +107,5 @@
|
||||||
private System.Windows.Forms.Button btnCancel;
|
private System.Windows.Forms.Button btnCancel;
|
||||||
private System.Windows.Forms.CheckBox cbDoubleSize;
|
private System.Windows.Forms.CheckBox cbDoubleSize;
|
||||||
private System.Windows.Forms.Label lblDoubleSize;
|
private System.Windows.Forms.Label lblDoubleSize;
|
||||||
private System.Windows.Forms.CheckBox cbForceDeterminism;
|
|
||||||
private System.Windows.Forms.Label label3;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -22,16 +22,12 @@ namespace BizHawk.Client.EmuHawk
|
||||||
var dlg = new SNESOptions
|
var dlg = new SNESOptions
|
||||||
{
|
{
|
||||||
AlwaysDoubleSize = s.AlwaysDoubleSize,
|
AlwaysDoubleSize = s.AlwaysDoubleSize,
|
||||||
ForceDeterminism = s.ForceDeterminism,
|
|
||||||
//Profile = ss.Profile
|
|
||||||
};
|
};
|
||||||
|
|
||||||
var result = dlg.ShowDialog(owner);
|
var result = dlg.ShowDialog(owner);
|
||||||
if (result == DialogResult.OK)
|
if (result == DialogResult.OK)
|
||||||
{
|
{
|
||||||
s.AlwaysDoubleSize = dlg.AlwaysDoubleSize;
|
s.AlwaysDoubleSize = dlg.AlwaysDoubleSize;
|
||||||
s.ForceDeterminism = dlg.ForceDeterminism;
|
|
||||||
//ss.Profile = dlg.Profile;
|
|
||||||
GlobalWin.MainForm.PutCoreSettings(s);
|
GlobalWin.MainForm.PutCoreSettings(s);
|
||||||
GlobalWin.MainForm.PutCoreSyncSettings(ss);
|
GlobalWin.MainForm.PutCoreSyncSettings(ss);
|
||||||
}
|
}
|
||||||
|
@ -51,12 +47,6 @@ namespace BizHawk.Client.EmuHawk
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool ForceDeterminism
|
|
||||||
{
|
|
||||||
get { return cbForceDeterminism.Checked; }
|
|
||||||
set { cbForceDeterminism.Checked = value; }
|
|
||||||
}
|
|
||||||
|
|
||||||
void RefreshDoubleSizeOption()
|
void RefreshDoubleSizeOption()
|
||||||
{
|
{
|
||||||
_suppressDoubleSize = true;
|
_suppressDoubleSize = true;
|
||||||
|
|
|
@ -55,7 +55,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
|
||||||
public bool ShowOBJ_3 { get; set; } = true;
|
public bool ShowOBJ_3 { get; set; } = true;
|
||||||
|
|
||||||
public bool AlwaysDoubleSize { get; set; } = false;
|
public bool AlwaysDoubleSize { get; set; } = false;
|
||||||
public bool ForceDeterminism { get; set; } = true;
|
|
||||||
public string Palette { get; set; } = "BizHawk";
|
public string Palette { get; set; } = "BizHawk";
|
||||||
|
|
||||||
public SnesSettings Clone()
|
public SnesSettings Clone()
|
||||||
|
|
Loading…
Reference in New Issue