Merge pull request #20 from spiiin/development

Development
spiiin · Jan 30, 2019 · b0c2c29 · b0c2c29
2 parents afc6161 + 8cc9009
commit b0c2c29
Show file tree

Hide file tree

Showing 74 changed files with 808 additions and 183 deletions.
diff --git a/CadEditor/ConfigScript.cs b/CadEditor/ConfigScript.cs
@@ -51,6 +51,7 @@ namespace CadEditor
 
     public delegate void DrawObjectFunc(Graphics g, ObjectRec curObject, int listNo, bool selected, float curScale, ImageList objectSprites, bool inactive, int leftMargin, int topMargin);
     public delegate void DrawObjectBigFunc(Graphics g, ObjectRec curObject, int listNo, bool selected, float curScale, Image[] objectSprites, bool inactive, int leftMargin, int topMargin);
+    public delegate bool SelectObjectBigFunc(ObjectRec objRec, Image[] objectSprites, int x, int y);
 
     public delegate Screen[] LoadScreensFunc();
     public delegate void SaveScreensFunc(Screen[] screens);
@@ -269,6 +270,7 @@ public static void LoadFromFile(string fileName)
 
             drawObjectFunc = callFromScript<DrawObjectFunc>(asm, data, "*.getDrawObjectFunc");
             drawObjectBigFunc = callFromScript<DrawObjectBigFunc>(asm, data, "*.getDrawObjectBigFunc");
+            selectObjectBigFunc = callFromScript<SelectObjectBigFunc>(asm, data, "*.getSelectObjectBigFunc");
 
             renderToMainScreenFunc = callFromScript<RenderToMainScreenFunc>(asm, data, "*.getRenderToMainScreenFunc");
 
@@ -829,6 +831,7 @@ public static byte[] getScrollByteArray()
 
         public static DrawObjectFunc drawObjectFunc;
         public static DrawObjectBigFunc drawObjectBigFunc;
+        public static SelectObjectBigFunc selectObjectBigFunc;
 
         public static LoadScreensFunc loadScreensFunc;
         public static SaveScreensFunc saveScreensFunc;

diff --git a/CadEditor/EnemyEditor.cs b/CadEditor/EnemyEditor.cs
@@ -681,7 +681,9 @@ private void mapScreen_MouseDown(object sender, MouseEventArgs e)
                         var obj = activeObjectList.objects[i];
                         if ((obj.sx == sx) && (obj.sy == sy))
                         {
-                            if (isMouseInside(obj, x, y, objectSpritesBig))
+                            var selectObjectBigFunc = ConfigScript.selectObjectBigFunc;
+                            bool selected = selectObjectBigFunc?.Invoke(obj, objectSpritesBig, x, y) ?? isMouseInside(obj, x, y, objectSpritesBig);
+                            if (selected)
                             {
                                 dgvObjects.Rows[i].Selected = !dgvObjects.Rows[i].Selected;
                             }
@@ -831,7 +833,6 @@ private void mapScreen_MouseClick(object sender, MouseEventArgs e)
                 var activeObjectList = objectLists[curActiveObjectListIndex];
                 activeObjectList.objects.Insert(insertPos, obj);
 
-                dgvObjects.DataSource = null;
                 fillObjectsDataGrid();
             }
             else if (curTool == ToolType.Delete)
@@ -898,7 +899,7 @@ private void cbObjectList_SelectedIndexChanged(object sender, EventArgs e)
 
         private void dgvObjects_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e)
         {
-            if (e.ColumnIndex == 1)
+            if (e.ColumnIndex == 0)
             {
                 var row = dgvObjects.Rows[e.RowIndex];
                 int cell0 = Convert.ToInt32(row.Cells[1].Value);
@@ -908,7 +909,8 @@ private void dgvObjects_CellFormatting(object sender, DataGridViewCellFormatting
                     //update icon
                     if ((cell0 >= 0) && (cell0 < objectSprites.Images.Count))
                     {
-                        row.Cells[0].Value = objectSprites.Images[cell0];
+                        e.Value = objectSprites.Images[cell0];
+                        e.FormattingApplied = true;
                     }
 
                     //update dictionary

diff --git a/CadEditor/FormMain.Designer.cs b/CadEditor/FormMain.Designer.cs