X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=a0ce19ebb8ce5c2d26e78c5ff6c2c2c9def749cc;hb=9618cdb31ec89b5f68f79a0d6011cd0c6c580a85;hp=6b60a7e2623a34073e77b23d382d609c188a8d7a;hpb=caa7c617a9ffc31ac6b4a20d7046235c409671ca;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 6b60a7e2..a0ce19eb 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -1212,21 +1212,33 @@ struct ConfigInfo image_config[] =
   { "yamyam.left.ypos",				"5"			},
   { "yamyam.left.frames",			"4"			},
   { "yamyam.left.anim_mode",			"pingpong2"		},
+  { "yamyam.left.EDITOR",			"RocksEMC.pcx"		},
+  { "yamyam.left.EDITOR.xpos",			"7"			},
+  { "yamyam.left.EDITOR.ypos",			"15"			},
   { "yamyam.right",				"RocksElements.pcx"	},
   { "yamyam.right.xpos",			"0"			},
   { "yamyam.right.ypos",			"5"			},
   { "yamyam.right.frames",			"4"			},
   { "yamyam.right.anim_mode",			"pingpong2"		},
+  { "yamyam.right.EDITOR",			"RocksEMC.pcx"		},
+  { "yamyam.right.EDITOR.xpos",			"8"			},
+  { "yamyam.right.EDITOR.ypos",			"15"			},
   { "yamyam.up",				"RocksElements.pcx"	},
   { "yamyam.up.xpos",				"0"			},
   { "yamyam.up.ypos",				"5"			},
   { "yamyam.up.frames",				"4"			},
   { "yamyam.up.anim_mode",			"pingpong2"		},
+  { "yamyam.up.EDITOR",				"RocksEMC.pcx"		},
+  { "yamyam.up.EDITOR.xpos",			"5"			},
+  { "yamyam.up.EDITOR.ypos",			"15"			},
   { "yamyam.down",				"RocksElements.pcx"	},
   { "yamyam.down.xpos",				"0"			},
   { "yamyam.down.ypos",				"5"			},
   { "yamyam.down.frames",			"4"			},
   { "yamyam.down.anim_mode",			"pingpong2"		},
+  { "yamyam.down.EDITOR",			"RocksEMC.pcx"		},
+  { "yamyam.down.EDITOR.xpos",			"6"			},
+  { "yamyam.down.EDITOR.ypos",			"15"			},
   { "yamyam.moving",				"RocksElements.pcx"	},
   { "yamyam.moving.xpos",			"0"			},
   { "yamyam.moving.ypos",			"5"			},
@@ -2369,6 +2381,14 @@ struct ConfigInfo image_config[] =
   { "expandable_wall_any.EDITOR.xpos",		"12"			},
   { "expandable_wall_any.EDITOR.ypos",		"13"			},
 
+  { "bd_expandable_wall",			"RocksElements.pcx"	},
+  { "bd_expandable_wall.xpos",			"5"			},
+  { "bd_expandable_wall.ypos",			"9"			},
+  { "bd_expandable_wall.frames",		"1"			},
+  { "bd_expandable_wall.EDITOR",		"RocksDC.pcx"		},
+  { "bd_expandable_wall.EDITOR.xpos",		"15"			},
+  { "bd_expandable_wall.EDITOR.ypos",		"15"			},
+
   { "expandable_wall.growing.left",		"RocksElements.pcx"	},
   { "expandable_wall.growing.left.xpos",	"8"			},
   { "expandable_wall.growing.left.ypos",	"10"			},
@@ -3446,9 +3466,24 @@ struct ConfigInfo image_config[] =
 
   { "trigger_ce_value",				"RocksDC.pcx"		},
   { "trigger_ce_value.xpos",			"15"			},
-  { "trigger_ce_value.ypos",			"15"			},
+  { "trigger_ce_value.ypos",			"11"			},
   { "trigger_ce_value.frames",			"1"			},
 
