X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Finit.c;h=8ec25b1df7d3436fa1c9d795f10d50a8d03a9a36;hb=2ffc7d13be24ed07f4dcb9a77924450f16597720;hp=1af2f48ee58f11b1eeb9b9126c2353df3efee9fa;hpb=53745d86fbc455ad0ed5c8fb04f39ec3c3f04b14;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 1af2f48e..8ec25b1d 100644
--- a/src/init.c
+++ b/src/init.c
@@ -748,16 +748,11 @@ static int get_element_from_token(char *token)
 static void set_graphic_parameters(int graphic, char **parameter_raw)
 {
   Bitmap *src_bitmap = getBitmapFromImageID(graphic);
-  boolean special_envelope_graphic;
   int parameter[NUM_GFX_ARGS];
   int anim_frames_per_row = 1, anim_frames_per_col = 1;
   int anim_frames_per_line = 1;
   int i;
 
-  special_envelope_graphic = (graphic == IMG_GAME_ENVELOPE_BACKGROUND ||
-			      (graphic >= IMG_GAME_ENVELOPE_1_BACKGROUND &&
-			       graphic <= IMG_GAME_ENVELOPE_4_BACKGROUND));
-
   /* get integer values from string parameters */
   for (i=0; i < NUM_GFX_ARGS; i++)
   {
@@ -847,8 +842,6 @@ static void set_graphic_parameters(int graphic, char **parameter_raw)
     graphic_info[graphic].anim_delay = 1;
 
   graphic_info[graphic].anim_mode = parameter[GFX_ARG_ANIM_MODE];
-  if (graphic_info[graphic].anim_frames == 1 && !special_envelope_graphic)
-    graphic_info[graphic].anim_mode = ANIM_NONE;
 
   /* automatically determine correct start frame, if not defined */
   if (parameter[GFX_ARG_START_FRAME] == ARG_UNDEFINED_VALUE)
@@ -884,10 +877,6 @@ static void set_graphic_parameters(int graphic, char **parameter_raw)
 
   /* this is only used for drawing envelope graphics */
   graphic_info[graphic].draw_masked = parameter[GFX_ARG_DRAW_MASKED];
-
-  /* global envelope settings override specific settings, if undefined */
-  if (special_envelope_graphic && graphic_info[graphic].bitmap == NULL)
-    graphic_info[graphic] = graphic_info[IMG_GAME_ENVELOPE_BACKGROUND];
 }
 
 static void InitGraphicInfo()