rnd-20100204-1-src

[rocksndiamonds.git] / src / conf_gfx.c

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 271ef2eb73b1453e1f76b477699bf68633f387bf..b282959b7016309a673dad36dffc40ccc25d0be5 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -431,6 +431,16 @@ struct ConfigInfo image_config[] =
   { "sp_infotron.EDITOR",                      "RocksSP.pcx"           },
   { "sp_infotron.EDITOR.xpos",                 "8"                     },
   { "sp_infotron.EDITOR.ypos",                 "11"                    },
+  { "sp_infotron.moving.left",                 "RocksSP.pcx"           },
+  { "sp_infotron.moving.left.xpos",            "8"                     },
+  { "sp_infotron.moving.left.ypos",            "13"                    },
+  { "sp_infotron.moving.left.frames",          "8"                     },
+  { "sp_infotron.moving.right",                        "RocksSP.pcx"           },
+  { "sp_infotron.moving.right.xpos",           "8"                     },
+  { "sp_infotron.moving.right.ypos",           "13"                    },
+  { "sp_infotron.moving.right.frames",         "8"                     },
+  { "sp_infotron.moving.right.start_frame",    "6"                     },
+  { "sp_infotron.moving.right.anim_mode",      "reverse"               },
   { "sp_infotron.collecting",                  "RocksSP.pcx"           },
   { "sp_infotron.collecting.xpos",             "8"                     },
   { "sp_infotron.collecting.ypos",             "7"                     },
@@ -553,85 +563,85 @@ struct ConfigInfo image_config[] =
   { "sp_gravity_port_right.ypos",              "1"                     },
   { "sp_gravity_port_right.frames",            "1"                     },
   { "sp_gravity_port_right.EDITOR",            "RocksSP.pcx"           },
-  { "sp_gravity_port_right.EDITOR.xpos",       "5"                     },
-  { "sp_gravity_port_right.EDITOR.ypos",       "1"                     },
+  { "sp_gravity_port_right.EDITOR.xpos",       "0"                     },
+  { "sp_gravity_port_right.EDITOR.ypos",       "14"                    },
   { "sp_gravity_port_down",                    "RocksSP.pcx"           },
   { "sp_gravity_port_down.xpos",               "2"                     },
   { "sp_gravity_port_down.ypos",               "1"                     },
   { "sp_gravity_port_down.frames",             "1"                     },
   { "sp_gravity_port_down.EDITOR",             "RocksSP.pcx"           },
-  { "sp_gravity_port_down.EDITOR.xpos",                "6"                     },
-  { "sp_gravity_port_down.EDITOR.ypos",                "1"                     },
+  { "sp_gravity_port_down.EDITOR.xpos",                "1"                     },
+  { "sp_gravity_port_down.EDITOR.ypos",                "14"                    },
   { "sp_gravity_port_left",                    "RocksSP.pcx"           },
   { "sp_gravity_port_left.xpos",               "3"                     },
   { "sp_gravity_port_left.ypos",               "1"                     },
   { "sp_gravity_port_left.frames",             "1"                     },
   { "sp_gravity_port_left.EDITOR",             "RocksSP.pcx"           },
-  { "sp_gravity_port_left.EDITOR.xpos",                "7"                     },
-  { "sp_gravity_port_left.EDITOR.ypos",                "1"                     },
+  { "sp_gravity_port_left.EDITOR.xpos",                "2"                     },
+  { "sp_gravity_port_left.EDITOR.ypos",                "14"                    },
   { "sp_gravity_port_up",                      "RocksSP.pcx"           },
   { "sp_gravity_port_up.xpos",                 "4"                     },
   { "sp_gravity_port_up.ypos",                 "1"                     },
   { "sp_gravity_port_up.frames",               "1"                     },
   { "sp_gravity_port_up.EDITOR",               "RocksSP.pcx"           },
-  { "sp_gravity_port_up.EDITOR.xpos",          "0"                     },
-  { "sp_gravity_port_up.EDITOR.ypos",          "2"                     },
+  { "sp_gravity_port_up.EDITOR.xpos",          "3"                     },
+  { "sp_gravity_port_up.EDITOR.ypos",          "14"                    },
   { "sp_gravity_on_port_right",                        "RocksSP.pcx"           },
   { "sp_gravity_on_port_right.xpos",           "1"                     },
   { "sp_gravity_on_port_right.ypos",           "1"                     },
   { "sp_gravity_on_port_right.frames",         "1"                     },
   { "sp_gravity_on_port_right.EDITOR",         "RocksSP.pcx"           },
