X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_var.c;h=3edf500b8036c03ada5952f62a8f6dec4f152dc8;hb=f965a2a6e56dd5c1e91b306dfd52b38b1dd49537;hp=3cf2fae60b1cd9602aa5d4938155814415aa47ea;hpb=197edf38367a6f825e4a60441a11a3c55191e51b;p=rocksndiamonds.git

diff --git a/src/conf_var.c b/src/conf_var.c
index 3cf2fae6..3edf500b 100644
--- a/src/conf_var.c
+++ b/src/conf_var.c
@@ -960,6 +960,26 @@ struct TokenIntPtrInfo image_config_vars[] =
     "border.draw_masked.DOOR",
     &border.draw_masked[GFX_SPECIAL_ARG_DOOR]
   },
+  {
+    "border.draw_masked_when_fading",
+    &border.draw_masked_when_fading
+  },
+  {
+    "init.busy.x",
+    &init.busy.x
+  },
+  {
+    "init.busy.y",
+    &init.busy.y
+  },
+  {
+    "init.busy.align",
+    &init.busy.align
+  },
+  {
+    "init.busy.valign",
+    &init.busy.valign
+  },
   {
     "menu.enter_menu.fade_mode",
     &menu.enter_menu.fade_mode
@@ -996,6 +1016,18 @@ struct TokenIntPtrInfo image_config_vars[] =
     "menu.enter_screen.post_delay",
     &menu.enter_screen[GFX_SPECIAL_ARG_DEFAULT].post_delay
   },
+  {
+    "menu.next_screen.fade_mode",
+    &menu.next_screen.fade_mode
+  },
+  {
+    "menu.next_screen.fade_delay",
+    &menu.next_screen.fade_delay
+  },
+  {
+    "menu.next_screen.post_delay",
+    &menu.next_screen.post_delay
+  },
   {
     "menu.leave_screen.fade_mode",
     &menu.leave_screen[GFX_SPECIAL_ARG_DEFAULT].fade_mode
@@ -1208,6 +1240,110 @@ struct TokenIntPtrInfo image_config_vars[] =
     "menu.draw_yoffset.SETUP",
     &menu.draw_yoffset[GFX_SPECIAL_ARG_SETUP]
   },
+  {
+    "menu.draw_xoffset.SETUP[GAME]",
+    &menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_GAME]
+  },
+  {
+    "menu.draw_yoffset.SETUP[GAME]",
+    &menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_GAME]
+  },
+  {
+    "menu.draw_xoffset.SETUP[EDITOR]",
+    &menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_EDITOR]
+  },
+  {
+    "menu.draw_yoffset.SETUP[EDITOR]",
+    &menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_EDITOR]
+  },
+  {
+    "menu.draw_xoffset.SETUP[GRAPHICS]",
+    &menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_GRAPHICS]
+  },
+  {
+    "menu.draw_yoffset.SETUP[GRAPHICS]",
+    &menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_GRAPHICS]
+  },
+  {
+    "menu.draw_xoffset.SETUP[SOUND]",
+    &menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_SOUND]
+  },
+  {
+    "menu.draw_yoffset.SETUP[SOUND]",
+    &menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_SOUND]
+  },
+  {
+    "menu.draw_xoffset.SETUP[ARTWORK]",
+    &menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_ARTWORK]
+  },
+  {
+    "menu.draw_yoffset.SETUP[ARTWORK]",
+    &menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_ARTWORK]
+  },
+  {
+    "menu.draw_xoffset.SETUP[INPUT]",
+    &menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_INPUT]
+  },
+  {
+    "menu.draw_yoffset.SETUP[INPUT]",
+    &menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_INPUT]
+  },
+  {
+    "menu.draw_xoffset.SETUP[SHORTCUTS]",
+    &menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_SHORTCUTS]
+  },
+  {
+    "menu.draw_yoffset.SETUP[SHORTCUTS]",
+    &menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_SHORTCUTS]
+  },
+  {
+    "menu.draw_xoffset.SETUP[SHORTCUTS_1]",
+    &menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_SHORTCUTS_1]
+  },
+  {
+    "menu.draw_yoffset.SETUP[SHORTCUTS_1]",
+    &menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_SHORTCUTS_1]
+  },
+  {
+    "menu.draw_xoffset.SETUP[SHORTCUTS_2]",
+    &menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_SHORTCUTS_2]
+  },
+  {
+    "menu.draw_yoffset.SETUP[SHORTCUTS_2]",
+    &menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_SHORTCUTS_2]
+  },
+  {
+    "menu.draw_xoffset.SETUP[SHORTCUTS_3]",
+    &menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_SHORTCUTS_3]
+  },
+  {
+    "menu.draw_yoffset.SETUP[SHORTCUTS_3]",
+    &menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_SHORTCUTS_3]
+  },
+  {
+    "menu.draw_xoffset.SETUP[SHORTCUTS_4]",
+    &menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_SHORTCUTS_4]
+  },
+  {
+    "menu.draw_yoffset.SETUP[SHORTCUTS_4]",
+    &menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_SHORTCUTS_4]
+  },
+  {
+    "menu.draw_xoffset.SETUP[CHOOSE_ARTWORK]",
+    &menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK]
+  },
+  {
+    "menu.draw_yoffset.SETUP[CHOOSE_ARTWORK]",
+    &menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_CHOOSE_ARTWORK]
+  },
+  {
+    "menu.draw_xoffset.SETUP[CHOOSE_OTHER]",
+    &menu.draw_xoffset_setup[GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER]
+  },
+  {
+    "menu.draw_yoffset.SETUP[CHOOSE_OTHER]",
+    &menu.draw_yoffset_setup[GFX_SPECIAL_ARG_SETUP_CHOOSE_OTHER]
+  },
   {
     "menu.scrollbar_xoffset",
     &menu.scrollbar_xoffset
@@ -1228,6 +1364,10 @@ struct TokenIntPtrInfo image_config_vars[] =
     "menu.list_size.INFO",
     &menu.list_size[GFX_SPECIAL_ARG_INFO]
   },
