X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=28fbd129bda4b8f4f8bf5de7be9aa9d9767e7f89;hb=18863a5655e9e07d548e2d673e7f82336703c8fb;hp=4c7e7cb7cfcfdd46edade4706bcb458f9c39022a;hpb=e63e92923fa0196ba7d538d4c8f5a16994e3bee8;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 4c7e7cb7..28fbd129 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -281,7 +281,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 +292,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 +338,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 +424,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 +447,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 +537,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 +579,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 +753,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 +785,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" }, @@ -4336,10 +4363,6 @@ struct ConfigInfo image_config[] = /* images not associated to game elements (used for menu screens etc.) */ /* keyword to stop parser: "NO_MORE_ELEMENT_IMAGES" <-- do not change! */ -#if 1 - { "sp_objects", "sp_objects.pcx" }, -#endif - #if 1 /* !!! TEMPORARILY STORED HERE -- PROBABLY TO BE CHANGED !!! */ @@ -4356,6 +4379,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" }, @@ -6348,6 +6381,8 @@ struct ConfigInfo image_config[] = { "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" },