From: Holger Schemel <info@artsoft.org>
Date: Wed, 13 Dec 2023 16:06:03 +0000 (+0100)
Subject: reverted setting (and maybe inheriting) draw order for global animations
X-Git-Tag: 4.3.8.1~4
X-Git-Url: https://git.artsoft.org/rocksndiamonds.git/?p=rocksndiamonds.git;a=commitdiff_plain;h=5d1f7afe4cac805e10a8f4e61c67497c55e22453

reverted setting (and maybe inheriting) draw order for global animations

Although this feature seems to be quite useful (setting draw order for
main animations once, and let animation parts inherit the draw order
from the main animation if it is not defined for the animation part),
it would have to be implemented for all other attributes, too (like X
and Y position of the main animation and animation parts, for example),
so it seems to be better to not make an exception for this specific
attribute.

This reverts commit 895d5cb3.
---

diff --git a/src/anim.c b/src/anim.c
index e836ff6a..cdc0fd05 100644
--- a/src/anim.c
+++ b/src/anim.c
@@ -531,10 +531,6 @@ static void InitGlobalAnimControls(void)
 
       anim->state = ANIM_STATE_INACTIVE;
 
-      // if draw order is undefined, set to default value "0"
-      if (anim->control_info.draw_order == ARG_UNDEFINED_VALUE)
-	anim->control_info.draw_order = 0;
-
       part_nr = 0;
 
       for (p = 0; p < NUM_GLOBAL_ANIM_PARTS_ALL; p++)
@@ -606,10 +602,6 @@ static void InitGlobalAnimControls(void)
 	if (part->control_info.class == get_hash_from_key("pointer") &&
 	    part->control_info.style == STYLE_DEFAULT)
 	  part->control_info.style |= STYLE_PASSTHROUGH;
-
-	// if draw order is undefined, inherit it from main animation
-	if (part->control_info.draw_order == ARG_UNDEFINED_VALUE)
-	  part->control_info.draw_order = anim->control_info.draw_order;
       }
 
       if (anim->num_parts > 0 || anim->has_base)
diff --git a/src/init.c b/src/init.c
index 45945dcd..af11e4c7 100644
--- a/src/init.c
+++ b/src/init.c
@@ -722,23 +722,14 @@ static void InitGlobalAnimGraphicInfo(void)
     struct GraphicInfo *g = &graphic_info[graphic];
     struct FileInfo *image = getImageListEntryFromImageID(graphic);
     char **parameter_raw = image->parameter;
-    int p1 = GFX_ARG_DRAW_MASKED;
-    int p2 = GFX_ARG_DRAW_ORDER;
-    int draw_masked = get_graphic_parameter_value(parameter_raw[p1],
-						  image_config_suffix[p1].token,
-						  image_config_suffix[p1].type);
-    int draw_order = get_graphic_parameter_value(parameter_raw[p2],
-						 image_config_suffix[p2].token,
-						 image_config_suffix[p2].type);
+    int p = GFX_ARG_DRAW_MASKED;
+    int draw_masked = get_graphic_parameter_value(parameter_raw[p],
+						  image_config_suffix[p].token,
+						  image_config_suffix[p].type);
 
     // if ".draw_masked" parameter is undefined, use default value "TRUE"
     if (draw_masked == ARG_UNDEFINED_VALUE)
       g->draw_masked = TRUE;
-
-    // if ".draw_order" parameter is undefined, set back to "undefined"
-    // (used to be able to inherit draw order from main animation later)
-    if (draw_order == ARG_UNDEFINED_VALUE)
-      g->draw_order = ARG_UNDEFINED_VALUE;
   }
 
 #if 0
@@ -1666,10 +1657,6 @@ static void set_graphic_parameters_ext(int graphic, int *parameter,
   if (parameter[GFX_ARG_DRAW_MASKED] != ARG_UNDEFINED_VALUE)
     g->draw_masked = parameter[GFX_ARG_DRAW_MASKED];
 
-  // use a different default value for global animations (corrected later)
-  if (graphic >= IMG_GLOBAL_ANIM_1 && graphic <= IMG_GLOBAL_ANIM_32)
-    g->draw_order = ARG_UNDEFINED_VALUE;
-
   // used for toon animations and global animations
   if (parameter[GFX_ARG_DRAW_ORDER] != ARG_UNDEFINED_VALUE)
     g->draw_order = parameter[GFX_ARG_DRAW_ORDER];