X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fconf_gfx.c;h=53176615aadfa7573fb28af1eab7e776c983a2a9;hb=ee0895b12e544444db37febb1242bcc8a72d6ad8;hp=0a6beead20fd0fa68f11ca1f87e6a3bf39777b07;hpb=05ca3ceb489c27197cf846441c1464536479a5cb;p=rocksndiamonds.git

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 0a6beead..53176615 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -15,25 +15,30 @@
 #include "main.h"
 
 
+/* List values that are not defined in the configuration file are set to
+   reliable default values. If that value is GFX_ARG_UNDEFINED, it will
+   be dynamically determined, using some of the other list values. */
+
 struct ConfigInfo image_config_suffix[] =
 {
-  { ".xpos",				"0",			TYPE_INTEGER },
-  { ".ypos",				"0",			TYPE_INTEGER },
-  { ".offset",				"32",			TYPE_INTEGER },
-  { ".vertical",			"false",		TYPE_BOOLEAN },
-  { ".xoffset",				GFX_ARG_UNDEFINED,	TYPE_INTEGER },
-  { ".yoffset",				GFX_ARG_UNDEFINED,	TYPE_INTEGER },
-  { ".frames",				"1",			TYPE_INTEGER },
-  { ".start_frame",			GFX_ARG_UNDEFINED,	TYPE_INTEGER },
-  { ".delay",				"1",			TYPE_INTEGER },
-  { ".mode_loop",			"false",		TYPE_BOOLEAN },
-  { ".mode_linear",			"false",		TYPE_BOOLEAN },
-  { ".mode_pingpong",			"false",		TYPE_BOOLEAN },
-  { ".mode_pingpong2",			"false",		TYPE_BOOLEAN },
-  { ".mode_reverse",			"false",		TYPE_BOOLEAN },
-  { ".global_sync",			GFX_ARG_UNDEFINED,	TYPE_BOOLEAN },
-
-  { NULL,				NULL,			0	     }
+  { ".xpos",				"0",		TYPE_INTEGER },
+  { ".ypos",				"0",		TYPE_INTEGER },
+  { ".offset",				"32",		TYPE_INTEGER },
+  { ".vertical",			"false",	TYPE_BOOLEAN },
+  { ".xoffset",				ARG_UNDEFINED,	TYPE_INTEGER },
+  { ".yoffset",				ARG_UNDEFINED,	TYPE_INTEGER },
+  { ".frames",				ARG_UNDEFINED,	TYPE_INTEGER },
+  { ".start_frame",			ARG_UNDEFINED,	TYPE_INTEGER },
+  { ".delay",				"1",		TYPE_INTEGER },
+  { ".mode_loop",			"false",	TYPE_BOOLEAN },
+  { ".mode_linear",			"false",	TYPE_BOOLEAN },
+  { ".mode_pingpong",			"false",	TYPE_BOOLEAN },
+  { ".mode_pingpong2",			"false",	TYPE_BOOLEAN },
+  { ".mode_random",			"false",	TYPE_BOOLEAN },
+  { ".mode_reverse",			"false",	TYPE_BOOLEAN },
+  { ".global_sync",			ARG_UNDEFINED,	TYPE_BOOLEAN },
+
+  { NULL,				NULL,		0	     }
 };
 
 struct ConfigInfo image_config[] =
@@ -487,10 +492,15 @@ struct ConfigInfo image_config[] =
   { "sp_buggy_base.xpos",			"1"			},
   { "sp_buggy_base.ypos",			"3"			},
   { "sp_buggy_base.frames",			"1"			},
+  { "sp_buggy_base.activating",			"RocksSP.pcx"		},
+  { "sp_buggy_base.activating.xpos",		"15"			},
+  { "sp_buggy_base.activating.ypos",		"2"			},
+  { "sp_buggy_base.activating.frames",		"1"			},
   { "sp_buggy_base.active",			"RocksSP.pcx"		},
   { "sp_buggy_base.active.xpos",		"8"			},
   { "sp_buggy_base.active.ypos",		"6"			},
   { "sp_buggy_base.active.frames",		"4"			},
+  { "sp_buggy_base.active.mode_random",		"true"			},
 
   { "sp_hard_base1",				"RocksSP.pcx"		},
   { "sp_hard_base1.xpos",			"4"			},