-  { "sp_gravity_on_port_right.EDITOR.xpos",    "5"                     },
-  { "sp_gravity_on_port_right.EDITOR.ypos",    "1"                     },
+  { "sp_gravity_on_port_right.EDITOR.xpos",    "0"                     },
+  { "sp_gravity_on_port_right.EDITOR.ypos",    "13"                    },
   { "sp_gravity_on_port_down",                 "RocksSP.pcx"           },
   { "sp_gravity_on_port_down.xpos",            "2"                     },
   { "sp_gravity_on_port_down.ypos",            "1"                     },
   { "sp_gravity_on_port_down.frames",          "1"                     },
   { "sp_gravity_on_port_down.EDITOR",          "RocksSP.pcx"           },
-  { "sp_gravity_on_port_down.EDITOR.xpos",     "6"                     },
-  { "sp_gravity_on_port_down.EDITOR.ypos",     "1"                     },
+  { "sp_gravity_on_port_down.EDITOR.xpos",     "1"                     },
+  { "sp_gravity_on_port_down.EDITOR.ypos",     "13"                    },
   { "sp_gravity_on_port_left",                 "RocksSP.pcx"           },
   { "sp_gravity_on_port_left.xpos",            "3"                     },
   { "sp_gravity_on_port_left.ypos",            "1"                     },
   { "sp_gravity_on_port_left.frames",          "1"                     },
   { "sp_gravity_on_port_left.EDITOR",          "RocksSP.pcx"           },
-  { "sp_gravity_on_port_left.EDITOR.xpos",     "7"                     },
-  { "sp_gravity_on_port_left.EDITOR.ypos",     "1"                     },
+  { "sp_gravity_on_port_left.EDITOR.xpos",     "2"                     },
+  { "sp_gravity_on_port_left.EDITOR.ypos",     "13"                    },
   { "sp_gravity_on_port_up",                   "RocksSP.pcx"           },
   { "sp_gravity_on_port_up.xpos",              "4"                     },
   { "sp_gravity_on_port_up.ypos",              "1"                     },
   { "sp_gravity_on_port_up.frames",            "1"                     },
   { "sp_gravity_on_port_up.EDITOR",            "RocksSP.pcx"           },
-  { "sp_gravity_on_port_up.EDITOR.xpos",       "0"                     },
-  { "sp_gravity_on_port_up.EDITOR.ypos",       "2"                     },
+  { "sp_gravity_on_port_up.EDITOR.xpos",       "3"                     },
+  { "sp_gravity_on_port_up.EDITOR.ypos",       "13"                    },
   { "sp_gravity_off_port_right",               "RocksSP.pcx"           },
   { "sp_gravity_off_port_right.xpos",          "1"                     },
   { "sp_gravity_off_port_right.ypos",          "1"                     },
   { "sp_gravity_off_port_right.frames",                "1"                     },
   { "sp_gravity_off_port_right.EDITOR",                "RocksSP.pcx"           },
-  { "sp_gravity_off_port_right.EDITOR.xpos",   "5"                     },
-  { "sp_gravity_off_port_right.EDITOR.ypos",   "1"                     },
+  { "sp_gravity_off_port_right.EDITOR.xpos",   "4"                     },
+  { "sp_gravity_off_port_right.EDITOR.ypos",   "13"                    },
   { "sp_gravity_off_port_down",                        "RocksSP.pcx"           },
   { "sp_gravity_off_port_down.xpos",           "2"                     },
   { "sp_gravity_off_port_down.ypos",           "1"                     },
   { "sp_gravity_off_port_down.frames",         "1"                     },
   { "sp_gravity_off_port_down.EDITOR",         "RocksSP.pcx"           },
