X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconf_gfx.c;h=913a3728888f4e97ec53c0d3ad59c9a82b57403d;hp=0ea0ef868408cd73fe33bd34780db2a202fc8bd9;hb=328e3b0f53ca41e626fda33427f5c51325bc700b;hpb=6d06ba238902736bb99714dc8122bb32a286577a diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 0ea0ef86..913a3728 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -43,8 +43,8 @@ struct ConfigTypeInfo image_config_suffix[] = { ".delay", "1", TYPE_INTEGER }, { ".anim_mode", ARG_UNDEFINED, TYPE_STRING }, { ".global_sync", "false", TYPE_BOOLEAN }, - { ".crumbled_like", ARG_UNDEFINED, TYPE_TOKEN }, - { ".diggable_like", ARG_UNDEFINED, TYPE_TOKEN }, + { ".crumbled_like", ARG_UNDEFINED, TYPE_ELEMENT }, + { ".diggable_like", ARG_UNDEFINED, TYPE_ELEMENT }, { ".border_size", ARG_UNDEFINED, TYPE_INTEGER }, { ".step_offset", "4", TYPE_INTEGER }, { ".step_delay", "1", TYPE_INTEGER }, @@ -59,7 +59,7 @@ struct ConfigTypeInfo image_config_suffix[] = { ".post_delay_random", ARG_UNDEFINED, TYPE_INTEGER }, { ".name", ARG_UNDEFINED, TYPE_STRING }, { ".scale_up_factor", ARG_UNDEFINED, TYPE_INTEGER }, - { ".clone_from", ARG_UNDEFINED, TYPE_TOKEN }, + { ".clone_from", ARG_UNDEFINED, TYPE_GRAPHIC }, { ".fade_mode", ARG_UNDEFINED, TYPE_INTEGER }, { ".fade_delay", ARG_UNDEFINED, TYPE_INTEGER }, { ".post_delay", ARG_UNDEFINED, TYPE_INTEGER }, @@ -67,6 +67,8 @@ struct ConfigTypeInfo image_config_suffix[] = { ".align", ARG_UNDEFINED, TYPE_INTEGER }, { ".valign", ARG_UNDEFINED, TYPE_INTEGER }, { ".sort_priority", ARG_UNDEFINED, TYPE_INTEGER }, + { ".class", ARG_UNDEFINED, TYPE_STRING }, + { ".style", ARG_UNDEFINED, TYPE_STRING }, { NULL, NULL, 0 } }; @@ -281,7 +283,7 @@ struct ConfigInfo image_config[] = { "[sp_default].exploding.xpos", "8" }, { "[sp_default].exploding.ypos", "3" }, { "[sp_default].exploding.frames", "8" }, - { "[sp_default].exploding.delay", "3" }, + { "[sp_default].exploding.delay", "4" }, { "[sp_default].exploding.anim_mode", "linear" }, { "sp_zonk", "RocksSP.pcx" }, @@ -292,26 +294,26 @@ struct ConfigInfo image_config[] = { "sp_zonk.moving.left.xpos", "0" }, { "sp_zonk.moving.left.ypos", "6" }, { "sp_zonk.moving.left.frames", "4" }, - { "sp_zonk.moving.left.delay", "2" }, + { "sp_zonk.moving.left.delay", "1" }, { "sp_zonk.moving.left.anim_mode", "reverse" }, { "sp_zonk.moving.right", "RocksSP.pcx" }, { "sp_zonk.moving.right.xpos", "0" }, { "sp_zonk.moving.right.ypos", "6" }, { "sp_zonk.moving.right.frames", "4" }, { "sp_zonk.moving.right.start_frame", "1" }, - { "sp_zonk.moving.right.delay", "2" }, + { "sp_zonk.moving.right.delay", "1" }, { "sp_zonk.pushing.left", "RocksSP.pcx" }, { "sp_zonk.pushing.left.xpos", "0" }, { "sp_zonk.pushing.left.ypos", "6" }, { "sp_zonk.pushing.left.frames", "4" }, - { "sp_zonk.pushing.left.delay", "2" }, + { "sp_zonk.pushing.left.delay", "1" }, { "sp_zonk.pushing.left.anim_mode", "reverse" }, { "sp_zonk.pushing.right", "RocksSP.pcx" }, { "sp_zonk.pushing.right.xpos", "0" }, { "sp_zonk.pushing.right.ypos", "6" }, { "sp_zonk.pushing.right.frames", "4" }, { "sp_zonk.pushing.right.start_frame", "1" }, - { "sp_zonk.pushing.right.delay", "2" }, + { "sp_zonk.pushing.right.delay", "1" }, { "sp_base", "RocksSP.pcx" }, { "sp_base.xpos", "2" }, @@ -338,36 +340,42 @@ struct ConfigInfo image_config[] = { "sp_murphy.moving.left.frames", "3" }, { "sp_murphy.moving.left.anim_mode", "pingpong" }, { "sp_murphy.moving.left.delay", "2" }, + { "sp_murphy.moving.left.start_frame", "1" }, { "sp_murphy.moving.right", "RocksSP.pcx" }, { "sp_murphy.moving.right.xpos", "11" }, { "sp_murphy.moving.right.ypos", "0" }, { "sp_murphy.moving.right.frames", "3" }, { "sp_murphy.moving.right.anim_mode", "pingpong" }, { "sp_murphy.moving.right.delay", "2" }, + { "sp_murphy.moving.right.start_frame", "1" }, { "sp_murphy.digging.left", "RocksSP.pcx" }, { "sp_murphy.digging.left.xpos", "8" }, { "sp_murphy.digging.left.ypos", "0" }, { "sp_murphy.digging.left.frames", "3" }, { "sp_murphy.digging.left.anim_mode", "pingpong" }, { "sp_murphy.digging.left.delay", "2" }, + { "sp_murphy.digging.left.start_frame", "1" }, { "sp_murphy.digging.right", "RocksSP.pcx" }, { "sp_murphy.digging.right.xpos", "11" }, { "sp_murphy.digging.right.ypos", "0" }, { "sp_murphy.digging.right.frames", "3" }, { "sp_murphy.digging.right.anim_mode", "pingpong" }, { "sp_murphy.digging.right.delay", "2" }, + { "sp_murphy.digging.right.start_frame", "1" }, { "sp_murphy.collecting.left", "RocksSP.pcx" }, { "sp_murphy.collecting.left.xpos", "8" }, { "sp_murphy.collecting.left.ypos", "0" }, { "sp_murphy.collecting.left.frames", "3" }, { "sp_murphy.collecting.left.anim_mode", "pingpong" }, { "sp_murphy.collecting.left.delay", "2" }, + { "sp_murphy.collecting.left.start_frame", "1" }, { "sp_murphy.collecting.right", "RocksSP.pcx" }, { "sp_murphy.collecting.right.xpos", "11" }, { "sp_murphy.collecting.right.ypos", "0" }, { "sp_murphy.collecting.right.frames", "3" }, { "sp_murphy.collecting.right.anim_mode", "pingpong" }, { "sp_murphy.collecting.right.delay", "2" }, + { "sp_murphy.collecting.right.start_frame", "1" }, { "sp_murphy.pushing.left", "RocksSP.pcx" }, { "sp_murphy.pushing.left.xpos", "11" }, { "sp_murphy.pushing.left.ypos", "1" }, @@ -418,6 +426,16 @@ struct ConfigInfo image_config[] = { "sp_murphy.sleeping.right.frames", "3" }, { "sp_murphy.sleeping.right.delay", "100" }, { "sp_murphy.sleeping.right.anim_mode", "linear" }, + { "sp_murphy.dropping", "RocksSP.pcx" }, + { "sp_murphy.dropping.xpos", "11" }, + { "sp_murphy.dropping.ypos", "12" }, + { "sp_murphy.dropping.frames", "1" }, + { "sp_murphy.shrinking", "RocksSP.pcx" }, + { "sp_murphy.shrinking.xpos", "8" }, + { "sp_murphy.shrinking.ypos", "14" }, + { "sp_murphy.shrinking.frames", "8" }, + { "sp_murphy.shrinking.delay", "4" }, + { "sp_murphy.shrinking.anim_mode", "linear" }, { "sp_murphy_clone", "RocksSP.pcx" }, { "sp_murphy_clone.xpos", "3" }, @@ -431,6 +449,16 @@ struct ConfigInfo image_config[] = { "sp_infotron.EDITOR", "RocksSP.pcx" }, { "sp_infotron.EDITOR.xpos", "8" }, { "sp_infotron.EDITOR.ypos", "11" }, + { "sp_infotron.moving.left", "RocksSP.pcx" }, + { "sp_infotron.moving.left.xpos", "8" }, + { "sp_infotron.moving.left.ypos", "13" }, + { "sp_infotron.moving.left.frames", "8" }, + { "sp_infotron.moving.right", "RocksSP.pcx" }, + { "sp_infotron.moving.right.xpos", "8" }, + { "sp_infotron.moving.right.ypos", "13" }, + { "sp_infotron.moving.right.frames", "8" }, + { "sp_infotron.moving.right.start_frame", "6" }, + { "sp_infotron.moving.right.anim_mode", "reverse" }, { "sp_infotron.collecting", "RocksSP.pcx" }, { "sp_infotron.collecting.xpos", "8" }, { "sp_infotron.collecting.ypos", "7" }, @@ -511,9 +539,9 @@ struct ConfigInfo image_config[] = { "sp_disk_red.ypos", "2" }, { "sp_disk_red.frames", "1" }, { "sp_disk_red.collecting", "RocksSP.pcx" }, - { "sp_disk_red.collecting.xpos", "8" }, + { "sp_disk_red.collecting.xpos", "9" }, { "sp_disk_red.collecting.ypos", "5" }, - { "sp_disk_red.collecting.frames", "8" }, + { "sp_disk_red.collecting.frames", "7" }, { "sp_disk_red.collecting.anim_mode", "linear" }, { "sp_disk_red.active", "RocksSP.pcx" }, { "sp_disk_red.active.xpos", "4" }, @@ -553,85 +581,85 @@ struct ConfigInfo image_config[] = { "sp_gravity_port_right.ypos", "1" }, { "sp_gravity_port_right.frames", "1" }, { "sp_gravity_port_right.EDITOR", "RocksSP.pcx" }, - { "sp_gravity_port_right.EDITOR.xpos", "5" }, - { "sp_gravity_port_right.EDITOR.ypos", "1" }, + { "sp_gravity_port_right.EDITOR.xpos", "0" }, + { "sp_gravity_port_right.EDITOR.ypos", "14" }, { "sp_gravity_port_down", "RocksSP.pcx" }, { "sp_gravity_port_down.xpos", "2" }, { "sp_gravity_port_down.ypos", "1" }, { "sp_gravity_port_down.frames", "1" }, { "sp_gravity_port_down.EDITOR", "RocksSP.pcx" }, - { "sp_gravity_port_down.EDITOR.xpos", "6" }, - { "sp_gravity_port_down.EDITOR.ypos", "1" }, + { "sp_gravity_port_down.EDITOR.xpos", "1" }, + { "sp_gravity_port_down.EDITOR.ypos", "14" }, { "sp_gravity_port_left", "RocksSP.pcx" }, { "sp_gravity_port_left.xpos", "3" }, { "sp_gravity_port_left.ypos", "1" }, { "sp_gravity_port_left.frames", "1" }, { "sp_gravity_port_left.EDITOR", "RocksSP.pcx" }, - { "sp_gravity_port_left.EDITOR.xpos", "7" }, - { "sp_gravity_port_left.EDITOR.ypos", "1" }, + { "sp_gravity_port_left.EDITOR.xpos", "2" }, + { "sp_gravity_port_left.EDITOR.ypos", "14" }, { "sp_gravity_port_up", "RocksSP.pcx" }, { "sp_gravity_port_up.xpos", "4" }, { "sp_gravity_port_up.ypos", "1" }, { "sp_gravity_port_up.frames", "1" }, { "sp_gravity_port_up.EDITOR", "RocksSP.pcx" }, - { "sp_gravity_port_up.EDITOR.xpos", "0" }, - { "sp_gravity_port_up.EDITOR.ypos", "2" }, + { "sp_gravity_port_up.EDITOR.xpos", "3" }, + { "sp_gravity_port_up.EDITOR.ypos", "14" }, { "sp_gravity_on_port_right", "RocksSP.pcx" }, { "sp_gravity_on_port_right.xpos", "1" }, { "sp_gravity_on_port_right.ypos", "1" }, { "sp_gravity_on_port_right.frames", "1" }, { "sp_gravity_on_port_right.EDITOR", "RocksSP.pcx" }, - { "sp_gravity_on_port_right.EDITOR.xpos", "5" }, - { "sp_gravity_on_port_right.EDITOR.ypos", "1" }, + { "sp_gravity_on_port_right.EDITOR.xpos", "0" }, + { "sp_gravity_on_port_right.EDITOR.ypos", "13" }, { "sp_gravity_on_port_down", "RocksSP.pcx" }, { "sp_gravity_on_port_down.xpos", "2" }, { "sp_gravity_on_port_down.ypos", "1" }, { "sp_gravity_on_port_down.frames", "1" }, { "sp_gravity_on_port_down.EDITOR", "RocksSP.pcx" }, - { "sp_gravity_on_port_down.EDITOR.xpos", "6" }, - { "sp_gravity_on_port_down.EDITOR.ypos", "1" }, + { "sp_gravity_on_port_down.EDITOR.xpos", "1" }, + { "sp_gravity_on_port_down.EDITOR.ypos", "13" }, { "sp_gravity_on_port_left", "RocksSP.pcx" }, { "sp_gravity_on_port_left.xpos", "3" }, { "sp_gravity_on_port_left.ypos", "1" }, { "sp_gravity_on_port_left.frames", "1" }, { "sp_gravity_on_port_left.EDITOR", "RocksSP.pcx" }, - { "sp_gravity_on_port_left.EDITOR.xpos", "7" }, - { "sp_gravity_on_port_left.EDITOR.ypos", "1" }, + { "sp_gravity_on_port_left.EDITOR.xpos", "2" }, + { "sp_gravity_on_port_left.EDITOR.ypos", "13" }, { "sp_gravity_on_port_up", "RocksSP.pcx" }, { "sp_gravity_on_port_up.xpos", "4" }, { "sp_gravity_on_port_up.ypos", "1" }, { "sp_gravity_on_port_up.frames", "1" }, { "sp_gravity_on_port_up.EDITOR", "RocksSP.pcx" }, - { "sp_gravity_on_port_up.EDITOR.xpos", "0" }, - { "sp_gravity_on_port_up.EDITOR.ypos", "2" }, + { "sp_gravity_on_port_up.EDITOR.xpos", "3" }, + { "sp_gravity_on_port_up.EDITOR.ypos", "13" }, { "sp_gravity_off_port_right", "RocksSP.pcx" }, { "sp_gravity_off_port_right.xpos", "1" }, { "sp_gravity_off_port_right.ypos", "1" }, { "sp_gravity_off_port_right.frames", "1" }, { "sp_gravity_off_port_right.EDITOR", "RocksSP.pcx" }, - { "sp_gravity_off_port_right.EDITOR.xpos", "5" }, - { "sp_gravity_off_port_right.EDITOR.ypos", "1" }, + { "sp_gravity_off_port_right.EDITOR.xpos", "4" }, + { "sp_gravity_off_port_right.EDITOR.ypos", "13" }, { "sp_gravity_off_port_down", "RocksSP.pcx" }, { "sp_gravity_off_port_down.xpos", "2" }, { "sp_gravity_off_port_down.ypos", "1" }, { "sp_gravity_off_port_down.frames", "1" }, { "sp_gravity_off_port_down.EDITOR", "RocksSP.pcx" }, - { "sp_gravity_off_port_down.EDITOR.xpos", "6" }, - { "sp_gravity_off_port_down.EDITOR.ypos", "1" }, + { "sp_gravity_off_port_down.EDITOR.xpos", "5" }, + { "sp_gravity_off_port_down.EDITOR.ypos", "13" }, { "sp_gravity_off_port_left", "RocksSP.pcx" }, { "sp_gravity_off_port_left.xpos", "3" }, { "sp_gravity_off_port_left.ypos", "1" }, { "sp_gravity_off_port_left.frames", "1" }, { "sp_gravity_off_port_left.EDITOR", "RocksSP.pcx" }, - { "sp_gravity_off_port_left.EDITOR.xpos", "7" }, - { "sp_gravity_off_port_left.EDITOR.ypos", "1" }, + { "sp_gravity_off_port_left.EDITOR.xpos", "6" }, + { "sp_gravity_off_port_left.EDITOR.ypos", "13" }, { "sp_gravity_off_port_up", "RocksSP.pcx" }, { "sp_gravity_off_port_up.xpos", "4" }, { "sp_gravity_off_port_up.ypos", "1" }, { "sp_gravity_off_port_up.frames", "1" }, { "sp_gravity_off_port_up.EDITOR", "RocksSP.pcx" }, - { "sp_gravity_off_port_up.EDITOR.xpos", "0" }, - { "sp_gravity_off_port_up.EDITOR.ypos", "2" }, + { "sp_gravity_off_port_up.EDITOR.xpos", "7" }, + { "sp_gravity_off_port_up.EDITOR.ypos", "13" }, { "sp_sniksnak", "RocksSP.pcx" }, { "sp_sniksnak.xpos", "1" }, @@ -727,7 +755,7 @@ struct ConfigInfo image_config[] = { "sp_electron.exploding.xpos", "8" }, { "sp_electron.exploding.ypos", "4" }, { "sp_electron.exploding.frames", "8" }, - { "sp_electron.exploding.delay", "3" }, + { "sp_electron.exploding.delay", "4" }, { "sp_electron.exploding.anim_mode", "linear" }, { "sp_terminal", "RocksSP.pcx" }, @@ -759,7 +787,8 @@ struct ConfigInfo image_config[] = { "sp_buggy_base.active.xpos", "8" }, { "sp_buggy_base.active.ypos", "6" }, { "sp_buggy_base.active.frames", "4" }, - { "sp_buggy_base.active.anim_mode", "random" }, + { "sp_buggy_base.active.delay", "4" }, + { "sp_buggy_base.active.anim_mode", "pingpong" }, { "sp_hardware_base_1", "RocksSP.pcx" }, { "sp_hardware_base_1.xpos", "4" }, @@ -4352,6 +4381,16 @@ struct ConfigInfo image_config[] = #endif #endif + { "sp_frame_horizontal", "RocksSP.pcx" }, + { "sp_frame_horizontal.xpos", "7" }, + { "sp_frame_horizontal.ypos", "14" }, + { "sp_frame_vertical", "RocksSP.pcx" }, + { "sp_frame_vertical.xpos", "6" }, + { "sp_frame_vertical.ypos", "14" }, + { "sp_frame_corner", "RocksSP.pcx" }, + { "sp_frame_corner.xpos", "5" }, + { "sp_frame_corner.ypos", "14" }, + { "toon_1", "RocksToons.pcx" }, { "toon_1.x", "2" }, { "toon_1.y", "72" }, @@ -4684,6 +4723,8 @@ struct ConfigInfo image_config[] = { "font.title_2.y", "0" }, { "font.title_2.width", "14" }, { "font.title_2.height", "14" }, + { "font.title_2.SETUP", UNDEFINED_FILENAME }, + { "font.title_2.SETUP.clone_from", "font.text_4" }, { "font.menu_1", "RocksFontBig.pcx" }, { "font.menu_1.x", "0" }, @@ -4932,13 +4973,22 @@ struct ConfigInfo image_config[] = { "global.border", "RocksScreen.pcx" }, { "global.door", "RocksDoor.pcx" }, + { "global.busy", "RocksBusy.pcx" }, + { "global.busy.x", "0" }, + { "global.busy.y", "0" }, + { "global.busy.width", "32" }, + { "global.busy.height", "32" }, + { "global.busy.frames", "28" }, + { "global.busy.frames_per_line", "7" }, + { "global.busy.delay", "2" }, + { "editor.element_border", "RocksElements.pcx" }, - { "editor.element_border.xpos", "0" }, - { "editor.element_border.ypos", "0" }, + { "editor.element_border.x", "0" }, + { "editor.element_border.y", "0" }, - { "editor.element_border_input", "RocksElements.pcx" }, - { "editor.element_border_input.xpos", "0" }, - { "editor.element_border_input.ypos", "0" }, + { "editor.element_border_input", "RocksDoor.pcx" }, + { "editor.element_border_input.x", "740" }, + { "editor.element_border_input.y", "48" }, { "editor.cascade_list", "RocksDoor.pcx" }, { "editor.cascade_list.x", "708" }, @@ -4964,6 +5014,7 @@ struct ConfigInfo image_config[] = { "background.INFO[VERSION]", UNDEFINED_FILENAME }, { "background.INFO[LEVELSET]", UNDEFINED_FILENAME }, { "background.SETUP", UNDEFINED_FILENAME }, + { "background.PLAYING", UNDEFINED_FILENAME }, { "background.DOOR", UNDEFINED_FILENAME }, { "background.titlescreen_initial_1", UNDEFINED_FILENAME }, @@ -5275,6 +5326,11 @@ struct ConfigInfo image_config[] = { "border.draw_masked_when_fading", "true" }, + { "init.busy.x", "336" }, + { "init.busy.y", "280" }, + { "init.busy.align", "center" }, + { "init.busy.valign", "middle" }, + { "menu.enter_menu.fade_mode", "none" }, { "menu.enter_menu.fade_delay", "250" }, { "menu.enter_menu.post_delay", "125" }, @@ -5284,6 +5340,9 @@ struct ConfigInfo image_config[] = { "menu.enter_screen.fade_mode", "fade" }, { "menu.enter_screen.fade_delay", "250" }, { "menu.enter_screen.post_delay", "125" }, + { "menu.next_screen.fade_mode", "crossfade" }, + { "menu.next_screen.fade_delay", "250" }, + { "menu.next_screen.post_delay", "125" }, { "menu.leave_screen.fade_mode", "fade" }, { "menu.leave_screen.fade_delay", "250" }, { "menu.leave_screen.post_delay", "125" }, @@ -5350,10 +5409,16 @@ struct ConfigInfo image_config[] = { "menu.draw_yoffset.SETUP[ARTWORK]", "0" }, { "menu.draw_xoffset.SETUP[INPUT]", "0" }, { "menu.draw_yoffset.SETUP[INPUT]", "0" }, + { "menu.draw_xoffset.SETUP[SHORTCUTS]", "0" }, + { "menu.draw_yoffset.SETUP[SHORTCUTS]", "0" }, { "menu.draw_xoffset.SETUP[SHORTCUTS_1]", "0" }, { "menu.draw_yoffset.SETUP[SHORTCUTS_1]", "0" }, { "menu.draw_xoffset.SETUP[SHORTCUTS_2]", "0" }, { "menu.draw_yoffset.SETUP[SHORTCUTS_2]", "0" }, + { "menu.draw_xoffset.SETUP[SHORTCUTS_3]", "0" }, + { "menu.draw_yoffset.SETUP[SHORTCUTS_3]", "0" }, + { "menu.draw_xoffset.SETUP[SHORTCUTS_4]", "0" }, + { "menu.draw_yoffset.SETUP[SHORTCUTS_4]", "0" }, { "menu.draw_xoffset.SETUP[CHOOSE_ARTWORK]", "0" }, { "menu.draw_yoffset.SETUP[CHOOSE_ARTWORK]", "0" }, { "menu.draw_xoffset.SETUP[CHOOSE_OTHER]", "0" }, @@ -5733,6 +5798,15 @@ struct ConfigInfo image_config[] = { "game.panel.score.draw_masked", "true" }, { "game.panel.score.draw_order", "0" }, + { "game.panel.highscore.x", "-1" }, + { "game.panel.highscore.y", "-1" }, + { "game.panel.highscore.align", "left" }, + { "game.panel.highscore.valign", "top" }, + { "game.panel.highscore.digits", "5" }, + { "game.panel.highscore.font", "font.text_2" }, + { "game.panel.highscore.draw_masked", "true" }, + { "game.panel.highscore.draw_order", "0" }, + { "game.panel.time.x", "50" }, { "game.panel.time.y", "194" }, { "game.panel.time.align", "center" }, @@ -6314,8 +6388,9 @@ struct ConfigInfo image_config[] = { "game.button.sound_simple.y", "245" }, { "game.forced_scroll_delay_value", "-1" }, - { "game.use_native_emc_graphics_engine", "false" }, + { "game.use_native_sp_graphics_engine", "true" }, + { "game.use_masked_pushing", "false" }, { "[player].boring_delay_fixed", "1000" }, { "[player].boring_delay_random", "1000" },