rnd-20030105-1-src

[rocksndiamonds.git] / src / conf_gfx.c

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index f35c21cf388c8b0eddf1d897392125387bec73b0..72e5e04a6ed26b8905cf1bbcddae0de851546a47 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"                     },
 
@@ -633,6 +633,18 @@ struct ConfigInfo image_config[] =
   { "nut.xpos",                                        "12"                    },
   { "nut.ypos",                                        "1"                     },
   { "nut.frames",                              "1"                     },
+  { "nut.falling",                             "RocksElements.pcx"     },
+  { "nut.falling.xpos",                                "12"                    },
+  { "nut.falling.ypos",                                "1"                     },
+  { "nut.falling.frames",                      "1"                     },
+  { "nut.moving_left",                         "RocksElements.pcx"     },
+  { "nut.moving_left.xpos",                    "12"                    },
+  { "nut.moving_left.ypos",                    "1"                     },
+  { "nut.moving_left.frames",                  "1"                     },
+  { "nut.moving_right",                                "RocksElements.pcx"     },
+  { "nut.moving_right.xpos",                   "12"                    },
+  { "nut.moving_right.ypos",                   "1"                     },
+  { "nut.moving_right.frames",                 "1"                     },
   { "nut.cracking",                            "RocksElements.pcx"     },
   { "nut.cracking.xpos",                       "13"                    },
   { "nut.cracking.ypos",                       "1"                     },
@@ -1185,7 +1197,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 +1237,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 +1277,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"                    },
@@ -2074,7 +2083,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"                     },
@@ -2569,12 +2578,13 @@ 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! */
 
-  { "menu.back",                               "RocksScreen.pcx"       },
+  { "menu.frame",                              "RocksScreen.pcx"       },
+  { "menu.background",                         UNDEFINED_FILENAME      },
   { "menu.door",                               "RocksDoor.pcx"         },
   { "menu.toons",                              "RocksToons.pcx"        },
   { "menu.font_big",                           "RocksFontBig.pcx"      },