X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_var.c;h=c8cd2f663c87928963a1b9b270f281d26a6e069e;hb=872cf2d86e73d185fcad1fac7b389e7d1dfcb839;hp=bd0662df1e05b4c46a63fafe0730212f9c1e7f1f;hpb=2f8bd98e428f73379a9173ccc9f7d03c885d641a;p=rocksndiamonds.git diff --git a/src/conf_var.c b/src/conf_var.c index bd0662df..c8cd2f66 100644 --- a/src/conf_var.c +++ b/src/conf_var.c @@ -21,8 +21,8 @@ struct TokenIntPtrInfo image_config_vars[] = { { - "[title_initial].anim_mode", - &title_initial_default.anim_mode + "[title_initial].fade_mode", + &title_initial_default.fade_mode }, { "[title_initial].fade_delay", @@ -37,8 +37,8 @@ struct TokenIntPtrInfo image_config_vars[] = &title_initial_default.auto_delay }, { - "[title].anim_mode", - &title_default.anim_mode + "[title].fade_mode", + &title_default.fade_mode }, { "[title].fade_delay", @@ -105,8 +105,8 @@ struct TokenIntPtrInfo image_config_vars[] = &titlemessage_initial_default.sort_priority }, { - "[titlemessage_initial].anim_mode", - &titlemessage_initial_default.anim_mode + "[titlemessage_initial].fade_mode", + &titlemessage_initial_default.fade_mode }, { "[titlemessage_initial].fade_delay", @@ -173,8 +173,8 @@ struct TokenIntPtrInfo image_config_vars[] = &titlemessage_default.sort_priority }, { - "[titlemessage].anim_mode", - &titlemessage_default.anim_mode + "[titlemessage].fade_mode", + &titlemessage_default.fade_mode }, { "[titlemessage].fade_delay", @@ -241,8 +241,8 @@ struct TokenIntPtrInfo image_config_vars[] = &titlemessage_initial[0].sort_priority }, { - "titlemessage_initial_1.anim_mode", - &titlemessage_initial[0].anim_mode + "titlemessage_initial_1.fade_mode", + &titlemessage_initial[0].fade_mode }, { "titlemessage_initial_1.fade_delay", @@ -309,8 +309,8 @@ struct TokenIntPtrInfo image_config_vars[] = &titlemessage_initial[1].sort_priority }, { - "titlemessage_initial_2.anim_mode", - &titlemessage_initial[1].anim_mode + "titlemessage_initial_2.fade_mode", + &titlemessage_initial[1].fade_mode }, { "titlemessage_initial_2.fade_delay", @@ -377,8 +377,8 @@ struct TokenIntPtrInfo image_config_vars[] = &titlemessage_initial[2].sort_priority }, { - "titlemessage_initial_3.anim_mode", - &titlemessage_initial[2].anim_mode + "titlemessage_initial_3.fade_mode", + &titlemessage_initial[2].fade_mode }, { "titlemessage_initial_3.fade_delay", @@ -445,8 +445,8 @@ struct TokenIntPtrInfo image_config_vars[] = &titlemessage_initial[3].sort_priority }, { - "titlemessage_initial_4.anim_mode", - &titlemessage_initial[3].anim_mode + "titlemessage_initial_4.fade_mode", + &titlemessage_initial[3].fade_mode }, { "titlemessage_initial_4.fade_delay", @@ -513,8 +513,8 @@ struct TokenIntPtrInfo image_config_vars[] = &titlemessage_initial[4].sort_priority }, { - "titlemessage_initial_5.anim_mode", - &titlemessage_initial[4].anim_mode + "titlemessage_initial_5.fade_mode", + &titlemessage_initial[4].fade_mode }, { "titlemessage_initial_5.fade_delay", @@ -581,8 +581,8 @@ struct TokenIntPtrInfo image_config_vars[] = &titlemessage[0].sort_priority }, { - "titlemessage_1.anim_mode", - &titlemessage[0].anim_mode + "titlemessage_1.fade_mode", + &titlemessage[0].fade_mode }, { "titlemessage_1.fade_delay", @@ -649,8 +649,8 @@ struct TokenIntPtrInfo image_config_vars[] = &titlemessage[1].sort_priority }, { - "titlemessage_2.anim_mode", - &titlemessage[1].anim_mode + "titlemessage_2.fade_mode", + &titlemessage[1].fade_mode }, { "titlemessage_2.fade_delay", @@ -717,8 +717,8 @@ struct TokenIntPtrInfo image_config_vars[] = &titlemessage[2].sort_priority }, { - "titlemessage_3.anim_mode", - &titlemessage[2].anim_mode + "titlemessage_3.fade_mode", + &titlemessage[2].fade_mode }, { "titlemessage_3.fade_delay", @@ -785,8 +785,8 @@ struct TokenIntPtrInfo image_config_vars[] = &titlemessage[3].sort_priority }, { - "titlemessage_4.anim_mode", - &titlemessage[3].anim_mode + "titlemessage_4.fade_mode", + &titlemessage[3].fade_mode }, { "titlemessage_4.fade_delay", @@ -853,8 +853,8 @@ struct TokenIntPtrInfo image_config_vars[] = &titlemessage[4].sort_priority }, { - "titlemessage_5.anim_mode", - &titlemessage[4].anim_mode + "titlemessage_5.fade_mode", + &titlemessage[4].fade_mode }, { "titlemessage_5.fade_delay", @@ -961,28 +961,148 @@ struct TokenIntPtrInfo image_config_vars[] = &border.draw_masked[GFX_SPECIAL_ARG_DOOR] }, { - "menu.navigation.anim_mode", - &menu.navigation.anim_mode + "menu.enter_menu.fade_mode", + &menu.enter_menu.fade_mode }, { - "menu.navigation.fade_delay", - &menu.navigation.fade_delay + "menu.enter_menu.fade_delay", + &menu.enter_menu.fade_delay }, { - "menu.navigation.post_delay", - &menu.navigation.post_delay + "menu.enter_menu.post_delay", + &menu.enter_menu.post_delay }, { - "menu.destination.anim_mode", - &menu.destination.anim_mode + "menu.leave_menu.fade_mode", + &menu.leave_menu.fade_mode }, { - "menu.destination.fade_delay", - &menu.destination.fade_delay + "menu.leave_menu.fade_delay", + &menu.leave_menu.fade_delay }, { - "menu.destination.post_delay", - &menu.destination.post_delay + "menu.leave_menu.post_delay", + &menu.leave_menu.post_delay + }, + { + "menu.enter_screen.fade_mode", + &menu.enter_screen[GFX_SPECIAL_ARG_DEFAULT].fade_mode + }, + { + "menu.enter_screen.fade_delay", + &menu.enter_screen[GFX_SPECIAL_ARG_DEFAULT].fade_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", @@ -1428,6 +1548,10 @@ struct TokenIntPtrInfo image_config_vars[] = "main.text.first_level.valign", &menu.main.text.first_level.valign }, + { + "main.text.first_level.digits", + &menu.main.text.first_level.size + }, { "main.text.first_level.font", &menu.main.text.first_level.font @@ -1448,6 +1572,10 @@ struct TokenIntPtrInfo image_config_vars[] = "main.text.last_level.valign", &menu.main.text.last_level.valign }, + { + "main.text.last_level.digits", + &menu.main.text.last_level.size + }, { "main.text.last_level.font", &menu.main.text.last_level.font @@ -1468,6 +1596,10 @@ struct TokenIntPtrInfo image_config_vars[] = "main.text.level_number.valign", &menu.main.text.level_number.valign }, + { + "main.text.level_number.digits", + &menu.main.text.level_number.size + }, { "main.text.level_number.font", &menu.main.text.level_number.font @@ -1490,7 +1622,7 @@ struct TokenIntPtrInfo image_config_vars[] = }, { "main.text.level_info_1.chars", - &menu.main.text.level_info_1.chars + &menu.main.text.level_info_1.size }, { "main.text.level_info_1.font", @@ -1514,7 +1646,7 @@ struct TokenIntPtrInfo image_config_vars[] = }, { "main.text.level_info_2.chars", - &menu.main.text.level_info_2.chars + &menu.main.text.level_info_2.size }, { "main.text.level_info_2.font", @@ -1542,7 +1674,7 @@ struct TokenIntPtrInfo image_config_vars[] = }, { "main.text.level_name.chars", - &menu.main.text.level_name.chars + &menu.main.text.level_name.size }, { "main.text.level_name.font", @@ -1566,7 +1698,7 @@ struct TokenIntPtrInfo image_config_vars[] = }, { "main.text.level_author.chars", - &menu.main.text.level_author.chars + &menu.main.text.level_author.size }, { "main.text.level_author.font", @@ -1589,8 +1721,8 @@ struct TokenIntPtrInfo image_config_vars[] = &menu.main.text.level_year.valign }, { - "main.text.level_year.chars", - &menu.main.text.level_year.chars + "main.text.level_year.digits", + &menu.main.text.level_year.size }, { "main.text.level_year.font", @@ -1614,7 +1746,7 @@ struct TokenIntPtrInfo image_config_vars[] = }, { "main.text.level_imported_from.chars", - &menu.main.text.level_imported_from.chars + &menu.main.text.level_imported_from.size }, { "main.text.level_imported_from.font", @@ -1638,7 +1770,7 @@ struct TokenIntPtrInfo image_config_vars[] = }, { "main.text.level_imported_by.chars", - &menu.main.text.level_imported_by.chars + &menu.main.text.level_imported_by.size }, { "main.text.level_imported_by.font", @@ -1662,7 +1794,7 @@ struct TokenIntPtrInfo image_config_vars[] = }, { "main.text.level_tested_by.chars", - &menu.main.text.level_tested_by.chars + &menu.main.text.level_tested_by.size }, { "main.text.level_tested_by.font", @@ -1853,8 +1985,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.level_number.valign }, { - "game.panel.level_number.chars", - &game.panel.level_number.chars + "game.panel.level_number.digits", + &game.panel.level_number.size }, { "game.panel.level_number.font", @@ -1881,36 +2013,228 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.gems.valign }, { - "game.panel.gems.chars", - &game.panel.gems.chars + "game.panel.gems.digits", + &game.panel.gems.size }, { "game.panel.gems.font", &game.panel.gems.font }, { - "game.panel.inventory.x", - &game.panel.inventory.x + "game.panel.inventory_count.x", + &game.panel.inventory_count.x + }, + { + "game.panel.inventory_count.y", + &game.panel.inventory_count.y + }, + { + "game.panel.inventory_count.align", + &game.panel.inventory_count.align + }, + { + "game.panel.inventory_count.valign", + &game.panel.inventory_count.valign + }, + { + "game.panel.inventory_count.digits", + &game.panel.inventory_count.size + }, + { + "game.panel.inventory_count.font", + &game.panel.inventory_count.font + }, + { + "game.panel.inventory_first_1.x", + &game.panel.inventory_first[0].x + }, + { + "game.panel.inventory_first_1.y", + &game.panel.inventory_first[0].y + }, + { + "game.panel.inventory_first_1.tile_size", + &game.panel.inventory_first[0].size + }, + { + "game.panel.inventory_first_2.x", + &game.panel.inventory_first[1].x + }, + { + "game.panel.inventory_first_2.y", + &game.panel.inventory_first[1].y + }, + { + "game.panel.inventory_first_2.tile_size", + &game.panel.inventory_first[1].size + }, + { + "game.panel.inventory_first_3.x", + &game.panel.inventory_first[2].x + }, + { + "game.panel.inventory_first_3.y", + &game.panel.inventory_first[2].y + }, + { + "game.panel.inventory_first_3.tile_size", + &game.panel.inventory_first[2].size + }, + { + "game.panel.inventory_first_4.x", + &game.panel.inventory_first[3].x + }, + { + "game.panel.inventory_first_4.y", + &game.panel.inventory_first[3].y + }, + { + "game.panel.inventory_first_4.tile_size", + &game.panel.inventory_first[3].size + }, + { + "game.panel.inventory_first_5.x", + &game.panel.inventory_first[4].x + }, + { + "game.panel.inventory_first_5.y", + &game.panel.inventory_first[4].y + }, + { + "game.panel.inventory_first_5.tile_size", + &game.panel.inventory_first[4].size + }, + { + "game.panel.inventory_first_6.x", + &game.panel.inventory_first[5].x + }, + { + "game.panel.inventory_first_6.y", + &game.panel.inventory_first[5].y + }, + { + "game.panel.inventory_first_6.tile_size", + &game.panel.inventory_first[5].size + }, + { + "game.panel.inventory_first_7.x", + &game.panel.inventory_first[6].x + }, + { + "game.panel.inventory_first_7.y", + &game.panel.inventory_first[6].y + }, + { + "game.panel.inventory_first_7.tile_size", + &game.panel.inventory_first[6].size + }, + { + "game.panel.inventory_first_8.x", + &game.panel.inventory_first[7].x + }, + { + "game.panel.inventory_first_8.y", + &game.panel.inventory_first[7].y + }, + { + "game.panel.inventory_first_8.tile_size", + &game.panel.inventory_first[7].size + }, + { + "game.panel.inventory_last_1.x", + &game.panel.inventory_last[0].x + }, + { + "game.panel.inventory_last_1.y", + &game.panel.inventory_last[0].y + }, + { + "game.panel.inventory_last_1.tile_size", + &game.panel.inventory_last[0].size + }, + { + "game.panel.inventory_last_2.x", + &game.panel.inventory_last[1].x + }, + { + "game.panel.inventory_last_2.y", + &game.panel.inventory_last[1].y + }, + { + "game.panel.inventory_last_2.tile_size", + &game.panel.inventory_last[1].size + }, + { + "game.panel.inventory_last_3.x", + &game.panel.inventory_last[2].x + }, + { + "game.panel.inventory_last_3.y", + &game.panel.inventory_last[2].y + }, + { + "game.panel.inventory_last_3.tile_size", + &game.panel.inventory_last[2].size + }, + { + "game.panel.inventory_last_4.x", + &game.panel.inventory_last[3].x }, { - "game.panel.inventory.y", - &game.panel.inventory.y + "game.panel.inventory_last_4.y", + &game.panel.inventory_last[3].y }, { - "game.panel.inventory.align", - &game.panel.inventory.align + "game.panel.inventory_last_4.tile_size", + &game.panel.inventory_last[3].size }, { - "game.panel.inventory.valign", - &game.panel.inventory.valign + "game.panel.inventory_last_5.x", + &game.panel.inventory_last[4].x }, { - "game.panel.inventory.chars", - &game.panel.inventory.chars + "game.panel.inventory_last_5.y", + &game.panel.inventory_last[4].y }, { - "game.panel.inventory.font", - &game.panel.inventory.font + "game.panel.inventory_last_5.tile_size", + &game.panel.inventory_last[4].size + }, + { + "game.panel.inventory_last_6.x", + &game.panel.inventory_last[5].x + }, + { + "game.panel.inventory_last_6.y", + &game.panel.inventory_last[5].y + }, + { + "game.panel.inventory_last_6.tile_size", + &game.panel.inventory_last[5].size + }, + { + "game.panel.inventory_last_7.x", + &game.panel.inventory_last[6].x + }, + { + "game.panel.inventory_last_7.y", + &game.panel.inventory_last[6].y + }, + { + "game.panel.inventory_last_7.tile_size", + &game.panel.inventory_last[6].size + }, + { + "game.panel.inventory_last_8.x", + &game.panel.inventory_last[7].x + }, + { + "game.panel.inventory_last_8.y", + &game.panel.inventory_last[7].y + }, + { + "game.panel.inventory_last_8.tile_size", + &game.panel.inventory_last[7].size }, { "game.panel.key_1.x", @@ -1920,6 +2244,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.key_1.y", &game.panel.key[0].y }, + { + "game.panel.key_1.tile_size", + &game.panel.key[0].size + }, { "game.panel.key_2.x", &game.panel.key[1].x @@ -1928,6 +2256,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.key_2.y", &game.panel.key[1].y }, + { + "game.panel.key_2.tile_size", + &game.panel.key[1].size + }, { "game.panel.key_3.x", &game.panel.key[2].x @@ -1936,6 +2268,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.key_3.y", &game.panel.key[2].y }, + { + "game.panel.key_3.tile_size", + &game.panel.key[2].size + }, { "game.panel.key_4.x", &game.panel.key[3].x @@ -1944,6 +2280,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.key_4.y", &game.panel.key[3].y }, + { + "game.panel.key_4.tile_size", + &game.panel.key[3].size + }, { "game.panel.key_5.x", &game.panel.key[4].x @@ -1952,6 +2292,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.key_5.y", &game.panel.key[4].y }, + { + "game.panel.key_5.tile_size", + &game.panel.key[4].size + }, { "game.panel.key_6.x", &game.panel.key[5].x @@ -1960,6 +2304,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.key_6.y", &game.panel.key[5].y }, + { + "game.panel.key_6.tile_size", + &game.panel.key[5].size + }, { "game.panel.key_7.x", &game.panel.key[6].x @@ -1968,6 +2316,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.key_7.y", &game.panel.key[6].y }, + { + "game.panel.key_7.tile_size", + &game.panel.key[6].size + }, { "game.panel.key_8.x", &game.panel.key[7].x @@ -1976,6 +2328,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.key_8.y", &game.panel.key[7].y }, + { + "game.panel.key_8.tile_size", + &game.panel.key[7].size + }, { "game.panel.key_white.x", &game.panel.key_white.x @@ -1984,6 +2340,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.key_white.y", &game.panel.key_white.y }, + { + "game.panel.key_white.tile_size", + &game.panel.key_white.size + }, { "game.panel.key_white_count.x", &game.panel.key_white_count.x @@ -2001,8 +2361,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.key_white_count.valign }, { - "game.panel.key_white_count.chars", - &game.panel.key_white_count.chars + "game.panel.key_white_count.digits", + &game.panel.key_white_count.size }, { "game.panel.key_white_count.font", @@ -2025,8 +2385,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.score.valign }, { - "game.panel.score.chars", - &game.panel.score.chars + "game.panel.score.digits", + &game.panel.score.size }, { "game.panel.score.font", @@ -2049,8 +2409,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.time.valign }, { - "game.panel.time.chars", - &game.panel.time.chars + "game.panel.time.digits", + &game.panel.time.size }, { "game.panel.time.font", @@ -2077,8 +2437,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.time_hh.valign }, { - "game.panel.time_hh.chars", - &game.panel.time_hh.chars + "game.panel.time_hh.digits", + &game.panel.time_hh.size }, { "game.panel.time_hh.font", @@ -2101,8 +2461,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.time_mm.valign }, { - "game.panel.time_mm.chars", - &game.panel.time_mm.chars + "game.panel.time_mm.digits", + &game.panel.time_mm.size }, { "game.panel.time_mm.font", @@ -2125,77 +2485,13 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.time_ss.valign }, { - "game.panel.time_ss.chars", - &game.panel.time_ss.chars + "game.panel.time_ss.digits", + &game.panel.time_ss.size }, { "game.panel.time_ss.font", &game.panel.time_ss.font }, - { - "game.panel.drop_next_1.x", - &game.panel.drop_next_1.x - }, - { - "game.panel.drop_next_1.y", - &game.panel.drop_next_1.y - }, - { - "game.panel.drop_next_2.x", - &game.panel.drop_next_2.x - }, - { - "game.panel.drop_next_2.y", - &game.panel.drop_next_2.y - }, - { - "game.panel.drop_next_3.x", - &game.panel.drop_next_3.x - }, - { - "game.panel.drop_next_3.y", - &game.panel.drop_next_3.y - }, - { - "game.panel.drop_next_4.x", - &game.panel.drop_next_4.x - }, - { - "game.panel.drop_next_4.y", - &game.panel.drop_next_4.y - }, - { - "game.panel.drop_next_5.x", - &game.panel.drop_next_5.x - }, - { - "game.panel.drop_next_5.y", - &game.panel.drop_next_5.y - }, - { - "game.panel.drop_next_6.x", - &game.panel.drop_next_6.x - }, - { - "game.panel.drop_next_6.y", - &game.panel.drop_next_6.y - }, - { - "game.panel.drop_next_7.x", - &game.panel.drop_next_7.x - }, - { - "game.panel.drop_next_7.y", - &game.panel.drop_next_7.y - }, - { - "game.panel.drop_next_8.x", - &game.panel.drop_next_8.x - }, - { - "game.panel.drop_next_8.y", - &game.panel.drop_next_8.y - }, { "game.panel.shield_normal.x", &game.panel.shield_normal.x @@ -2204,6 +2500,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.shield_normal.y", &game.panel.shield_normal.y }, + { + "game.panel.shield_normal.tile_size", + &game.panel.shield_normal.size + }, { "game.panel.shield_normal_time.x", &game.panel.shield_normal_time.x @@ -2221,8 +2521,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.shield_normal_time.valign }, { - "game.panel.shield_normal_time.chars", - &game.panel.shield_normal_time.chars + "game.panel.shield_normal_time.digits", + &game.panel.shield_normal_time.size }, { "game.panel.shield_normal_time.font", @@ -2236,6 +2536,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.shield_deadly.y", &game.panel.shield_deadly.y }, + { + "game.panel.shield_deadly.tile_size", + &game.panel.shield_deadly.size + }, { "game.panel.shield_deadly_time.x", &game.panel.shield_deadly_time.x @@ -2253,8 +2557,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.shield_deadly_time.valign }, { - "game.panel.shield_deadly_time.chars", - &game.panel.shield_deadly_time.chars + "game.panel.shield_deadly_time.digits", + &game.panel.shield_deadly_time.size }, { "game.panel.shield_deadly_time.font", @@ -2269,36 +2573,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.exit.y }, { - "game.panel.em_exit.x", - &game.panel.em_exit.x - }, - { - "game.panel.em_exit.y", - &game.panel.em_exit.y - }, - { - "game.panel.sp_exit.x", - &game.panel.sp_exit.x - }, - { - "game.panel.sp_exit.y", - &game.panel.sp_exit.y - }, - { - "game.panel.steel_exit.x", - &game.panel.steel_exit.x - }, - { - "game.panel.steel_exit.y", - &game.panel.steel_exit.y - }, - { - "game.panel.em_steel_exit.x", - &game.panel.em_steel_exit.x - }, - { - "game.panel.em_steel_exit.y", - &game.panel.em_steel_exit.y + "game.panel.exit.tile_size", + &game.panel.exit.size }, { "game.panel.emc_magic_ball.x", @@ -2308,6 +2584,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.emc_magic_ball.y", &game.panel.emc_magic_ball.y }, + { + "game.panel.emc_magic_ball.tile_size", + &game.panel.emc_magic_ball.size + }, { "game.panel.emc_magic_ball_switch.x", &game.panel.emc_magic_ball_switch.x @@ -2317,28 +2597,8 @@ struct TokenIntPtrInfo image_config_vars[] = &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.emc_magic_ball_switch.tile_size", + &game.panel.emc_magic_ball_switch.size }, { "game.panel.light_switch.x", @@ -2348,6 +2608,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.light_switch.y", &game.panel.light_switch.y }, + { + "game.panel.light_switch.tile_size", + &game.panel.light_switch.size + }, { "game.panel.light_switch_time.x", &game.panel.light_switch_time.x @@ -2365,8 +2629,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.light_switch_time.valign }, { - "game.panel.light_switch_time.chars", - &game.panel.light_switch_time.chars + "game.panel.light_switch_time.digits", + &game.panel.light_switch_time.size }, { "game.panel.light_switch_time.font", @@ -2380,6 +2644,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.timegate_switch.y", &game.panel.timegate_switch.y }, + { + "game.panel.timegate_switch.tile_size", + &game.panel.timegate_switch.size + }, { "game.panel.timegate_switch_time.x", &game.panel.timegate_switch_time.x @@ -2397,8 +2665,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.timegate_switch_time.valign }, { - "game.panel.timegate_switch_time.chars", - &game.panel.timegate_switch_time.chars + "game.panel.timegate_switch_time.digits", + &game.panel.timegate_switch_time.size }, { "game.panel.timegate_switch_time.font", @@ -2412,6 +2680,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.switchgate_switch.y", &game.panel.switchgate_switch.y }, + { + "game.panel.switchgate_switch.tile_size", + &game.panel.switchgate_switch.size + }, { "game.panel.emc_lenses.x", &game.panel.emc_lenses.x @@ -2420,6 +2692,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.emc_lenses.y", &game.panel.emc_lenses.y }, + { + "game.panel.emc_lenses.tile_size", + &game.panel.emc_lenses.size + }, { "game.panel.emc_lenses_time.x", &game.panel.emc_lenses_time.x @@ -2437,8 +2713,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.emc_lenses_time.valign }, { - "game.panel.emc_lenses_time.chars", - &game.panel.emc_lenses_time.chars + "game.panel.emc_lenses_time.digits", + &game.panel.emc_lenses_time.size }, { "game.panel.emc_lenses_time.font", @@ -2452,6 +2728,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.emc_magnifier.y", &game.panel.emc_magnifier.y }, + { + "game.panel.emc_magnifier.tile_size", + &game.panel.emc_magnifier.size + }, { "game.panel.emc_magnifier_time.x", &game.panel.emc_magnifier_time.x @@ -2469,8 +2749,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.emc_magnifier_time.valign }, { - "game.panel.emc_magnifier_time.chars", - &game.panel.emc_magnifier_time.chars + "game.panel.emc_magnifier_time.digits", + &game.panel.emc_magnifier_time.size }, { "game.panel.emc_magnifier_time.font", @@ -2484,6 +2764,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.balloon_switch.y", &game.panel.balloon_switch.y }, + { + "game.panel.balloon_switch.tile_size", + &game.panel.balloon_switch.size + }, { "game.panel.dynabomb_number.x", &game.panel.dynabomb_number.x @@ -2501,8 +2785,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.dynabomb_number.valign }, { - "game.panel.dynabomb_number.chars", - &game.panel.dynabomb_number.chars + "game.panel.dynabomb_number.digits", + &game.panel.dynabomb_number.size }, { "game.panel.dynabomb_number.font", @@ -2525,8 +2809,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.dynabomb_size.valign }, { - "game.panel.dynabomb_size.chars", - &game.panel.dynabomb_size.chars + "game.panel.dynabomb_size.digits", + &game.panel.dynabomb_size.size }, { "game.panel.dynabomb_size.font", @@ -2540,6 +2824,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.dynabomb_power.y", &game.panel.dynabomb_power.y }, + { + "game.panel.dynabomb_power.tile_size", + &game.panel.dynabomb_power.size + }, { "game.panel.penguins.x", &game.panel.penguins.x @@ -2557,8 +2845,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.penguins.valign }, { - "game.panel.penguins.chars", - &game.panel.penguins.chars + "game.panel.penguins.digits", + &game.panel.penguins.size }, { "game.panel.penguins.font", @@ -2581,8 +2869,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.sokoban_objects.valign }, { - "game.panel.sokoban_objects.chars", - &game.panel.sokoban_objects.chars + "game.panel.sokoban_objects.digits", + &game.panel.sokoban_objects.size }, { "game.panel.sokoban_objects.font", @@ -2605,8 +2893,8 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.sokoban_fields.valign }, { - "game.panel.sokoban_fields.chars", - &game.panel.sokoban_fields.chars + "game.panel.sokoban_fields.digits", + &game.panel.sokoban_fields.size }, { "game.panel.sokoban_fields.font", @@ -2620,69 +2908,105 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.robot_wheel.y", &game.panel.robot_wheel.y }, + { + "game.panel.robot_wheel.tile_size", + &game.panel.robot_wheel.size + }, { "game.panel.conveyor_belt_1.x", - &game.panel.conveyor_belt_1.x + &game.panel.conveyor_belt[0].x }, { "game.panel.conveyor_belt_1.y", - &game.panel.conveyor_belt_1.y + &game.panel.conveyor_belt[0].y + }, + { + "game.panel.conveyor_belt_1.tile_size", + &game.panel.conveyor_belt[0].size }, { "game.panel.conveyor_belt_1_switch.x", - &game.panel.conveyor_belt_1_switch.x + &game.panel.conveyor_belt_switch[0].x }, { "game.panel.conveyor_belt_1_switch.y", - &game.panel.conveyor_belt_1_switch.y + &game.panel.conveyor_belt_switch[0].y + }, + { + "game.panel.conveyor_belt_1_switch.tile_size", + &game.panel.conveyor_belt_switch[0].size }, { "game.panel.conveyor_belt_2.x", - &game.panel.conveyor_belt_2.x + &game.panel.conveyor_belt[1].x }, { "game.panel.conveyor_belt_2.y", - &game.panel.conveyor_belt_2.y + &game.panel.conveyor_belt[1].y + }, + { + "game.panel.conveyor_belt_2.tile_size", + &game.panel.conveyor_belt[1].size }, { "game.panel.conveyor_belt_2_switch.x", - &game.panel.conveyor_belt_2_switch.x + &game.panel.conveyor_belt_switch[1].x }, { "game.panel.conveyor_belt_2_switch.y", - &game.panel.conveyor_belt_2_switch.y + &game.panel.conveyor_belt_switch[1].y + }, + { + "game.panel.conveyor_belt_2_switch.tile_size", + &game.panel.conveyor_belt_switch[1].size }, { "game.panel.conveyor_belt_3.x", - &game.panel.conveyor_belt_3.x + &game.panel.conveyor_belt[2].x }, { "game.panel.conveyor_belt_3.y", - &game.panel.conveyor_belt_3.y + &game.panel.conveyor_belt[2].y + }, + { + "game.panel.conveyor_belt_3.tile_size", + &game.panel.conveyor_belt[2].size }, { "game.panel.conveyor_belt_3_switch.x", - &game.panel.conveyor_belt_3_switch.x + &game.panel.conveyor_belt_switch[2].x }, { "game.panel.conveyor_belt_3_switch.y", - &game.panel.conveyor_belt_3_switch.y + &game.panel.conveyor_belt_switch[2].y + }, + { + "game.panel.conveyor_belt_3_switch.tile_size", + &game.panel.conveyor_belt_switch[2].size }, { "game.panel.conveyor_belt_4.x", - &game.panel.conveyor_belt_4.x + &game.panel.conveyor_belt[3].x }, { "game.panel.conveyor_belt_4.y", - &game.panel.conveyor_belt_4.y + &game.panel.conveyor_belt[3].y + }, + { + "game.panel.conveyor_belt_4.tile_size", + &game.panel.conveyor_belt[3].size }, { "game.panel.conveyor_belt_4_switch.x", - &game.panel.conveyor_belt_4_switch.x + &game.panel.conveyor_belt_switch[3].x }, { "game.panel.conveyor_belt_4_switch.y", - &game.panel.conveyor_belt_4_switch.y + &game.panel.conveyor_belt_switch[3].y + }, + { + "game.panel.conveyor_belt_4_switch.tile_size", + &game.panel.conveyor_belt_switch[3].size }, { "game.panel.magic_wall.x", @@ -2692,6 +3016,10 @@ struct TokenIntPtrInfo image_config_vars[] = "game.panel.magic_wall.y", &game.panel.magic_wall.y }, + { + "game.panel.magic_wall.tile_size", + &game.panel.magic_wall.size + }, { "game.panel.magic_wall_time.x", &game.panel.magic_wall_time.x @@ -2709,28 +3037,392 @@ struct TokenIntPtrInfo image_config_vars[] = &game.panel.magic_wall_time.valign }, { - "game.panel.magic_wall_time.chars", - &game.panel.magic_wall_time.chars + "game.panel.magic_wall_time.digits", + &game.panel.magic_wall_time.size }, { "game.panel.magic_wall_time.font", &game.panel.magic_wall_time.font }, { - "game.panel.bd_magic_wall.x", - &game.panel.bd_magic_wall.x + "game.panel.gravity_state.x", + &game.panel.gravity_state.x + }, + { + "game.panel.gravity_state.y", + &game.panel.gravity_state.y + }, + { + "game.panel.gravity_state.align", + &game.panel.gravity_state.align + }, + { + "game.panel.gravity_state.valign", + &game.panel.gravity_state.valign + }, + { + "game.panel.gravity_state.chars", + &game.panel.gravity_state.size + }, + { + "game.panel.gravity_state.font", + &game.panel.gravity_state.font + }, + { + "game.panel.gravity_state.font_active", + &game.panel.gravity_state.font_alt + }, + { + "game.panel.ce_score_1.x", + &game.panel.ce_score[0].x + }, + { + "game.panel.ce_score_1.y", + &game.panel.ce_score[0].y + }, + { + "game.panel.ce_score_1.align", + &game.panel.ce_score[0].align + }, + { + "game.panel.ce_score_1.valign", + &game.panel.ce_score[0].valign + }, + { + "game.panel.ce_score_1.digits", + &game.panel.ce_score[0].size + }, + { + "game.panel.ce_score_1.font", + &game.panel.ce_score[0].font + }, + { + "game.panel.ce_score_1.element", + &game.panel.ce_score[0].id + }, + { + "game.panel.ce_score_1_element.x", + &game.panel.ce_score_element[0].x + }, + { + "game.panel.ce_score_1_element.y", + &game.panel.ce_score_element[0].y + }, + { + "game.panel.ce_score_1_element.tile_size", + &game.panel.ce_score_element[0].size + }, + { + "game.panel.ce_score_1_element.element", + &game.panel.ce_score_element[0].id + }, + { + "game.panel.ce_score_2.x", + &game.panel.ce_score[1].x + }, + { + "game.panel.ce_score_2.y", + &game.panel.ce_score[1].y + }, + { + "game.panel.ce_score_2.align", + &game.panel.ce_score[1].align + }, + { + "game.panel.ce_score_2.valign", + &game.panel.ce_score[1].valign + }, + { + "game.panel.ce_score_2.digits", + &game.panel.ce_score[1].size + }, + { + "game.panel.ce_score_2.font", + &game.panel.ce_score[1].font + }, + { + "game.panel.ce_score_2.element", + &game.panel.ce_score[1].id + }, + { + "game.panel.ce_score_2_element.x", + &game.panel.ce_score_element[1].x + }, + { + "game.panel.ce_score_2_element.y", + &game.panel.ce_score_element[1].y + }, + { + "game.panel.ce_score_2_element.tile_size", + &game.panel.ce_score_element[1].size + }, + { + "game.panel.ce_score_2_element.element", + &game.panel.ce_score_element[1].id + }, + { + "game.panel.ce_score_3.x", + &game.panel.ce_score[2].x + }, + { + "game.panel.ce_score_3.y", + &game.panel.ce_score[2].y + }, + { + "game.panel.ce_score_3.align", + &game.panel.ce_score[2].align + }, + { + "game.panel.ce_score_3.valign", + &game.panel.ce_score[2].valign + }, + { + "game.panel.ce_score_3.digits", + &game.panel.ce_score[2].size + }, + { + "game.panel.ce_score_3.font", + &game.panel.ce_score[2].font + }, + { + "game.panel.ce_score_3.element", + &game.panel.ce_score[2].id + }, + { + "game.panel.ce_score_3_element.x", + &game.panel.ce_score_element[2].x + }, + { + "game.panel.ce_score_3_element.y", + &game.panel.ce_score_element[2].y + }, + { + "game.panel.ce_score_3_element.tile_size", + &game.panel.ce_score_element[2].size + }, + { + "game.panel.ce_score_3_element.element", + &game.panel.ce_score_element[2].id + }, + { + "game.panel.ce_score_4.x", + &game.panel.ce_score[3].x + }, + { + "game.panel.ce_score_4.y", + &game.panel.ce_score[3].y + }, + { + "game.panel.ce_score_4.align", + &game.panel.ce_score[3].align + }, + { + "game.panel.ce_score_4.valign", + &game.panel.ce_score[3].valign + }, + { + "game.panel.ce_score_4.digits", + &game.panel.ce_score[3].size + }, + { + "game.panel.ce_score_4.font", + &game.panel.ce_score[3].font + }, + { + "game.panel.ce_score_4.element", + &game.panel.ce_score[3].id + }, + { + "game.panel.ce_score_4_element.x", + &game.panel.ce_score_element[3].x + }, + { + "game.panel.ce_score_4_element.y", + &game.panel.ce_score_element[3].y + }, + { + "game.panel.ce_score_4_element.tile_size", + &game.panel.ce_score_element[3].size }, { - "game.panel.bd_magic_wall.y", - &game.panel.bd_magic_wall.y + "game.panel.ce_score_4_element.element", + &game.panel.ce_score_element[3].id }, { - "game.panel.dc_magic_wall.x", - &game.panel.dc_magic_wall.x + "game.panel.ce_score_5.x", + &game.panel.ce_score[4].x }, { - "game.panel.dc_magic_wall.y", - &game.panel.dc_magic_wall.y + "game.panel.ce_score_5.y", + &game.panel.ce_score[4].y + }, + { + "game.panel.ce_score_5.align", + &game.panel.ce_score[4].align + }, + { + "game.panel.ce_score_5.valign", + &game.panel.ce_score[4].valign + }, + { + "game.panel.ce_score_5.digits", + &game.panel.ce_score[4].size + }, + { + "game.panel.ce_score_5.font", + &game.panel.ce_score[4].font + }, + { + "game.panel.ce_score_5.element", + &game.panel.ce_score[4].id + }, + { + "game.panel.ce_score_5_element.x", + &game.panel.ce_score_element[4].x + }, + { + "game.panel.ce_score_5_element.y", + &game.panel.ce_score_element[4].y + }, + { + "game.panel.ce_score_5_element.tile_size", + &game.panel.ce_score_element[4].size + }, + { + "game.panel.ce_score_5_element.element", + &game.panel.ce_score_element[4].id + }, + { + "game.panel.ce_score_6.x", + &game.panel.ce_score[5].x + }, + { + "game.panel.ce_score_6.y", + &game.panel.ce_score[5].y + }, + { + "game.panel.ce_score_6.align", + &game.panel.ce_score[5].align + }, + { + "game.panel.ce_score_6.valign", + &game.panel.ce_score[5].valign + }, + { + "game.panel.ce_score_6.digits", + &game.panel.ce_score[5].size + }, + { + "game.panel.ce_score_6.font", + &game.panel.ce_score[5].font + }, + { + "game.panel.ce_score_6.element", + &game.panel.ce_score[5].id + }, + { + "game.panel.ce_score_6_element.x", + &game.panel.ce_score_element[5].x + }, + { + "game.panel.ce_score_6_element.y", + &game.panel.ce_score_element[5].y + }, + { + "game.panel.ce_score_6_element.tile_size", + &game.panel.ce_score_element[5].size + }, + { + "game.panel.ce_score_6_element.element", + &game.panel.ce_score_element[5].id + }, + { + "game.panel.ce_score_7.x", + &game.panel.ce_score[6].x + }, + { + "game.panel.ce_score_7.y", + &game.panel.ce_score[6].y + }, + { + "game.panel.ce_score_7.align", + &game.panel.ce_score[6].align + }, + { + "game.panel.ce_score_7.valign", + &game.panel.ce_score[6].valign + }, + { + "game.panel.ce_score_7.digits", + &game.panel.ce_score[6].size + }, + { + "game.panel.ce_score_7.font", + &game.panel.ce_score[6].font + }, + { + "game.panel.ce_score_7.element", + &game.panel.ce_score[6].id + }, + { + "game.panel.ce_score_7_element.x", + &game.panel.ce_score_element[6].x + }, + { + "game.panel.ce_score_7_element.y", + &game.panel.ce_score_element[6].y + }, + { + "game.panel.ce_score_7_element.tile_size", + &game.panel.ce_score_element[6].size + }, + { + "game.panel.ce_score_7_element.element", + &game.panel.ce_score_element[6].id + }, + { + "game.panel.ce_score_8.x", + &game.panel.ce_score[7].x + }, + { + "game.panel.ce_score_8.y", + &game.panel.ce_score[7].y + }, + { + "game.panel.ce_score_8.align", + &game.panel.ce_score[7].align + }, + { + "game.panel.ce_score_8.valign", + &game.panel.ce_score[7].valign + }, + { + "game.panel.ce_score_8.digits", + &game.panel.ce_score[7].size + }, + { + "game.panel.ce_score_8.font", + &game.panel.ce_score[7].font + }, + { + "game.panel.ce_score_8.element", + &game.panel.ce_score[7].id + }, + { + "game.panel.ce_score_8_element.x", + &game.panel.ce_score_element[7].x + }, + { + "game.panel.ce_score_8_element.y", + &game.panel.ce_score_element[7].y + }, + { + "game.panel.ce_score_8_element.tile_size", + &game.panel.ce_score_element[7].size + }, + { + "game.panel.ce_score_8_element.element", + &game.panel.ce_score_element[7].id }, { "game.panel.player_name.x", @@ -2750,7 +3442,7 @@ struct TokenIntPtrInfo image_config_vars[] = }, { "game.panel.player_name.chars", - &game.panel.player_name.chars + &game.panel.player_name.size }, { "game.panel.player_name.font", @@ -2774,7 +3466,7 @@ struct TokenIntPtrInfo image_config_vars[] = }, { "game.panel.level_name.chars", - &game.panel.level_name.chars + &game.panel.level_name.size }, { "game.panel.level_name.font", @@ -2798,7 +3490,7 @@ struct TokenIntPtrInfo image_config_vars[] = }, { "game.panel.level_author.chars", - &game.panel.level_author.chars + &game.panel.level_author.size }, { "game.panel.level_author.font", @@ -2852,6 +3544,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