X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=d5198c80c624aa1da6db41ae363e889564d31212;hb=b197ad86c0801f6139e4f147bf22bd375c9dfb63;hp=bb4e5e213174e29bfef66198f9aa54ccc83cc586;hpb=642b8eee1c2a598ca127dde3f202db2add4533c8;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index bb4e5e21..d5198c80 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -294,8 +294,6 @@ struct ConfigInfo image_config[] =
 
   { "bd_amoeba_2",					UNDEFINED_FILENAME		},
   { "bd_amoeba_2.clone_from",				"bd_amoeba"			},
-  { "bd_amoeba_2.EDITOR",				UNDEFINED_FILENAME		},
-  { "bd_amoeba_2.EDITOR.clone_from",			"bd_amoeba.EDITOR"		},
 
   { "bd_butterfly",					"RocksElements.png"		},
   { "bd_butterfly.xpos",				"4"				},
@@ -674,9 +672,9 @@ struct ConfigInfo image_config[] =
   { "bd_inbox.opening.frames",				"2"				},
   { "bd_inbox.opening.delay",				"8"				},
   { "bd_inbox.opening.anim_mode",			"reverse"			},
-  { "bd_inbox.EDITOR",					"RocksBD.png"			},
-  { "bd_inbox.EDITOR.xpos",				"2"				},
-  { "bd_inbox.EDITOR.ypos",				"3"				},
+  { "bd_inbox.EDITOR",					"RocksBD2.png"			},
+  { "bd_inbox.EDITOR.xpos",				"0"				},
+  { "bd_inbox.EDITOR.ypos",				"0"				},
 
   { "bd_exit_closed",					"RocksBD.png"			},
   { "bd_exit_closed.xpos",				"8"				},
@@ -735,15 +733,14 @@ struct ConfigInfo image_config[] =
   { "bd_flying_diamond.ypos",				"3"				},
   { "bd_flying_diamond.frames",				"4"				},
   { "bd_flying_diamond.delay",				"4"				},
-  { "bd_flying_diamond.anim_mode",			"reverse"			},
   { "bd_flying_diamond.moving",				"RocksBD.png"			},
   { "bd_flying_diamond.moving.xpos",			"3"				},
-  { "bd_flying_diamond.moving.ypos",			"4"				},
+  { "bd_flying_diamond.moving.ypos",			"3"				},
   { "bd_flying_diamond.moving.frames",			"2"				},
   { "bd_flying_diamond.moving.delay",			"4"				},
   { "bd_flying_diamond.flying",				"RocksBD.png"			},
   { "bd_flying_diamond.flying.xpos",			"3"				},
-  { "bd_flying_diamond.flying.ypos",			"4"				},
+  { "bd_flying_diamond.flying.ypos",			"3"				},
   { "bd_flying_diamond.flying.frames",			"2"				},
   { "bd_flying_diamond.flying.delay",			"4"				},
   { "bd_flying_diamond.flying.EDITOR",			"RocksBD2.png"			},
@@ -773,7 +770,7 @@ struct ConfigInfo image_config[] =
   { "bd_nut.falling.EDITOR.ypos",			"2"				},
 
   { "bd_bladder",					"RocksBD.png"			},
-  { "bd_bladder.xpos",					"8"				},
+  { "bd_bladder.xpos",					"4"				},
   { "bd_bladder.ypos",					"11"				},
   { "bd_bladder.frames",				"4"				},
   { "bd_bladder.delay",					"4"				},
@@ -877,11 +874,8 @@ struct ConfigInfo image_config[] =
   { "bd_gravity_switch.active.ypos",			"10"				},
   { "bd_gravity_switch.active.frames",			"1"				},
 
-  { "bd_acid",						"boulder_rush.png"		},
-  { "bd_acid.xpos",					"4"				},
-  { "bd_acid.ypos",					"2"				},
-  { "bd_acid.frames",					"1"				},
-  { "bd_acid.scale_up_factor",				"2"				},
+  { "bd_acid",						UNDEFINED_FILENAME		},
+  { "bd_acid.clone_from",				"amoeba_dead"			},
 
   { "bd_box",						"RocksBD.png"			},
   { "bd_box.xpos",					"8"				},
@@ -908,11 +902,35 @@ struct ConfigInfo image_config[] =
   { "bd_pot.ypos",					"6"				},
   { "bd_pot.frames",					"1"				},
 
-  { "bd_pneumatic_hammer",				"boulder_rush.png"		},
-  { "bd_pneumatic_hammer.xpos",				"6"				},
-  { "bd_pneumatic_hammer.ypos",				"7"				},
+  { "bd_pneumatic_hammer",				"RocksBD.png"			},
+  { "bd_pneumatic_hammer.xpos",				"11"				},
+  { "bd_pneumatic_hammer.ypos",				"9"				},
   { "bd_pneumatic_hammer.frames",			"1"				},
-  { "bd_pneumatic_hammer.scale_up_factor",		"2"				},
+  { "bd_pneumatic_hammer.hitting.left",			"RocksBD.png"			},
+  { "bd_pneumatic_hammer.hitting.left.xpos",		"4"				},
+  { "bd_pneumatic_hammer.hitting.left.ypos",		"12"				},
+  { "bd_pneumatic_hammer.hitting.left.frames",		"2"				},
+  { "bd_pneumatic_hammer.hitting.left.delay",		"4"				},
+  { "bd_pneumatic_hammer.hitting.left.offset",		"64"				},
+  { "bd_pneumatic_hammer.hitting.right",		"RocksBD.png"			},
+  { "bd_pneumatic_hammer.hitting.right.xpos",		"1"				},
+  { "bd_pneumatic_hammer.hitting.right.ypos",		"12"				},
+  { "bd_pneumatic_hammer.hitting.right.frames",		"2"				},
+  { "bd_pneumatic_hammer.hitting.right.delay",		"4"				},
+  { "bd_pneumatic_hammer.hitting.right.offset",		"64"				},
+
+  { "bd_player.hitting.left",				"RocksBD.png"			},
+  { "bd_player.hitting.left.xpos",			"5"				},
+  { "bd_player.hitting.left.ypos",			"12"				},
+  { "bd_player.hitting.left.frames",			"2"				},
+  { "bd_player.hitting.left.delay",			"4"				},
+  { "bd_player.hitting.left.offset",			"64"				},
+  { "bd_player.hitting.right",				"RocksBD.png"			},
+  { "bd_player.hitting.right.xpos",			"0"				},
+  { "bd_player.hitting.right.ypos",			"12"				},
+  { "bd_player.hitting.right.frames",			"2"				},
+  { "bd_player.hitting.right.delay",			"4"				},
+  { "bd_player.hitting.right.offset",			"64"				},
 
   { "bd_teleporter",					"RocksBD.png"			},
   { "bd_teleporter.xpos",				"2"				},
@@ -962,11 +980,10 @@ struct ConfigInfo image_config[] =
   { "bd_sweet.ypos",					"6"				},
   { "bd_sweet.frames",					"1"				},
 
-  { "bd_voodoo_doll",					"boulder_rush.png"		},
-  { "bd_voodoo_doll.xpos",				"7"				},
-  { "bd_voodoo_doll.ypos",				"0"				},
+  { "bd_voodoo_doll",					"RocksBD.png"			},
+  { "bd_voodoo_doll.xpos",				"11"				},
+  { "bd_voodoo_doll.ypos",				"7"				},
   { "bd_voodoo_doll.frames",				"1"				},
-  { "bd_voodoo_doll.scale_up_factor",			"2"				},
 
   { "bd_slime",						"RocksBD.png"			},
   { "bd_slime.xpos",					"0"				},