X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconf_gfx.c;h=f2ddadfda4fcab17151e74edcf21c571183524c4;hp=44eafc75419d54bbc5346b5696c962b67a18858a;hb=6f5b701331e07bdd3e02eeb61f66bfa14d5b530f;hpb=7927e26b1ec2ef8b787a35d7867bdc40249cd2ee

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 44eafc75..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"			},
@@ -5664,6 +5663,11 @@ struct ConfigInfo image_config[] =
   { "editor.input.gfx.level_number.border_size","1"			},
 
   { "global.border",				"RocksScreen.png"	},
+  { "global.border.MAIN",			UNDEFINED_FILENAME	},
+  { "global.border.SCORES",			UNDEFINED_FILENAME	},
+  { "global.border.EDITOR",			UNDEFINED_FILENAME	},
+  { "global.border.PLAYING",			UNDEFINED_FILENAME	},
+
   { "global.door",				"RocksDoor.png"		},
 
   { "global.busy",				"RocksBusy.png"		},
@@ -7380,16 +7384,16 @@ struct ConfigInfo image_config[] =
   { "game.button.pause.y",			"215"			},
   { "game.button.play.x",			"65"			},
   { "game.button.play.y",			"215"			},
-  { "game.button.undo.x",			"5"			},
-  { "game.button.undo.y",			"215"			},
-  { "game.button.redo.x",			"65"			},
-  { "game.button.redo.y",			"215"			},
-  { "game.button.save.x",			"5"			},
-  { "game.button.save.y",			"215"			},
-  { "game.button.pause2.x",			"35"			},
-  { "game.button.pause2.y",			"215"			},
-  { "game.button.load.x",			"65"			},
-  { "game.button.load.y",			"215"			},
+  { "game.button.undo.x",			"-1"			},
+  { "game.button.undo.y",			"-1"			},
+  { "game.button.redo.x",			"-1"			},
+  { "game.button.redo.y",			"-1"			},
+  { "game.button.save.x",			"-1"			},
+  { "game.button.save.y",			"-1"			},
+  { "game.button.pause2.x",			"-1"			},
+  { "game.button.pause2.y",			"-1"			},
+  { "game.button.load.x",			"-1"			},
+  { "game.button.load.y",			"-1"			},
   { "game.button.sound_music.x",		"5"			},
   { "game.button.sound_music.y",		"245"			},
   { "game.button.sound_loops.x",		"35"			},
@@ -7626,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"		},
@@ -7709,16 +7715,21 @@ struct ConfigInfo image_config[] =
   { "viewport.playfield.MAIN.width",		ARG_DEFAULT		},
   { "viewport.playfield.MAIN.height",		ARG_DEFAULT		},
   { "viewport.playfield.MAIN.border_size",	ARG_DEFAULT		},
-  { "viewport.playfield.PLAYING.x",		ARG_DEFAULT		},
-  { "viewport.playfield.PLAYING.y",		ARG_DEFAULT		},
-  { "viewport.playfield.PLAYING.width",		ARG_DEFAULT		},
-  { "viewport.playfield.PLAYING.height",	ARG_DEFAULT		},
-  { "viewport.playfield.PLAYING.border_size",	ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.x",		ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.y",		ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.width",		ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.height",		ARG_DEFAULT		},
+  { "viewport.playfield.SCORES.border_size",	ARG_DEFAULT		},
   { "viewport.playfield.EDITOR.x",		ARG_DEFAULT		},
   { "viewport.playfield.EDITOR.y",		ARG_DEFAULT		},
   { "viewport.playfield.EDITOR.width",		ARG_DEFAULT		},
   { "viewport.playfield.EDITOR.height",		ARG_DEFAULT		},
   { "viewport.playfield.EDITOR.border_size",	ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.x",		ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.y",		ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.width",		ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.height",	ARG_DEFAULT		},
+  { "viewport.playfield.PLAYING.border_size",	ARG_DEFAULT		},
   { "viewport.door_1.x",			"566"			},
   { "viewport.door_1.y",			"60"			},
   { "viewport.door_1.width",			"100"			},
