X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=6c150ea0f86b3ea4be3de7cc8a7ed79b252036c2;hb=HEAD;hp=d9addaf1fc074a8ef0f8bde81ead0dfd780f579d;hpb=3e76edd9591c599d4ec9b3a179e07c23c0aa135c;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index d9addaf1..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;
@@ -11826,6 +11830,7 @@ int get_parameter_value(char *value_raw, char *suffix, int type)
 	      strEqual(value, "bottom") ? POS_BOTTOM :
 	      strEqual(value, "any")    ? POS_ANY :
 	      strEqual(value, "ce")     ? POS_CE :
+	      strEqual(value, "ce_trigger") ? POS_CE_TRIGGER :
 	      strEqual(value, "last")   ? POS_LAST : POS_UNDEFINED);
   }
   else if (strEqual(suffix, ".align"))
@@ -11859,6 +11864,7 @@ int get_parameter_value(char *value_raw, char *suffix, int type)
 	      string_has_parameter(value, "centered")	? ANIM_CENTERED :
 	      string_has_parameter(value, "all")	? ANIM_ALL :
 	      string_has_parameter(value, "tiled")	? ANIM_TILED :
+	      string_has_parameter(value, "level_nr")	? ANIM_LEVEL_NR :
 	      ANIM_DEFAULT);
 
     if (string_has_parameter(value, "once"))
@@ -11923,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 :