rnd-20050103-1-src

[rocksndiamonds.git] / src / conf_gfx.c

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 38f682eaff5cc4317f111c64f1c6f104dbb1c00c..d67557609ec2cab0879ecadfd7fe787a0d2a206c 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -36,6 +36,7 @@ struct ConfigTypeInfo image_config_suffix[] =
   { ".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    },
@@ -3338,22 +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.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"                    },