X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=854fa2648da8cb81ab15d528c3a3d1edd5dfe292;hb=1a22e8bdd70708d1ee0bb3f21a456eca4e3de50a;hp=6c1a6ba2ef9e35bb469daca99bb93e4ae8bc06c5;hpb=914d869445048466ef00954109a15286938521c6;p=rocksndiamonds.git diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 6c1a6ba2..854fa264 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -5654,22 +5654,6 @@ struct ConfigInfo image_config[] = // keyword to stop parser: "NO_MORE_ELEMENT_IMAGES" <-- do not change! -#if 1 - // !!! TEMPORARILY STORED HERE -- PROBABLY TO BE CHANGED !!! - - // (for testing, change filename back to "emc_objects dot png") - { "emc_object", "RocksEMC.png" }, -#if 0 - { "emc_object.scale_up_factor", "2" }, -#endif - - // (for testing, change filename back to "emc_players dot png") - { "emc_sprite", "RocksEMC.png" }, -#if 0 - { "emc_sprite.scale_up_factor", "2" }, -#endif -#endif - { "sp_frame_horizontal", "RocksSP.png" }, { "sp_frame_horizontal.xpos", "7" }, { "sp_frame_horizontal.ypos", "14" }, @@ -6055,6 +6039,34 @@ struct ConfigInfo image_config[] = { "menu.button_play_solution", UNDEFINED_FILENAME }, { "menu.button_play_solution.active", UNDEFINED_FILENAME }, + { "menu.button_switch_ecs_aga", UNDEFINED_FILENAME }, + { "menu.button_switch_ecs_aga.active", UNDEFINED_FILENAME }, + + { "menu.button_touch_back", "RocksTouch.png" }, + { "menu.button_touch_back.x", "210" }, + { "menu.button_touch_back.y", "180" }, + { "menu.button_touch_back.width", "60" }, + { "menu.button_touch_back.height", "60" }, + { "menu.button_touch_back.pressed_xoffset", "-200" }, + { "menu.button_touch_next", "RocksTouch.png" }, + { "menu.button_touch_next.x", "330" }, + { "menu.button_touch_next.y", "180" }, + { "menu.button_touch_next.width", "60" }, + { "menu.button_touch_next.height", "60" }, + { "menu.button_touch_next.pressed_xoffset", "-200" }, + { "menu.button_touch_back2", "RocksTouch.png" }, + { "menu.button_touch_back2.x", "210" }, + { "menu.button_touch_back2.y", "180" }, + { "menu.button_touch_back2.width", "60" }, + { "menu.button_touch_back2.height", "60" }, + { "menu.button_touch_back2.pressed_xoffset", "-200" }, + { "menu.button_touch_next2", "RocksTouch.png" }, + { "menu.button_touch_next2.x", "330" }, + { "menu.button_touch_next2.y", "180" }, + { "menu.button_touch_next2.width", "60" }, + { "menu.button_touch_next2.height", "60" }, + { "menu.button_touch_next2.pressed_xoffset", "-200" }, + { "menu.scrollbar", "RocksDC.png" }, { "menu.scrollbar.xpos", "8" }, { "menu.scrollbar.ypos", "10" }, @@ -6172,6 +6184,20 @@ struct ConfigInfo image_config[] = { "gfx.game.button.panel_sound_loops", UNDEFINED_FILENAME }, { "gfx.game.button.panel_sound_simple", UNDEFINED_FILENAME }, + { "gfx.game.button.touch_stop", "RocksTouch.png" }, + { "gfx.game.button.touch_stop.x", "210" }, + { "gfx.game.button.touch_stop.y", "120" }, + { "gfx.game.button.touch_stop.width", "60" }, + { "gfx.game.button.touch_stop.height", "60" }, + { "gfx.game.button.touch_stop.pressed_xoffset", "-200" }, + { "gfx.game.button.touch_pause", "RocksTouch.png" }, + { "gfx.game.button.touch_pause.x", "270" }, + { "gfx.game.button.touch_pause.y", "120" }, + { "gfx.game.button.touch_pause.width", "60" }, + { "gfx.game.button.touch_pause.height", "60" }, + { "gfx.game.button.touch_pause.pressed_xoffset", "-200" }, + { "gfx.game.button.touch_pause.active_yoffset", "60" }, + { "gfx.tape.button.eject", "RocksDoor.png" }, { "gfx.tape.button.eject.x", "305" }, { "gfx.tape.button.eject.y", "357" }, @@ -6336,6 +6362,25 @@ struct ConfigInfo image_config[] = { "gfx.request.button.player_4", UNDEFINED_FILENAME }, { "gfx.request.button.player_4.clone_from", "gfx.request.button.player_1" }, + { "gfx.request.button.touch_yes", "RocksTouch.png" }, + { "gfx.request.button.touch_yes.x", "204" }, + { "gfx.request.button.touch_yes.y", "0" }, + { "gfx.request.button.touch_yes.width", "92" }, + { "gfx.request.button.touch_yes.height", "56" }, + { "gfx.request.button.touch_yes.pressed_xoffset", "-200" }, + { "gfx.request.button.touch_no", "RocksTouch.png" }, + { "gfx.request.button.touch_no.x", "304" }, + { "gfx.request.button.touch_no.y", "0" }, + { "gfx.request.button.touch_no.width", "92" }, + { "gfx.request.button.touch_no.height", "56" }, + { "gfx.request.button.touch_no.pressed_xoffset", "-200" }, + { "gfx.request.button.touch_confirm", "RocksTouch.png" }, + { "gfx.request.button.touch_confirm.x", "204" }, + { "gfx.request.button.touch_confirm.y", "60" }, + { "gfx.request.button.touch_confirm.width", "192" }, + { "gfx.request.button.touch_confirm.height", "56" }, + { "gfx.request.button.touch_confirm.pressed_xoffset", "-200" }, + { "font.initial_1", "RocksFontSmall.png" }, { "font.initial_1.x", "0" }, { "font.initial_1.y", "0" }, @@ -7757,6 +7802,8 @@ struct ConfigInfo image_config[] = { "menu.draw_yoffset.SETUP", "0" }, { "menu.draw_xoffset.SETUP[GAME]", "0" }, { "menu.draw_yoffset.SETUP[GAME]", "0" }, + { "menu.draw_xoffset.SETUP[ENGINES]", "0" }, + { "menu.draw_yoffset.SETUP[ENGINES]", "0" }, { "menu.draw_xoffset.SETUP[EDITOR]", "0" }, { "menu.draw_yoffset.SETUP[EDITOR]", "0" }, { "menu.draw_xoffset.SETUP[GRAPHICS]", "0" }, @@ -7923,6 +7970,9 @@ struct ConfigInfo image_config[] = { "main.button.play_solution.x", "-1" }, { "main.button.play_solution.y", "-1" }, + { "main.button.switch_ecs_aga.x", "-1" }, + { "main.button.switch_ecs_aga.y", "-1" }, + { "main.text.name.x", "-1" }, { "main.text.name.y", "-1" }, { "main.text.name.width", "-1" }, @@ -8092,6 +8142,15 @@ struct ConfigInfo image_config[] = { "setup.button.next_player.x", "384" }, { "setup.button.next_player.y", "64" }, + { "setup.button.touch_back.x", "0" }, + { "setup.button.touch_back.y", "0" }, + { "setup.button.touch_next.x", "-60" }, + { "setup.button.touch_next.y", "0" }, + { "setup.button.touch_back2.x", "0" }, + { "setup.button.touch_back2.y", "-60" }, + { "setup.button.touch_next2.x", "-60" }, + { "setup.button.touch_next2.y", "-60" }, + { "preview.x", "272" }, { "preview.y", "380" }, { "preview.align", "center" }, @@ -9118,6 +9177,11 @@ struct ConfigInfo image_config[] = { "game.button.panel_sound_simple.x", "-1" }, { "game.button.panel_sound_simple.y", "-1" }, + { "game.button.touch_stop.x", "0" }, + { "game.button.touch_stop.y", "0" }, + { "game.button.touch_pause.x", "-60" }, + { "game.button.touch_pause.y", "0" }, + { "tape.button.eject.x", "5" }, { "tape.button.eject.y", "77" }, { "tape.button.stop.x", "23" }, @@ -9414,6 +9478,13 @@ struct ConfigInfo image_config[] = { "request.button.player_4.draw_player", "true" }, { "request.button.player_4.tile_size", "16" }, + { "request.button.touch_yes.x", "0" }, + { "request.button.touch_yes.y", "-56" }, + { "request.button.touch_no.x", "-92" }, + { "request.button.touch_no.y", "-56" }, + { "request.button.touch_confirm.x", "0" }, + { "request.button.touch_confirm.y", "-56" }, + { "request.x", "-1" }, { "request.y", "-1" }, { "request.width", "120" },