+  {
+    "menu.list_size.SETUP",
+    &menu.list_size[GFX_SPECIAL_ARG_SETUP]
+  },
   {
     "main.button.name.x",
     &menu.main.button.name.x
@@ -2632,6 +2772,38 @@ struct TokenIntPtrInfo image_config_vars[] =
     "game.panel.score.draw_order",
     &game.panel.score.sort_priority
   },
+  {
+    "game.panel.highscore.x",
+    &game.panel.highscore.x
+  },
+  {
+    "game.panel.highscore.y",
+    &game.panel.highscore.y
+  },
+  {
+    "game.panel.highscore.align",
+    &game.panel.highscore.align
+  },
+  {
+    "game.panel.highscore.valign",
+    &game.panel.highscore.valign
+  },
+  {
+    "game.panel.highscore.digits",
+    &game.panel.highscore.size
+  },
+  {
+    "game.panel.highscore.font",
+    &game.panel.highscore.font
+  },
+  {
+    "game.panel.highscore.draw_masked",
+    &game.panel.highscore.draw_masked
+  },
+  {
+    "game.panel.highscore.draw_order",
+    &game.panel.highscore.sort_priority
+  },
   {
     "game.panel.time.x",
     &game.panel.time.x
@@ -2764,6 +2936,38 @@ struct TokenIntPtrInfo image_config_vars[] =
     "game.panel.time_ss.draw_order",
     &game.panel.time_ss.sort_priority
   },
+  {
+    "game.panel.frame.x",
+    &game.panel.frame.x
+  },
+  {
+    "game.panel.frame.y",
+    &game.panel.frame.y
+  },
+  {
+    "game.panel.frame.align",
+    &game.panel.frame.align
+  },
+  {
+    "game.panel.frame.valign",
+    &game.panel.frame.valign
+  },
+  {
+    "game.panel.frame.digits",
+    &game.panel.frame.size
+  },
+  {
+    "game.panel.frame.font",
+    &game.panel.frame.font
+  },
+  {
+    "game.panel.frame.draw_masked",
+    &game.panel.frame.draw_masked
+  },
+  {
+    "game.panel.frame.draw_order",
+    &game.panel.frame.sort_priority
+  },
   {
     "game.panel.shield_normal.x",
     &game.panel.shield_normal.x
@@ -3624,6 +3828,134 @@ struct TokenIntPtrInfo image_config_vars[] =
     "game.panel.gravity_state.draw_order",
     &game.panel.gravity_state.sort_priority
   },
