projects / rocksndiamonds.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fixed hierarchical definitions for title screen transitions
[rocksndiamonds.git] / src / conf_gfx.c
diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 28d85cf1bb4d6d8f0c2a30263b7e7b9028ac81f1..4766b3fd5aa56cedba3442383af626df8560e9fb 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"                   },
@@ -5895,10 +5894,72 @@ struct ConfigInfo image_config[] =
   { "[title].post_delay",                      "250"                   },
   { "[title].auto_delay",                      "-1"                    },
 
-  { "[titlemessage_initial].x",                        "336"                   },
-  { "[titlemessage_initial].y",                        "280"                   },
-  { "[titlemessage_initial].width",            "640"                   },
-  { "[titlemessage_initial].height",           "512"                   },
+  { "[titlescreen_initial].sort_priority",     "0"                     },
+  { "[titlescreen_initial].fade_mode",         ARG_DEFAULT             },
+  { "[titlescreen_initial].fade_delay",                ARG_DEFAULT             },
+  { "[titlescreen_initial].post_delay",                ARG_DEFAULT             },
+  { "[titlescreen_initial].auto_delay",                ARG_DEFAULT             },
+  { "[titlescreen].sort_priority",             "0"                     },
+  { "[titlescreen].fade_mode",                 ARG_DEFAULT             },
+  { "[titlescreen].fade_delay",                        ARG_DEFAULT             },
+  { "[titlescreen].post_delay",                        ARG_DEFAULT             },
+  { "[titlescreen].auto_delay",                        ARG_DEFAULT             },
+
+  { "titlescreen_initial_1.sort_priority",     ARG_DEFAULT             },
+  { "titlescreen_initial_1.fade_mode",         ARG_DEFAULT             },
+  { "titlescreen_initial_1.fade_delay",                ARG_DEFAULT             },
+  { "titlescreen_initial_1.post_delay",                ARG_DEFAULT             },
+  { "titlescreen_initial_1.auto_delay",                ARG_DEFAULT             },
+  { "titlescreen_initial_2.sort_priority",     ARG_DEFAULT             },
+  { "titlescreen_initial_2.fade_mode",         ARG_DEFAULT             },
+  { "titlescreen_initial_2.fade_delay",                ARG_DEFAULT             },
+  { "titlescreen_initial_2.post_delay",                ARG_DEFAULT             },
+  { "titlescreen_initial_2.auto_delay",                ARG_DEFAULT             },
+  { "titlescreen_initial_3.sort_priority",     ARG_DEFAULT             },
+  { "titlescreen_initial_3.fade_mode",         ARG_DEFAULT             },
+  { "titlescreen_initial_3.fade_delay",                ARG_DEFAULT             },
+  { "titlescreen_initial_3.post_delay",                ARG_DEFAULT             },
+  { "titlescreen_initial_3.auto_delay",                ARG_DEFAULT             },
+  { "titlescreen_initial_4.sort_priority",     ARG_DEFAULT             },
+  { "titlescreen_initial_4.fade_mode",         ARG_DEFAULT             },
+  { "titlescreen_initial_4.fade_delay",                ARG_DEFAULT             },
+  { "titlescreen_initial_4.post_delay",                ARG_DEFAULT             },
+  { "titlescreen_initial_4.auto_delay",                ARG_DEFAULT             },
+  { "titlescreen_initial_5.sort_priority",     ARG_DEFAULT             },
+  { "titlescreen_initial_5.fade_mode",         ARG_DEFAULT             },
+  { "titlescreen_initial_5.fade_delay",                ARG_DEFAULT             },
+  { "titlescreen_initial_5.post_delay",                ARG_DEFAULT             },
+  { "titlescreen_initial_5.auto_delay",                ARG_DEFAULT             },
+  { "titlescreen_1.sort_priority",             ARG_DEFAULT             },
+  { "titlescreen_1.fade_mode",                 ARG_DEFAULT             },
+  { "titlescreen_1.fade_delay",                        ARG_DEFAULT             },
+  { "titlescreen_1.post_delay",                        ARG_DEFAULT             },
+  { "titlescreen_1.auto_delay",                        ARG_DEFAULT             },
+  { "titlescreen_2.sort_priority",             ARG_DEFAULT             },
+  { "titlescreen_2.fade_mode",                 ARG_DEFAULT             },
+  { "titlescreen_2.fade_delay",                        ARG_DEFAULT             },
+  { "titlescreen_2.post_delay",                        ARG_DEFAULT             },
+  { "titlescreen_2.auto_delay",                        ARG_DEFAULT             },
+  { "titlescreen_3.sort_priority",             ARG_DEFAULT             },
+  { "titlescreen_3.fade_mode",                 ARG_DEFAULT             },
+  { "titlescreen_3.fade_delay",                        ARG_DEFAULT             },
+  { "titlescreen_3.post_delay",                        ARG_DEFAULT             },
+  { "titlescreen_3.auto_delay",                        ARG_DEFAULT             },
+  { "titlescreen_4.sort_priority",             ARG_DEFAULT             },
+  { "titlescreen_4.fade_mode",                 ARG_DEFAULT             },
+  { "titlescreen_4.fade_delay",                        ARG_DEFAULT             },
+  { "titlescreen_4.post_delay",                        ARG_DEFAULT             },
+  { "titlescreen_4.auto_delay",                        ARG_DEFAULT             },
+  { "titlescreen_5.sort_priority",             ARG_DEFAULT             },
+  { "titlescreen_5.fade_mode",                 ARG_DEFAULT             },
+  { "titlescreen_5.fade_delay",                        ARG_DEFAULT             },
+  { "titlescreen_5.post_delay",                        ARG_DEFAULT             },
+  { "titlescreen_5.auto_delay",                        ARG_DEFAULT             },
+
+  { "[titlemessage_initial].x",                        "-1"                    },
+  { "[titlemessage_initial].y",                        "-1"                    },
+  { "[titlemessage_initial].width",            "-1"                    },
+  { "[titlemessage_initial].height",           "-1"                    },
   { "[titlemessage_initial].chars",            "-1"                    },
   { "[titlemessage_initial].lines",            "-1"                    },
   { "[titlemessage_initial].align",            "center"                },
