X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconf_gfx.c;h=5075ee37cd2cccf182e39ca35cc55f14c2ccd022;hp=bc6e1e5e378d22d2d7125599ee25778794fb0cfe;hb=2965766321c0bc9b8985b3760a624ea9ef8e44e5;hpb=e617cc94b68c43105fc3c06d26d31c9bc99161a4

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index bc6e1e5e..5075ee37 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -75,6 +75,7 @@ struct ConfigTypeInfo image_config_suffix[] =
   { ".fade_delay",			ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".post_delay",			ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".auto_delay",			ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".auto_delay_unit",			ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".align",				ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".valign",				ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".sort_priority",			ARG_UNDEFINED,	TYPE_INTEGER	},
@@ -7333,72 +7334,86 @@ struct ConfigInfo image_config[] =
   { "[title_initial].fade_delay",		"500"			},
   { "[title_initial].post_delay",		"250"			},
   { "[title_initial].auto_delay",		"-1"			},
+  { "[title_initial].auto_delay_unit",		"ms"			},
   { "[title].fade_mode",			"fade"			},
   { "[title].fade_delay",			"500"			},
   { "[title].post_delay",			"250"			},
   { "[title].auto_delay",			"-1"			},
+  { "[title].auto_delay_unit",			"ms"			},
 
   { "[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_initial].auto_delay_unit",	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].auto_delay_unit",		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_1.auto_delay_unit",	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_2.auto_delay_unit",	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_3.auto_delay_unit",	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_4.auto_delay_unit",	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_initial_5.auto_delay_unit",	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_1.auto_delay_unit",		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_2.auto_delay_unit",		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_3.auto_delay_unit",		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_4.auto_delay_unit",		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		},
+  { "titlescreen_5.auto_delay_unit",		ARG_DEFAULT		},
 
   { "[titlemessage_initial].x",			"-1"			},
   { "[titlemessage_initial].y",			"-1"			},
@@ -7417,6 +7432,7 @@ struct ConfigInfo image_config[] =
   { "[titlemessage_initial].fade_delay",	ARG_DEFAULT		},
   { "[titlemessage_initial].post_delay",	ARG_DEFAULT		},
   { "[titlemessage_initial].auto_delay",	ARG_DEFAULT		},
+  { "[titlemessage_initial].auto_delay_unit",	ARG_DEFAULT		},
   { "[titlemessage].x",				"-1"			},
   { "[titlemessage].y",				"-1"			},
   { "[titlemessage].width",			"-1"			},
@@ -7434,6 +7450,7 @@ struct ConfigInfo image_config[] =
   { "[titlemessage].fade_delay",		ARG_DEFAULT		},
   { "[titlemessage].post_delay",		ARG_DEFAULT		},
   { "[titlemessage].auto_delay",		ARG_DEFAULT		},
+  { "[titlemessage].auto_delay_unit",		ARG_DEFAULT		},
 
   { "titlemessage_initial_1.x",			ARG_DEFAULT		},
   { "titlemessage_initial_1.y",			ARG_DEFAULT		},
@@ -7452,6 +7469,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_initial_1.fade_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_1.post_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_1.auto_delay",	ARG_DEFAULT		},
+  { "titlemessage_initial_1.auto_delay_unit",	ARG_DEFAULT		},
   { "titlemessage_initial_2.x",			ARG_DEFAULT		},
   { "titlemessage_initial_2.y",			ARG_DEFAULT		},
   { "titlemessage_initial_2.width",		ARG_DEFAULT		},
@@ -7469,6 +7487,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_initial_2.fade_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_2.post_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_2.auto_delay",	ARG_DEFAULT		},
+  { "titlemessage_initial_2.auto_delay_unit",	ARG_DEFAULT		},
   { "titlemessage_initial_3.x",			ARG_DEFAULT		},
   { "titlemessage_initial_3.y",			ARG_DEFAULT		},
   { "titlemessage_initial_3.width",		ARG_DEFAULT		},
@@ -7486,6 +7505,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_initial_3.fade_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_3.post_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_3.auto_delay",	ARG_DEFAULT		},
+  { "titlemessage_initial_3.auto_delay_unit",	ARG_DEFAULT		},
   { "titlemessage_initial_4.x",			ARG_DEFAULT		},
   { "titlemessage_initial_4.y",			ARG_DEFAULT		},
   { "titlemessage_initial_4.width",		ARG_DEFAULT		},
