X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=52f0f135d05056f9950bc85de8255bac0cbe8430;hb=c5d03f36989babf47697957101ecebe9b7b9cbe8;hp=7127e0b48f10338424401763beb3c965a81f3770;hpb=b180608242f0190c6c8b31772e4dcfce2e9af47c;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 7127e0b4..52f0f135 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -3450,6 +3450,15 @@ struct ConfigInfo image_config[] =
   { "emc_android.xpos",				"0"			},
   { "emc_android.ypos",				"8"			},
   { "emc_android.frames",			"8"			},
+  { "emc_android.delay",			"2"			},
+  { "emc_android.shrinking",			"RocksEMC.pcx"		},
+  { "emc_android.shrinking.xpos",		"0"			},
+  { "emc_android.shrinking.ypos",		"8"			},
+  { "emc_android.shrinking.frames",		"1"			},
+  { "emc_android.growing",			"RocksEMC.pcx"		},
+  { "emc_android.growing.xpos",			"0"			},
+  { "emc_android.growing.ypos",			"8"			},
+  { "emc_android.growing.frames",		"1"			},
 
   { "emc_grass",				"RocksEMC.pcx"		},
   { "emc_grass.xpos",				"0"			},
@@ -3512,18 +3521,21 @@ struct ConfigInfo image_config[] =
   { "emc_magic_ball.xpos",			"0"			},
   { "emc_magic_ball.ypos",			"9"			},
   { "emc_magic_ball.frames",			"1"			},
-
   { "emc_magic_ball.active",			"RocksEMC.pcx"		},
   { "emc_magic_ball.active.xpos",		"0"			},
   { "emc_magic_ball.active.ypos",		"9"			},
   { "emc_magic_ball.active.frames",		"16"			},
   { "emc_magic_ball.active.frames_per_line",	"8"			},
+  { "emc_magic_ball.dropping",			"RocksElements.pcx"	},
+  { "emc_magic_ball.dropping.xpos",		"0"			},
+  { "emc_magic_ball.dropping.ypos",		"4"			},
+  { "emc_magic_ball.dropping.frames",		"8"			},
+  { "emc_magic_ball.dropping.anim_mode",	"linear"		},
 
   { "emc_magic_ball_switch",			"RocksEMC.pcx"		},
   { "emc_magic_ball_switch.xpos",		"8"			},
   { "emc_magic_ball_switch.ypos",		"10"			},
   { "emc_magic_ball_switch.frames",		"1"			},
-
   { "emc_magic_ball_switch.active",		"RocksEMC.pcx"		},
   { "emc_magic_ball_switch.active.xpos",	"8"			},
   { "emc_magic_ball_switch.active.ypos",	"9"			},
@@ -3656,13 +3668,13 @@ struct ConfigInfo image_config[] =
   /* !!! TEMPORARILY STORED HERE -- PROBABLY TO BE CHANGED !!! */
 
   /* (for testing, change filename back to "emc_object dot pcx") */
-  { "emc_object",				"RocksEMC.pcx"		},
+  { "emc_object",				"emc_object.pcx"	},
 #if 0
   { "emc_object.scale_up_factor",		"2"			},
 #endif
 
   /* (for testing, change filename back to "emc_sprite dot pcx") */
-  { "emc_sprite",				"RocksEMC.pcx"		},
+  { "emc_sprite",				"emc_sprite.pcx"	},
 #if 0
   { "emc_sprite.scale_up_factor",		"2"			},
 #endif
@@ -3909,13 +3921,13 @@ struct ConfigInfo image_config[] =
   { "menu.button_down.active.ypos",		"9"			},
   { "menu.button_down.active.frames",		"1"			},
 
-  { "menu.button_enter_menu",			UNDEFINED_FILENAME	},
+  { "menu.button_enter_menu",			"RocksDC.pcx"		},
   { "menu.button_enter_menu.clone_from",	"menu.button_right"	},
-  { "menu.button_enter_menu.active",		UNDEFINED_FILENAME	},
+  { "menu.button_enter_menu.active",		"RocksDC.pcx"		},
   { "menu.button_enter_menu.active.clone_from",	"menu.button_right.active" },
-  { "menu.button_leave_menu",			UNDEFINED_FILENAME	},
+  { "menu.button_leave_menu",			"RocksDC.pcx"		},
   { "menu.button_leave_menu.clone_from",	"menu.button_left"	},
-  { "menu.button_leave_menu.active",		UNDEFINED_FILENAME	},
+  { "menu.button_leave_menu.active",		"RocksDC.pcx"		},
   { "menu.button_leave_menu.active.clone_from",	"menu.button_left.active" },
 
   { "menu.scrollbar",				"RocksDC.pcx"		},
@@ -3953,11 +3965,6 @@ struct ConfigInfo image_config[] =
   { "font.title_1.y",				"480"			},
   { "font.title_1.width",			"32"			},
   { "font.title_1.height",			"32"			},
-  { "font.title_1.LEVELS",			"RocksFontBig.pcx"	},
-  { "font.title_1.LEVELS.x",			"0"			},
-  { "font.title_1.LEVELS.y",			"320"			},
-  { "font.title_1.LEVELS.width",		"32"			},
-  { "font.title_1.LEVELS.height",		"32"			},
   { "font.title_2",				"RocksFontSmall.pcx"	},
   { "font.title_2.x",				"0"			},
   { "font.title_2.y",				"0"			},
@@ -4183,6 +4190,15 @@ struct ConfigInfo image_config[] =
   { "editor.element_border_input.xpos",		"0"			},
   { "editor.element_border_input.ypos",		"0"			},
 
+  { "editor.cascade_list",			"RocksDoor.pcx"		},
+  { "editor.cascade_list.x",			"708"			},
+  { "editor.cascade_list.y",			"80"			},
+  { "editor.cascade_list.frames",		"1"			},
+  { "editor.cascade_list.active",		"RocksDoor.pcx"		},
+  { "editor.cascade_list.active.x",		"740"			},
+  { "editor.cascade_list.active.y",		"80"			},
+  { "editor.cascade_list.active.frames",	"1"			},
+
   { "background.envelope_1",			"RocksScreen.pcx"	},
   { "background.envelope_1.x",			"0"			},
   { "background.envelope_1.y",			"0"			},
@@ -4253,9 +4269,14 @@ struct ConfigInfo image_config[] =
   { "menu.list_size.SCORES",			"-1"			},
   { "menu.list_size.INFO",			"-1"			},
 
+  { "door_1.width",				"-1"			},
+  { "door_1.height",				"-1"			},
   { "door_1.step_offset",			"2"			},
   { "door_1.step_delay",			"10"			},
   { "door_1.anim_mode",				"default"		},
+
+  { "door_2.width",				"-1"			},
+  { "door_2.height",				"-1"			},
   { "door_2.step_offset",			"2"			},
   { "door_2.step_delay",			"10"			},
   { "door_2.anim_mode",				"default"		},