+  { "trigger_ce_score",				"RocksDC.pcx"		},
+  { "trigger_ce_score.xpos",			"15"			},
+  { "trigger_ce_score.ypos",			"12"			},
+  { "trigger_ce_score.frames",			"1"			},
+
+  { "current_ce_value",				"RocksDC.pcx"		},
+  { "current_ce_value.xpos",			"14"			},
+  { "current_ce_value.ypos",			"11"			},
+  { "current_ce_value.frames",			"1"			},
+
+  { "current_ce_score",				"RocksDC.pcx"		},
+  { "current_ce_score.xpos",			"14"			},
+  { "current_ce_score.ypos",			"12"			},
+  { "current_ce_score.frames",			"1"			},
+
   { "emc_key_5",				"RocksEMC.pcx"		},
   { "emc_key_5.xpos",				"0"			},
   { "emc_key_5.ypos",				"5"			},
@@ -3758,6 +3793,10 @@ struct ConfigInfo image_config[] =
   { "emc_fake_grass.active.CRUMBLED.xpos",	"3"			},
   { "emc_fake_grass.active.CRUMBLED.ypos",	"4"			},
   { "emc_fake_grass.active.CRUMBLED.frames",	"1"			},
+  { "emc_fake_grass.EDITOR",			"RocksEMC.pcx"		},
+  { "emc_fake_grass.EDITOR.xpos",		"2"			},
+  { "emc_fake_grass.EDITOR.ypos",		"4"			},
+  { "emc_fake_grass.EDITOR.frames",		"1"			},
 
   { "emc_fake_acid",				"RocksElements.pcx"	},
   { "emc_fake_acid.xpos",			"12"			},
@@ -3788,14 +3827,14 @@ struct ConfigInfo image_config[] =
 #if 1
   /* !!! TEMPORARILY STORED HERE -- PROBABLY TO BE CHANGED !!! */
 
-  /* (for testing, change filename back to "emc_object dot pcx") */
-  { "emc_object",				"emc_objects.pcx"	},
+  /* (for testing, change filename back to "emc_objects dot pcx") */
+  { "emc_object",				"RocksEMC.pcx"		},
 #if 0
   { "emc_object.scale_up_factor",		"2"			},
 #endif
 
-  /* (for testing, change filename back to "emc_sprite dot pcx") */
-  { "emc_sprite",				"emc_players.pcx"	},
+  /* (for testing, change filename back to "emc_players dot pcx") */
+  { "emc_sprite",				"RocksEMC.pcx"		},
 #if 0
   { "emc_sprite.scale_up_factor",		"2"			},
 #endif
@@ -4051,6 +4090,15 @@ struct ConfigInfo image_config[] =
   { "menu.button_leave_menu.active",		"RocksDC.pcx"		},
   { "menu.button_leave_menu.active.clone_from",	"menu.button_left.active" },
 
+  { "menu.button_next_level",			"RocksDC.pcx"		},
+  { "menu.button_next_level.clone_from",	"menu.button_right"	},
+  { "menu.button_next_level.active",		"RocksDC.pcx"		},
+  { "menu.button_next_level.active.clone_from",	"menu.button_right.active" },
+  { "menu.button_last_level",			"RocksDC.pcx"		},
+  { "menu.button_last_level.clone_from",	"menu.button_left"	},
+  { "menu.button_last_level.active",		"RocksDC.pcx"		},
+  { "menu.button_last_level.active.clone_from",	"menu.button_left.active" },
+
   { "menu.scrollbar",				"RocksDC.pcx"		},
   { "menu.scrollbar.xpos",			"8"			},
   { "menu.scrollbar.ypos",			"10"			},
@@ -4349,7 +4397,14 @@ struct ConfigInfo image_config[] =
   { "background.envelope_4.anim_mode",		"default"		},
   { "background.envelope_4.draw_masked",	"false"			},
 
+  { "titlescreen_1",				UNDEFINED_FILENAME	},
+  { "titlescreen_2",				UNDEFINED_FILENAME	},
+  { "titlescreen_3",				UNDEFINED_FILENAME	},
+  { "titlescreen_4",				UNDEFINED_FILENAME	},
+  { "titlescreen_5",				UNDEFINED_FILENAME	},
+
   { "background",				UNDEFINED_FILENAME	},
+  { "background.TITLE",				UNDEFINED_FILENAME	},
   { "background.MAIN",				UNDEFINED_FILENAME	},
   { "background.LEVELS",			UNDEFINED_FILENAME	},
   { "background.SCORES",			UNDEFINED_FILENAME	},