From: Holger Schemel Date: Mon, 19 Mar 2007 14:22:39 +0000 (+0100) Subject: rnd-20070319-1-src X-Git-Tag: 3.2.4^2~63 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=dbe6f9f331452b40183a12219d57eb234ff078fe;p=rocksndiamonds.git rnd-20070319-1-src * titlemessage_initial_x and titlemessage_x set to "[DEFAULT]" in static configuration (set from "[titlemessage_initial]" and "[titlemessage]") --- diff --git a/ChangeLog b/ChangeLog index ca6007bf..c1cd0dcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-03-19 + * titlemessage_initial_x and titlemessage_x set to "[DEFAULT]" in static + configuration (set from "[titlemessage_initial]" and "[titlemessage]") + 2007-03-18 * added configurability of graphics, sounds and music for title screens, which are separated into initial title screens (only shown once at @@ -32,7 +36,7 @@ that affect all text messages: - [titlemessage_initial]. - [titlemessage]. - or use directives affect single text messages: + or use directives that affect single text messages: - titlemessage_initial_x. (with x in 1,2,3,4,5) - titlemessage_x. (with x in 1,2,3,4,5) diff --git a/src/conf_gfx.c b/src/conf_gfx.c index dc30739e..c98d0601 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -5007,136 +5007,136 @@ struct ConfigInfo image_config[] = { "[titlemessage].parse_comments", "false" }, { "[titlemessage].sort_priority", "0" }, - { "titlemessage_initial_1.x", "336" }, - { "titlemessage_initial_1.y", "280" }, - { "titlemessage_initial_1.width", "640" }, - { "titlemessage_initial_1.height", "512" }, - { "titlemessage_initial_1.chars", "-1" }, - { "titlemessage_initial_1.lines", "-1" }, - { "titlemessage_initial_1.align", "center" }, - { "titlemessage_initial_1.valign", "middle" }, - { "titlemessage_initial_1.font", "font.text_1" }, - { "titlemessage_initial_1.autowrap", "false" }, - { "titlemessage_initial_1.centered", "false" }, - { "titlemessage_initial_1.parse_comments", "false" }, - { "titlemessage_initial_1.sort_priority", "0" }, - { "titlemessage_initial_2.x", "336" }, - { "titlemessage_initial_2.y", "280" }, - { "titlemessage_initial_2.width", "640" }, - { "titlemessage_initial_2.height", "512" }, - { "titlemessage_initial_2.chars", "-1" }, - { "titlemessage_initial_2.lines", "-1" }, - { "titlemessage_initial_2.align", "center" }, - { "titlemessage_initial_2.valign", "middle" }, - { "titlemessage_initial_2.font", "font.text_1" }, - { "titlemessage_initial_2.autowrap", "false" }, - { "titlemessage_initial_2.centered", "false" }, - { "titlemessage_initial_2.parse_comments", "false" }, - { "titlemessage_initial_2.sort_priority", "0" }, - { "titlemessage_initial_3.x", "336" }, - { "titlemessage_initial_3.y", "280" }, - { "titlemessage_initial_3.width", "640" }, - { "titlemessage_initial_3.height", "512" }, - { "titlemessage_initial_3.chars", "-1" }, - { "titlemessage_initial_3.lines", "-1" }, - { "titlemessage_initial_3.align", "center" }, - { "titlemessage_initial_3.valign", "middle" }, - { "titlemessage_initial_3.font", "font.text_1" }, - { "titlemessage_initial_3.autowrap", "false" }, - { "titlemessage_initial_3.centered", "false" }, - { "titlemessage_initial_3.parse_comments", "false" }, - { "titlemessage_initial_3.sort_priority", "0" }, - { "titlemessage_initial_4.x", "336" }, - { "titlemessage_initial_4.y", "280" }, - { "titlemessage_initial_4.width", "640" }, - { "titlemessage_initial_4.height", "512" }, - { "titlemessage_initial_4.chars", "-1" }, - { "titlemessage_initial_4.lines", "-1" }, - { "titlemessage_initial_4.align", "center" }, - { "titlemessage_initial_4.valign", "middle" }, - { "titlemessage_initial_4.font", "font.text_1" }, - { "titlemessage_initial_4.autowrap", "false" }, - { "titlemessage_initial_4.centered", "false" }, - { "titlemessage_initial_4.parse_comments", "false" }, - { "titlemessage_initial_4.sort_priority", "0" }, - { "titlemessage_initial_5.x", "336" }, - { "titlemessage_initial_5.y", "280" }, - { "titlemessage_initial_5.width", "640" }, - { "titlemessage_initial_5.height", "512" }, - { "titlemessage_initial_5.chars", "-1" }, - { "titlemessage_initial_5.lines", "-1" }, - { "titlemessage_initial_5.align", "center" }, - { "titlemessage_initial_5.valign", "middle" }, - { "titlemessage_initial_5.font", "font.text_1" }, - { "titlemessage_initial_5.autowrap", "false" }, - { "titlemessage_initial_5.centered", "false" }, - { "titlemessage_initial_5.parse_comments", "false" }, - { "titlemessage_initial_5.sort_priority", "0" }, - { "titlemessage_1.x", "336" }, - { "titlemessage_1.y", "280" }, - { "titlemessage_1.width", "640" }, - { "titlemessage_1.height", "512" }, - { "titlemessage_1.chars", "-1" }, - { "titlemessage_1.lines", "-1" }, - { "titlemessage_1.align", "center" }, - { "titlemessage_1.valign", "middle" }, - { "titlemessage_1.font", "font.text_1" }, - { "titlemessage_1.autowrap", "false" }, - { "titlemessage_1.centered", "false" }, - { "titlemessage_1.parse_comments", "false" }, - { "titlemessage_1.sort_priority", "0" }, - { "titlemessage_2.x", "336" }, - { "titlemessage_2.y", "280" }, - { "titlemessage_2.width", "640" }, - { "titlemessage_2.height", "512" }, - { "titlemessage_2.chars", "-1" }, - { "titlemessage_2.lines", "-1" }, - { "titlemessage_2.align", "center" }, - { "titlemessage_2.valign", "middle" }, - { "titlemessage_2.font", "font.text_1" }, - { "titlemessage_2.autowrap", "false" }, - { "titlemessage_2.centered", "false" }, - { "titlemessage_2.parse_comments", "false" }, - { "titlemessage_2.sort_priority", "0" }, - { "titlemessage_3.x", "336" }, - { "titlemessage_3.y", "280" }, - { "titlemessage_3.width", "640" }, - { "titlemessage_3.height", "512" }, - { "titlemessage_3.chars", "-1" }, - { "titlemessage_3.lines", "-1" }, - { "titlemessage_3.align", "center" }, - { "titlemessage_3.valign", "middle" }, - { "titlemessage_3.font", "font.text_1" }, - { "titlemessage_3.autowrap", "false" }, - { "titlemessage_3.centered", "false" }, - { "titlemessage_3.parse_comments", "false" }, - { "titlemessage_3.sort_priority", "0" }, - { "titlemessage_4.x", "336" }, - { "titlemessage_4.y", "280" }, - { "titlemessage_4.width", "640" }, - { "titlemessage_4.height", "512" }, - { "titlemessage_4.chars", "-1" }, - { "titlemessage_4.lines", "-1" }, - { "titlemessage_4.align", "center" }, - { "titlemessage_4.valign", "middle" }, - { "titlemessage_4.font", "font.text_1" }, - { "titlemessage_4.autowrap", "false" }, - { "titlemessage_4.centered", "false" }, - { "titlemessage_4.parse_comments", "false" }, - { "titlemessage_4.sort_priority", "0" }, - { "titlemessage_5.x", "336" }, - { "titlemessage_5.y", "280" }, - { "titlemessage_5.width", "640" }, - { "titlemessage_5.height", "512" }, - { "titlemessage_5.chars", "-1" }, - { "titlemessage_5.lines", "-1" }, - { "titlemessage_5.align", "center" }, - { "titlemessage_5.valign", "middle" }, - { "titlemessage_5.font", "font.text_1" }, - { "titlemessage_5.autowrap", "false" }, - { "titlemessage_5.centered", "false" }, - { "titlemessage_5.parse_comments", "false" }, - { "titlemessage_5.sort_priority", "0" }, + { "titlemessage_initial_1.x", ARG_DEFAULT }, + { "titlemessage_initial_1.y", ARG_DEFAULT }, + { "titlemessage_initial_1.width", ARG_DEFAULT }, + { "titlemessage_initial_1.height", ARG_DEFAULT }, + { "titlemessage_initial_1.chars", ARG_DEFAULT }, + { "titlemessage_initial_1.lines", ARG_DEFAULT }, + { "titlemessage_initial_1.align", ARG_DEFAULT }, + { "titlemessage_initial_1.valign", ARG_DEFAULT }, + { "titlemessage_initial_1.font", ARG_DEFAULT }, + { "titlemessage_initial_1.autowrap", ARG_DEFAULT }, + { "titlemessage_initial_1.centered", ARG_DEFAULT }, + { "titlemessage_initial_1.parse_comments", ARG_DEFAULT }, + { "titlemessage_initial_1.sort_priority", ARG_DEFAULT }, + { "titlemessage_initial_2.x", ARG_DEFAULT }, + { "titlemessage_initial_2.y", ARG_DEFAULT }, + { "titlemessage_initial_2.width", ARG_DEFAULT }, + { "titlemessage_initial_2.height", ARG_DEFAULT }, + { "titlemessage_initial_2.chars", ARG_DEFAULT }, + { "titlemessage_initial_2.lines", ARG_DEFAULT }, + { "titlemessage_initial_2.align", ARG_DEFAULT }, + { "titlemessage_initial_2.valign", ARG_DEFAULT }, + { "titlemessage_initial_2.font", ARG_DEFAULT }, + { "titlemessage_initial_2.autowrap", ARG_DEFAULT }, + { "titlemessage_initial_2.centered", ARG_DEFAULT }, + { "titlemessage_initial_2.parse_comments", ARG_DEFAULT }, + { "titlemessage_initial_2.sort_priority", ARG_DEFAULT }, + { "titlemessage_initial_3.x", ARG_DEFAULT }, + { "titlemessage_initial_3.y", ARG_DEFAULT }, + { "titlemessage_initial_3.width", ARG_DEFAULT }, + { "titlemessage_initial_3.height", ARG_DEFAULT }, + { "titlemessage_initial_3.chars", ARG_DEFAULT }, + { "titlemessage_initial_3.lines", ARG_DEFAULT }, + { "titlemessage_initial_3.align", ARG_DEFAULT }, + { "titlemessage_initial_3.valign", ARG_DEFAULT }, + { "titlemessage_initial_3.font", ARG_DEFAULT }, + { "titlemessage_initial_3.autowrap", ARG_DEFAULT }, + { "titlemessage_initial_3.centered", ARG_DEFAULT }, + { "titlemessage_initial_3.parse_comments", ARG_DEFAULT }, + { "titlemessage_initial_3.sort_priority", ARG_DEFAULT }, + { "titlemessage_initial_4.x", ARG_DEFAULT }, + { "titlemessage_initial_4.y", ARG_DEFAULT }, + { "titlemessage_initial_4.width", ARG_DEFAULT }, + { "titlemessage_initial_4.height", ARG_DEFAULT }, + { "titlemessage_initial_4.chars", ARG_DEFAULT }, + { "titlemessage_initial_4.lines", ARG_DEFAULT }, + { "titlemessage_initial_4.align", ARG_DEFAULT }, + { "titlemessage_initial_4.valign", ARG_DEFAULT }, + { "titlemessage_initial_4.font", ARG_DEFAULT }, + { "titlemessage_initial_4.autowrap", ARG_DEFAULT }, + { "titlemessage_initial_4.centered", ARG_DEFAULT }, + { "titlemessage_initial_4.parse_comments", ARG_DEFAULT }, + { "titlemessage_initial_4.sort_priority", ARG_DEFAULT }, + { "titlemessage_initial_5.x", ARG_DEFAULT }, + { "titlemessage_initial_5.y", ARG_DEFAULT }, + { "titlemessage_initial_5.width", ARG_DEFAULT }, + { "titlemessage_initial_5.height", ARG_DEFAULT }, + { "titlemessage_initial_5.chars", ARG_DEFAULT }, + { "titlemessage_initial_5.lines", ARG_DEFAULT }, + { "titlemessage_initial_5.align", ARG_DEFAULT }, + { "titlemessage_initial_5.valign", ARG_DEFAULT }, + { "titlemessage_initial_5.font", ARG_DEFAULT }, + { "titlemessage_initial_5.autowrap", ARG_DEFAULT }, + { "titlemessage_initial_5.centered", ARG_DEFAULT }, + { "titlemessage_initial_5.parse_comments", ARG_DEFAULT }, + { "titlemessage_initial_5.sort_priority", ARG_DEFAULT }, + { "titlemessage_1.x", ARG_DEFAULT }, + { "titlemessage_1.y", ARG_DEFAULT }, + { "titlemessage_1.width", ARG_DEFAULT }, + { "titlemessage_1.height", ARG_DEFAULT }, + { "titlemessage_1.chars", ARG_DEFAULT }, + { "titlemessage_1.lines", ARG_DEFAULT }, + { "titlemessage_1.align", ARG_DEFAULT }, + { "titlemessage_1.valign", ARG_DEFAULT }, + { "titlemessage_1.font", ARG_DEFAULT }, + { "titlemessage_1.autowrap", ARG_DEFAULT }, + { "titlemessage_1.centered", ARG_DEFAULT }, + { "titlemessage_1.parse_comments", ARG_DEFAULT }, + { "titlemessage_1.sort_priority", ARG_DEFAULT }, + { "titlemessage_2.x", ARG_DEFAULT }, + { "titlemessage_2.y", ARG_DEFAULT }, + { "titlemessage_2.width", ARG_DEFAULT }, + { "titlemessage_2.height", ARG_DEFAULT }, + { "titlemessage_2.chars", ARG_DEFAULT }, + { "titlemessage_2.lines", ARG_DEFAULT }, + { "titlemessage_2.align", ARG_DEFAULT }, + { "titlemessage_2.valign", ARG_DEFAULT }, + { "titlemessage_2.font", ARG_DEFAULT }, + { "titlemessage_2.autowrap", ARG_DEFAULT }, + { "titlemessage_2.centered", ARG_DEFAULT }, + { "titlemessage_2.parse_comments", ARG_DEFAULT }, + { "titlemessage_2.sort_priority", ARG_DEFAULT }, + { "titlemessage_3.x", ARG_DEFAULT }, + { "titlemessage_3.y", ARG_DEFAULT }, + { "titlemessage_3.width", ARG_DEFAULT }, + { "titlemessage_3.height", ARG_DEFAULT }, + { "titlemessage_3.chars", ARG_DEFAULT }, + { "titlemessage_3.lines", ARG_DEFAULT }, + { "titlemessage_3.align", ARG_DEFAULT }, + { "titlemessage_3.valign", ARG_DEFAULT }, + { "titlemessage_3.font", ARG_DEFAULT }, + { "titlemessage_3.autowrap", ARG_DEFAULT }, + { "titlemessage_3.centered", ARG_DEFAULT }, + { "titlemessage_3.parse_comments", ARG_DEFAULT }, + { "titlemessage_3.sort_priority", ARG_DEFAULT }, + { "titlemessage_4.x", ARG_DEFAULT }, + { "titlemessage_4.y", ARG_DEFAULT }, + { "titlemessage_4.width", ARG_DEFAULT }, + { "titlemessage_4.height", ARG_DEFAULT }, + { "titlemessage_4.chars", ARG_DEFAULT }, + { "titlemessage_4.lines", ARG_DEFAULT }, + { "titlemessage_4.align", ARG_DEFAULT }, + { "titlemessage_4.valign", ARG_DEFAULT }, + { "titlemessage_4.font", ARG_DEFAULT }, + { "titlemessage_4.autowrap", ARG_DEFAULT }, + { "titlemessage_4.centered", ARG_DEFAULT }, + { "titlemessage_4.parse_comments", ARG_DEFAULT }, + { "titlemessage_4.sort_priority", ARG_DEFAULT }, + { "titlemessage_5.x", ARG_DEFAULT }, + { "titlemessage_5.y", ARG_DEFAULT }, + { "titlemessage_5.width", ARG_DEFAULT }, + { "titlemessage_5.height", ARG_DEFAULT }, + { "titlemessage_5.chars", ARG_DEFAULT }, + { "titlemessage_5.lines", ARG_DEFAULT }, + { "titlemessage_5.align", ARG_DEFAULT }, + { "titlemessage_5.valign", ARG_DEFAULT }, + { "titlemessage_5.font", ARG_DEFAULT }, + { "titlemessage_5.autowrap", ARG_DEFAULT }, + { "titlemessage_5.centered", ARG_DEFAULT }, + { "titlemessage_5.parse_comments", ARG_DEFAULT }, + { "titlemessage_5.sort_priority", ARG_DEFAULT }, { "readme.x", "272" }, { "readme.y", "150" }, diff --git a/src/conftime.h b/src/conftime.h index fa7ec707..07f70bb8 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "2007-03-18 22:44" +#define COMPILE_DATE_STRING "2007-03-19 15:16" diff --git a/src/files.c b/src/files.c index 51cc6317..501339f1 100644 --- a/src/files.c +++ b/src/files.c @@ -8441,7 +8441,7 @@ void LoadSpecialMenuDesignSettings() char *filename_base = UNDEFINED_FILENAME, *filename_local; int i, j; - /* always start with reliable default values from default config */ + /* always start with reliable default values from static default config */ for (i = 0; image_config_vars[i].token != NULL; i++) for (j = 0; image_config[j].token != NULL; j++) if (strEqual(image_config_vars[i].token, image_config[j].token)) @@ -8449,6 +8449,13 @@ void LoadSpecialMenuDesignSettings() get_token_parameter_value(image_config_vars[i].token, image_config[j].value); + /* special case: initialize with default values that may be overwritten */ + for (i = 0; i < MAX_NUM_TITLE_MESSAGES; i++) + { + titlemessage_initial[i] = titlemessage_initial_default; + titlemessage[i] = titlemessage_default; + } + if (!SETUP_OVERRIDE_ARTWORK(setup, ARTWORK_TYPE_GRAPHICS)) { /* first look for special settings configured in level series config */