X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=d67557609ec2cab0879ecadfd7fe787a0d2a206c;hb=a268c893d49b178fdcc80956484b567952868fd4;hp=f25b957cd8b823c72ad5ce1d1add177630b6a3f3;hpb=21597f245598c0c30506c53448c1a549beeb3722;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index f25b957c..d6755760 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -27,10 +27,16 @@ struct ConfigTypeInfo image_config_suffix[] =
   { ".ypos",				ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".width",				ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".height",				ARG_UNDEFINED,	TYPE_INTEGER	},
-  { ".offset",				ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".vertical",			"false",	TYPE_BOOLEAN	},
+  { ".offset",				ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".xoffset",				ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".yoffset",				ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".2nd_movement_tile",		"false",	TYPE_BOOLEAN	},
+  { ".2nd_vertical",			ARG_UNDEFINED,	TYPE_BOOLEAN	},
+  { ".2nd_offset",			ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".2nd_xoffset",			ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".2nd_yoffset",			ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".2nd_swap_tiles",			ARG_UNDEFINED,	TYPE_BOOLEAN	},
   { ".frames",				ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".frames_per_line",			ARG_UNDEFINED,	TYPE_INTEGER	},
   { ".start_frame",			ARG_UNDEFINED,	TYPE_INTEGER	},
@@ -3293,7 +3299,6 @@ struct ConfigInfo image_config[] =
   { "emc_android.xpos",				"7"			},
   { "emc_android.ypos",				"13"			},
   { "emc_android.frames",			"8"			},
-  { "emc_android.delay",			"1"			},
   { "emc_android.vertical",			"true"			},
   { "emc_android.scale_up_factor",		"2"			},
 
@@ -3302,16 +3307,10 @@ struct ConfigInfo image_config[] =
   { "emc_grass.ypos",				"5"			},
   { "emc_grass.frames",				"1"			},
   { "emc_grass.scale_up_factor",		"2"			},
-  { "emc_grass.CRUMBLED",			"emc_object.pcx"	},
-  { "emc_grass.CRUMBLED.xpos",			"20"			},
-  { "emc_grass.CRUMBLED.ypos",			"5"			},
-  { "emc_grass.CRUMBLED.frames",		"1"			},
-  { "emc_grass.CRUMBLED.scale_up_factor",	"2"			},
   { "emc_grass.digging.left",			"emc_object.pcx"	},
   { "emc_grass.digging.left.xpos",		"20"			},
   { "emc_grass.digging.left.ypos",		"27"			},
   { "emc_grass.digging.left.frames",		"7"			},
-  { "emc_grass.digging.left.delay",		"1"			},
   { "emc_grass.digging.left.vertical",		"true"			},
   { "emc_grass.digging.left.anim_mode",		"linear,reverse"	},
   { "emc_grass.digging.left.scale_up_factor",	"2"			},
@@ -3319,7 +3318,6 @@ struct ConfigInfo image_config[] =
   { "emc_grass.digging.right.xpos",		"20"			},
   { "emc_grass.digging.right.ypos",		"13"			},
   { "emc_grass.digging.right.frames",		"7"			},
-  { "emc_grass.digging.right.delay",		"1"			},
   { "emc_grass.digging.right.vertical",		"true"			},
   { "emc_grass.digging.right.anim_mode",	"linear,reverse"	},
   { "emc_grass.digging.right.scale_up_factor",	"2"			},
@@ -3327,7 +3325,6 @@ struct ConfigInfo image_config[] =
   { "emc_grass.digging.up.xpos",		"20"			},
   { "emc_grass.digging.up.ypos",		"6"			},
   { "emc_grass.digging.up.frames",		"7"			},
-  { "emc_grass.digging.up.delay",		"1"			},
   { "emc_grass.digging.up.vertical",		"true"			},
   { "emc_grass.digging.up.anim_mode",		"linear,reverse"	},
   { "emc_grass.digging.up.scale_up_factor",	"2"			},
