X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=75bce21f6aa2db8d51ea35d6eca6107d40b7ac85;hb=3f122c168c929658a001b385be98ac613b41c7ec;hp=5b601e626fae1c3dde606f68b027c60b51181d20;hpb=10f312b2236afd0bd063d1dab380064d8431a850;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 5b601e62..75bce21f 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -86,6 +86,10 @@ struct ConfigTypeInfo image_config_suffix[] =
   { ".active_yoffset",			"0",		TYPE_INTEGER	},
   { ".pressed_xoffset",			"0",		TYPE_INTEGER	},
   { ".pressed_yoffset",			"0",		TYPE_INTEGER	},
+  { ".stacked_xfactor",			"1",		TYPE_INTEGER	},
+  { ".stacked_yfactor",			"1",		TYPE_INTEGER	},
+  { ".stacked_xoffset",			"0",		TYPE_INTEGER	},
+  { ".stacked_yoffset",			"0",		TYPE_INTEGER	},
 
   { NULL,				NULL,		0		}
 };
@@ -5037,20 +5041,26 @@ struct ConfigInfo image_config[] =
   { "mm_teleporter_blue_16.frames",		"1"			},
 
   { "mm_kettle",				"RocksMM.png"		},
-  { "mm_kettle.xpos",				"12"			},
-  { "mm_kettle.ypos",				"1"			},
+  { "mm_kettle.xpos",				"9"			},
+  { "mm_kettle.ypos",				"8"			},
   { "mm_kettle.frames",				"1"			},
   { "mm_kettle.exploding",			"RocksMM.png"		},
-  { "mm_kettle.exploding.xpos",			"13"			},
-  { "mm_kettle.exploding.ypos",			"1"			},
-  { "mm_kettle.exploding.frames",		"3"			},
-  { "mm_kettle.exploding.delay",		"4"			},
+  { "mm_kettle.exploding.xpos",			"10"			},
+  { "mm_kettle.exploding.ypos",			"8"			},
+  { "mm_kettle.exploding.frames",		"6"			},
+  { "mm_kettle.exploding.delay",		"2"			},
   { "mm_kettle.exploding.anim_mode",		"linear"		},
 
   { "mm_bomb",					"RocksMM.png"		},
   { "mm_bomb.xpos",				"5"			},
   { "mm_bomb.ypos",				"2"			},
   { "mm_bomb.frames",				"1"			},
+  { "mm_bomb.active",				"RocksMM.png"		},
+  { "mm_bomb.active.xpos",			"12"			},
+  { "mm_bomb.active.ypos",			"1"			},
+  { "mm_bomb.active.frames",			"3"			},
+  { "mm_bomb.active.delay",			"6"			},
+  { "mm_bomb.active.anim_mode",			"pingpong"		},
 
   { "mm_prism",					"RocksMM.png"		},
   { "mm_prism.xpos",				"0"			},
@@ -5070,11 +5080,23 @@ struct ConfigInfo image_config[] =
   { "mm_steel_lock.xpos",			"8"			},
   { "mm_steel_lock.ypos",			"2"			},
   { "mm_steel_lock.frames",			"1"			},
+  { "mm_steel_lock.exploding",			"RocksMM.png"		},
+  { "mm_steel_lock.exploding.xpos",		"4"			},
+  { "mm_steel_lock.exploding.ypos",		"8"			},
+  { "mm_steel_lock.exploding.frames",		"5"			},
+  { "mm_steel_lock.exploding.delay",		"2"			},
+  { "mm_steel_lock.exploding.anim_mode",	"linear"		},
 
   { "mm_wooden_lock",				"RocksMM.png"		},
   { "mm_wooden_lock.xpos",			"9"			},
   { "mm_wooden_lock.ypos",			"6"			},
   { "mm_wooden_lock.frames",			"1"			},
+  { "mm_wooden_lock.exploding",			"RocksMM.png"		},
+  { "mm_wooden_lock.exploding.xpos",		"4"			},
+  { "mm_wooden_lock.exploding.ypos",		"8"			},
+  { "mm_wooden_lock.exploding.frames",		"5"			},
+  { "mm_wooden_lock.exploding.delay",		"2"			},
+  { "mm_wooden_lock.exploding.anim_mode",	"linear"		},
 
   { "mm_steel_block",				"RocksMM.png"		},
   { "mm_steel_block.xpos",			"8"			},
