X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconf_gfx.c;h=6272795092e2485105dba5434eed30176ca4cba6;hp=5e26e68fcd711a46a87710e5379c58d02255aa34;hb=5c94351c5b8a12d8615b447b6275dd2f68615be4;hpb=884012f34f9f3c22bf75d1468e4ed57d7795a24b

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 5e26e68f..62727950 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -60,6 +60,7 @@ struct ConfigTypeInfo image_config_suffix[] =
   { ".name",				ARG_UNDEFINED,	TYPE_STRING	},
   { ".scale_up_factor",			ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".clone_from",			ARG_UNDEFINED,	TYPE_TOKEN	},
+  { ".fade_mode",			ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".fade_delay",			ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".post_delay",			ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".auto_delay",			ARG_UNDEFINED,	TYPE_INTEGER	},
@@ -4980,11 +4981,11 @@ struct ConfigInfo image_config[] =
 
   /* keyword to start parser: "CONFIG_VARS_START" <-- do not change! */
 
-  { "[title_initial].anim_mode",		"fade"			},
+  { "[title_initial].fade_mode",		"fade"			},
   { "[title_initial].fade_delay",		"500"			},
   { "[title_initial].post_delay",		"250"			},
   { "[title_initial].auto_delay",		"-1"			},
-  { "[title].anim_mode",			"fade"			},
+  { "[title].fade_mode",			"fade"			},
   { "[title].fade_delay",			"500"			},
   { "[title].post_delay",			"250"			},
   { "[title].auto_delay",			"-1"			},
@@ -5002,7 +5003,7 @@ struct ConfigInfo image_config[] =
   { "[titlemessage_initial].centered",		"false"			},
   { "[titlemessage_initial].parse_comments",	"false"			},
   { "[titlemessage_initial].sort_priority",	"0"			},
-  { "[titlemessage_initial].anim_mode",		ARG_DEFAULT		},
+  { "[titlemessage_initial].fade_mode",		ARG_DEFAULT		},
   { "[titlemessage_initial].fade_delay",	ARG_DEFAULT		},
   { "[titlemessage_initial].post_delay",	ARG_DEFAULT		},
   { "[titlemessage_initial].auto_delay",	ARG_DEFAULT		},
@@ -5019,7 +5020,7 @@ struct ConfigInfo image_config[] =
   { "[titlemessage].centered",			"false"			},
   { "[titlemessage].parse_comments",		"false"			},
   { "[titlemessage].sort_priority",		"0"			},
-  { "[titlemessage].anim_mode",			ARG_DEFAULT		},
+  { "[titlemessage].fade_mode",			ARG_DEFAULT		},
   { "[titlemessage].fade_delay",		ARG_DEFAULT		},
   { "[titlemessage].post_delay",		ARG_DEFAULT		},
   { "[titlemessage].auto_delay",		ARG_DEFAULT		},
@@ -5037,7 +5038,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_initial_1.centered",		ARG_DEFAULT		},
   { "titlemessage_initial_1.parse_comments",	ARG_DEFAULT		},
   { "titlemessage_initial_1.sort_priority",	ARG_DEFAULT		},
-  { "titlemessage_initial_1.anim_mode",		ARG_DEFAULT		},
+  { "titlemessage_initial_1.fade_mode",		ARG_DEFAULT		},
   { "titlemessage_initial_1.fade_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_1.post_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_1.auto_delay",	ARG_DEFAULT		},
@@ -5054,7 +5055,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_initial_2.centered",		ARG_DEFAULT		},
   { "titlemessage_initial_2.parse_comments",	ARG_DEFAULT		},
   { "titlemessage_initial_2.sort_priority",	ARG_DEFAULT		},
-  { "titlemessage_initial_2.anim_mode",		ARG_DEFAULT		},
+  { "titlemessage_initial_2.fade_mode",		ARG_DEFAULT		},
   { "titlemessage_initial_2.fade_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_2.post_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_2.auto_delay",	ARG_DEFAULT		},
@@ -5071,7 +5072,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_initial_3.centered",		ARG_DEFAULT		},
   { "titlemessage_initial_3.parse_comments",	ARG_DEFAULT		},
   { "titlemessage_initial_3.sort_priority",	ARG_DEFAULT		},
-  { "titlemessage_initial_3.anim_mode",		ARG_DEFAULT		},
+  { "titlemessage_initial_3.fade_mode",		ARG_DEFAULT		},
   { "titlemessage_initial_3.fade_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_3.post_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_3.auto_delay",	ARG_DEFAULT		},
@@ -5088,7 +5089,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_initial_4.centered",		ARG_DEFAULT		},
   { "titlemessage_initial_4.parse_comments",	ARG_DEFAULT		},
   { "titlemessage_initial_4.sort_priority",	ARG_DEFAULT		},
-  { "titlemessage_initial_4.anim_mode",		ARG_DEFAULT		},
+  { "titlemessage_initial_4.fade_mode",		ARG_DEFAULT		},
   { "titlemessage_initial_4.fade_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_4.post_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_4.auto_delay",	ARG_DEFAULT		},