@@ -3335,7 +3332,6 @@ struct ConfigInfo image_config[] =
   { "emc_grass.digging.down.xpos",		"20"			},
   { "emc_grass.digging.down.ypos",		"20"			},
   { "emc_grass.digging.down.frames",		"7"			},
-  { "emc_grass.digging.down.delay",		"1"			},
   { "emc_grass.digging.down.vertical",		"true"			},
   { "emc_grass.digging.down.anim_mode",		"linear,reverse"	},
   { "emc_grass.digging.down.scale_up_factor",	"2"			},
@@ -3343,23 +3339,42 @@ struct ConfigInfo image_config[] =
   { "emc_magic_ball",				"emc_object.pcx"	},
   { "emc_magic_ball.xpos",			"22"			},
   { "emc_magic_ball.ypos",			"18"			},
-  { "emc_magic_ball.frames",			"16"			},
-  { "emc_magic_ball.delay",			"1"			},
-  { "emc_magic_ball.vertical",			"true"			},
+  { "emc_magic_ball.frames",			"1"			},
   { "emc_magic_ball.scale_up_factor",		"2"			},
 
+  { "emc_magic_ball.active",			"emc_object.pcx"	},
+  { "emc_magic_ball.active.xpos",		"22"			},
+  { "emc_magic_ball.active.ypos",		"18"			},
+  { "emc_magic_ball.active.frames",		"16"			},
+  { "emc_magic_ball.active.vertical",		"true"			},
+  { "emc_magic_ball.active.scale_up_factor",	"2"			},
+
   { "emc_magic_ball_switch",			"emc_object.pcx"	},
   { "emc_magic_ball_switch.xpos",		"25"			},
   { "emc_magic_ball_switch.ypos",		"10"			},
   { "emc_magic_ball_switch.frames",		"1"			},
   { "emc_magic_ball_switch.scale_up_factor",	"2"			},
 
+  { "emc_magic_ball_switch.active",		"emc_object.pcx"	},
+  { "emc_magic_ball_switch.active.xpos",	"25"			},
+  { "emc_magic_ball_switch.active.ypos",	"9"			},
+  { "emc_magic_ball_switch.active.frames",	"1"			},
+  { "emc_magic_ball_switch.active.scale_up_factor", "2"			},
+
   { "emc_spring_bumper",			"emc_object.pcx"	},
   { "emc_spring_bumper.xpos",			"25"			},
   { "emc_spring_bumper.ypos",			"3"			},
   { "emc_spring_bumper.frames",			"1"			},
   { "emc_spring_bumper.scale_up_factor",	"2"			},
 
+  { "emc_spring_bumper.active",			"emc_object.pcx"	},
+  { "emc_spring_bumper.active.xpos",		"25"			},
+  { "emc_spring_bumper.active.ypos",		"3"			},
+  { "emc_spring_bumper.active.frames",		"4"			},
+  { "emc_spring_bumper.active.vertical",	"true"			},
+  { "emc_spring_bumper.active.anim_mode",	"pingpong2"		},
+  { "emc_spring_bumper.active.scale_up_factor",	"2"			},
+
   { "emc_plant",				"emc_object.pcx"	},
   { "emc_plant.xpos",				"25"			},
   { "emc_plant.ypos",				"12"			},
@@ -3440,6 +3455,12 @@ struct ConfigInfo image_config[] =
   { "emc_wall_slippery_4.frames",		"1"			},
   { "emc_wall_slippery_4.scale_up_factor",	"2"			},
 
+  { "emc_fake_grass",				"emc_object.pcx"	},
+  { "emc_fake_grass.xpos",			"20"			},
+  { "emc_fake_grass.ypos",			"5"			},
+  { "emc_fake_grass.frames",			"1"			},
+  { "emc_fake_grass.scale_up_factor",		"2"			},
+
   { "emc_dripper",				"emc_object.pcx"	},
   { "emc_dripper.xpos",				"25"			},
   { "emc_dripper.ypos",				"15"			},