rnd-20090719-1-src

[rocksndiamonds.git] / src / conf_gfx.c

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 751876b5a69ab1049cee3eb03de12ac5e7d9706d..4c7e7cb7cfcfdd46edade4706bcb458f9c39022a 100644 (file)
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -43,8 +43,8 @@ struct ConfigTypeInfo image_config_suffix[] =
   { ".delay",                          "1",            TYPE_INTEGER    },
   { ".anim_mode",                      ARG_UNDEFINED,  TYPE_STRING     },
   { ".global_sync",                    "false",        TYPE_BOOLEAN    },
-  { ".crumbled_like",                  ARG_UNDEFINED,  TYPE_TOKEN      },
-  { ".diggable_like",                  ARG_UNDEFINED,  TYPE_TOKEN      },
+  { ".crumbled_like",                  ARG_UNDEFINED,  TYPE_ELEMENT    },
+  { ".diggable_like",                  ARG_UNDEFINED,  TYPE_ELEMENT    },
   { ".border_size",                    ARG_UNDEFINED,  TYPE_INTEGER    },
   { ".step_offset",                    "4",            TYPE_INTEGER    },
   { ".step_delay",                     "1",            TYPE_INTEGER    },
@@ -59,7 +59,7 @@ struct ConfigTypeInfo image_config_suffix[] =
   { ".post_delay_random",              ARG_UNDEFINED,  TYPE_INTEGER    },
   { ".name",                           ARG_UNDEFINED,  TYPE_STRING     },
   { ".scale_up_factor",                        ARG_UNDEFINED,  TYPE_INTEGER    },
-  { ".clone_from",                     ARG_UNDEFINED,  TYPE_TOKEN      },
+  { ".clone_from",                     ARG_UNDEFINED,  TYPE_GRAPHIC    },
   { ".fade_mode",                      ARG_UNDEFINED,  TYPE_INTEGER    },
   { ".fade_delay",                     ARG_UNDEFINED,  TYPE_INTEGER    },
   { ".post_delay",                     ARG_UNDEFINED,  TYPE_INTEGER    },
@@ -4336,6 +4336,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 !!! */
 
@@ -4684,6 +4688,8 @@ struct ConfigInfo image_config[] =
   { "font.title_2.y",                          "0"                     },
   { "font.title_2.width",                      "14"                    },
   { "font.title_2.height",                     "14"                    },
+  { "font.title_2.SETUP",                      UNDEFINED_FILENAME      },
+  { "font.title_2.SETUP.clone_from",           "font.text_4"           },
 
   { "font.menu_1",                             "RocksFontBig.pcx"      },
   { "font.menu_1.x",                           "0"                     },
@@ -4942,12 +4948,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"                   },
@@ -4973,6 +4979,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      },
@@ -5298,6 +5305,9 @@ struct ConfigInfo image_config[] =
   { "menu.enter_screen.fade_mode",             "fade"                  },
   { "menu.enter_screen.fade_delay",            "250"                   },
   { "menu.enter_screen.post_delay",            "125"                   },
+  { "menu.next_screen.fade_mode",              "crossfade"             },
+  { "menu.next_screen.fade_delay",             "250"                   },
+  { "menu.next_screen.post_delay",             "125"                   },
   { "menu.leave_screen.fade_mode",             "fade"                  },
   { "menu.leave_screen.fade_delay",            "250"                   },
   { "menu.leave_screen.post_delay",            "125"                   },
@@ -5747,6 +5757,15 @@ struct ConfigInfo image_config[] =
   { "game.panel.score.draw_masked",            "true"                  },
   { "game.panel.score.draw_order",             "0"                     },
 
+  { "game.panel.highscore.x",                  "-1"                    },
+  { "game.panel.highscore.y",                  "-1"                    },
+  { "game.panel.highscore.align",              "left"                  },
+  { "game.panel.highscore.valign",             "top"                   },
+  { "game.panel.highscore.digits",             "5"                     },
+  { "game.panel.highscore.font",               "font.text_2"           },
+  { "game.panel.highscore.draw_masked",                "true"                  },
+  { "game.panel.highscore.draw_order",         "0"                     },
+
   { "game.panel.time.x",                       "50"                    },
   { "game.panel.time.y",                       "194"                   },
   { "game.panel.time.align",                   "center"                },