+  {
+    "game.panel.graphic_1.x",
+    &game.panel.graphic[0].x
+  },
+  {
+    "game.panel.graphic_1.y",
+    &game.panel.graphic[0].y
+  },
+  {
+    "game.panel.graphic_1.draw_masked",
+    &game.panel.graphic[0].draw_masked
+  },
+  {
+    "game.panel.graphic_1.draw_order",
+    &game.panel.graphic[0].sort_priority
+  },
+  {
+    "game.panel.graphic_2.x",
+    &game.panel.graphic[1].x
+  },
+  {
+    "game.panel.graphic_2.y",
+    &game.panel.graphic[1].y
+  },
+  {
+    "game.panel.graphic_2.draw_masked",
+    &game.panel.graphic[1].draw_masked
+  },
+  {
+    "game.panel.graphic_2.draw_order",
+    &game.panel.graphic[1].sort_priority
+  },
+  {
+    "game.panel.graphic_3.x",
+    &game.panel.graphic[2].x
+  },
+  {
+    "game.panel.graphic_3.y",
+    &game.panel.graphic[2].y
+  },
+  {
+    "game.panel.graphic_3.draw_masked",
+    &game.panel.graphic[2].draw_masked
+  },
+  {
+    "game.panel.graphic_3.draw_order",
+    &game.panel.graphic[2].sort_priority
+  },
+  {
+    "game.panel.graphic_4.x",
+    &game.panel.graphic[3].x
+  },
+  {
+    "game.panel.graphic_4.y",
+    &game.panel.graphic[3].y
+  },
+  {
+    "game.panel.graphic_4.draw_masked",
+    &game.panel.graphic[3].draw_masked
+  },
+  {
+    "game.panel.graphic_4.draw_order",
+    &game.panel.graphic[3].sort_priority
+  },
+  {
+    "game.panel.graphic_5.x",
+    &game.panel.graphic[4].x
+  },
+  {
+    "game.panel.graphic_5.y",
+    &game.panel.graphic[4].y
+  },
+  {
+    "game.panel.graphic_5.draw_masked",
+    &game.panel.graphic[4].draw_masked
+  },
+  {
+    "game.panel.graphic_5.draw_order",
+    &game.panel.graphic[4].sort_priority
+  },
+  {
+    "game.panel.graphic_6.x",
+    &game.panel.graphic[5].x
+  },
+  {
+    "game.panel.graphic_6.y",
+    &game.panel.graphic[5].y
+  },
+  {
+    "game.panel.graphic_6.draw_masked",
+    &game.panel.graphic[5].draw_masked
+  },
+  {
+    "game.panel.graphic_6.draw_order",
+    &game.panel.graphic[5].sort_priority
+  },
+  {
+    "game.panel.graphic_7.x",
+    &game.panel.graphic[6].x
+  },
+  {
+    "game.panel.graphic_7.y",
+    &game.panel.graphic[6].y
+  },
+  {
+    "game.panel.graphic_7.draw_masked",
+    &game.panel.graphic[6].draw_masked
+  },
+  {
+    "game.panel.graphic_7.draw_order",
+    &game.panel.graphic[6].sort_priority
+  },
+  {
+    "game.panel.graphic_8.x",
+    &game.panel.graphic[7].x
+  },
+  {
+    "game.panel.graphic_8.y",
+    &game.panel.graphic[7].y
+  },
+  {
+    "game.panel.graphic_8.draw_masked",
+    &game.panel.graphic[7].draw_masked
+  },
+  {
+    "game.panel.graphic_8.draw_order",
+    &game.panel.graphic[7].sort_priority
+  },
   {
     "game.panel.element_1.x",
     &game.panel.element[0].x
@@ -4732,6 +5064,18 @@ struct TokenIntPtrInfo image_config_vars[] =
     "game.forced_scroll_delay_value",
     &game.forced_scroll_delay_value
   },
+  {
+    "game.use_native_emc_graphics_engine",
+    &game.use_native_emc_graphics_engine
+  },
+  {
+    "game.use_native_sp_graphics_engine",
+    &game.use_native_sp_graphics_engine
+  },
+  {
+    "game.use_masked_pushing",
+    &game.use_masked_pushing
+  },
   {
     "[player].boring_delay_fixed",
     &game.player_boring_delay_fixed