From: Holger Schemel <info@artsoft.org>
Date: Wed, 12 Aug 2015 15:05:11 +0000 (+0200)
Subject: fixed bug with mis-using image config option '.tile_size' for screen output
X-Git-Tag: 4.0.0.0-rc1~159
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=6f5b701331e07bdd3e02eeb61f66bfa14d5b530f;p=rocksndiamonds.git

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 28d85cf1..f2ddadfd 100644
--- 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 dc7fdc82..828ebd7f 100644
--- 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 63eacc01..61bc328e 100644
--- 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