-  { "sp_gravity_off_port_down.EDITOR.xpos",    "6"                     },
-  { "sp_gravity_off_port_down.EDITOR.ypos",    "1"                     },
+  { "sp_gravity_off_port_down.EDITOR.xpos",    "5"                     },
+  { "sp_gravity_off_port_down.EDITOR.ypos",    "13"                    },
   { "sp_gravity_off_port_left",                        "RocksSP.pcx"           },
   { "sp_gravity_off_port_left.xpos",           "3"                     },
   { "sp_gravity_off_port_left.ypos",           "1"                     },
   { "sp_gravity_off_port_left.frames",         "1"                     },
   { "sp_gravity_off_port_left.EDITOR",         "RocksSP.pcx"           },
-  { "sp_gravity_off_port_left.EDITOR.xpos",    "7"                     },
-  { "sp_gravity_off_port_left.EDITOR.ypos",    "1"                     },
+  { "sp_gravity_off_port_left.EDITOR.xpos",    "6"                     },
+  { "sp_gravity_off_port_left.EDITOR.ypos",    "13"                    },
   { "sp_gravity_off_port_up",                  "RocksSP.pcx"           },
   { "sp_gravity_off_port_up.xpos",             "4"                     },
   { "sp_gravity_off_port_up.ypos",             "1"                     },
   { "sp_gravity_off_port_up.frames",           "1"                     },
   { "sp_gravity_off_port_up.EDITOR",           "RocksSP.pcx"           },
-  { "sp_gravity_off_port_up.EDITOR.xpos",      "0"                     },
-  { "sp_gravity_off_port_up.EDITOR.ypos",      "2"                     },
+  { "sp_gravity_off_port_up.EDITOR.xpos",      "7"                     },
+  { "sp_gravity_off_port_up.EDITOR.ypos",      "13"                    },
 
   { "sp_sniksnak",                             "RocksSP.pcx"           },
   { "sp_sniksnak.xpos",                                "1"                     },
@@ -4336,6 +4346,10 @@ struct ConfigInfo image_config[] =
   /* images not associated to game elements (used for menu screens etc.) */
   /* keyword to stop parser: "NO_MORE_ELEMENT_IMAGES" <-- do not change! */
 
+#if 1
+  { "sp_objects",                              "sp_objects.pcx"        },
+#endif
+
 #if 1
   /* !!! TEMPORARILY STORED HERE -- PROBABLY TO BE CHANGED !!! */
 
@@ -4944,12 +4958,12 @@ struct ConfigInfo image_config[] =
   { "global.busy.delay",                       "2"                     },
 
   { "editor.element_border",                   "RocksElements.pcx"     },
-  { "editor.element_border.xpos",              "0"                     },
-  { "editor.element_border.ypos",              "0"                     },
+  { "editor.element_border.x",                 "0"                     },
+  { "editor.element_border.y",                 "0"                     },
 
-  { "editor.element_border_input",             "RocksElements.pcx"     },
-  { "editor.element_border_input.xpos",                "0"                     },
-  { "editor.element_border_input.ypos",                "0"                     },
+  { "editor.element_border_input",             "RocksDoor.pcx"         },
+  { "editor.element_border_input.x",           "740"                   },
+  { "editor.element_border_input.y",           "48"                    },
 
   { "editor.cascade_list",                     "RocksDoor.pcx"         },
   { "editor.cascade_list.x",                   "708"                   },
@@ -4975,6 +4989,7 @@ struct ConfigInfo image_config[] =
   { "background.INFO[VERSION]",                        UNDEFINED_FILENAME      },
   { "background.INFO[LEVELSET]",               UNDEFINED_FILENAME      },
   { "background.SETUP",                                UNDEFINED_FILENAME      },
+  { "background.PLAYING",                      UNDEFINED_FILENAME      },
   { "background.DOOR",                         UNDEFINED_FILENAME      },
 
   { "background.titlescreen_initial_1",                UNDEFINED_FILENAME      },
@@ -6343,6 +6358,7 @@ struct ConfigInfo image_config[] =
 
   { "game.forced_scroll_delay_value",          "-1"                    },
   { "game.use_native_emc_graphics_engine",     "false"                 },
+  { "game.use_masked_pushing",                 "false"                 },
 
   { "[player].boring_delay_fixed",             "1000"                  },
   { "[player].boring_delay_random",            "1000"                  },