X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fconf_gfx.c;h=f2ddadfda4fcab17151e74edcf21c571183524c4;hp=e749b222c01f9a8e7ecd54a8efd83c56bab3eaf2;hb=6f5b701331e07bdd3e02eeb61f66bfa14d5b530f;hpb=f6bcc10ce7b517f04eb5cddf01c9ec29ee729b7e diff --git a/src/conf_gfx.c b/src/conf_gfx.c index e749b222..f2ddadfd 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -4722,21 +4722,38 @@ struct ConfigInfo image_config[] = { "game.button.gfx.play.height", "30" }, { "game.button.gfx.play.pressed_xoffset", "-100" }, - { "game.button.gfx.undo", "RocksDoor.png" }, - { "game.button.gfx.undo.x", "405" }, - { "game.button.gfx.undo.y", "215" }, + { "game.button.gfx.undo", "RocksDoor2.png" }, + { "game.button.gfx.undo.x", "105" }, + { "game.button.gfx.undo.y", "20" }, { "game.button.gfx.undo.width", "30" }, { "game.button.gfx.undo.height", "30" }, - { "game.button.gfx.undo.pressed_yoffset", "30" }, - { "game.button.gfx.redo", "RocksDoor.png" }, - { "game.button.gfx.redo.x", "465" }, - { "game.button.gfx.redo.y", "215" }, + { "game.button.gfx.undo.pressed_xoffset", "-100" }, + { "game.button.gfx.redo", "RocksDoor2.png" }, + { "game.button.gfx.redo.x", "165" }, + { "game.button.gfx.redo.y", "20" }, { "game.button.gfx.redo.width", "30" }, { "game.button.gfx.redo.height", "30" }, - { "game.button.gfx.redo.pressed_yoffset", "30" }, - - { "game.button.gfx.save", UNDEFINED_FILENAME }, - { "game.button.gfx.load", UNDEFINED_FILENAME }, + { "game.button.gfx.redo.pressed_xoffset", "-100" }, + + { "game.button.gfx.save", "RocksDoor2.png" }, + { "game.button.gfx.save.x", "105" }, + { "game.button.gfx.save.y", "50" }, + { "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" }, + { "game.button.gfx.load.width", "30" }, + { "game.button.gfx.load.height", "30" }, + { "game.button.gfx.load.pressed_xoffset", "-100" }, { "game.button.gfx.sound_music", "RocksDoor.png" }, { "game.button.gfx.sound_music.x", "305" }, @@ -5213,18 +5230,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" }, @@ -5234,7 +5239,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" }, @@ -5416,12 +5420,12 @@ 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", "RocksDoor2.png" }, + { "editor.button.gfx.properties.x", "105" }, + { "editor.button.gfx.properties.y", "0" }, { "editor.button.gfx.properties.width", "90" }, { "editor.button.gfx.properties.height", "20" }, - { "editor.button.gfx.properties.pressed_yoffset", "-20" }, + { "editor.button.gfx.properties.pressed_xoffset", "-100" }, { "editor.no_toolbox_button", "RocksDoor.png" }, { "editor.no_toolbox_button.x", "506" }, @@ -5509,13 +5513,13 @@ struct ConfigInfo image_config[] = { "editor.button.gfx.rotate_left.pressed_xoffset", "-100" }, { "editor.button.gfx.rotate_left.active_yoffset", "-94" }, - { "editor.button.gfx.zoom_level", "RocksDoor.png" }, - { "editor.button.gfx.zoom_level.x", "750" }, - { "editor.button.gfx.zoom_level.y", "286" }, + { "editor.button.gfx.zoom_level", "RocksDoor2.png" }, + { "editor.button.gfx.zoom_level.x", "350" }, + { "editor.button.gfx.zoom_level.y", "22" }, { "editor.button.gfx.zoom_level.width", "22" }, { "editor.button.gfx.zoom_level.height", "22" }, { "editor.button.gfx.zoom_level.pressed_xoffset", "-100" }, - { "editor.button.gfx.zoom_level.active_yoffset", "-94" }, + { "editor.button.gfx.zoom_level.active_yoffset", "-22" }, { "editor.button.gfx.rotate_right", "RocksDoor.png" }, { "editor.button.gfx.rotate_right.x", "772" }, @@ -5607,7 +5611,7 @@ struct ConfigInfo image_config[] = { "editor.button.gfx.cp_paste.y", "70" }, { "editor.button.gfx.cp_paste.width", "20" }, { "editor.button.gfx.cp_paste.height", "20" }, - { "editor.button.gfx.cp_paste.pressed_xoffset", "-20" }, + { "editor.button.gfx.cp_paste.pressed_xoffset", "-20" }, { "editor.button.gfx.undo", "RocksDoor.png" }, { "editor.button.gfx.undo.x", "705" }, @@ -5658,6 +5662,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 }, @@ -6219,6 +6240,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" }, @@ -7362,12 +7384,14 @@ struct ConfigInfo image_config[] = { "game.button.pause.y", "215" }, { "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.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" }, @@ -7606,6 +7630,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" }, @@ -7658,6 +7684,8 @@ 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" }, @@ -7687,16 +7715,21 @@ 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" }, @@ -7707,16 +7740,21 @@ 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" }, @@ -7727,16 +7765,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 } };