rnd-20030104-1-src

[rocksndiamonds.git] / src / conf_gfx.c

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 886d95741038e300334022b27633f8d1ba1efa7c..c4107ce9cc2f3d96ebd21f04d260a1ecf52c89f2 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -473,13 +473,13 @@ struct ConfigInfo image_config[] =
   { "sp_electron.delay",                       "2"                     },
 
   { "sp_terminal",                             "RocksSP.pcx"           },
-  { "sp_terminal.xpos",                                "8"                     },
-  { "sp_terminal.ypos",                                "11"                    },
+  { "sp_terminal.xpos",                                "0"                     },
+  { "sp_terminal.ypos",                                "10"                    },
   { "sp_terminal.frames",                      "7"                     },
   { "sp_terminal.delay",                       "12"                    },
   { "sp_terminal.active",                      "RocksSP.pcx"           },
-  { "sp_terminal.active.xpos",                 "8"                     },
-  { "sp_terminal.active.ypos",                 "12"                    },
+  { "sp_terminal.active.xpos",                 "0"                     },
+  { "sp_terminal.active.ypos",                 "11"                    },
   { "sp_terminal.active.frames",               "7"                     },
   { "sp_terminal.active.delay",                        "4"                     },
 
@@ -545,9 +545,9 @@ struct ConfigInfo image_config[] =
 
   /* images for Emerald Mine style elements and actions */
 
-  { "empty_space",                             "RocksElements.pcx"     },
-  { "empty_space.xpos",                                "7"                     },
-  { "empty_space.ypos",                                "9"                     },
+  { "empty_space",                             "RocksSP.pcx"           },
+  { "empty_space.xpos",                                "0"                     },
+  { "empty_space.ypos",                                "0"                     },
   { "empty_space.frames",                      "1"                     },
 
   { "sand",                                    "RocksElements.pcx"     },
@@ -1185,7 +1185,6 @@ struct ConfigInfo image_config[] =
   { "conveyor_belt2_right.active.ypos",                "5"                     },
   { "conveyor_belt2_right.active.frames",      "8"                     },
   { "conveyor_belt2_right.active.delay",       "2"                     },
-  { "conveyor_belt2_right.active.delay",       "2"                     },
   { "conveyor_belt2_switch_left",              "RocksDC.pcx"           },
   { "conveyor_belt2_switch_left.xpos",         "1"                     },
   { "conveyor_belt2_switch_left.ypos",         "12"                    },
@@ -1226,7 +1225,6 @@ struct ConfigInfo image_config[] =
   { "conveyor_belt3_right.active.ypos",                "8"                     },
   { "conveyor_belt3_right.active.frames",      "8"                     },
   { "conveyor_belt3_right.active.delay",       "2"                     },
-  { "conveyor_belt3_right.active.delay",       "2"                     },
   { "conveyor_belt3_switch_left",              "RocksDC.pcx"           },
   { "conveyor_belt3_switch_left.xpos",         "2"                     },
   { "conveyor_belt3_switch_left.ypos",         "12"                    },
@@ -1267,7 +1265,6 @@ struct ConfigInfo image_config[] =
   { "conveyor_belt4_right.active.ypos",                "11"                    },
   { "conveyor_belt4_right.active.frames",      "8"                     },
   { "conveyor_belt4_right.active.delay",       "2"                     },
-  { "conveyor_belt4_right.active.delay",       "2"                     },
   { "conveyor_belt4_switch_left",              "RocksDC.pcx"           },
   { "conveyor_belt4_switch_left.xpos",         "3"                     },
   { "conveyor_belt4_switch_left.ypos",         "12"                    },
@@ -1617,26 +1614,44 @@ struct ConfigInfo image_config[] =
   { "emerald_yellow.xpos",                     "10"                    },
   { "emerald_yellow.ypos",                     "8"                     },
   { "emerald_yellow.frames",                   "1"                     },
+  { "emerald_yellow.moving",                   "RocksElements.pcx"     },
+  { "emerald_yellow.moving.xpos",              "10"                    },
+  { "emerald_yellow.moving.ypos",              "8"                     },
+  { "emerald_yellow.moving.frames",            "2"                     },
+  { "emerald_yellow.moving.delay",             "4"                     },
   { "emerald_yellow.falling",                  "RocksElements.pcx"     },
   { "emerald_yellow.falling.xpos",             "10"                    },
   { "emerald_yellow.falling.ypos",             "8"                     },
   { "emerald_yellow.falling.frames",           "2"                     },
+  { "emerald_yellow.falling.delay",            "4"                     },
   { "emerald_red",                             "RocksElements.pcx"     },
   { "emerald_red.xpos",                                "8"                     },
   { "emerald_red.ypos",                                "9"                     },
   { "emerald_red.frames",                      "1"                     },
+  { "emerald_red.moving",                      "RocksElements.pcx"     },
+  { "emerald_red.moving.xpos",                 "8"                     },
+  { "emerald_red.moving.ypos",                 "9"                     },
+  { "emerald_red.moving.frames",               "2"                     },
+  { "emerald_red.moving.delay",                        "4"                     },
   { "emerald_red.falling",                     "RocksElements.pcx"     },
   { "emerald_red.falling.xpos",                        "8"                     },
   { "emerald_red.falling.ypos",                        "9"                     },
   { "emerald_red.falling.frames",              "2"                     },
+  { "emerald_red.falling.delay",               "4"                     },
   { "emerald_purple",                          "RocksElements.pcx"     },
   { "emerald_purple.xpos",                     "10"                    },
   { "emerald_purple.ypos",                     "9"                     },
   { "emerald_purple.frames",                   "1"                     },
+  { "emerald_purple.moving",                   "RocksElements.pcx"     },
+  { "emerald_purple.moving.xpos",              "10"                    },
+  { "emerald_purple.moving.ypos",              "9"                     },
+  { "emerald_purple.moving.frames",            "2"                     },
+  { "emerald_purple.moving.delay",             "4"                     },
   { "emerald_purple.falling",                  "RocksElements.pcx"     },
   { "emerald_purple.falling.xpos",             "10"                    },
   { "emerald_purple.falling.ypos",             "9"                     },
   { "emerald_purple.falling.frames",           "2"                     },
+  { "emerald_purple.falling.delay",            "4"                     },
 
   { "wall_emerald_yellow",                     "RocksElements.pcx"     },
   { "wall_emerald_yellow.xpos",                        "8"                     },
@@ -2056,7 +2071,7 @@ struct ConfigInfo image_config[] =
   { "stoneblock.ypos",                         "1"                     },
   { "stoneblock.frames",                       "1"                     },
 
-  /* images for generic elements and actions */
+  /* images for other elements and actions */
 
   { "player1",                                 "RocksHeroes.pcx"       },
   { "player1.xpos",                            "0"                     },
@@ -2551,7 +2566,7 @@ struct ConfigInfo image_config[] =
   { "scrollbar_yellow.frames",                 "1"                     },
 
 #include "conf_chr.c"  /* include auto-generated data structure definitions */
-#include "conf_gen.c"  /* include auto-generated data structure definitions */
+#include "conf_cus.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! */