X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fconf_gfx.c;h=afcffb011f4778de427ef4c2205c3091ff034e6c;hb=e0bf8eee0aec424593e68e37e35c6b6f120e4712;hp=d0758de8b21bd809e3725e649c6a669b27e1f178;hpb=e093d2ffd9547d556207818c38f71d5afa455ad0;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index d0758de8..afcffb01 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -21,35 +21,39 @@
 
 struct ConfigInfo image_config_suffix[] =
 {
-  { ".x",				ARG_UNDEFINED,	TYPE_INTEGER },
-  { ".y",				ARG_UNDEFINED,	TYPE_INTEGER },
-  { ".xpos",				ARG_UNDEFINED,	TYPE_INTEGER },
-  { ".ypos",				ARG_UNDEFINED,	TYPE_INTEGER },
-  { ".width",				ARG_UNDEFINED,	TYPE_INTEGER },
-  { ".height",				ARG_UNDEFINED,	TYPE_INTEGER },
-  { ".offset",				ARG_UNDEFINED,	TYPE_INTEGER },
-  { ".vertical",			"false",	TYPE_BOOLEAN },
-  { ".xoffset",				ARG_UNDEFINED,	TYPE_INTEGER },
-  { ".yoffset",				ARG_UNDEFINED,	TYPE_INTEGER },
-  { ".frames",				ARG_UNDEFINED,	TYPE_INTEGER },
-  { ".frames_per_line",			ARG_UNDEFINED,	TYPE_INTEGER },
-  { ".start_frame",			ARG_UNDEFINED,	TYPE_INTEGER },
-  { ".delay",				"1",		TYPE_INTEGER },
-  { ".anim_mode",			ARG_UNDEFINED,	TYPE_STRING  },
-  { ".global_sync",			"false",	TYPE_BOOLEAN },
-  { ".crumbled_like",			ARG_UNDEFINED,	TYPE_TOKEN   },
-  { ".diggable_like",			ARG_UNDEFINED,	TYPE_TOKEN   },
-  { ".border_size",			ARG_UNDEFINED,	TYPE_INTEGER },
-  { ".step_offset",			"4",		TYPE_INTEGER },
-  { ".step_delay",			"1",		TYPE_INTEGER },
-  { ".direction",			ARG_UNDEFINED,	TYPE_STRING  },
-  { ".position",			ARG_UNDEFINED,	TYPE_STRING  },
-  { ".draw_xoffset",			"0",		TYPE_INTEGER },
-  { ".draw_yoffset",			"0",		TYPE_INTEGER },
-  { ".draw_masked",			"false",	TYPE_BOOLEAN },
-  { ".name",				ARG_UNDEFINED,	TYPE_STRING  },
-
-  { NULL,				NULL,		0	     }
+  { ".x",				ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".y",				ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".xpos",				ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".ypos",				ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".width",				ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".height",				ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".offset",				ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".vertical",			"false",	TYPE_BOOLEAN	},
+  { ".xoffset",				ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".yoffset",				ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".frames",				ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".frames_per_line",			ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".start_frame",			ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".delay",				"1",		TYPE_INTEGER	},
+  { ".anim_mode",			ARG_UNDEFINED,	TYPE_STRING	},
+  { ".global_sync",			"false",	TYPE_BOOLEAN	},
+  { ".crumbled_like",			ARG_UNDEFINED,	TYPE_TOKEN	},
+  { ".diggable_like",			ARG_UNDEFINED,	TYPE_TOKEN	},
+  { ".border_size",			ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".step_offset",			"4",		TYPE_INTEGER	},
+  { ".step_delay",			"1",		TYPE_INTEGER	},
+  { ".direction",			ARG_UNDEFINED,	TYPE_STRING	},
+  { ".position",			ARG_UNDEFINED,	TYPE_STRING	},
+  { ".draw_xoffset",			"0",		TYPE_INTEGER	},
+  { ".draw_yoffset",			"0",		TYPE_INTEGER	},
+  { ".draw_masked",			"false",	TYPE_BOOLEAN	},
+  { ".anim_delay_fixed",		ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".anim_delay_random",		ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".post_delay_fixed",		ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".post_delay_random",		ARG_UNDEFINED,	TYPE_INTEGER	},
+  { ".name",				ARG_UNDEFINED,	TYPE_STRING	},
+
+  { NULL,				NULL,		0		}
 };
 
 struct ConfigInfo image_config[] =
