projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed setting (and maybe inheriting) draw order for global animations
[rocksndiamonds.git]
/
src
/
anim.c
diff --git
a/src/anim.c
b/src/anim.c
index a23d6e581de1c2f23c1b780d91e1f771c92f1247..0cb2023d85b6b21f1eb0f14bcf551f352942ace2 100644
(file)
--- a/
src/anim.c
+++ b/
src/anim.c
@@
-535,6
+535,10
@@
static void InitGlobalAnimControls(void)
anim->state = ANIM_STATE_INACTIVE;
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++)
part_nr = 0;
for (p = 0; p < NUM_GLOBAL_ANIM_PARTS_ALL; p++)
@@
-606,6
+610,10
@@
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 (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)
}
if (anim->num_parts > 0 || anim->has_base)