X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_var.c;h=4a6389ad826491c77359b4429925038f8c73162b;hb=56356dc9e2d4a856879a3c91aa7212d0a80afdfd;hp=57d32a7df9aa057c4046f3d0e052d854f6667395;hpb=4231c290a878b5fb95bffdf78b5486359ce1268f;p=rocksndiamonds.git diff --git a/src/conf_var.c b/src/conf_var.c index 57d32a7d..4a6389ad 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,86 @@ 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_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[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 +1340,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 @@ -3624,6 +3740,614 @@ 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 + }, + { + "game.panel.element_1.y", + &game.panel.element[0].y + }, + { + "game.panel.element_1.tile_size", + &game.panel.element[0].size + }, + { + "game.panel.element_1.element", + &game.panel.element[0].id + }, + { + "game.panel.element_1.draw_masked", + &game.panel.element[0].draw_masked + }, + { + "game.panel.element_1.draw_order", + &game.panel.element[0].sort_priority + }, + { + "game.panel.element_1_count.x", + &game.panel.element_count[0].x + }, + { + "game.panel.element_1_count.y", + &game.panel.element_count[0].y + }, + { + "game.panel.element_1_count.align", + &game.panel.element_count[0].align + }, + { + "game.panel.element_1_count.valign", + &game.panel.element_count[0].valign + }, + { + "game.panel.element_1_count.digits", + &game.panel.element_count[0].size + }, + { + "game.panel.element_1_count.font", + &game.panel.element_count[0].font + }, + { + "game.panel.element_1_count.element", + &game.panel.element_count[0].id + }, + { + "game.panel.element_1_count.draw_masked", + &game.panel.element_count[0].draw_masked + }, + { + "game.panel.element_1_count.draw_order", + &game.panel.element_count[0].sort_priority + }, + { + "game.panel.element_2.x", + &game.panel.element[1].x + }, + { + "game.panel.element_2.y", + &game.panel.element[1].y + }, + { + "game.panel.element_2.tile_size", + &game.panel.element[1].size + }, + { + "game.panel.element_2.element", + &game.panel.element[1].id + }, + { + "game.panel.element_2.draw_masked", + &game.panel.element[1].draw_masked + }, + { + "game.panel.element_2.draw_order", + &game.panel.element[1].sort_priority + }, + { + "game.panel.element_2_count.x", + &game.panel.element_count[1].x + }, + { + "game.panel.element_2_count.y", + &game.panel.element_count[1].y + }, + { + "game.panel.element_2_count.align", + &game.panel.element_count[1].align + }, + { + "game.panel.element_2_count.valign", + &game.panel.element_count[1].valign + }, + { + "game.panel.element_2_count.digits", + &game.panel.element_count[1].size + }, + { + "game.panel.element_2_count.font", + &game.panel.element_count[1].font + }, + { + "game.panel.element_2_count.element", + &game.panel.element_count[1].id + }, + { + "game.panel.element_2_count.draw_masked", + &game.panel.element_count[1].draw_masked + }, + { + "game.panel.element_2_count.draw_order", + &game.panel.element_count[1].sort_priority + }, + { + "game.panel.element_3.x", + &game.panel.element[2].x + }, + { + "game.panel.element_3.y", + &game.panel.element[2].y + }, + { + "game.panel.element_3.tile_size", + &game.panel.element[2].size + }, + { + "game.panel.element_3.element", + &game.panel.element[2].id + }, + { + "game.panel.element_3.draw_masked", + &game.panel.element[2].draw_masked + }, + { + "game.panel.element_3.draw_order", + &game.panel.element[2].sort_priority + }, + { + "game.panel.element_3_count.x", + &game.panel.element_count[2].x + }, + { + "game.panel.element_3_count.y", + &game.panel.element_count[2].y + }, + { + "game.panel.element_3_count.align", + &game.panel.element_count[2].align + }, + { + "game.panel.element_3_count.valign", + &game.panel.element_count[2].valign + }, + { + "game.panel.element_3_count.digits", + &game.panel.element_count[2].size + }, + { + "game.panel.element_3_count.font", + &game.panel.element_count[2].font + }, + { + "game.panel.element_3_count.element", + &game.panel.element_count[2].id + }, + { + "game.panel.element_3_count.draw_masked", + &game.panel.element_count[2].draw_masked + }, + { + "game.panel.element_3_count.draw_order", + &game.panel.element_count[2].sort_priority + }, + { + "game.panel.element_4.x", + &game.panel.element[3].x + }, + { + "game.panel.element_4.y", + &game.panel.element[3].y + }, + { + "game.panel.element_4.tile_size", + &game.panel.element[3].size + }, + { + "game.panel.element_4.element", + &game.panel.element[3].id + }, + { + "game.panel.element_4.draw_masked", + &game.panel.element[3].draw_masked + }, + { + "game.panel.element_4.draw_order", + &game.panel.element[3].sort_priority + }, + { + "game.panel.element_4_count.x", + &game.panel.element_count[3].x + }, + { + "game.panel.element_4_count.y", + &game.panel.element_count[3].y + }, + { + "game.panel.element_4_count.align", + &game.panel.element_count[3].align + }, + { + "game.panel.element_4_count.valign", + &game.panel.element_count[3].valign + }, + { + "game.panel.element_4_count.digits", + &game.panel.element_count[3].size + }, + { + "game.panel.element_4_count.font", + &game.panel.element_count[3].font + }, + { + "game.panel.element_4_count.element", + &game.panel.element_count[3].id + }, + { + "game.panel.element_4_count.draw_masked", + &game.panel.element_count[3].draw_masked + }, + { + "game.panel.element_4_count.draw_order", + &game.panel.element_count[3].sort_priority + }, + { + "game.panel.element_5.x", + &game.panel.element[4].x + }, + { + "game.panel.element_5.y", + &game.panel.element[4].y + }, + { + "game.panel.element_5.tile_size", + &game.panel.element[4].size + }, + { + "game.panel.element_5.element", + &game.panel.element[4].id + }, + { + "game.panel.element_5.draw_masked", + &game.panel.element[4].draw_masked + }, + { + "game.panel.element_5.draw_order", + &game.panel.element[4].sort_priority + }, + { + "game.panel.element_5_count.x", + &game.panel.element_count[4].x + }, + { + "game.panel.element_5_count.y", + &game.panel.element_count[4].y + }, + { + "game.panel.element_5_count.align", + &game.panel.element_count[4].align + }, + { + "game.panel.element_5_count.valign", + &game.panel.element_count[4].valign + }, + { + "game.panel.element_5_count.digits", + &game.panel.element_count[4].size + }, + { + "game.panel.element_5_count.font", + &game.panel.element_count[4].font + }, + { + "game.panel.element_5_count.element", + &game.panel.element_count[4].id + }, + { + "game.panel.element_5_count.draw_masked", + &game.panel.element_count[4].draw_masked + }, + { + "game.panel.element_5_count.draw_order", + &game.panel.element_count[4].sort_priority + }, + { + "game.panel.element_6.x", + &game.panel.element[5].x + }, + { + "game.panel.element_6.y", + &game.panel.element[5].y + }, + { + "game.panel.element_6.tile_size", + &game.panel.element[5].size + }, + { + "game.panel.element_6.element", + &game.panel.element[5].id + }, + { + "game.panel.element_6.draw_masked", + &game.panel.element[5].draw_masked + }, + { + "game.panel.element_6.draw_order", + &game.panel.element[5].sort_priority + }, + { + "game.panel.element_6_count.x", + &game.panel.element_count[5].x + }, + { + "game.panel.element_6_count.y", + &game.panel.element_count[5].y + }, + { + "game.panel.element_6_count.align", + &game.panel.element_count[5].align + }, + { + "game.panel.element_6_count.valign", + &game.panel.element_count[5].valign + }, + { + "game.panel.element_6_count.digits", + &game.panel.element_count[5].size + }, + { + "game.panel.element_6_count.font", + &game.panel.element_count[5].font + }, + { + "game.panel.element_6_count.element", + &game.panel.element_count[5].id + }, + { + "game.panel.element_6_count.draw_masked", + &game.panel.element_count[5].draw_masked + }, + { + "game.panel.element_6_count.draw_order", + &game.panel.element_count[5].sort_priority + }, + { + "game.panel.element_7.x", + &game.panel.element[6].x + }, + { + "game.panel.element_7.y", + &game.panel.element[6].y + }, + { + "game.panel.element_7.tile_size", + &game.panel.element[6].size + }, + { + "game.panel.element_7.element", + &game.panel.element[6].id + }, + { + "game.panel.element_7.draw_masked", + &game.panel.element[6].draw_masked + }, + { + "game.panel.element_7.draw_order", + &game.panel.element[6].sort_priority + }, + { + "game.panel.element_7_count.x", + &game.panel.element_count[6].x + }, + { + "game.panel.element_7_count.y", + &game.panel.element_count[6].y + }, + { + "game.panel.element_7_count.align", + &game.panel.element_count[6].align + }, + { + "game.panel.element_7_count.valign", + &game.panel.element_count[6].valign + }, + { + "game.panel.element_7_count.digits", + &game.panel.element_count[6].size + }, + { + "game.panel.element_7_count.font", + &game.panel.element_count[6].font + }, + { + "game.panel.element_7_count.element", + &game.panel.element_count[6].id + }, + { + "game.panel.element_7_count.draw_masked", + &game.panel.element_count[6].draw_masked + }, + { + "game.panel.element_7_count.draw_order", + &game.panel.element_count[6].sort_priority + }, + { + "game.panel.element_8.x", + &game.panel.element[7].x + }, + { + "game.panel.element_8.y", + &game.panel.element[7].y + }, + { + "game.panel.element_8.tile_size", + &game.panel.element[7].size + }, + { + "game.panel.element_8.element", + &game.panel.element[7].id + }, + { + "game.panel.element_8.draw_masked", + &game.panel.element[7].draw_masked + }, + { + "game.panel.element_8.draw_order", + &game.panel.element[7].sort_priority + }, + { + "game.panel.element_8_count.x", + &game.panel.element_count[7].x + }, + { + "game.panel.element_8_count.y", + &game.panel.element_count[7].y + }, + { + "game.panel.element_8_count.align", + &game.panel.element_count[7].align + }, + { + "game.panel.element_8_count.valign", + &game.panel.element_count[7].valign + }, + { + "game.panel.element_8_count.digits", + &game.panel.element_count[7].size + }, + { + "game.panel.element_8_count.font", + &game.panel.element_count[7].font + }, + { + "game.panel.element_8_count.element", + &game.panel.element_count[7].id + }, + { + "game.panel.element_8_count.draw_masked", + &game.panel.element_count[7].draw_masked + }, + { + "game.panel.element_8_count.draw_order", + &game.panel.element_count[7].sort_priority + }, { "game.panel.ce_score_1.x", &game.panel.ce_score[0].x @@ -4252,6 +4976,10 @@ 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 + }, { "[player].boring_delay_fixed", &game.player_boring_delay_fixed