@@ -167,50 +171,18 @@ struct ConfigInfo image_config[] =
   { "bd_butterfly.anim_mode",			"pingpong"		},
   { "bd_butterfly.delay",			"4"			},
   { "bd_butterfly.global_sync",			"true"			},
-  { "bd_butterfly.right",			"RocksElements.pcx"	},
-  { "bd_butterfly.right.xpos",			"4"			},
-  { "bd_butterfly.right.ypos",			"12"			},
-  { "bd_butterfly.right.frames",		"2"			},
-  { "bd_butterfly.right.anim_mode",		"pingpong"		},
-  { "bd_butterfly.right.delay",			"4"			},
-  { "bd_butterfly.right.global_sync",		"true"			},
   { "bd_butterfly.right.EDITOR",		"RocksElements.pcx"	},
   { "bd_butterfly.right.EDITOR.xpos",		"8"			},
   { "bd_butterfly.right.EDITOR.ypos",		"12"			},
-  { "bd_butterfly.right.EDITOR.frames",		"1"			},
-  { "bd_butterfly.up",				"RocksElements.pcx"	},
-  { "bd_butterfly.up.xpos",			"4"			},
-  { "bd_butterfly.up.ypos",			"12"			},
-  { "bd_butterfly.up.frames",			"2"			},
-  { "bd_butterfly.up.anim_mode",		"pingpong"		},
-  { "bd_butterfly.up.delay",			"4"			},
-  { "bd_butterfly.up.global_sync",		"true"			},
   { "bd_butterfly.up.EDITOR",			"RocksElements.pcx"	},
   { "bd_butterfly.up.EDITOR.xpos",		"9"			},
   { "bd_butterfly.up.EDITOR.ypos",		"12"			},
-  { "bd_butterfly.up.EDITOR.frames",		"1"			},
-  { "bd_butterfly.left",			"RocksElements.pcx"	},
-  { "bd_butterfly.left.xpos",			"4"			},
-  { "bd_butterfly.left.ypos",			"12"			},
-  { "bd_butterfly.left.frames",			"2"			},
-  { "bd_butterfly.left.anim_mode",		"pingpong"		},
-  { "bd_butterfly.left.delay",			"4"			},
-  { "bd_butterfly.left.global_sync",		"true"			},
   { "bd_butterfly.left.EDITOR",			"RocksElements.pcx"	},
   { "bd_butterfly.left.EDITOR.xpos",		"10"			},
   { "bd_butterfly.left.EDITOR.ypos",		"12"			},
-  { "bd_butterfly.left.EDITOR.frames",		"1"			},
-  { "bd_butterfly.down",			"RocksElements.pcx"	},
-  { "bd_butterfly.down.xpos",			"4"			},
-  { "bd_butterfly.down.ypos",			"12"			},
-  { "bd_butterfly.down.frames",			"2"			},
-  { "bd_butterfly.down.anim_mode",		"pingpong"		},
-  { "bd_butterfly.down.delay",			"4"			},
-  { "bd_butterfly.down.global_sync",		"true"			},
   { "bd_butterfly.down.EDITOR",			"RocksElements.pcx"	},
   { "bd_butterfly.down.EDITOR.xpos",		"11"			},
   { "bd_butterfly.down.EDITOR.ypos",		"12"			},
-  { "bd_butterfly.down.EDITOR.frames",		"1"			},
 
   { "bd_firefly",				"RocksElements.pcx"	},
   { "bd_firefly.xpos",				"6"			},
@@ -219,50 +191,18 @@ struct ConfigInfo image_config[] =
   { "bd_firefly.anim_mode",			"pingpong"		},
   { "bd_firefly.delay",				"4"			},
   { "bd_firefly.global_sync",			"true"			},
-  { "bd_firefly.right",				"RocksElements.pcx"	},
-  { "bd_firefly.right.xpos",			"6"			},
-  { "bd_firefly.right.ypos",			"12"			},
-  { "bd_firefly.right.frames",			"2"			},
-  { "bd_firefly.right.anim_mode",		"pingpong"		},
-  { "bd_firefly.right.delay",			"4"			},
-  { "bd_firefly.right.global_sync",		"true"			},
   { "bd_firefly.right.EDITOR",			"RocksElements.pcx"	},
   { "bd_firefly.right.EDITOR.xpos",		"12"			},
   { "bd_firefly.right.EDITOR.ypos",		"12"			},
