X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconf_gfx.c;h=ed2d85ebf8d6c7a4a594a09fbd04b83144bb7c1d;hp=11eb95ed348c57e6a318bb272cb1150704873193;hb=3d7e2dc14fb5478cb7590eb9808ccafbe48ae096;hpb=1a9252c7cfc77d9d616bd0a3f538cce2d24e2f74 diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 11eb95ed..ed2d85eb 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -45,12 +45,18 @@ struct ConfigTypeInfo image_config_suffix[] = { ".diggable_like", ARG_UNDEFINED, TYPE_ELEMENT }, { ".border_size", ARG_UNDEFINED, TYPE_INTEGER }, { ".step_offset", "4", TYPE_INTEGER }, + { ".step_xoffset", ARG_UNDEFINED, TYPE_INTEGER }, + { ".step_yoffset", ARG_UNDEFINED, TYPE_INTEGER }, + { ".step_frames", ARG_UNDEFINED, TYPE_INTEGER }, { ".step_delay", "1", TYPE_INTEGER }, { ".direction", ARG_UNDEFINED, TYPE_STRING }, { ".position", ARG_UNDEFINED, TYPE_STRING }, { ".draw_xoffset", "0", TYPE_INTEGER }, { ".draw_yoffset", "0", TYPE_INTEGER }, { ".draw_masked", "false", TYPE_BOOLEAN }, + { ".draw_order", ARG_UNDEFINED, TYPE_INTEGER }, + { ".init_delay_fixed", ARG_UNDEFINED, TYPE_INTEGER }, + { ".init_delay_random", ARG_UNDEFINED, TYPE_INTEGER }, { ".anim_delay_fixed", ARG_UNDEFINED, TYPE_INTEGER }, { ".anim_delay_random", ARG_UNDEFINED, TYPE_INTEGER }, { ".post_delay_fixed", ARG_UNDEFINED, TYPE_INTEGER }, @@ -4588,6 +4594,29 @@ struct ConfigInfo image_config[] = { "toon_20.direction", "down" }, { "toon_20.position", "any" }, + { "global.anim_1.gfx", UNDEFINED_FILENAME }, + { "global.anim_2.gfx", UNDEFINED_FILENAME }, + { "global.anim_3.gfx", UNDEFINED_FILENAME }, + { "global.anim_4.gfx", UNDEFINED_FILENAME }, + { "global.anim_5.gfx", UNDEFINED_FILENAME }, + { "global.anim_6.gfx", UNDEFINED_FILENAME }, + { "global.anim_7.gfx", UNDEFINED_FILENAME }, + { "global.anim_8.gfx", UNDEFINED_FILENAME }, + + { "global.anim_1", UNDEFINED_FILENAME }, + { "global.anim_2", UNDEFINED_FILENAME }, + { "global.anim_3", UNDEFINED_FILENAME }, + { "global.anim_4", UNDEFINED_FILENAME }, + { "global.anim_5", UNDEFINED_FILENAME }, + { "global.anim_6", UNDEFINED_FILENAME }, + { "global.anim_7", UNDEFINED_FILENAME }, + { "global.anim_8", UNDEFINED_FILENAME }, + + { "internal.global.toon_default", UNDEFINED_FILENAME }, + { "internal.global.toon_default.anim_mode", "random" }, + + { "internal.global.anim_default", UNDEFINED_FILENAME }, + { "menu.calibrate_red", "RocksElements.png" }, { "menu.calibrate_red.xpos", "12" }, { "menu.calibrate_red.ypos", "8" }, @@ -4741,6 +4770,13 @@ struct ConfigInfo image_config[] = { "game.button.gfx.save.width", "30" }, { "game.button.gfx.save.height", "30" }, { "game.button.gfx.save.pressed_xoffset", "-100" }, + { "game.button.gfx.pause2", "RocksDoor2.png" }, + { "game.button.gfx.pause2.x", "135" }, + { "game.button.gfx.pause2.y", "50" }, + { "game.button.gfx.pause2.width", "30" }, + { "game.button.gfx.pause2.height", "30" }, + { "game.button.gfx.pause2.pressed_xoffset", "-100" }, + { "game.button.gfx.pause2.active_yoffset", "-30" }, { "game.button.gfx.load", "RocksDoor2.png" }, { "game.button.gfx.load.x", "165" }, { "game.button.gfx.load.y", "50" }, @@ -5223,18 +5259,6 @@ struct ConfigInfo image_config[] = { "font.info.levelset", UNDEFINED_FILENAME }, { "font.info.levelset.clone_from", "font.level_number" }, - { "global.border", "RocksScreen.png" }, - { "global.door", "RocksDoor.png" }, - - { "global.busy", "RocksBusy.png" }, - { "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", "RocksMore.png" }, { "editor.element_border.xpos", "0" }, { "editor.element_border.ypos", "2" }, @@ -5244,7 +5268,6 @@ struct ConfigInfo image_config[] = { "editor.element_border_input.xpos", "10" }, { "editor.element_border_input.ypos", "7" }, { "editor.element_border_input.border_size", "4" }, - { "editor.element_border_input.tile_size", "16" }, { "editor.counter.down", "RocksDoor.png" }, { "editor.counter.down.x", "302" }, @@ -5668,6 +5691,23 @@ struct ConfigInfo image_config[] = { "editor.input.gfx.level_number.height", "16" }, { "editor.input.gfx.level_number.border_size","1" }, + { "global.border", "RocksScreen.png" }, + { "global.border.MAIN", UNDEFINED_FILENAME }, + { "global.border.SCORES", UNDEFINED_FILENAME }, + { "global.border.EDITOR", UNDEFINED_FILENAME }, + { "global.border.PLAYING", UNDEFINED_FILENAME }, + + { "global.door", "RocksDoor.png" }, + + { "global.busy", "RocksBusy.png" }, + { "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" }, + { "background", UNDEFINED_FILENAME }, { "background.TITLE_INITIAL", UNDEFINED_FILENAME }, { "background.TITLE", UNDEFINED_FILENAME }, @@ -5883,10 +5923,72 @@ struct ConfigInfo image_config[] = { "[title].post_delay", "250" }, { "[title].auto_delay", "-1" }, - { "[titlemessage_initial].x", "336" }, - { "[titlemessage_initial].y", "280" }, - { "[titlemessage_initial].width", "640" }, - { "[titlemessage_initial].height", "512" }, + { "[titlescreen_initial].sort_priority", "0" }, + { "[titlescreen_initial].fade_mode", ARG_DEFAULT }, + { "[titlescreen_initial].fade_delay", ARG_DEFAULT }, + { "[titlescreen_initial].post_delay", ARG_DEFAULT }, + { "[titlescreen_initial].auto_delay", ARG_DEFAULT }, + { "[titlescreen].sort_priority", "0" }, + { "[titlescreen].fade_mode", ARG_DEFAULT }, + { "[titlescreen].fade_delay", ARG_DEFAULT }, + { "[titlescreen].post_delay", ARG_DEFAULT }, + { "[titlescreen].auto_delay", ARG_DEFAULT }, + + { "titlescreen_initial_1.sort_priority", ARG_DEFAULT }, + { "titlescreen_initial_1.fade_mode", ARG_DEFAULT }, + { "titlescreen_initial_1.fade_delay", ARG_DEFAULT }, + { "titlescreen_initial_1.post_delay", ARG_DEFAULT }, + { "titlescreen_initial_1.auto_delay", ARG_DEFAULT }, + { "titlescreen_initial_2.sort_priority", ARG_DEFAULT }, + { "titlescreen_initial_2.fade_mode", ARG_DEFAULT }, + { "titlescreen_initial_2.fade_delay", ARG_DEFAULT }, + { "titlescreen_initial_2.post_delay", ARG_DEFAULT }, + { "titlescreen_initial_2.auto_delay", ARG_DEFAULT }, + { "titlescreen_initial_3.sort_priority", ARG_DEFAULT }, + { "titlescreen_initial_3.fade_mode", ARG_DEFAULT }, + { "titlescreen_initial_3.fade_delay", ARG_DEFAULT }, + { "titlescreen_initial_3.post_delay", ARG_DEFAULT }, + { "titlescreen_initial_3.auto_delay", ARG_DEFAULT }, + { "titlescreen_initial_4.sort_priority", ARG_DEFAULT }, + { "titlescreen_initial_4.fade_mode", ARG_DEFAULT }, + { "titlescreen_initial_4.fade_delay", ARG_DEFAULT }, + { "titlescreen_initial_4.post_delay", ARG_DEFAULT }, + { "titlescreen_initial_4.auto_delay", ARG_DEFAULT }, + { "titlescreen_initial_5.sort_priority", ARG_DEFAULT }, + { "titlescreen_initial_5.fade_mode", ARG_DEFAULT }, + { "titlescreen_initial_5.fade_delay", ARG_DEFAULT }, + { "titlescreen_initial_5.post_delay", ARG_DEFAULT }, + { "titlescreen_initial_5.auto_delay", ARG_DEFAULT }, + { "titlescreen_1.sort_priority", ARG_DEFAULT }, + { "titlescreen_1.fade_mode", ARG_DEFAULT }, + { "titlescreen_1.fade_delay", ARG_DEFAULT }, + { "titlescreen_1.post_delay", ARG_DEFAULT }, + { "titlescreen_1.auto_delay", ARG_DEFAULT }, + { "titlescreen_2.sort_priority", ARG_DEFAULT }, + { "titlescreen_2.fade_mode", ARG_DEFAULT }, + { "titlescreen_2.fade_delay", ARG_DEFAULT }, + { "titlescreen_2.post_delay", ARG_DEFAULT }, + { "titlescreen_2.auto_delay", ARG_DEFAULT }, + { "titlescreen_3.sort_priority", ARG_DEFAULT }, + { "titlescreen_3.fade_mode", ARG_DEFAULT }, + { "titlescreen_3.fade_delay", ARG_DEFAULT }, + { "titlescreen_3.post_delay", ARG_DEFAULT }, + { "titlescreen_3.auto_delay", ARG_DEFAULT }, + { "titlescreen_4.sort_priority", ARG_DEFAULT }, + { "titlescreen_4.fade_mode", ARG_DEFAULT }, + { "titlescreen_4.fade_delay", ARG_DEFAULT }, + { "titlescreen_4.post_delay", ARG_DEFAULT }, + { "titlescreen_4.auto_delay", ARG_DEFAULT }, + { "titlescreen_5.sort_priority", ARG_DEFAULT }, + { "titlescreen_5.fade_mode", ARG_DEFAULT }, + { "titlescreen_5.fade_delay", ARG_DEFAULT }, + { "titlescreen_5.post_delay", ARG_DEFAULT }, + { "titlescreen_5.auto_delay", ARG_DEFAULT }, + + { "[titlemessage_initial].x", "-1" }, + { "[titlemessage_initial].y", "-1" }, + { "[titlemessage_initial].width", "-1" }, + { "[titlemessage_initial].height", "-1" }, { "[titlemessage_initial].chars", "-1" }, { "[titlemessage_initial].lines", "-1" }, { "[titlemessage_initial].align", "center" }, @@ -5900,10 +6002,10 @@ struct ConfigInfo image_config[] = { "[titlemessage_initial].fade_delay", ARG_DEFAULT }, { "[titlemessage_initial].post_delay", ARG_DEFAULT }, { "[titlemessage_initial].auto_delay", ARG_DEFAULT }, - { "[titlemessage].x", "336" }, - { "[titlemessage].y", "280" }, - { "[titlemessage].width", "640" }, - { "[titlemessage].height", "512" }, + { "[titlemessage].x", "-1" }, + { "[titlemessage].y", "-1" }, + { "[titlemessage].width", "-1" }, + { "[titlemessage].height", "-1" }, { "[titlemessage].chars", "-1" }, { "[titlemessage].lines", "-1" }, { "[titlemessage].align", "center" }, @@ -6118,8 +6220,8 @@ struct ConfigInfo image_config[] = { "border.draw_masked_when_fading", "true" }, - { "init.busy.x", "336" }, - { "init.busy.y", "280" }, + { "init.busy.x", "-1" }, + { "init.busy.y", "-1" }, { "init.busy.align", "center" }, { "init.busy.valign", "middle" }, @@ -6132,12 +6234,16 @@ 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" }, + { "menu.next_screen.fade_mode", "crossfade" }, + { "menu.next_screen.fade_delay", "250" }, + { "menu.next_screen.post_delay", "125" }, + { "menu.enter_screen.TITLE.fade_mode", "fade" }, + { "menu.enter_screen.TITLE.fade_delay", "500" }, + { "menu.enter_screen.TITLE.post_delay", "250" }, + { "menu.enter_screen.TITLE.auto_delay", "-1" }, { "menu.enter_screen.SCORES.fade_mode", ARG_DEFAULT }, { "menu.enter_screen.SCORES.fade_delay", ARG_DEFAULT }, { "menu.enter_screen.SCORES.post_delay", ARG_DEFAULT }, @@ -6150,6 +6256,10 @@ struct ConfigInfo image_config[] = { "menu.enter_screen.PLAYING.fade_mode", ARG_DEFAULT }, { "menu.enter_screen.PLAYING.fade_delay", ARG_DEFAULT }, { "menu.enter_screen.PLAYING.post_delay", ARG_DEFAULT }, + { "menu.leave_screen.TITLE.fade_mode", "fade" }, + { "menu.leave_screen.TITLE.fade_delay", "500" }, + { "menu.leave_screen.TITLE.post_delay", "250" }, + { "menu.leave_screen.TITLE.auto_delay", "-1" }, { "menu.leave_screen.SCORES.fade_mode", ARG_DEFAULT }, { "menu.leave_screen.SCORES.fade_delay", ARG_DEFAULT }, { "menu.leave_screen.SCORES.post_delay", ARG_DEFAULT }, @@ -6162,6 +6272,13 @@ struct ConfigInfo image_config[] = { "menu.leave_screen.PLAYING.fade_mode", ARG_DEFAULT }, { "menu.leave_screen.PLAYING.fade_delay", ARG_DEFAULT }, { "menu.leave_screen.PLAYING.post_delay", ARG_DEFAULT }, + { "menu.next_screen.TITLE.fade_mode", "fade" }, + { "menu.next_screen.TITLE.fade_delay", "500" }, + { "menu.next_screen.TITLE.post_delay", "250" }, + { "menu.next_screen.TITLE.auto_delay", "-1" }, + { "menu.next_screen.INFO.fade_mode", ARG_DEFAULT }, + { "menu.next_screen.INFO.fade_delay", ARG_DEFAULT }, + { "menu.next_screen.INFO.post_delay", ARG_DEFAULT }, { "menu.draw_xoffset", "0" }, { "menu.draw_yoffset", "0" }, @@ -6229,6 +6346,7 @@ struct ConfigInfo image_config[] = { "menu.list_size.LEVELNR", "-1" }, { "menu.list_size.SCORES", "-1" }, { "menu.list_size.INFO", "-1" }, + { "menu.list_size.INFO[ELEMENTS]", "-1" }, { "menu.list_size.SETUP", "-1" }, { "main.button.name.x", "0" }, @@ -7366,20 +7484,22 @@ struct ConfigInfo image_config[] = { "game.panel.level_author.draw_masked", "true" }, { "game.panel.level_author.draw_order", "0" }, - { "game.button.stop.x", "-1" }, - { "game.button.stop.y", "-1" }, + { "game.button.stop.x", "5" }, + { "game.button.stop.y", "215" }, { "game.button.pause.x", "35" }, { "game.button.pause.y", "215" }, - { "game.button.play.x", "35" }, + { "game.button.play.x", "65" }, { "game.button.play.y", "215" }, - { "game.button.undo.x", "5" }, - { "game.button.undo.y", "215" }, - { "game.button.redo.x", "65" }, - { "game.button.redo.y", "215" }, - { "game.button.save.x", "5" }, - { "game.button.save.y", "215" }, - { "game.button.load.x", "65" }, - { "game.button.load.y", "215" }, + { "game.button.undo.x", "-1" }, + { "game.button.undo.y", "-1" }, + { "game.button.redo.x", "-1" }, + { "game.button.redo.y", "-1" }, + { "game.button.save.x", "-1" }, + { "game.button.save.y", "-1" }, + { "game.button.pause2.x", "-1" }, + { "game.button.pause2.y", "-1" }, + { "game.button.load.x", "-1" }, + { "game.button.load.y", "-1" }, { "game.button.sound_music.x", "5" }, { "game.button.sound_music.y", "245" }, { "game.button.sound_loops.x", "35" }, @@ -7616,6 +7736,8 @@ struct ConfigInfo image_config[] = { "editor.palette.element_right.y", "258" }, { "editor.palette.element_right.tile_size", "16" }, + { "editor.drawingarea.tile_size", "16" }, + { "editor.settings.headline.x", "272" }, { "editor.settings.headline.y", "16" }, { "editor.settings.headline.align", "center" }, @@ -7668,12 +7790,15 @@ struct ConfigInfo image_config[] = { "request.step_offset", "10" }, { "request.step_delay", "20" }, { "request.anim_mode", "default" }, + { "request.align", "center" }, + { "request.valign", "middle" }, { "request.autowrap", "false" }, { "request.centered", "true" }, { "request.wrap_single_words", "true" }, { "global.use_envelope_request", "false" }, + { "game.graphics_engine_version", "-1" }, { "game.forced_scroll_delay_value", "-1" }, { "game.use_native_emc_graphics_engine", "false" }, { "game.use_native_sp_graphics_engine", "true" }, @@ -7687,6 +7812,9 @@ struct ConfigInfo image_config[] = { "viewport.window.width", "672" }, { "viewport.window.height", "560" }, + { "viewport.window.TITLE.width", ARG_DEFAULT }, + { "viewport.window.TITLE.height", ARG_DEFAULT }, + { "viewport.playfield.x", "6" }, { "viewport.playfield.y", "6" }, { "viewport.playfield.width", "548" }, @@ -7697,16 +7825,22 @@ struct ConfigInfo image_config[] = { "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.SCORES.x", ARG_DEFAULT }, + { "viewport.playfield.SCORES.y", ARG_DEFAULT }, + { "viewport.playfield.SCORES.width", ARG_DEFAULT }, + { "viewport.playfield.SCORES.height", ARG_DEFAULT }, + { "viewport.playfield.SCORES.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.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.door_1.x", "566" }, { "viewport.door_1.y", "60" }, { "viewport.door_1.width", "100" }, @@ -7717,16 +7851,22 @@ struct ConfigInfo image_config[] = { "viewport.door_1.MAIN.width", ARG_DEFAULT }, { "viewport.door_1.MAIN.height", ARG_DEFAULT }, { "viewport.door_1.MAIN.border_size", ARG_DEFAULT }, - { "viewport.door_1.PLAYING.x", ARG_DEFAULT }, - { "viewport.door_1.PLAYING.y", ARG_DEFAULT }, - { "viewport.door_1.PLAYING.width", ARG_DEFAULT }, - { "viewport.door_1.PLAYING.height", ARG_DEFAULT }, - { "viewport.door_1.PLAYING.border_size", ARG_DEFAULT }, + { "viewport.door_1.SCORES.x", ARG_DEFAULT }, + { "viewport.door_1.SCORES.y", ARG_DEFAULT }, + { "viewport.door_1.SCORES.width", ARG_DEFAULT }, + { "viewport.door_1.SCORES.height", ARG_DEFAULT }, + { "viewport.door_1.SCORES.border_size", ARG_DEFAULT }, { "viewport.door_1.EDITOR.x", ARG_DEFAULT }, { "viewport.door_1.EDITOR.y", ARG_DEFAULT }, { "viewport.door_1.EDITOR.width", ARG_DEFAULT }, { "viewport.door_1.EDITOR.height", ARG_DEFAULT }, { "viewport.door_1.EDITOR.border_size", ARG_DEFAULT }, + { "viewport.door_1.PLAYING.x", ARG_DEFAULT }, + { "viewport.door_1.PLAYING.y", ARG_DEFAULT }, + { "viewport.door_1.PLAYING.width", ARG_DEFAULT }, + { "viewport.door_1.PLAYING.height", ARG_DEFAULT }, + { "viewport.door_1.PLAYING.border_size", ARG_DEFAULT }, + { "viewport.door_2.x", "566" }, { "viewport.door_2.y", "400" }, { "viewport.door_2.width", "100" }, @@ -7737,16 +7877,21 @@ struct ConfigInfo image_config[] = { "viewport.door_2.MAIN.width", ARG_DEFAULT }, { "viewport.door_2.MAIN.height", ARG_DEFAULT }, { "viewport.door_2.MAIN.border_size", ARG_DEFAULT }, - { "viewport.door_2.PLAYING.x", ARG_DEFAULT }, - { "viewport.door_2.PLAYING.y", ARG_DEFAULT }, - { "viewport.door_2.PLAYING.width", ARG_DEFAULT }, - { "viewport.door_2.PLAYING.height", ARG_DEFAULT }, - { "viewport.door_2.PLAYING.border_size", ARG_DEFAULT }, + { "viewport.door_2.SCORES.x", ARG_DEFAULT }, + { "viewport.door_2.SCORES.y", ARG_DEFAULT }, + { "viewport.door_2.SCORES.width", ARG_DEFAULT }, + { "viewport.door_2.SCORES.height", ARG_DEFAULT }, + { "viewport.door_2.SCORES.border_size", ARG_DEFAULT }, { "viewport.door_2.EDITOR.x", "566" }, { "viewport.door_2.EDITOR.y", "356" }, { "viewport.door_2.EDITOR.width", "100" }, { "viewport.door_2.EDITOR.height", "144" }, { "viewport.door_2.EDITOR.border_size", "4" }, + { "viewport.door_2.PLAYING.x", ARG_DEFAULT }, + { "viewport.door_2.PLAYING.y", ARG_DEFAULT }, + { "viewport.door_2.PLAYING.width", ARG_DEFAULT }, + { "viewport.door_2.PLAYING.height", ARG_DEFAULT }, + { "viewport.door_2.PLAYING.border_size", ARG_DEFAULT }, { NULL, NULL } };