Some small fixes

capashaa · Dec 26, 2024 · c290c57 · c290c57
1 parent 00731af
commit c290c57
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.1.0
+Fixed: Npc didn't use correct messages when placed.  
+Fixed: Save as, ended with error.   
+Fixed: Now possible to cancel Middle circle.  
+Fixed: Paint on Minimap use the current selected pen blockid.  
+
 ## 2.0.9
 
 Added: Nord theme as dark theme.  

diff --git a/EEditor/Frame.cs b/EEditor/Frame.cs
@@ -181,7 +181,6 @@ public void SaveLVL(FileStream file)
             }
             else
             {
-                if (File.Exists(file.Name)) File.Delete(file.Name);
                 savelvl.Save(file);
                 file.Dispose();
             }

diff --git a/EEditor/MainForm.cs b/EEditor/MainForm.cs
@@ -4861,11 +4861,12 @@ private void circleSizeButton_Click(object sender, EventArgs e)
         {
             editArea.Tool.CleanUp(false);
             ToolCircleSize toolCircleMiddle = new ToolCircleSize();
-            if (MessageBox.Show("Circle around border?", "Circle Middle", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            DialogResult yesno = MessageBox.Show("Yes = Circle around border, No = Circle on border", "Circle Middle", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
+            if (yesno == DialogResult.Yes)
             {
                 toolCircleMiddle.CircleSize(new Point(0, 0), new Point(editArea.BlockWidth - 1, editArea.BlockHeight - 1), selectedBrick.ID);
             }
-            else
+            else if (yesno == DialogResult.No)
             {
                 toolCircleMiddle.CircleSize(new Point(1, 1), new Point(editArea.BlockWidth - 2, editArea.BlockHeight - 2), selectedBrick.ID);
             }

diff --git a/EEditor/Minimap.cs b/EEditor/Minimap.cs
@@ -14,6 +14,8 @@ public partial class Minimap : UserControl
     {
         public int BlockWidth { get; set; }
         public int BlockHeight { get; set; }
+
+
         public static Bitmap Bitmap { get; set; }
         public static uint[] Colors = new uint[3000];
         public static bool[] ImageColor = new bool[Colors.Length];
@@ -103,7 +105,7 @@ void DrawLine(System.Drawing.Point P, System.Drawing.Point Q)
             for (int i = 0; i < xs.Count; ++i)
             {
                 SetPixel(xs[i], ys[i], 9);
-                MainForm.editArea.Frames[0].Foreground[ys[i], xs[i]] = 9;
+                MainForm.editArea.Frames[0].Foreground[ys[i], xs[i]] = MainForm.editArea.Tool.PenID;
                 MainForm.editArea.Draw(xs[i], ys[i], Graphics.FromImage(MainForm.editArea.Back), MainForm.userdata.thisColor);
                 r.X = xs[i];
                 r.Y = ys[i];

diff --git a/EEditor/Properties/AssemblyInfo.cs b/EEditor/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.9")]
-[assembly: AssemblyFileVersion("2.0.0.9")]
+[assembly: AssemblyVersion("2.1.0")]
+[assembly: AssemblyFileVersion("2.1.0")]
diff --git a/EEditor/ToolPen.cs b/EEditor/ToolPen.cs
@@ -415,7 +415,7 @@ private void PlaceBrick(int x, int y, bool button, bool useincfg, bool mousedown
                                     {
                                         if (editArea.Tool.NPCtempMessage1 != null) { editArea.CurFrame.BlockData4[y, x] = editArea.Tool.NPCtempMessage1; }
                                         else { editArea.CurFrame.BlockData4[y, x] = "Welcome"; }
-                                        if (editArea.Tool.NPCtempMessage2 != null) { editArea.CurFrame.BlockData5[y, x] = editArea.Tool.NPCtempMessage3; }
+                                        if (editArea.Tool.NPCtempMessage2 != null) { editArea.CurFrame.BlockData5[y, x] = editArea.Tool.NPCtempMessage2; }
                                         else { editArea.CurFrame.BlockData5[y, x] = "To"; }
                                         if (editArea.Tool.NPCtempMessage3 != null) { editArea.CurFrame.BlockData6[y, x] = editArea.Tool.NPCtempMessage3; }
                                         else { editArea.CurFrame.BlockData6[y, x] = "My World!"; }
@@ -429,7 +429,7 @@ private void PlaceBrick(int x, int y, bool button, bool useincfg, bool mousedown
                             {
                                 if (editArea.Tool.NPCtempMessage1 != null) { editArea.CurFrame.BlockData4[y, x] = editArea.Tool.NPCtempMessage1; }
                                 else { editArea.CurFrame.BlockData4[y, x] = "Welcome"; }
-                                if (editArea.Tool.NPCtempMessage2 != null) { editArea.CurFrame.BlockData5[y, x] = editArea.Tool.NPCtempMessage3; }
+                                if (editArea.Tool.NPCtempMessage2 != null) { editArea.CurFrame.BlockData5[y, x] = editArea.Tool.NPCtempMessage2; }
                                 else { editArea.CurFrame.BlockData5[y, x] = "To"; }
                                 if (editArea.Tool.NPCtempMessage3 != null) { editArea.CurFrame.BlockData6[y, x] = editArea.Tool.NPCtempMessage3; }
                                 else { editArea.CurFrame.BlockData6[y, x] = "My World!"; }
-Original file line number
+Diff line change
@@ Expand Up / @@ -181,7 +181,6 @@ public void SaveLVL(FileStream file) @@
                 }
                 else
                 {
-                    if (File.Exists(file.Name)) File.Delete(file.Name);
                     savelvl.Save(file);
                     file.Dispose();
                 }
@@ Expand Down @@