X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fconf_gfx.c;h=bc5307f1048263fddb89d904361e22dfa5275486;hb=70b6d1af1a18c70b698cac732ec04e69ac32315c;hp=33df19924bfdc6fc0fcfbd105046cdad8eb2cc5d;hpb=652f2eebd3bac1458da0010bef1b1208c19649c7;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 33df1992..bc5307f1 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -3368,6 +3368,11 @@ struct ConfigInfo image_config[] =
   { "trigger_player.ypos",			"13"			},
   { "trigger_player.frames",			"1"			},
 
+  { "trigger_ce_value",				"RocksDC.pcx"		},
+  { "trigger_ce_value.xpos",			"15"			},
+  { "trigger_ce_value.ypos",			"15"			},
+  { "trigger_ce_value.frames",			"1"			},
+
   { "emc_key_5",				"RocksEMC.pcx"		},
   { "emc_key_5.xpos",				"0"			},
   { "emc_key_5.ypos",				"5"			},
@@ -3450,6 +3455,55 @@ struct ConfigInfo image_config[] =
   { "emc_android.xpos",				"0"			},
   { "emc_android.ypos",				"8"			},
   { "emc_android.frames",			"8"			},
+  { "emc_android.delay",			"2"			},
+
+  { "emc_android.shrinking.upleft",		"RocksEMC.pcx"		},
+  { "emc_android.shrinking.upleft.xpos",	"1"			},
+  { "emc_android.shrinking.upleft.ypos",	"11"			},
+  { "emc_android.shrinking.upleft.frames",	"8"			},
+  { "emc_android.shrinking.upleft.anim_mode",	"linear"		},
+
+  { "emc_android.growing.downright",		"RocksEMC.pcx"		},
+  { "emc_android.growing.downright.xpos",	"0"			},
+  { "emc_android.growing.downright.ypos",	"11"			},
+  { "emc_android.growing.downright.frames",	"8"			},
+  { "emc_android.growing.downright.anim_mode",	"linear,reverse"	},
+
+  { "emc_android.shrinking.downleft",		"RocksEMC.pcx"		},
+  { "emc_android.shrinking.downleft.xpos",	"1"			},
+  { "emc_android.shrinking.downleft.ypos",	"12"			},
+  { "emc_android.shrinking.downleft.frames",	"8"			},
+  { "emc_android.shrinking.downleft.anim_mode",	"linear"		},
+
+  { "emc_android.growing.upright",		"RocksEMC.pcx"		},
+  { "emc_android.growing.upright.xpos",		"0"			},
+  { "emc_android.growing.upright.ypos",		"12"			},
+  { "emc_android.growing.upright.frames",	"8"			},
+  { "emc_android.growing.upright.anim_mode",	"linear,reverse"	},
+
+  { "emc_android.shrinking.upright",		"RocksEMC.pcx"		},
+  { "emc_android.shrinking.upright.xpos",	"1"			},
+  { "emc_android.shrinking.upright.ypos",	"13"			},
+  { "emc_android.shrinking.upright.frames",	"8"			},
+  { "emc_android.shrinking.upright.anim_mode",	"linear"		},
+
+  { "emc_android.growing.downleft",		"RocksEMC.pcx"		},
+  { "emc_android.growing.downleft.xpos",	"0"			},
+  { "emc_android.growing.downleft.ypos",	"13"			},
+  { "emc_android.growing.downleft.frames",	"8"			},
+  { "emc_android.growing.downleft.anim_mode",	"linear,reverse"	},
+
+  { "emc_android.shrinking.downright",		"RocksEMC.pcx"		},
+  { "emc_android.shrinking.downright.xpos",	"1"			},
+  { "emc_android.shrinking.downright.ypos",	"14"			},
+  { "emc_android.shrinking.downright.frames",	"8"			},
+  { "emc_android.shrinking.downright.anim_mode","linear"		},
+
+  { "emc_android.growing.upleft",		"RocksEMC.pcx"		},
+  { "emc_android.growing.upleft.xpos",		"0"			},
+  { "emc_android.growing.upleft.ypos",		"14"			},
+  { "emc_android.growing.upleft.frames",	"8"			},
+  { "emc_android.growing.upleft.anim_mode",	"linear,reverse"	},
 
   { "emc_grass",				"RocksEMC.pcx"		},
   { "emc_grass.xpos",				"0"			},
@@ -3659,13 +3713,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
@@ -3912,13 +3966,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"		},
@@ -4181,13 +4235,13 @@ struct ConfigInfo image_config[] =
   { "editor.element_border_input.xpos",		"0"			},
   { "editor.element_border_input.ypos",		"0"			},
 
-  { "editor.cascade_list",			"RocksFontEM.pcx"	},
-  { "editor.cascade_list.xpos",			"11"			},
-  { "editor.cascade_list.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",		"RocksFontEM.pcx"	},
-  { "editor.cascade_list.active.xpos",		"13"			},
-  { "editor.cascade_list.active.ypos",		"0"			},
+  { "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"	},
@@ -4260,9 +4314,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"		},