Merge branch 'master' of https://github.com/TimeHACKDevs/TimeHACK.git

3 files changed, 72 insertions, 3 deletions

diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs
index 32e2661..f7dc954 100644
--- a/TimeHACK.Engine/SaveSystem.cs
+++ b/TimeHACK.Engine/SaveSystem.cs
@@ -653,6 +653,15 @@ namespace TimeHACK.Engine
         public bool FTime95 { get; set; }
 
         [Order]
+        public int mineSweepE { get; set; } = 999;
+
+        [Order]
+        public int mineSweepI { get; set; } = 999;
+
+        [Order]
+        public int mineSweepH { get; set; } = 999;
+
+        [Order]
         public string ThemeName { get; set; }
 
         [Order]
diff --git a/TimeHACK.Engine/Template/WinClassic.Designer.cs b/TimeHACK.Engine/Template/WinClassic.Designer.cs
index 7801b96..2dd94e5 100644
--- a/TimeHACK.Engine/Template/WinClassic.Designer.cs
+++ b/TimeHACK.Engine/Template/WinClassic.Designer.cs
@@ -155,11 +155,13 @@
             // 
             this.toprightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.toprightcorner.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("toprightcorner.BackgroundImage")));
+            this.toprightcorner.Cursor = System.Windows.Forms.Cursors.SizeNESW;
             this.toprightcorner.Location = new System.Drawing.Point(296, 0);
             this.toprightcorner.Name = "toprightcorner";
             this.toprightcorner.Size = new System.Drawing.Size(4, 4);
             this.toprightcorner.TabIndex = 6;
             this.toprightcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
+            this.toprightcorner.MouseMove += new System.Windows.Forms.MouseEventHandler(this.toprightcorner_MouseMove);
             // 
             // bottomrightcorner
             // 
@@ -171,29 +173,35 @@
             this.bottomrightcorner.Size = new System.Drawing.Size(4, 4);
             this.bottomrightcorner.TabIndex = 4;
             this.bottomrightcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
+            this.bottomrightcorner.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bottomrightcorner_MouseMove);
             // 
             // bottomleftcorner
             // 
             this.bottomleftcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.bottomleftcorner.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("bottomleftcorner.BackgroundImage")));
+            this.bottomleftcorner.Cursor = System.Windows.Forms.Cursors.SizeNESW;
             this.bottomleftcorner.Location = new System.Drawing.Point(0, 296);
             this.bottomleftcorner.Name = "bottomleftcorner";
             this.bottomleftcorner.Size = new System.Drawing.Size(4, 4);
             this.bottomleftcorner.TabIndex = 2;
             this.bottomleftcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
+            this.bottomleftcorner.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bottomleftcorner_MouseMove);
             // 
             // topleftcorner
             // 
             this.topleftcorner.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("topleftcorner.BackgroundImage")));
+            this.topleftcorner.Cursor = System.Windows.Forms.Cursors.SizeNWSE;
             this.topleftcorner.Location = new System.Drawing.Point(0, 0);
             this.topleftcorner.Name = "topleftcorner";
             this.topleftcorner.Size = new System.Drawing.Size(4, 4);
             this.topleftcorner.TabIndex = 1;
             this.topleftcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
+            this.topleftcorner.MouseMove += new System.Windows.Forms.MouseEventHandler(this.topleftcorner_MouseMove);
             // 
             // left
             // 
             this.left.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("left.BackgroundImage")));
+            this.left.Cursor = System.Windows.Forms.Cursors.SizeWE;
             this.left.Dock = System.Windows.Forms.DockStyle.Left;
             this.left.Location = new System.Drawing.Point(0, 4);
             this.left.Name = "left";
@@ -231,12 +239,14 @@
             // 
             this.top.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("top.BackgroundImage")));
             this.top.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.top.Cursor = System.Windows.Forms.Cursors.SizeNS;
             this.top.Dock = System.Windows.Forms.DockStyle.Top;
             this.top.Location = new System.Drawing.Point(0, 0);
             this.top.Name = "top";
             this.top.Size = new System.Drawing.Size(300, 4);
             this.top.TabIndex = 8;
             this.top.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown);
+            this.top.MouseMove += new System.Windows.Forms.MouseEventHandler(this.top_MouseMove);
             // 
             // WinClassic
             // 
diff --git a/TimeHACK.Engine/Template/WinClassic.cs b/TimeHACK.Engine/Template/WinClassic.cs
index ec80fcc..75398dd 100644
--- a/TimeHACK.Engine/Template/WinClassic.cs
+++ b/TimeHACK.Engine/Template/WinClassic.cs
@@ -67,6 +67,7 @@ namespace TimeHACK.Engine.Template
             Title.ForeColor = SaveSystem.currentTheme.inactiveTitleTextColor;
         }
 
+
         private void right_MouseMove(object sender, MouseEventArgs e)
         {
             if (e.Button == MouseButtons.Left)
@@ -79,18 +80,67 @@ namespace TimeHACK.Engine.Template
         {
             if (e.Button == MouseButtons.Left)
             {
-                if (resizable) this.Size = new Size(this.Size.Width + (this.Location.X - MousePosition.X), this.Size.Height);
-                if (resizable) this.Location = new Point(MousePosition.X, this.Location.Y);
+                if (resizable) this.Width = ((this.Width + this.Location.X) - Cursor.Position.X);
+                if (resizable)this.Location = new Point(Cursor.Position.X, this.Location.Y);
             }
         }
 
         private void bottom_MouseMove(object sender, MouseEventArgs e)
         {
-            if (e.Button == MouseButtons.Left) {
+            if (e.Button == MouseButtons.Left)
+            {
                 if (resizable) this.Size = new Size(this.Size.Width, MousePosition.Y - this.Location.Y);
             }
         }
 
+        private void bottomrightcorner_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Left)
+            {
+                if (resizable) this.Size = new Size(MousePosition.X - this.Location.X, MousePosition.Y - this.Location.Y);
+            }
+        }
+
+        private void bottomleftcorner_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Left)
+            {
+                if (resizable) this.Width = ((this.Width + this.Location.X) - Cursor.Position.X);
+                if (resizable) this.Height = (Cursor.Position.Y - this.Location.Y);
+                if (resizable) this.Location = new Point(Cursor.Position.X, this.Location.Y);
+            }
+        }
+
+        private void topleftcorner_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Left)
+            {
+                if (resizable) this.Width = ((this.Width + this.Location.X) - Cursor.Position.X);
+                if (resizable) this.Location = new Point(Cursor.Position.X, this.Location.Y);
+                if (resizable) this.Height = ((this.Height + this.Location.Y) - Cursor.Position.Y);
+                if (resizable) this.Location = new Point(this.Location.X, Cursor.Position.Y);
+            }
+        }
+
+        private void top_MouseMove(object sender, MouseEventArgs e)
+        {
+            if(e.Button == MouseButtons.Left)
+            {
+                if(resizable) this.Height = ((this.Height + this.Location.Y) - Cursor.Position.Y);
+                if(resizable) this.Location = new Point(this.Location.X, Cursor.Position.Y);
+            }
+        }
+
+        private void toprightcorner_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Left)
+            {
+                if (resizable) this.Width = (Cursor.Position.X - this.Location.X);
+                if (resizable) this.Height = ((this.Location.Y - Cursor.Position.Y) + this.Height);
+                if (resizable) this.Location = new Point(this.Location.X, Cursor.Position.Y);
+            }
+        }
+
         public bool max = false;
 
         private void maximizebutton_Click(object sender, EventArgs e)