@@ -5122,6 +5144,10 @@ struct ConfigInfo image_config[] =
   { "mm_gray_ball.xpos",			"15"			},
   { "mm_gray_ball.ypos",			"2"			},
   { "mm_gray_ball.frames",			"1"			},
+  { "mm_gray_ball.EDITOR",			"RocksMM.png"		},
+  { "mm_gray_ball.EDITOR.xpos",			"15"			},
+  { "mm_gray_ball.EDITOR.ypos",			"1"			},
+  { "mm_gray_ball.EDITOR.frames",		"1"			},
 
   { "mm_fuel_full",				"RocksMM.png"		},
   { "mm_fuel_full.xpos",			"10"			},
@@ -5201,9 +5227,26 @@ struct ConfigInfo image_config[] =
   { "mm_pacman.eating.down.ypos",		"4"			},
   { "mm_pacman.eating.down.frames",		"1"			},
 
+  { "mm_envelope_1",				UNDEFINED_FILENAME	},
+  { "mm_envelope_1.clone_from",			"envelope_1"		},
+  { "mm_envelope_1.collecting",			UNDEFINED_FILENAME	},
+  { "mm_envelope_1.collecting.clone_from",	"envelope_1.collecting"	},
+  { "mm_envelope_2",				UNDEFINED_FILENAME	},
+  { "mm_envelope_2.clone_from",			"envelope_2"		},
+  { "mm_envelope_2.collecting",			UNDEFINED_FILENAME	},
+  { "mm_envelope_2.collecting.clone_from",	"envelope_2.collecting"	},
+  { "mm_envelope_3",				UNDEFINED_FILENAME	},
+  { "mm_envelope_3.clone_from",			"envelope_3"		},
+  { "mm_envelope_3.collecting",			UNDEFINED_FILENAME	},
+  { "mm_envelope_3.collecting.clone_from",	"envelope_3.collecting"	},
+  { "mm_envelope_4",				UNDEFINED_FILENAME	},
+  { "mm_envelope_4.clone_from",			"envelope_4"		},
+  { "mm_envelope_4.collecting",			UNDEFINED_FILENAME	},
+  { "mm_envelope_4.collecting.clone_from",	"envelope_4.collecting"	},
+
   { "[mm_default].exploding",			"RocksMM.png"		},
-  { "[mm_default].exploding.xpos",		"8"			},
-  { "[mm_default].exploding.ypos",		"4"			},
+  { "[mm_default].exploding.xpos",		"0"			},
+  { "[mm_default].exploding.ypos",		"8"			},
   { "[mm_default].exploding.frames",		"8"			},
   { "[mm_default].exploding.delay",		"2"			},
   { "[mm_default].exploding.anim_mode",		"linear"		},
@@ -5731,6 +5774,12 @@ struct ConfigInfo image_config[] =
   { "df_mine.xpos",				"4"			},
   { "df_mine.ypos",				"8"			},
   { "df_mine.frames",				"1"			},
+  { "df_mine.active",				"RocksDF.png"		},
+  { "df_mine.active.xpos",			"3"			},
+  { "df_mine.active.ypos",			"8"			},
+  { "df_mine.active.frames",			"3"			},
+  { "df_mine.active.delay",			"6"			},
+  { "df_mine.active.anim_mode",			"pingpong"		},
 
   // (these are only defined as elements to support ".PANEL" definitions)
   { "graphic_1",				UNDEFINED_FILENAME	},
@@ -6162,8 +6211,10 @@ struct ConfigInfo image_config[] =
 
   { "menu.button_levelset_info",		UNDEFINED_FILENAME	},
   { "menu.button_levelset_info.clone_from",	"envelope_1"		},
+  { "menu.button_levelset_info.pressed",	UNDEFINED_FILENAME	},
+  { "menu.button_levelset_info.pressed.clone_from", "envelope_1.collecting" },
   { "menu.button_levelset_info.active",		UNDEFINED_FILENAME	},
-  { "menu.button_levelset_info.active.clone_from", "envelope_1.collecting" },
+  { "menu.button_levelset_info.active.clone_from", "envelope_1"		},
 
   { "menu.button_switch_ecs_aga",		UNDEFINED_FILENAME	},
   { "menu.button_switch_ecs_aga.active",	UNDEFINED_FILENAME	},