Merge branch 'master' into global-anims

[rocksndiamonds.git] / src / conf_gfx.c

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index e5937a08e32782ffa3107c4d56eb71b63003d08a..04db35adef9073cfda0039f78a6e027e51e5a43c 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -47,13 +47,15 @@ struct ConfigTypeInfo image_config_suffix[] =
   { ".step_offset",                    "4",            TYPE_INTEGER    },
   { ".step_xoffset",                   ARG_UNDEFINED,  TYPE_INTEGER    },
   { ".step_yoffset",                   ARG_UNDEFINED,  TYPE_INTEGER    },
-  { ".step_frames",                    ARG_UNDEFINED,  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    },
+  { ".draw_order",                     ARG_UNDEFINED,  TYPE_INTEGER    },
+  { ".init_delay_fixed",               ARG_UNDEFINED,  TYPE_INTEGER    },
+  { ".init_delay_random",              ARG_UNDEFINED,  TYPE_INTEGER    },
   { ".anim_delay_fixed",               ARG_UNDEFINED,  TYPE_INTEGER    },
   { ".anim_delay_random",              ARG_UNDEFINED,  TYPE_INTEGER    },
   { ".post_delay_fixed",               ARG_UNDEFINED,  TYPE_INTEGER    },
@@ -4591,6 +4593,15 @@ struct ConfigInfo image_config[] =
   { "toon_20.direction",                       "down"                  },
   { "toon_20.position",                                "any"                   },
 
+  { "global.anim_1.gfx",                       UNDEFINED_FILENAME      },
+  { "global.anim_2.gfx",                       UNDEFINED_FILENAME      },
+  { "global.anim_3.gfx",                       UNDEFINED_FILENAME      },
+  { "global.anim_4.gfx",                       UNDEFINED_FILENAME      },
+  { "global.anim_5.gfx",                       UNDEFINED_FILENAME      },
+  { "global.anim_6.gfx",                       UNDEFINED_FILENAME      },
+  { "global.anim_7.gfx",                       UNDEFINED_FILENAME      },
+  { "global.anim_8.gfx",                       UNDEFINED_FILENAME      },
+
   { "global.anim_1",                           UNDEFINED_FILENAME      },
   { "global.anim_2",                           UNDEFINED_FILENAME      },
   { "global.anim_3",                           UNDEFINED_FILENAME      },
@@ -4600,6 +4611,11 @@ struct ConfigInfo image_config[] =
   { "global.anim_7",                           UNDEFINED_FILENAME      },
   { "global.anim_8",                           UNDEFINED_FILENAME      },
 
+  { "internal.global.toon_default",            UNDEFINED_FILENAME      },
+  { "internal.global.toon_default.anim_mode",  "random"                },
+
+  { "internal.global.anim_default",            UNDEFINED_FILENAME      },
+
   { "menu.calibrate_red",                      "RocksElements.png"     },
   { "menu.calibrate_red.xpos",                 "12"                    },
   { "menu.calibrate_red.ypos",                 "8"                     },