@@ -5912,10 +5973,10 @@ struct ConfigInfo image_config[] =
   { "[titlemessage_initial].fade_delay",       ARG_DEFAULT             },
   { "[titlemessage_initial].post_delay",       ARG_DEFAULT             },
   { "[titlemessage_initial].auto_delay",       ARG_DEFAULT             },
-  { "[titlemessage].x",                                "336"                   },
-  { "[titlemessage].y",                                "280"                   },
-  { "[titlemessage].width",                    "640"                   },
-  { "[titlemessage].height",                   "512"                   },
+  { "[titlemessage].x",                                "-1"                    },
+  { "[titlemessage].y",                                "-1"                    },
+  { "[titlemessage].width",                    "-1"                    },
+  { "[titlemessage].height",                   "-1"                    },
   { "[titlemessage].chars",                    "-1"                    },
   { "[titlemessage].lines",                    "-1"                    },
   { "[titlemessage].align",                    "center"                },
@@ -6130,8 +6191,8 @@ struct ConfigInfo image_config[] =
 
   { "border.draw_masked_when_fading",          "true"                  },
 
-  { "init.busy.x",                             "336"                   },
-  { "init.busy.y",                             "280"                   },
+  { "init.busy.x",                             "-1"                    },
+  { "init.busy.y",                             "-1"                    },
   { "init.busy.align",                         "center"                },
   { "init.busy.valign",                                "middle"                },
 
@@ -6144,12 +6205,16 @@ struct ConfigInfo image_config[] =
   { "menu.enter_screen.fade_mode",             "fade"                  },
   { "menu.enter_screen.fade_delay",            "250"                   },
   { "menu.enter_screen.post_delay",            "125"                   },
-  { "menu.next_screen.fade_mode",              "crossfade"             },
-  { "menu.next_screen.fade_delay",             "250"                   },
-  { "menu.next_screen.post_delay",             "125"                   },
   { "menu.leave_screen.fade_mode",             "fade"                  },
   { "menu.leave_screen.fade_delay",            "250"                   },
   { "menu.leave_screen.post_delay",            "125"                   },
