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

Rewind - remove speed multiplier option, very redundant given that speedup and turbo calculate toward rewind speed

This commit is contained in:
adelikat 2020-06-19 15:02:03 -05:00
parent 6440d92a34
commit 6b514293ff
4 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/BizHawk.Client.Common/config/RewindConfig.cs
View File

@ -16,6 +16,5 @@
public bool EnabledMedium { get; set; }
public bool EnabledLarge { get; set; }
public int BufferSize { get; set; } = 128; // in mb
public int SpeedMultiplier { get; set; } = 1;
}
}

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

@ -2082,7 +2082,7 @@ namespace BizHawk.Client.EmuHawk
if (rewind)
{
speedPercent = Math.Max(speedPercent * Config.Rewind.SpeedMultiplier / Rewinder.RewindFrequency, 5);
speedPercent = Math.Max(speedPercent / Rewinder.RewindFrequency, 5);
}
GlobalWin.DisableSecondaryThrottling = _unthrottled || turbo || fastForward || rewind;

39
src/BizHawk.Client.EmuHawk/config/RewindConfig.Designer.cs generated
View File

@ -43,8 +43,6 @@
this.label1 = new System.Windows.Forms.Label();
this.StateSizeLabel = new System.Windows.Forms.Label();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.label19 = new System.Windows.Forms.Label();
this.RewindSpeedNumeric = new System.Windows.Forms.NumericUpDown();
this.label18 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.BufferSizeUpDown = new System.Windows.Forms.NumericUpDown();
@ -81,7 +79,6 @@
this.label12 = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.RewindSpeedNumeric)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.BufferSizeUpDown)).BeginInit();
this.groupBox4.SuspendLayout();
this.groupBox6.SuspendLayout();
@ -230,8 +227,6 @@
//
// groupBox3
//
this.groupBox3.Controls.Add(this.label19);
this.groupBox3.Controls.Add(this.RewindSpeedNumeric);
this.groupBox3.Controls.Add(this.label18);
this.groupBox3.Controls.Add(this.label4);
this.groupBox3.Controls.Add(this.BufferSizeUpDown);
@ -244,37 +239,6 @@
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Rewind Options";
//
// label19
//
this.label19.AutoSize = true;
this.label19.Location = new System.Drawing.Point(128, 21);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(12, 13);
this.label19.TabIndex = 2;
this.label19.Text = "x";
//
// RewindSpeedNumeric
//
this.RewindSpeedNumeric.Location = new System.Drawing.Point(90, 19);
this.RewindSpeedNumeric.Maximum = new decimal(new int[] {
4,
0,
0,
0});
this.RewindSpeedNumeric.Minimum = new decimal(new int[] {
1,
0,
0,
0});
this.RewindSpeedNumeric.Name = "RewindSpeedNumeric";
this.RewindSpeedNumeric.Size = new System.Drawing.Size(36, 20);
this.RewindSpeedNumeric.TabIndex = 1;
this.RewindSpeedNumeric.Value = new decimal(new int[] {
1,
0,
0,
0});
//
// label18
//
this.label18.AutoSize = true;
@ -676,7 +640,6 @@
this.groupBox1.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.RewindSpeedNumeric)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.BufferSizeUpDown)).EndInit();
this.groupBox4.ResumeLayout(false);
this.groupBox4.PerformLayout();
@ -739,8 +702,6 @@
private System.Windows.Forms.Label label15;
private System.Windows.Forms.Label label16;
private System.Windows.Forms.CheckBox BackupSavestatesCheckbox;
private System.Windows.Forms.Label label19;
private System.Windows.Forms.NumericUpDown RewindSpeedNumeric;
private System.Windows.Forms.Label label18;
private System.Windows.Forms.Label label20;
}

2
src/BizHawk.Client.EmuHawk/config/RewindConfig.cs
View File

@ -36,7 +36,6 @@ namespace BizHawk.Client.EmuHawk
RewindFramesUsedLabel.Text = "N/A";
}
RewindSpeedNumeric.Value = _config.Rewind.SpeedMultiplier;
_stateSize = _statableCore.CloneSavestate().Length;
BufferSizeUpDown.Value = Math.Max(_config.Rewind.BufferSize, BufferSizeUpDown.Minimum);
@ -129,7 +128,6 @@ namespace BizHawk.Client.EmuHawk
_config.Rewind.BufferSize = PutRewindSetting(_config.Rewind.BufferSize, (int)BufferSizeUpDown.Value);
// These settings are not used by DoRewindSettings
_config.Rewind.SpeedMultiplier = (int)RewindSpeedNumeric.Value;
_config.Savestates.CompressionLevelNormal = (int)nudCompression.Value;
if (rbStatesBinary.Checked) _config.Savestates.Type = SaveStateType.Binary;
if (rbStatesText.Checked) _config.Savestates.Type = SaveStateType.Text;