-  { "bd_firefly.right.EDITOR.frames",		"1"			},
-  { "bd_firefly.up",				"RocksElements.pcx"	},
-  { "bd_firefly.up.xpos",			"6"			},
-  { "bd_firefly.up.ypos",			"12"			},
-  { "bd_firefly.up.frames",			"2"			},
-  { "bd_firefly.up.anim_mode",			"pingpong"		},
-  { "bd_firefly.up.delay",			"4"			},
-  { "bd_firefly.up.global_sync",		"true"			},
   { "bd_firefly.up.EDITOR",			"RocksElements.pcx"	},
   { "bd_firefly.up.EDITOR.xpos",		"13"			},
   { "bd_firefly.up.EDITOR.ypos",		"12"			},
-  { "bd_firefly.up.EDITOR.frames",		"1"			},
-  { "bd_firefly.left",				"RocksElements.pcx"	},
-  { "bd_firefly.left.xpos",			"6"			},
-  { "bd_firefly.left.ypos",			"12"			},
-  { "bd_firefly.left.frames",			"2"			},
-  { "bd_firefly.left.anim_mode",		"pingpong"		},
-  { "bd_firefly.left.delay",			"4"			},
-  { "bd_firefly.left.global_sync",		"true"			},
   { "bd_firefly.left.EDITOR",			"RocksElements.pcx"	},
   { "bd_firefly.left.EDITOR.xpos",		"14"			},
   { "bd_firefly.left.EDITOR.ypos",		"12"			},
-  { "bd_firefly.left.EDITOR.frames",		"1"			},
-  { "bd_firefly.down",				"RocksElements.pcx"	},
-  { "bd_firefly.down.xpos",			"6"			},
-  { "bd_firefly.down.ypos",			"12"			},
-  { "bd_firefly.down.frames",			"2"			},
-  { "bd_firefly.down.anim_mode",		"pingpong"		},
-  { "bd_firefly.down.delay",			"4"			},
-  { "bd_firefly.down.global_sync",		"true"			},
   { "bd_firefly.down.EDITOR",			"RocksElements.pcx"	},
   { "bd_firefly.down.EDITOR.xpos",		"15"			},
   { "bd_firefly.down.EDITOR.ypos",		"12"			},
-  { "bd_firefly.down.EDITOR.frames",		"1"			},
 
   /* images for Supaplex style elements and actions */
 
@@ -684,6 +624,14 @@ struct ConfigInfo image_config[] =
   { "sokoban_field_full.ypos",			"7"			},
   { "sokoban_field_full.frames",		"1"			},
 
+  { "sokoban_field_player",			"RocksHeroes.pcx"	},
+  { "sokoban_field_player.xpos",		"0"			},
+  { "sokoban_field_player.ypos",		"15"			},
+  { "sokoban_field_player.frames",		"1"			},
+  { "sokoban_field_player.EDITOR",		"RocksHeroes.pcx"	},
+  { "sokoban_field_player.EDITOR.xpos",		"1"			},
+  { "sokoban_field_player.EDITOR.ypos",		"15"			},
+
   /* images for Emerald Mine style elements and actions */
 
   { "empty_space",				"RocksSP.pcx"		},
@@ -3186,6 +3134,7 @@ struct ConfigInfo image_config[] =
 
 #include "conf_chr.c"	/* include auto-generated data structure definitions */
 #include "conf_cus.c"	/* include auto-generated data structure definitions */
+#include "conf_grp.c"	/* include auto-generated data structure definitions */
 
   /* images not associated to game elements (used for menu screens etc.) */
   /* keyword to stop parser: "NO_MORE_ELEMENT_IMAGES" <-- do not change! */
@@ -3768,5 +3717,10 @@ struct ConfigInfo image_config[] =
   { "door_2.step_delay",			"10"			},
   { "door_2.anim_mode",				"default"		},
 
+  { "[player].boring_delay_fixed",		"-1"			},
+  { "[player].boring_delay_random",		"-1"			},
+  { "[player].sleeping_delay_fixed",		"-1"			},
+  { "[player].sleeping_delay_random",		"-1"			},
+
   { NULL,					NULL			}
 };