@@ -7729,16 +7740,21 @@ struct ConfigInfo image_config[] =
   { "viewport.door_1.MAIN.width",		ARG_DEFAULT		},
   { "viewport.door_1.MAIN.height",		ARG_DEFAULT		},
   { "viewport.door_1.MAIN.border_size",		ARG_DEFAULT		},
-  { "viewport.door_1.PLAYING.x",		ARG_DEFAULT		},
-  { "viewport.door_1.PLAYING.y",		ARG_DEFAULT		},
-  { "viewport.door_1.PLAYING.width",		ARG_DEFAULT		},
-  { "viewport.door_1.PLAYING.height",		ARG_DEFAULT		},
-  { "viewport.door_1.PLAYING.border_size",	ARG_DEFAULT		},
+  { "viewport.door_1.SCORES.x",			ARG_DEFAULT		},
+  { "viewport.door_1.SCORES.y",			ARG_DEFAULT		},
+  { "viewport.door_1.SCORES.width",		ARG_DEFAULT		},
+  { "viewport.door_1.SCORES.height",		ARG_DEFAULT		},
+  { "viewport.door_1.SCORES.border_size",	ARG_DEFAULT		},
   { "viewport.door_1.EDITOR.x",			ARG_DEFAULT		},
   { "viewport.door_1.EDITOR.y",			ARG_DEFAULT		},
   { "viewport.door_1.EDITOR.width",		ARG_DEFAULT		},
   { "viewport.door_1.EDITOR.height",		ARG_DEFAULT		},
   { "viewport.door_1.EDITOR.border_size",	ARG_DEFAULT		},
+  { "viewport.door_1.PLAYING.x",		ARG_DEFAULT		},
+  { "viewport.door_1.PLAYING.y",		ARG_DEFAULT		},
+  { "viewport.door_1.PLAYING.width",		ARG_DEFAULT		},
+  { "viewport.door_1.PLAYING.height",		ARG_DEFAULT		},
+  { "viewport.door_1.PLAYING.border_size",	ARG_DEFAULT		},
   { "viewport.door_2.x",			"566"			},
   { "viewport.door_2.y",			"400"			},
   { "viewport.door_2.width",			"100"			},
@@ -7749,16 +7765,21 @@ struct ConfigInfo image_config[] =
   { "viewport.door_2.MAIN.width",		ARG_DEFAULT		},
   { "viewport.door_2.MAIN.height",		ARG_DEFAULT		},
   { "viewport.door_2.MAIN.border_size",		ARG_DEFAULT		},
-  { "viewport.door_2.PLAYING.x",		ARG_DEFAULT		},
-  { "viewport.door_2.PLAYING.y",		ARG_DEFAULT		},
-  { "viewport.door_2.PLAYING.width",		ARG_DEFAULT		},
-  { "viewport.door_2.PLAYING.height",		ARG_DEFAULT		},
-  { "viewport.door_2.PLAYING.border_size",	ARG_DEFAULT		},
+  { "viewport.door_2.SCORES.x",			ARG_DEFAULT		},
+  { "viewport.door_2.SCORES.y",			ARG_DEFAULT		},
+  { "viewport.door_2.SCORES.width",		ARG_DEFAULT		},
+  { "viewport.door_2.SCORES.height",		ARG_DEFAULT		},
+  { "viewport.door_2.SCORES.border_size",	ARG_DEFAULT		},
   { "viewport.door_2.EDITOR.x",			"566"			},
   { "viewport.door_2.EDITOR.y",			"356"			},
   { "viewport.door_2.EDITOR.width",		"100"			},
   { "viewport.door_2.EDITOR.height",		"144"			},
   { "viewport.door_2.EDITOR.border_size",	"4"			},
+  { "viewport.door_2.PLAYING.x",		ARG_DEFAULT		},
+  { "viewport.door_2.PLAYING.y",		ARG_DEFAULT		},
+  { "viewport.door_2.PLAYING.width",		ARG_DEFAULT		},
+  { "viewport.door_2.PLAYING.height",		ARG_DEFAULT		},
+  { "viewport.door_2.PLAYING.border_size",	ARG_DEFAULT		},
 
   { NULL,					NULL			}
 };