X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconf_gfx.c;h=96ff7825da2219bf8aedc4ddb73c64822cb1cf16;hp=82f508fd6af3630670d6e7987dd62bf59b3aa2ae;hb=f1f15272242355ab7bc94028b4fa4b2e0f8152b5;hpb=08077278b4277434ebbeb0e828cf45f9ce9ee387 diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 82f508fd..96ff7825 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -1,15 +1,13 @@ -/*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * -*----------------------------------------------------------* -* (c) 1995-2006 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* conf_gfx.c * -***********************************************************/ +// ============================================================================ +// Rocks'n'Diamonds - McDuffin Strikes Back! +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// conf_gfx.c +// ============================================================================ #include "libgame/libgame.h" #include "main.h" @@ -59,6 +57,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 }, + { ".tile_size", ARG_UNDEFINED, TYPE_INTEGER }, { ".clone_from", ARG_UNDEFINED, TYPE_GRAPHIC }, { ".fade_mode", ARG_UNDEFINED, TYPE_INTEGER }, { ".fade_delay", ARG_UNDEFINED, TYPE_INTEGER }, @@ -5306,6 +5305,20 @@ struct ConfigInfo image_config[] = { "editor.button.gfx.next_level.height", "16" }, { "editor.button.gfx.next_level.pressed_xoffset", "-16" }, + { "editor.button.gfx.properties", "RocksDoor.png" }, + { "editor.button.gfx.properties.x", "505" }, + { "editor.button.gfx.properties.y", "110" }, + { "editor.button.gfx.properties.width", "90" }, + { "editor.button.gfx.properties.height", "20" }, + { "editor.button.gfx.properties.pressed_yoffset", "-20" }, + + { "editor.input.gfx.level_number", "RocksDoor.png" }, + { "editor.input.gfx.level_number.x", "529" }, + { "editor.input.gfx.level_number.y", "5" }, + { "editor.input.gfx.level_number.width", "42" }, + { "editor.input.gfx.level_number.height", "16" }, + { "editor.input.gfx.level_number.border_size","1" }, + { "background", UNDEFINED_FILENAME }, { "background.TITLE_INITIAL", UNDEFINED_FILENAME }, { "background.TITLE", UNDEFINED_FILENAME }, @@ -5419,62 +5432,74 @@ struct ConfigInfo image_config[] = { "door_1.gfx.part_1.y", "0" }, { "door_1.gfx.part_1.width", "100" }, { "door_1.gfx.part_1.height", "77" }, + { "door_1.gfx.part_1.frames", "1" }, { "door_1.gfx.part_2", "RocksDoor.png" }, { "door_1.gfx.part_2.x", "0" }, { "door_1.gfx.part_2.y", "77" }, { "door_1.gfx.part_2.width", "100" }, { "door_1.gfx.part_2.height", "63" }, + { "door_1.gfx.part_2.frames", "1" }, { "door_1.gfx.part_3", "RocksDoor.png" }, { "door_1.gfx.part_3.x", "0" }, { "door_1.gfx.part_3.y", "140" }, { "door_1.gfx.part_3.width", "100" }, { "door_1.gfx.part_3.height", "63" }, + { "door_1.gfx.part_3.frames", "1" }, { "door_1.gfx.part_4", "RocksDoor.png" }, { "door_1.gfx.part_4.x", "0" }, { "door_1.gfx.part_4.y", "203" }, { "door_1.gfx.part_4.width", "100" }, { "door_1.gfx.part_4.height", "77" }, + { "door_1.gfx.part_4.frames", "1" }, { "door_1.gfx.part_5", "RocksDoor.png" }, { "door_1.gfx.part_5.x", "100" }, { "door_1.gfx.part_5.y", "0" }, { "door_1.gfx.part_5.width", "100" }, { "door_1.gfx.part_5.height", "77" }, + { "door_1.gfx.part_5.frames", "1" }, { "door_1.gfx.part_6", "RocksDoor.png" }, { "door_1.gfx.part_6.x", "100" }, { "door_1.gfx.part_6.y", "77" }, { "door_1.gfx.part_6.width", "100" }, { "door_1.gfx.part_6.height", "63" }, + { "door_1.gfx.part_6.frames", "1" }, { "door_1.gfx.part_7", "RocksDoor.png" }, { "door_1.gfx.part_7.x", "100" }, { "door_1.gfx.part_7.y", "140" }, { "door_1.gfx.part_7.width", "100" }, { "door_1.gfx.part_7.height", "63" }, + { "door_1.gfx.part_7.frames", "1" }, { "door_1.gfx.part_8", "RocksDoor.png" }, { "door_1.gfx.part_8.x", "100" }, { "door_1.gfx.part_8.y", "203" }, { "door_1.gfx.part_8.width", "100" }, { "door_1.gfx.part_8.height", "77" }, + { "door_1.gfx.part_8.frames", "1" }, { "door_2.gfx.part_1", "RocksDoor.png" }, { "door_2.gfx.part_1.x", "0" }, { "door_2.gfx.part_1.y", "280" }, { "door_2.gfx.part_1.width", "100" }, { "door_2.gfx.part_1.height", "50" }, + { "door_1.gfx.part_1.frames", "1" }, { "door_2.gfx.part_2", "RocksDoor.png" }, { "door_2.gfx.part_2.x", "0" }, { "door_2.gfx.part_2.y", "330" }, { "door_2.gfx.part_2.width", "100" }, { "door_2.gfx.part_2.height", "50" }, + { "door_1.gfx.part_2.frames", "1" }, { "door_2.gfx.part_3", "RocksDoor.png" }, { "door_2.gfx.part_3.x", "100" }, { "door_2.gfx.part_3.y", "280" }, { "door_2.gfx.part_3.width", "100" }, { "door_2.gfx.part_3.height", "50" }, + { "door_1.gfx.part_3.frames", "1" }, { "door_2.gfx.part_4", "RocksDoor.png" }, { "door_2.gfx.part_4.x", "100" }, { "door_2.gfx.part_4.y", "330" }, { "door_2.gfx.part_4.width", "100" }, { "door_2.gfx.part_4.height", "50" }, + { "door_1.gfx.part_4.frames", "1" }, { "door_2.gfx.part_5", UNDEFINED_FILENAME }, { "door_2.gfx.part_6", UNDEFINED_FILENAME }, { "door_2.gfx.part_7", UNDEFINED_FILENAME }, @@ -5715,10 +5740,10 @@ struct ConfigInfo image_config[] = { "titlemessage_5.post_delay", ARG_DEFAULT }, { "titlemessage_5.auto_delay", ARG_DEFAULT }, - { "readme.x", "272" }, - { "readme.y", "150" }, - { "readme.width", "480" }, - { "readme.height", "364" }, + { "readme.x", "-1" }, + { "readme.y", "-1" }, + { "readme.width", "-1" }, + { "readme.height", "-1" }, { "readme.chars", "-1" }, { "readme.lines", "-1" }, { "readme.align", "center" }, @@ -5829,6 +5854,8 @@ 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[TOUCH]", "0" }, + { "menu.draw_yoffset.SETUP[TOUCH]", "0" }, { "menu.draw_xoffset.SETUP[SHORTCUTS]", "0" }, { "menu.draw_yoffset.SETUP[SHORTCUTS]", "0" }, { "menu.draw_xoffset.SETUP[SHORTCUTS_1]", "0" }, @@ -6023,8 +6050,6 @@ struct ConfigInfo image_config[] = { "main.input.name.valign", "top" }, { "main.input.name.font", "font.input_1" }, - { "main.show_game_buttons", "false" }, - { "preview.x", "272" }, { "preview.y", "380" }, { "preview.align", "center" }, @@ -7072,26 +7097,104 @@ struct ConfigInfo image_config[] = { "tape.text.date.align", "left" }, { "tape.text.date.valign", "top" }, { "tape.text.date.digits", "-1" }, + { "tape.text.date.xoffset", "27" }, + { "tape.text.date.2nd_xoffset", "64" }, { "tape.text.date.font", "font.tape_recorder" }, + { "tape.text.date.draw_masked", "false" }, + + { "tape.text.date_yyyy.x", "-1" }, + { "tape.text.date_yyyy.y", "-1" }, + { "tape.text.date_yyyy.align", "left" }, + { "tape.text.date_yyyy.valign", "top" }, + { "tape.text.date_yyyy.digits", "2" }, + { "tape.text.date_yyyy.font", "font.tape_recorder" }, + { "tape.text.date_yyyy.draw_masked", "true" }, + { "tape.text.date_yy.x", "-1" }, + { "tape.text.date_yy.y", "-1" }, + { "tape.text.date_yy.align", "left" }, + { "tape.text.date_yy.valign", "top" }, + { "tape.text.date_yy.digits", "2" }, + { "tape.text.date_yy.font", "font.tape_recorder" }, + { "tape.text.date_yy.draw_masked", "true" }, + { "tape.text.date_mmm.x", "-1" }, + { "tape.text.date_mmm.y", "-1" }, + { "tape.text.date_mmm.align", "left" }, + { "tape.text.date_mmm.valign", "top" }, + { "tape.text.date_mmm.digits", "2" }, + { "tape.text.date_mmm.font", "font.tape_recorder" }, + { "tape.text.date_mmm.draw_masked", "true" }, + { "tape.text.date_mm.x", "-1" }, + { "tape.text.date_mm.y", "-1" }, + { "tape.text.date_mm.align", "left" }, + { "tape.text.date_mm.valign", "top" }, + { "tape.text.date_mm.digits", "2" }, + { "tape.text.date_mm.font", "font.tape_recorder" }, + { "tape.text.date_mm.draw_masked", "true" }, + { "tape.text.date_dd.x", "-1" }, + { "tape.text.date_dd.y", "-1" }, + { "tape.text.date_dd.align", "left" }, + { "tape.text.date_dd.valign", "top" }, + { "tape.text.date_dd.digits", "2" }, + { "tape.text.date_dd.font", "font.tape_recorder" }, + { "tape.text.date_dd.draw_masked", "true" }, { "tape.text.time.x", "44" }, { "tape.text.time.y", "55" }, { "tape.text.time.align", "left" }, { "tape.text.time.valign", "top" }, { "tape.text.time.digits", "-1" }, + { "tape.text.time.xoffset", "27" }, { "tape.text.time.font", "font.tape_recorder" }, + { "tape.text.time.draw_masked", "false" }, + + { "tape.text.time_hh.x", "-1" }, + { "tape.text.time_hh.y", "-1" }, + { "tape.text.time_hh.align", "left" }, + { "tape.text.time_hh.valign", "top" }, + { "tape.text.time_hh.digits", "2" }, + { "tape.text.time_hh.font", "font.tape_recorder" }, + { "tape.text.time_hh.draw_masked", "true" }, + { "tape.text.time_mm.x", "-1" }, + { "tape.text.time_mm.y", "-1" }, + { "tape.text.time_mm.align", "left" }, + { "tape.text.time_mm.valign", "top" }, + { "tape.text.time_mm.digits", "2" }, + { "tape.text.time_mm.font", "font.tape_recorder" }, + { "tape.text.time_mm.draw_masked", "true" }, + { "tape.text.time_ss.x", "-1" }, + { "tape.text.time_ss.y", "-1" }, + { "tape.text.time_ss.align", "left" }, + { "tape.text.time_ss.valign", "top" }, + { "tape.text.time_ss.digits", "2" }, + { "tape.text.time_ss.font", "font.tape_recorder" }, + { "tape.text.time_ss.draw_masked", "true" }, + + { "tape.show_game_buttons", "false" }, + + { "editor.button.prev_level.x", "5" }, + { "editor.button.prev_level.y", "5" }, + { "editor.button.next_level.x", "79" }, + { "editor.button.next_level.y", "5" }, + { "editor.button.properties.x", "5" }, + { "editor.button.properties.y", "230" }, + { "editor.input.level_number.x", "29" }, + { "editor.input.level_number.y", "5" }, { "editor.palette.x", "5" }, { "editor.palette.y", "30" }, { "editor.palette.cols", "4" }, - { "editor.palette.rows", "11" }, + { "editor.palette.rows", "10" }, + { "editor.palette.tile_size", "16" }, { "editor.palette.element_left.x", "6" }, { "editor.palette.element_left.y", "258" }, + { "editor.palette.element_left.tile_size", "16" }, { "editor.palette.element_middle.x", "42" }, { "editor.palette.element_middle.y", "258" }, + { "editor.palette.element_middle.tile_size", "16" }, { "editor.palette.element_right.x", "78" }, { "editor.palette.element_right.y", "258" }, + { "editor.palette.element_right.tile_size", "16" }, { "request.button.yes.x", "2" }, { "request.button.yes.y", "250" },