@@ -7503,6 +7523,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_initial_4.fade_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_4.post_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_4.auto_delay",	ARG_DEFAULT		},
+  { "titlemessage_initial_4.auto_delay_unit",	ARG_DEFAULT		},
   { "titlemessage_initial_5.x",			ARG_DEFAULT		},
   { "titlemessage_initial_5.y",			ARG_DEFAULT		},
   { "titlemessage_initial_5.width",		ARG_DEFAULT		},
@@ -7520,6 +7541,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_initial_5.fade_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_5.post_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_5.auto_delay",	ARG_DEFAULT		},
+  { "titlemessage_initial_5.auto_delay_unit",	ARG_DEFAULT		},
   { "titlemessage_1.x",				ARG_DEFAULT		},
   { "titlemessage_1.y",				ARG_DEFAULT		},
   { "titlemessage_1.width",			ARG_DEFAULT		},
@@ -7537,6 +7559,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_1.fade_delay",		ARG_DEFAULT		},
   { "titlemessage_1.post_delay",		ARG_DEFAULT		},
   { "titlemessage_1.auto_delay",		ARG_DEFAULT		},
+  { "titlemessage_1.auto_delay_unit",		ARG_DEFAULT		},
   { "titlemessage_2.x",				ARG_DEFAULT		},
   { "titlemessage_2.y",				ARG_DEFAULT		},
   { "titlemessage_2.width",			ARG_DEFAULT		},
@@ -7554,6 +7577,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_2.fade_delay",		ARG_DEFAULT		},
   { "titlemessage_2.post_delay",		ARG_DEFAULT		},
   { "titlemessage_2.auto_delay",		ARG_DEFAULT		},
+  { "titlemessage_2.auto_delay_unit",		ARG_DEFAULT		},
   { "titlemessage_3.x",				ARG_DEFAULT		},
   { "titlemessage_3.y",				ARG_DEFAULT		},
   { "titlemessage_3.width",			ARG_DEFAULT		},
@@ -7571,6 +7595,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_3.fade_delay",		ARG_DEFAULT		},
   { "titlemessage_3.post_delay",		ARG_DEFAULT		},
   { "titlemessage_3.auto_delay",		ARG_DEFAULT		},
+  { "titlemessage_3.auto_delay_unit",		ARG_DEFAULT		},
   { "titlemessage_4.x",				ARG_DEFAULT		},
   { "titlemessage_4.y",				ARG_DEFAULT		},
   { "titlemessage_4.width",			ARG_DEFAULT		},
@@ -7588,6 +7613,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_4.fade_delay",		ARG_DEFAULT		},
   { "titlemessage_4.post_delay",		ARG_DEFAULT		},
   { "titlemessage_4.auto_delay",		ARG_DEFAULT		},
+  { "titlemessage_4.auto_delay_unit",		ARG_DEFAULT		},
   { "titlemessage_5.x",				ARG_DEFAULT		},
   { "titlemessage_5.y",				ARG_DEFAULT		},
   { "titlemessage_5.width",			ARG_DEFAULT		},
@@ -7605,6 +7631,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_5.fade_delay",		ARG_DEFAULT		},
   { "titlemessage_5.post_delay",		ARG_DEFAULT		},
   { "titlemessage_5.auto_delay",		ARG_DEFAULT		},
+  { "titlemessage_5.auto_delay_unit",		ARG_DEFAULT		},
 
   { "readme.x",					"-1"			},
   { "readme.y",					"-1"			},
@@ -7659,6 +7686,7 @@ struct ConfigInfo image_config[] =
   { "menu.enter_screen.TITLE.fade_delay",	"500"			},
   { "menu.enter_screen.TITLE.post_delay",	"250"			},
   { "menu.enter_screen.TITLE.auto_delay",	"-1"			},
+  { "menu.enter_screen.TITLE.auto_delay_unit",	"-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		},
@@ -7675,6 +7703,7 @@ struct ConfigInfo image_config[] =
   { "menu.leave_screen.TITLE.fade_delay",	"500"			},
   { "menu.leave_screen.TITLE.post_delay",	"250"			},
   { "menu.leave_screen.TITLE.auto_delay",	"-1"			},
+  { "menu.leave_screen.TITLE.auto_delay_unit",	"-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		},
@@ -7691,6 +7720,7 @@ struct ConfigInfo image_config[] =
   { "menu.next_screen.TITLE.fade_delay",	"500"			},
   { "menu.next_screen.TITLE.post_delay",	"250"			},
   { "menu.next_screen.TITLE.auto_delay",	"-1"			},
+  { "menu.next_screen.TITLE.auto_delay_unit",	"-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		},