X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=a607b377908db46b56316ed92ece1ee4b839870b;hb=8da08295743b5a375f8cabe26cc1d48249c89b42;hp=5bb2817fc5a6b9c4b9fa76aa8dddf415e5ecf4e6;hpb=65bfe5289ae5bcb4c1ea9bee97ebc619e1ecfc16;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 5bb2817f..a607b377 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,31 @@ struct ConfigInfo image_config[] =
   { "menu.button_play_solution",		UNDEFINED_FILENAME	},
   { "menu.button_play_solution.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 +6181,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"			},
@@ -8111,6 +8134,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"		},
@@ -9137,6 +9169,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"			},