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

[rocksndiamonds.git] / src / conf_gfx.c

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 0975d42a99dd6c7d2b619b480cb057a2ac3ecad7..f2ddadfda4fcab17151e74edcf21c571183524c4 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -4741,6 +4741,13 @@ struct ConfigInfo image_config[] =
   { "game.button.gfx.save.width",              "30"                    },
   { "game.button.gfx.save.height",             "30"                    },
   { "game.button.gfx.save.pressed_xoffset",    "-100"                  },
+  { "game.button.gfx.pause2",                  "RocksDoor2.png"        },
+  { "game.button.gfx.pause2.x",                        "135"                   },
+  { "game.button.gfx.pause2.y",                        "50"                    },
+  { "game.button.gfx.pause2.width",            "30"                    },
+  { "game.button.gfx.pause2.height",           "30"                    },
+  { "game.button.gfx.pause2.pressed_xoffset",  "-100"                  },
+  { "game.button.gfx.pause2.active_yoffset",   "-30"                   },
   { "game.button.gfx.load",                    "RocksDoor2.png"        },
   { "game.button.gfx.load.x",                  "165"                   },
   { "game.button.gfx.load.y",                  "50"                    },
@@ -5232,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"                   },
@@ -5657,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"         },
@@ -6229,6 +6240,7 @@ struct ConfigInfo image_config[] =
   { "menu.list_size.LEVELNR",                  "-1"                    },
   { "menu.list_size.SCORES",                   "-1"                    },
   { "menu.list_size.INFO",                     "-1"                    },
+  { "menu.list_size.INFO[ELEMENTS]",           "-1"                    },
   { "menu.list_size.SETUP",                    "-1"                    },
 
   { "main.button.name.x",                      "0"                     },
@@ -7366,20 +7378,22 @@ struct ConfigInfo image_config[] =
   { "game.panel.level_author.draw_masked",     "true"                  },
   { "game.panel.level_author.draw_order",      "0"                     },
 
-  { "game.button.stop.x",                      "-1"                    },
-  { "game.button.stop.y",                      "-1"                    },
+  { "game.button.stop.x",                      "5"                     },
+  { "game.button.stop.y",                      "215"                   },
   { "game.button.pause.x",                     "35"                    },
   { "game.button.pause.y",                     "215"                   },
-  { "game.button.play.x",                      "35"                    },
+  { "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.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"                    },
@@ -7616,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"                },
@@ -7668,6 +7684,8 @@ struct ConfigInfo image_config[] =
   { "request.step_offset",                     "10"                    },
   { "request.step_delay",                      "20"                    },
   { "request.anim_mode",                       "default"               },
+  { "request.align",                           "center"                },
+  { "request.valign",                          "middle"                },
   { "request.autowrap",                                "false"                 },
   { "request.centered",                                "true"                  },
   { "request.wrap_single_words",               "true"                  },
@@ -7697,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"                   },
@@ -7717,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"                   },
@@ -7737,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                    }
 };