X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=3f64eeca6aa418ab88fe76bde8c16d96d6231463;hb=c118d37bf6ad02e90d4ea7c4a4d7d34d8f745c26;hp=28a22318586abec39305fef963acbdca7e79d346;hpb=9e14b7d4bf8d485bfa4b4e13b82496cedc259554;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 28a22318..3f64eeca 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		}
 };
@@ -5051,6 +5055,12 @@ struct ConfigInfo image_config[] =
   { "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"			},
@@ -5134,6 +5144,12 @@ struct ConfigInfo image_config[] =
   { "mm_gray_ball.xpos",			"15"			},
   { "mm_gray_ball.ypos",			"2"			},
   { "mm_gray_ball.frames",			"1"			},
+  { "mm_gray_ball.active",			"RocksMM.png"		},
+  { "mm_gray_ball.active.xpos",			"15"			},
+  { "mm_gray_ball.active.ypos",			"1"			},
+  { "mm_gray_ball.active.frames",		"2"			},
+  { "mm_gray_ball.active.delay",		"20"			},
+  { "mm_gray_ball.active.vertical",		"true"			},
   { "mm_gray_ball.EDITOR",			"RocksMM.png"		},
   { "mm_gray_ball.EDITOR.xpos",			"15"			},
   { "mm_gray_ball.EDITOR.ypos",			"1"			},
@@ -5217,6 +5233,23 @@ 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",		"0"			},
   { "[mm_default].exploding.ypos",		"8"			},
@@ -5747,6 +5780,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	},
@@ -6178,8 +6217,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	},