+  { "menu.next_screen.fade_mode",              "crossfade"             },
+  { "menu.next_screen.fade_delay",             "250"                   },
+  { "menu.next_screen.post_delay",             "125"                   },
+  { "menu.enter_screen.TITLE.fade_mode",       "fade"                  },
+  { "menu.enter_screen.TITLE.fade_delay",      "500"                   },
+  { "menu.enter_screen.TITLE.post_delay",      "250"                   },
+  { "menu.enter_screen.TITLE.auto_delay",      "-1"                    },
   { "menu.enter_screen.SCORES.fade_mode",      ARG_DEFAULT             },
   { "menu.enter_screen.SCORES.fade_delay",     ARG_DEFAULT             },
   { "menu.enter_screen.SCORES.post_delay",     ARG_DEFAULT             },
@@ -6162,6 +6227,10 @@ struct ConfigInfo image_config[] =
   { "menu.enter_screen.PLAYING.fade_mode",     ARG_DEFAULT             },
   { "menu.enter_screen.PLAYING.fade_delay",    ARG_DEFAULT             },
   { "menu.enter_screen.PLAYING.post_delay",    ARG_DEFAULT             },
+  { "menu.leave_screen.TITLE.fade_mode",       "fade"                  },
+  { "menu.leave_screen.TITLE.fade_delay",      "500"                   },
+  { "menu.leave_screen.TITLE.post_delay",      "250"                   },
+  { "menu.leave_screen.TITLE.auto_delay",      "-1"                    },
   { "menu.leave_screen.SCORES.fade_mode",      ARG_DEFAULT             },
   { "menu.leave_screen.SCORES.fade_delay",     ARG_DEFAULT             },
   { "menu.leave_screen.SCORES.post_delay",     ARG_DEFAULT             },
@@ -6174,6 +6243,13 @@ struct ConfigInfo image_config[] =
   { "menu.leave_screen.PLAYING.fade_mode",     ARG_DEFAULT             },
   { "menu.leave_screen.PLAYING.fade_delay",    ARG_DEFAULT             },
   { "menu.leave_screen.PLAYING.post_delay",    ARG_DEFAULT             },
+  { "menu.next_screen.TITLE.fade_mode",                "fade"                  },
+  { "menu.next_screen.TITLE.fade_delay",       "500"                   },
+  { "menu.next_screen.TITLE.post_delay",       "250"                   },
+  { "menu.next_screen.TITLE.auto_delay",       "-1"                    },
+  { "menu.next_screen.INFO.fade_mode",         ARG_DEFAULT             },
+  { "menu.next_screen.INFO.fade_delay",                ARG_DEFAULT             },
+  { "menu.next_screen.INFO.post_delay",                ARG_DEFAULT             },
 
   { "menu.draw_xoffset",                       "0"                     },
   { "menu.draw_yoffset",                       "0"                     },
@@ -7631,6 +7707,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"                },
@@ -7691,6 +7769,7 @@ struct ConfigInfo image_config[] =
 
   { "global.use_envelope_request",             "false"                 },
 
+  { "game.graphics_engine_version",            "-1"                    },
   { "game.forced_scroll_delay_value",          "-1"                    },
   { "game.use_native_emc_graphics_engine",     "false"                 },
   { "game.use_native_sp_graphics_engine",      "true"                  },
@@ -7704,6 +7783,9 @@ struct ConfigInfo image_config[] =
 
   { "viewport.window.width",                   "672"                   },
   { "viewport.window.height",                  "560"                   },
+  { "viewport.window.TITLE.width",             ARG_DEFAULT             },
+  { "viewport.window.TITLE.height",            ARG_DEFAULT             },
+
   { "viewport.playfield.x",                    "6"                     },
   { "viewport.playfield.y",                    "6"                     },
   { "viewport.playfield.width",                        "548"                   },
@@ -7729,6 +7811,7 @@ struct ConfigInfo image_config[] =
   { "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"                   },
@@ -7754,6 +7837,7 @@ struct ConfigInfo image_config[] =
   { "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"                   },
Rocks'n'Diamonds