@@ -5105,7 +5106,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_initial_5.centered",		ARG_DEFAULT		},
   { "titlemessage_initial_5.parse_comments",	ARG_DEFAULT		},
   { "titlemessage_initial_5.sort_priority",	ARG_DEFAULT		},
-  { "titlemessage_initial_5.anim_mode",		ARG_DEFAULT		},
+  { "titlemessage_initial_5.fade_mode",		ARG_DEFAULT		},
   { "titlemessage_initial_5.fade_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_5.post_delay",	ARG_DEFAULT		},
   { "titlemessage_initial_5.auto_delay",	ARG_DEFAULT		},
@@ -5122,7 +5123,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_1.centered",			ARG_DEFAULT		},
   { "titlemessage_1.parse_comments",		ARG_DEFAULT		},
   { "titlemessage_1.sort_priority",		ARG_DEFAULT		},
-  { "titlemessage_1.anim_mode",			ARG_DEFAULT		},
+  { "titlemessage_1.fade_mode",			ARG_DEFAULT		},
   { "titlemessage_1.fade_delay",		ARG_DEFAULT		},
   { "titlemessage_1.post_delay",		ARG_DEFAULT		},
   { "titlemessage_1.auto_delay",		ARG_DEFAULT		},
@@ -5139,7 +5140,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_2.centered",			ARG_DEFAULT		},
   { "titlemessage_2.parse_comments",		ARG_DEFAULT		},
   { "titlemessage_2.sort_priority",		ARG_DEFAULT		},
-  { "titlemessage_2.anim_mode",			ARG_DEFAULT		},
+  { "titlemessage_2.fade_mode",			ARG_DEFAULT		},
   { "titlemessage_2.fade_delay",		ARG_DEFAULT		},
   { "titlemessage_2.post_delay",		ARG_DEFAULT		},
   { "titlemessage_2.auto_delay",		ARG_DEFAULT		},
@@ -5156,7 +5157,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_3.centered",			ARG_DEFAULT		},
   { "titlemessage_3.parse_comments",		ARG_DEFAULT		},
   { "titlemessage_3.sort_priority",		ARG_DEFAULT		},
-  { "titlemessage_3.anim_mode",			ARG_DEFAULT		},
+  { "titlemessage_3.fade_mode",			ARG_DEFAULT		},
   { "titlemessage_3.fade_delay",		ARG_DEFAULT		},
   { "titlemessage_3.post_delay",		ARG_DEFAULT		},
   { "titlemessage_3.auto_delay",		ARG_DEFAULT		},
@@ -5173,7 +5174,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_4.centered",			ARG_DEFAULT		},
   { "titlemessage_4.parse_comments",		ARG_DEFAULT		},
   { "titlemessage_4.sort_priority",		ARG_DEFAULT		},
-  { "titlemessage_4.anim_mode",			ARG_DEFAULT		},
+  { "titlemessage_4.fade_mode",			ARG_DEFAULT		},
   { "titlemessage_4.fade_delay",		ARG_DEFAULT		},
   { "titlemessage_4.post_delay",		ARG_DEFAULT		},
   { "titlemessage_4.auto_delay",		ARG_DEFAULT		},
@@ -5190,7 +5191,7 @@ struct ConfigInfo image_config[] =
   { "titlemessage_5.centered",			ARG_DEFAULT		},
   { "titlemessage_5.parse_comments",		ARG_DEFAULT		},
   { "titlemessage_5.sort_priority",		ARG_DEFAULT		},
-  { "titlemessage_5.anim_mode",			ARG_DEFAULT		},
+  { "titlemessage_5.fade_mode",			ARG_DEFAULT		},
   { "titlemessage_5.fade_delay",		ARG_DEFAULT		},
   { "titlemessage_5.post_delay",		ARG_DEFAULT		},
   { "titlemessage_5.auto_delay",		ARG_DEFAULT		},
@@ -5221,12 +5222,15 @@ struct ConfigInfo image_config[] =
   { "border.draw_masked.PLAYING",		"false"			},
   { "border.draw_masked.DOOR",			"false"			},
 
-  { "menu.navigation.anim_mode",		"none"			},
-  { "menu.navigation.fade_delay",		"250"			},
-  { "menu.navigation.post_delay",		"125"			},
-  { "menu.destination.anim_mode",		"fade"			},
-  { "menu.destination.fade_delay",		"250"			},
-  { "menu.destination.post_delay",		"125"			},
+  { "menu.enter_menu.fade_mode",		"none"			},
+  { "menu.enter_menu.fade_delay",		"250"			},
+  { "menu.enter_menu.post_delay",		"125"			},
+  { "menu.leave_menu.fade_mode",		"none"			},
+  { "menu.leave_menu.fade_delay",		"250"			},
+  { "menu.leave_menu.post_delay",		"125"			},
+  { "menu.start_item.fade_mode",		"fade"			},
+  { "menu.start_item.fade_delay",		"250"			},
+  { "menu.start_item.post_delay",		"125"			},
 
   { "menu.draw_xoffset",			"0"			},
   { "menu.draw_yoffset",			"0"			},