diff --git a/DebugEditor/DebugEditor.Designer.cs b/DebugEditor/DebugEditor.Designer.cs index c18777ed..41c99b79 100644 --- a/DebugEditor/DebugEditor.Designer.cs +++ b/DebugEditor/DebugEditor.Designer.cs @@ -23,6 +23,7 @@ /// the contents of this method with the code editor. /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.Column0 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -34,6 +35,7 @@ this.bSGlobals = new System.Windows.Forms.Button(); this.bArrays = new System.Windows.Forms.Button(); this.bEdit = new System.Windows.Forms.Button(); + this.redrawTimer = new System.Windows.Forms.Timer(this.components); this.bCrittersLvar = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); this.SuspendLayout(); @@ -154,6 +156,11 @@ this.bEdit.UseVisualStyleBackColor = true; this.bEdit.Click += new System.EventHandler(this.bEdit_Click); // + // redrawTimer + // + this.redrawTimer.Interval = 200; + this.redrawTimer.Tick += new System.EventHandler(this.timer1_Tick); + // // bCrittersLvar // this.bCrittersLvar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -202,6 +209,7 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column1; private System.Windows.Forms.DataGridViewTextBoxColumn Column2; private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + internal System.Windows.Forms.Timer redrawTimer; private System.Windows.Forms.Button bCrittersLvar; } diff --git a/DebugEditor/DebugEditor.cs b/DebugEditor/DebugEditor.cs index 530088ef..bcaa145d 100644 --- a/DebugEditor/DebugEditor.cs +++ b/DebugEditor/DebugEditor.cs @@ -137,6 +137,7 @@ namespace FalloutClient { sr.Close(); } Redraw(); + redrawTimer.Start(); } private void DebugEditor_FormClosing(object sender, FormClosingEventArgs e) { @@ -188,6 +189,7 @@ namespace FalloutClient { default: return; } + redrawTimer.Stop(); if (e.ColumnIndex == 2) { string str = dataGridView1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString(); int val; @@ -211,11 +213,13 @@ namespace FalloutClient { connection.WriteInt(converter.GetAsInt(val)); } } + redrawTimer.Start(); } private void bEdit_Click(object sender, EventArgs e) { if (dataGridView1.SelectedRows.Count == 0) return; int i = (int)dataGridView1.SelectedRows[0].Tag; + redrawTimer.Stop(); switch (mode) { case Mode.Arrays: { DataType[] types = new DataType[connection.ArrayLengths[i]]; @@ -333,6 +337,7 @@ namespace FalloutClient { } break; } + redrawTimer.Start(); } private void bCrittersLvar_Click(object sender, EventArgs e) { @@ -381,5 +386,9 @@ namespace FalloutClient { private void dataGridView1_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e) { dataGridView1.Rows[e.RowIndex].Tag = e.RowIndex; } + + private void timer1_Tick(object sender, EventArgs e) { + connection.WriteDataType(DataTypeSend.RedrawGame); + } } } diff --git a/DebugEditor/DebugEditor.resx b/DebugEditor/DebugEditor.resx index ddc459e7..464bceeb 100644 --- a/DebugEditor/DebugEditor.resx +++ b/DebugEditor/DebugEditor.resx @@ -129,4 +129,7 @@ True + + 17, 17 + \ No newline at end of file diff --git a/DebugEditor/EditorWindow.cs b/DebugEditor/EditorWindow.cs index 970b0204..e869c293 100644 --- a/DebugEditor/EditorWindow.cs +++ b/DebugEditor/EditorWindow.cs @@ -48,8 +48,10 @@ namespace FalloutClient { } public static string[] ShowEditor(DebugEditor form, string[] names, DataType[] types, string[] values, bool isMap = false) { + form.redrawTimer.Start(); EditorWindow editor = new EditorWindow(names, types, values, isMap); editor.ShowDialog(); + form.redrawTimer.Stop(); if (editor.save) { if (valueInHex) editor.ConvertValues(false); return editor.values; @@ -70,8 +72,10 @@ namespace FalloutClient { } public static string[] ShowEditor(DebugEditor form, string[] lvalues) { + form.redrawTimer.Start(); EditorWindow editor = new EditorWindow(lvalues); editor.ShowDialog(); + form.redrawTimer.Stop(); if (editor.save) { if (valueInHex) editor.ConvertValues(false); return editor.values; diff --git a/DebugEditor/Program.cs b/DebugEditor/Program.cs index 4b13a202..18c4e68e 100644 --- a/DebugEditor/Program.cs +++ b/DebugEditor/Program.cs @@ -32,6 +32,7 @@ namespace FalloutClient { SetArray = 10, GetLocal = 11, SetLocal = 12, - Exit = 254 + Exit = 254, + RedrawGame = 255 } } diff --git a/DebugEditor/Properties/AssemblyInfo.cs b/DebugEditor/Properties/AssemblyInfo.cs index 943a81cf..e51c7851 100644 --- a/DebugEditor/Properties/AssemblyInfo.cs +++ b/DebugEditor/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("sfall")] -[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyCopyright("Copyright (C) 2022")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("4.1.9.0")] -[assembly: AssemblyFileVersion("4.1.9.0")] +[assembly: AssemblyVersion("4.1.9.1")] +[assembly: AssemblyFileVersion("4.1.9.1")]