X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_var.c;h=38ab1c563d3457ec5b791e62a39c682c97f6e277;hb=585994e9f3f77300b730f790062010518f35a739;hp=f9e708ef57af0328e4bb9a9a1fab8ad3d3988a23;hpb=5c94351c5b8a12d8615b447b6275dd2f68615be4;p=rocksndiamonds.git

diff --git a/src/conf_var.c b/src/conf_var.c
index f9e708ef..38ab1c56 100644
--- a/src/conf_var.c
+++ b/src/conf_var.c
@@ -985,16 +985,124 @@ struct TokenIntPtrInfo image_config_vars[] =
     &menu.leave_menu.post_delay
   },
   {
-    "menu.start_item.fade_mode",
-    &menu.start_item.fade_mode
+    "menu.enter_screen.fade_mode",
+    &menu.enter_screen[GFX_SPECIAL_ARG_DEFAULT].fade_mode
   },
   {
-    "menu.start_item.fade_delay",
-    &menu.start_item.fade_delay
+    "menu.enter_screen.fade_delay",
+    &menu.enter_screen[GFX_SPECIAL_ARG_DEFAULT].fade_delay
   },
   {
-    "menu.start_item.post_delay",
-    &menu.start_item.post_delay
+    "menu.enter_screen.post_delay",
+    &menu.enter_screen[GFX_SPECIAL_ARG_DEFAULT].post_delay
+  },
+  {
+    "menu.leave_screen.fade_mode",
+    &menu.leave_screen[GFX_SPECIAL_ARG_DEFAULT].fade_mode
+  },
+  {
+    "menu.leave_screen.fade_delay",
+    &menu.leave_screen[GFX_SPECIAL_ARG_DEFAULT].fade_delay
+  },
+  {
+    "menu.leave_screen.post_delay",
+    &menu.leave_screen[GFX_SPECIAL_ARG_DEFAULT].post_delay
+  },
+  {
+    "menu.enter_screen.SCORES.fade_mode",
+    &menu.enter_screen[GFX_SPECIAL_ARG_SCORES].fade_mode
+  },
+  {
+    "menu.enter_screen.SCORES.fade_delay",
+    &menu.enter_screen[GFX_SPECIAL_ARG_SCORES].fade_delay
+  },
+  {
+    "menu.enter_screen.SCORES.post_delay",
+    &menu.enter_screen[GFX_SPECIAL_ARG_SCORES].post_delay
+  },
+  {
+    "menu.enter_screen.EDITOR.fade_mode",
+    &menu.enter_screen[GFX_SPECIAL_ARG_EDITOR].fade_mode
+  },
+  {
+    "menu.enter_screen.EDITOR.fade_delay",
+    &menu.enter_screen[GFX_SPECIAL_ARG_EDITOR].fade_delay
+  },
+  {
+    "menu.enter_screen.EDITOR.post_delay",
+    &menu.enter_screen[GFX_SPECIAL_ARG_EDITOR].post_delay
+  },
+  {
+    "menu.enter_screen.INFO.fade_mode",
+    &menu.enter_screen[GFX_SPECIAL_ARG_INFO].fade_mode
+  },
+  {
+    "menu.enter_screen.INFO.fade_delay",
+    &menu.enter_screen[GFX_SPECIAL_ARG_INFO].fade_delay
+  },
+  {
+    "menu.enter_screen.INFO.post_delay",
+    &menu.enter_screen[GFX_SPECIAL_ARG_INFO].post_delay
+  },
+  {
+    "menu.enter_screen.PLAYING.fade_mode",
+    &menu.enter_screen[GFX_SPECIAL_ARG_PLAYING].fade_mode
+  },
+  {
+    "menu.enter_screen.PLAYING.fade_delay",
+    &menu.enter_screen[GFX_SPECIAL_ARG_PLAYING].fade_delay
+  },
+  {
+    "menu.enter_screen.PLAYING.post_delay",
+    &menu.enter_screen[GFX_SPECIAL_ARG_PLAYING].post_delay
+  },
+  {
+    "menu.leave_screen.SCORES.fade_mode",
+    &menu.leave_screen[GFX_SPECIAL_ARG_SCORES].fade_mode
+  },
+  {
+    "menu.leave_screen.SCORES.fade_delay",
+    &menu.leave_screen[GFX_SPECIAL_ARG_SCORES].fade_delay
+  },
+  {
+    "menu.leave_screen.SCORES.post_delay",
+    &menu.leave_screen[GFX_SPECIAL_ARG_SCORES].post_delay
+  },
+  {
+    "menu.leave_screen.EDITOR.fade_mode",
+    &menu.leave_screen[GFX_SPECIAL_ARG_EDITOR].fade_mode
+  },
+  {
+    "menu.leave_screen.EDITOR.fade_delay",
+    &menu.leave_screen[GFX_SPECIAL_ARG_EDITOR].fade_delay
+  },
+  {
+    "menu.leave_screen.EDITOR.post_delay",
+    &menu.leave_screen[GFX_SPECIAL_ARG_EDITOR].post_delay
+  },
+  {
+    "menu.leave_screen.INFO.fade_mode",
+    &menu.leave_screen[GFX_SPECIAL_ARG_INFO].fade_mode
+  },
+  {
+    "menu.leave_screen.INFO.fade_delay",
+    &menu.leave_screen[GFX_SPECIAL_ARG_INFO].fade_delay
+  },
+  {
+    "menu.leave_screen.INFO.post_delay",
+    &menu.leave_screen[GFX_SPECIAL_ARG_INFO].post_delay
+  },
+  {
+    "menu.leave_screen.PLAYING.fade_mode",
+    &menu.leave_screen[GFX_SPECIAL_ARG_PLAYING].fade_mode
+  },
+  {
+    "menu.leave_screen.PLAYING.fade_delay",
+    &menu.leave_screen[GFX_SPECIAL_ARG_PLAYING].fade_delay
+  },
+  {
+    "menu.leave_screen.PLAYING.post_delay",
+    &menu.leave_screen[GFX_SPECIAL_ARG_PLAYING].post_delay
   },
   {
     "menu.draw_xoffset",
@@ -2328,30 +2436,6 @@ struct TokenIntPtrInfo image_config_vars[] =
     "game.panel.emc_magic_ball_switch.y",
     &game.panel.emc_magic_ball_switch.y
   },
-  {
-    "game.panel.emc_magic_ball_time.x",
-    &game.panel.emc_magic_ball_time.x
-  },
-  {
-    "game.panel.emc_magic_ball_time.y",
-    &game.panel.emc_magic_ball_time.y
-  },
-  {
-    "game.panel.emc_magic_ball_time.align",
-    &game.panel.emc_magic_ball_time.align
-  },
-  {
-    "game.panel.emc_magic_ball_time.valign",
-    &game.panel.emc_magic_ball_time.valign
-  },
-  {
-    "game.panel.emc_magic_ball_time.chars",
-    &game.panel.emc_magic_ball_time.chars
-  },
-  {
-    "game.panel.emc_magic_ball_time.font",
-    &game.panel.emc_magic_ball_time.font
-  },
   {
     "game.panel.light_switch.x",
     &game.panel.light_switch.x
@@ -2864,6 +2948,10 @@ struct TokenIntPtrInfo image_config_vars[] =
     "game.button.sound_simple.y",
     &game.button.sound_simple.y
   },
+  {
+    "game.forced_scroll_delay_value",
+    &game.forced_scroll_delay_value
+  },
   {
     "[player].boring_delay_fixed",
     &game.player_boring_delay_fixed