X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=012826ec7774105ef948bc504c1ad74c893a4287;hb=9583e9c55b889974e0df9a8ca1930efdf29bda29;hp=e2182ecd2c22a400d8c397228895ea9be00ffd1d;hpb=98cdb3fce945485772ccc49741fa29051338ce0d;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index e2182ecd..012826ec 100644
--- a/src/main.c
+++ b/src/main.c
@@ -122,7 +122,10 @@ SetupFileHash          *helptext_info = NULL;
 /* element definitions                                                       */
 /* ------------------------------------------------------------------------- */
 
-struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
+struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1];
+
+/* this contains predefined structure elements to initialize "element_info" */
+struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
 {
   /* keyword to start parser: "ELEMENT_INFO_START" <-- do not change! */
 
@@ -3416,6 +3419,256 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
     "trigger",
     "player triggering change"
   },
+  {
+    "sp_gravity_on_port_right",
+    "sp_port",
+    "gravity on port (leading right)"
+  },
+  {
+    "sp_gravity_on_port_down",
+    "sp_port",
+    "gravity on port (leading down)"
+  },
+  {
+    "sp_gravity_on_port_left",
+    "sp_port",
+    "gravity on port (leading left)"
+  },
+  {
+    "sp_gravity_on_port_up",
+    "sp_port",
+    "gravity on port (leading up)"
+  },
+  {
+    "sp_gravity_off_port_right",
+    "sp_port",
+    "gravity off port (leading right)"
+  },
+  {
+    "sp_gravity_off_port_down",
+    "sp_port",
+    "gravity off port (leading down)"
+  },
+  {
+    "sp_gravity_off_port_left",
+    "sp_port",
+    "gravity off port (leading left)"
+  },
+  {
+    "sp_gravity_off_port_up",
+    "sp_port",
+    "gravity off port (leading up)"
+  },
+  {
+    "balloon_switch_none",
+    "balloon_switch",
+    "stop moving balloon"
+  },
+  {
+    "emc_level_border",
+    "wall",
+    "level border steelwall",
+  },
+  {
+    "emc_android",
+    "emc_android",
+    "android",
+  },
+  {
+    "emc_android_right",
+    "emc_android",
+    "android",
+  },
+  {
+    "emc_android_up",
+    "emc_android",
+    "android",
+  },
+  {
+    "emc_android_left",
+    "emc_android",
+    "android",
+  },
+  {
+    "emc_android_down",
+    "emc_android",
+    "android",
+  },
+  {
+    "emc_android_left_up",
+    "emc_android",
+    "android",
+  },
+  {
+    "emc_android_left_down",
+    "emc_android",
+    "android",
+  },
+  {
+    "emc_android_right_up",
+    "emc_android",
+    "android",
+  },
+  {
+    "emc_android_right_down",
+    "emc_android",
+    "android",
+  },
+  {
+    "emc_grass",
+    "emc_grass",
+    "grass",
+  },
+  {
+    "emc_generator_ball",
+    "emc_generator_ball",
+    "generator ball",
+  },
+  {
+    "emc_grow",
+    "emc_grow",
+    "grow",
+  },
+  {
+    "emc_gate_1",
+    "gate",
+    "door 1 (EMC style)",
+  },
+  {
+    "emc_gate_2",
+    "gate",
+    "door 2 (EMC style)",
+  },
+  {
+    "emc_gate_3",
+    "gate",
+    "door 3 (EMC style)",
+  },
+  {
+    "emc_gate_4",
+    "gate",
+    "door 4 (EMC style)",
+  },
+  {
+    "emc_gate_5",
+    "gate",
+    "door 5 (EMC style)",
+  },
+  {
+    "emc_gate_6",
+    "gate",
+    "door 6 (EMC style)",
+  },
+  {
+    "emc_gate_7",
+    "gate",
+    "door 7 (EMC style)",
+  },
+  {
+    "emc_gate_8",
+    "gate",
+    "door 8 (EMC style)",
+  },
+  {
+    "emc_gate_1_gray",
+    "gate",
+    "gray door (EMC style, key 1)",
+  },
+  {
+    "emc_gate_2_gray",
+    "gate",
+    "gray door (EMC style, key 2)",
+  },
+  {
+    "emc_gate_3_gray",
+    "gate",
+    "gray door (EMC style, key 3)",
+  },
+  {
+    "emc_gate_4_gray",
+    "gate",
+    "gray door (EMC style, key 4)",
+  },
+  {
+    "emc_gate_5_gray",
+    "gate",
+    "gray door (EMC style, key 5)",
+  },
+  {
+    "emc_gate_6_gray",
+    "gate",
+    "gray door (EMC style, key 6)",
+  },
+  {
+    "emc_gate_7_gray",
+    "gate",
+    "gray door (EMC style, key 7)",
+  },
+  {
+    "emc_gate_8_gray",
+    "gate",
+    "gray door (EMC style, key 8)",
+  },
+  {
+    "emc_key_1",
+    "key",
+    "key 1 (EMC style)",
+  },
+  {
+    "emc_key_2",
+    "key",
+    "key 2 (EMC style)",
+  },
+  {
+    "emc_key_3",
+    "key",
+    "key 3 (EMC style)",
+  },
+  {
+    "emc_key_4",
+    "key",
+    "key 4 (EMC style)",
+  },
+  {
+    "emc_key_5",
+    "key",
+    "key 5 (EMC style)",
+  },
+  {
+    "emc_key_6",
+    "key",
+    "key 6 (EMC style)",
+  },
+  {
+    "emc_key_7",
+    "key",
+    "key 7 (EMC style)",
+  },
+  {
+    "emc_key_8",
+    "key",
+    "key 8 (EMC style)",
+  },
+  {
+    "emc_bumper",
+    "emc_bumper",
+    "bumper",
+  },
+  {
+    "emc_plant",
+    "emc_plant",
+    "plant",
+  },
+  {
+    "emc_lenses",
+    "emc_lenses",
+    "lenses",
+  },
+  {
+    "emc_magnifier",
+    "emc_magnifier",
+    "magnifier",
+  },
 
   /* ----------------------------------------------------------------------- */
   /* "real" (and therefore drawable) runtime elements                        */
@@ -4111,7 +4364,7 @@ static void print_usage()
 	 "      --serveronly                 only start network server\n"
 	 "  -v, --verbose                    verbose mode\n"
 	 "      --debug                      display debugging information\n"
-	 "  -e, --execute COMMAND            execute batch COMMAND:\n"
+	 "  -e, --execute COMMAND            execute batch COMMAND\n"
 	 "\n"
 	 "Valid commands for '--execute' option:\n"
 	 "  \"print graphicsinfo.conf\"        print default graphics config\n"
@@ -4122,7 +4375,8 @@ static void print_usage()
 	 "  \"print helptext.conf\"            print default helptext config\n"
 	 "  \"dump level FILE\"                dump level data from FILE\n"
 	 "  \"dump tape FILE\"                 dump tape data from FILE\n"
-	 "  \"autoplay LEVELDIR\"              play level tapes for LEVELDIR\n"
+	 "  \"autoplay LEVELDIR [NR]\"         play level tapes for LEVELDIR\n"
+	 "  \"convert LEVELDIR [NR]\"          convert levels in LEVELDIR\n"
 	 "\n",
 	 program.command_basename);
 }