rnd-20070428-1-src

[rocksndiamonds.git] / src / conf_gfx.c

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index 751876b5a69ab1049cee3eb03de12ac5e7d9706d..908700cd252ea18e29bd7cd37c935a1b82db700c 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    },
@@ -5289,16 +5289,19 @@ struct ConfigInfo image_config[] =
   { "init.busy.align",                         "center"                },
   { "init.busy.valign",                                "middle"                },
 
-  { "menu.enter_menu.fade_mode",               "none"                  },
+  { "menu.enter_menu.fade_mode",               "crossfade"             },
   { "menu.enter_menu.fade_delay",              "250"                   },
   { "menu.enter_menu.post_delay",              "125"                   },
-  { "menu.leave_menu.fade_mode",               "none"                  },
+  { "menu.leave_menu.fade_mode",               "crossfade"             },
   { "menu.leave_menu.fade_delay",              "250"                   },
   { "menu.leave_menu.post_delay",              "125"                   },
-  { "menu.enter_screen.fade_mode",             "fade"                  },
+  { "menu.enter_screen.fade_mode",             "crossfade"             },
   { "menu.enter_screen.fade_delay",            "250"                   },
   { "menu.enter_screen.post_delay",            "125"                   },
-  { "menu.leave_screen.fade_mode",             "fade"                  },
+  { "menu.next_screen.fade_mode",              "crossfade"             },
+  { "menu.next_screen.fade_delay",             "250"                   },
+  { "menu.next_screen.post_delay",             "125"                   },
+  { "menu.leave_screen.fade_mode",             "crossfade"             },
   { "menu.leave_screen.fade_delay",            "250"                   },
   { "menu.leave_screen.post_delay",            "125"                   },
   { "menu.enter_screen.SCORES.fade_mode",      ARG_DEFAULT             },