X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=1b6ed53ec9a2538a417cfcf2c80df75bc9ce231e;hb=84c888496c5bf6f9e649882d77400c47634e177a;hp=b4789635243a7cb622ecc6ae8344291c72165c76;hpb=c2575609f053eab9617b11f2150e308904cab339;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index b4789635..1b6ed53e 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		}
 };
@@ -5140,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"			},
@@ -5223,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"			},
@@ -6190,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	},
@@ -8053,6 +8082,8 @@ struct ConfigInfo image_config[] =
   { "menu.list_size.INFO[ELEMENTS]",		"-1"			},
   { "menu.list_size.SETUP",			"-1"			},
 
+  { "menu.list_entry_size.INFO[ELEMENTS]",	"-1"			},
+
   { "menu.left_spacing.SCOREINFO",		"16"			},
   { "menu.left_spacing.INFO",			"16"			},
   { "menu.left_spacing.INFO[TITLE]",		"16"			},
@@ -8144,7 +8175,7 @@ struct ConfigInfo image_config[] =
   { "menu.extra_spacing.SCOREINFO",		"2"			},
   { "menu.extra_spacing.INFO",			"2"			},
   { "menu.extra_spacing.INFO[TITLE]",		"2"			},
-  { "menu.extra_spacing.INFO[ELEMENTS]",	"2"			},
+  { "menu.extra_spacing.INFO[ELEMENTS]",	"4"			},
   { "menu.extra_spacing.INFO[MUSIC]",		"2"			},
   { "menu.extra_spacing.INFO[CREDITS]",		"2"			},
   { "menu.extra_spacing.INFO[PROGRAM]",		"2"			},