fixed bug with mis-using image config option '.tile_size' for screen output

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 28d85cf1bb4d6d8f0c2a30263b7e7b9028ac81f1..f2ddadfda4fcab17151e74edcf21c571183524c4 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -5239,7 +5239,6 @@ struct ConfigInfo image_config[] =
   { "editor.element_border_input.xpos",                "10"                    },
   { "editor.element_border_input.ypos",                "7"                     },
   { "editor.element_border_input.border_size", "4"                     },
-  { "editor.element_border_input.tile_size",   "16"                    },
 
   { "editor.counter.down",                     "RocksDoor.png"         },
   { "editor.counter.down.x",                   "302"                   },
@@ -7631,6 +7630,8 @@ struct ConfigInfo image_config[] =
   { "editor.palette.element_right.y",          "258"                   },
   { "editor.palette.element_right.tile_size",  "16"                    },
 
+  { "editor.drawingarea.tile_size",            "16"                    },
+
   { "editor.settings.headline.x",              "272"                   },
   { "editor.settings.headline.y",              "16"                    },
   { "editor.settings.headline.align",          "center"                },

diff --git a/src/editor.c b/src/editor.c
index dc7fdc82ce8e760028335d404cbe00f4b5ac3987..828ebd7fd9987128d896279f0636d60d51720582 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -79,7 +79,7 @@
 #define IMG_BORDER_2                   IMG_EDITOR_ELEMENT_BORDER_INPUT
 #define ED_ELEMENT_BORDER              (graphic_info[IMG_BORDER_1].border_size)
 #define ED_DRAWINGAREA_BORDER_SIZE     (graphic_info[IMG_BORDER_2].border_size)
-#define ED_DRAWINGAREA_TILE_SIZE       (graphic_info[IMG_BORDER_2].tile_size)
+#define ED_DRAWINGAREA_TILE_SIZE       (editor.drawingarea.tile_size)
 
 /* values for checkbutton gadgets */
 #define ED_CHECKBUTTON_XSIZE        (graphic_info[IMG_EDITOR_CHECKBOX].width)

diff --git a/src/main.h b/src/main.h
index 63eacc0167c4621eb686a402301506efd22dd14f..61bc328e52c81c014ac2a560c07985d0746ef7c5 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -2327,6 +2327,11 @@ struct EditorPaletteInfo
   struct EditorPaletteElementInfo element_right;
 };
 
+struct EditorDrawingAreaInfo
+{
+  int tile_size;
+};
+
 struct EditorInfo
 {
   struct EditorSettingsInfo settings;
@@ -2334,6 +2339,7 @@ struct EditorInfo
   struct EditorButtonInfo button;
   struct EditorInputInfo input;
   struct EditorPaletteInfo palette;
+  struct EditorDrawingAreaInfo drawingarea;
 };
 
 struct ViewportInfo