X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=fa5b9e45de312059aed05884faf00b2da6e12c91;hb=HEAD;hp=1514d4e6d864ddc0dc0761257561b8f1f77baa45;hpb=60d09459a7974a32142b51e737b4e94d7491cdc9;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 1514d4e6..097deead 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1903,8 +1903,7 @@ static void setLevelInfoToDefaults_Elements(struct LevelInfo *level)
     setElementChangeInfoToDefaults(ei->change);
 
     if (IS_CUSTOM_ELEMENT(element) ||
-	IS_GROUP_ELEMENT(element) ||
-	IS_INTERNAL_ELEMENT(element))
+	IS_GROUP_ELEMENT(element))
     {
       setElementDescriptionToDefault(ei);
 
@@ -9490,6 +9489,10 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_SWITCH,
     &setup.toons,				"toons"
   },
+  {
+    TYPE_SWITCH,
+    &setup.global_animations,			"global_animations"
+  },
   {
     TYPE_SWITCH,
     &setup.scroll_delay,			"scroll_delay"
@@ -10409,6 +10412,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->sound_music = TRUE;
   si->sound_simple = TRUE;
   si->toons = TRUE;
+  si->global_animations = TRUE;
   si->scroll_delay = TRUE;
   si->forced_scroll_delay = FALSE;
   si->scroll_delay_value = STD_SCROLL_DELAY;
@@ -11925,6 +11929,8 @@ int get_parameter_value(char *value_raw, char *suffix, int type)
   {
     result = (string_has_parameter(value, "none")	? FADE_MODE_NONE :
 	      string_has_parameter(value, "fade")	? FADE_MODE_FADE :
+	      string_has_parameter(value, "fade_in")	? FADE_MODE_FADE_IN :
+	      string_has_parameter(value, "fade_out")	? FADE_MODE_FADE_OUT :
 	      string_has_parameter(value, "crossfade")	? FADE_MODE_CROSSFADE :
 	      string_has_parameter(value, "melt")	? FADE_MODE_MELT :
 	      string_has_parameter(value, "curtain")	? FADE_MODE_CURTAIN :