X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=5fb7849384501cc03a889ffb401971308ca50293;hb=87382cdd307aa01757ed5c8a863ebb7dcb812e8e;hp=8720cb69080394ba488a742a8fbb3a8aa0b2c8e9;hpb=e742774a369161df5592ec2d7c553ea6d1143de3;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 8720cb69..5fb78493 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -67,6 +67,12 @@ 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 }, + { ".active_xoffset", "0", TYPE_INTEGER }, + { ".active_yoffset", "0", TYPE_INTEGER }, + { ".pressed_xoffset", "0", TYPE_INTEGER }, + { ".pressed_yoffset", "0", TYPE_INTEGER }, { NULL, NULL, 0 } }; @@ -281,7 +287,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 +298,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 +344,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,10 +430,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" }, @@ -525,9 +543,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" }, @@ -741,7 +759,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" }, @@ -773,7 +791,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" }, @@ -4350,10 +4369,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 !!! */ @@ -4370,6 +4385,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" }, @@ -4671,6 +4696,83 @@ struct ConfigInfo image_config[] = { "menu.scrollbar.active.ypos", "10" }, { "menu.scrollbar.active.frames", "1" }, + { "game.button.gfx.stop", "RocksDoor.pcx" }, + { "game.button.gfx.stop.x", "305" }, + { "game.button.gfx.stop.y", "185" }, + { "game.button.gfx.stop.width", "30" }, + { "game.button.gfx.stop.height", "30" }, + { "game.button.gfx.stop.pressed_xoffset", "-100" }, + { "game.button.gfx.pause", "RocksDoor.pcx" }, + { "game.button.gfx.pause.x", "335" }, + { "game.button.gfx.pause.y", "185" }, + { "game.button.gfx.pause.width", "30" }, + { "game.button.gfx.pause.height", "30" }, + { "game.button.gfx.pause.pressed_xoffset", "-100" }, + { "game.button.gfx.play", "RocksDoor.pcx" }, + { "game.button.gfx.play.x", "365" }, + { "game.button.gfx.play.y", "185" }, + { "game.button.gfx.play.width", "30" }, + { "game.button.gfx.play.height", "30" }, + { "game.button.gfx.play.pressed_xoffset", "-100" }, + { "game.button.gfx.sound_music", "RocksDoor.pcx" }, + { "game.button.gfx.sound_music.x", "305" }, + { "game.button.gfx.sound_music.y", "245" }, + { "game.button.gfx.sound_music.width", "30" }, + { "game.button.gfx.sound_music.height", "30" }, + { "game.button.gfx.sound_music.pressed_xoffset", "-100" }, + { "game.button.gfx.sound_music.active_yoffset", "-30" }, + { "game.button.gfx.sound_loops", "RocksDoor.pcx" }, + { "game.button.gfx.sound_loops.x", "335" }, + { "game.button.gfx.sound_loops.y", "245" }, + { "game.button.gfx.sound_loops.width", "30" }, + { "game.button.gfx.sound_loops.height", "30" }, + { "game.button.gfx.sound_loops.pressed_xoffset", "-100" }, + { "game.button.gfx.sound_loops.active_yoffset", "-30" }, + { "game.button.gfx.sound_simple", "RocksDoor.pcx" }, + { "game.button.gfx.sound_simple.x", "365" }, + { "game.button.gfx.sound_simple.y", "245" }, + { "game.button.gfx.sound_simple.width", "30" }, + { "game.button.gfx.sound_simple.height", "30" }, + { "game.button.gfx.sound_simple.pressed_xoffset", "-100" }, + { "game.button.gfx.sound_simple.active_yoffset", "-30" }, + + { "tape.button.gfx.eject", "RocksDoor.pcx" }, + { "tape.button.gfx.eject.x", "305" }, + { "tape.button.gfx.eject.y", "357" }, + { "tape.button.gfx.eject.width", "18" }, + { "tape.button.gfx.eject.height", "18" }, + { "tape.button.gfx.eject.pressed_xoffset", "-100" }, + { "tape.button.gfx.extra", "RocksDoor.pcx" }, + { "tape.button.gfx.extra.x", "505" }, + { "tape.button.gfx.extra.y", "357" }, + { "tape.button.gfx.extra.width", "18" }, + { "tape.button.gfx.extra.height", "18" }, + { "tape.button.gfx.extra.pressed_xoffset", "-100" }, + { "tape.button.gfx.stop", "RocksDoor.pcx" }, + { "tape.button.gfx.stop.x", "323" }, + { "tape.button.gfx.stop.y", "357" }, + { "tape.button.gfx.stop.width", "18" }, + { "tape.button.gfx.stop.height", "18" }, + { "tape.button.gfx.stop.pressed_xoffset", "-100" }, + { "tape.button.gfx.pause", "RocksDoor.pcx" }, + { "tape.button.gfx.pause.x", "341" }, + { "tape.button.gfx.pause.y", "357" }, + { "tape.button.gfx.pause.width", "18" }, + { "tape.button.gfx.pause.height", "18" }, + { "tape.button.gfx.pause.pressed_xoffset", "-100" }, + { "tape.button.gfx.record", "RocksDoor.pcx" }, + { "tape.button.gfx.record.x", "359" }, + { "tape.button.gfx.record.y", "357" }, + { "tape.button.gfx.record.width", "18" }, + { "tape.button.gfx.record.height", "18" }, + { "tape.button.gfx.record.pressed_xoffset", "-100" }, + { "tape.button.gfx.play", "RocksDoor.pcx" }, + { "tape.button.gfx.play.x", "377" }, + { "tape.button.gfx.play.y", "357" }, + { "tape.button.gfx.play.width", "18" }, + { "tape.button.gfx.play.height", "18" }, + { "tape.button.gfx.play.pressed_xoffset", "-100" }, + { "font.initial_1", "RocksFontSmall.pcx" }, { "font.initial_1.x", "0" }, { "font.initial_1.y", "0" }, @@ -5388,10 +5490,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" }, @@ -5815,6 +5923,15 @@ struct ConfigInfo image_config[] = { "game.panel.time_ss.draw_masked", "true" }, { "game.panel.time_ss.draw_order", "0" }, + { "game.panel.frame.x", "-1" }, + { "game.panel.frame.y", "-1" }, + { "game.panel.frame.align", "left" }, + { "game.panel.frame.valign", "top" }, + { "game.panel.frame.digits", "-1" }, + { "game.panel.frame.font", "font.text_2" }, + { "game.panel.frame.draw_masked", "true" }, + { "game.panel.frame.draw_order", "0" }, + { "game.panel.shield_normal.x", "-1" }, { "game.panel.shield_normal.y", "-1" }, { "game.panel.shield_normal.tile_size", "16" }, @@ -6360,8 +6477,20 @@ struct ConfigInfo image_config[] = { "game.button.sound_simple.x", "65" }, { "game.button.sound_simple.y", "245" }, + { "tape.button.eject.x", "5" }, + { "tape.button.eject.y", "77" }, + { "tape.button.stop.x", "23" }, + { "tape.button.stop.y", "77" }, + { "tape.button.pause.x", "41" }, + { "tape.button.pause.y", "77" }, + { "tape.button.record.x", "59" }, + { "tape.button.record.y", "77" }, + { "tape.button.play.x", "77" }, + { "tape.button.play.y", "77" }, + { "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" }, @@ -6369,5 +6498,44 @@ struct ConfigInfo image_config[] = { "[player].sleeping_delay_fixed", "2000" }, { "[player].sleeping_delay_random", "2000" }, + { "viewport.window.width", "672" }, + { "viewport.window.height", "560" }, + { "viewport.playfield.x", "6" }, + { "viewport.playfield.y", "6" }, + { "viewport.playfield.width", "548" }, + { "viewport.playfield.height", "548" }, + { "viewport.playfield.border_size", "2" }, + { "viewport.playfield.MAIN.x", ARG_DEFAULT }, + { "viewport.playfield.MAIN.y", ARG_DEFAULT }, + { "viewport.playfield.MAIN.width", ARG_DEFAULT }, + { "viewport.playfield.MAIN.height", ARG_DEFAULT }, + { "viewport.playfield.MAIN.border_size", ARG_DEFAULT }, + { "viewport.playfield.PLAYING.x", ARG_DEFAULT }, + { "viewport.playfield.PLAYING.y", ARG_DEFAULT }, + { "viewport.playfield.PLAYING.width", ARG_DEFAULT }, + { "viewport.playfield.PLAYING.height", ARG_DEFAULT }, + { "viewport.playfield.PLAYING.border_size", ARG_DEFAULT }, + { "viewport.playfield.EDITOR.x", ARG_DEFAULT }, + { "viewport.playfield.EDITOR.y", ARG_DEFAULT }, + { "viewport.playfield.EDITOR.width", ARG_DEFAULT }, + { "viewport.playfield.EDITOR.height", ARG_DEFAULT }, + { "viewport.playfield.EDITOR.border_size", ARG_DEFAULT }, + { "viewport.door_1.x", "566" }, + { "viewport.door_1.y", "60" }, + { "viewport.door_1.MAIN.x", ARG_DEFAULT }, + { "viewport.door_1.MAIN.y", ARG_DEFAULT }, + { "viewport.door_1.PLAYING.x", ARG_DEFAULT }, + { "viewport.door_1.PLAYING.y", ARG_DEFAULT }, + { "viewport.door_1.EDITOR.x", ARG_DEFAULT }, + { "viewport.door_1.EDITOR.y", ARG_DEFAULT }, + { "viewport.door_2.x", "566" }, + { "viewport.door_2.y", "400" }, + { "viewport.door_2.MAIN.x", ARG_DEFAULT }, + { "viewport.door_2.MAIN.y", ARG_DEFAULT }, + { "viewport.door_2.PLAYING.x", ARG_DEFAULT }, + { "viewport.door_2.PLAYING.y", ARG_DEFAULT }, + { "viewport.door_2.EDITOR.x", "566" }, + { "viewport.door_2.EDITOR.y", "356" }, + { NULL, NULL } };