fixed ignoring clicks on global animations after executing event actions

[rocksndiamonds.git] / src / anim.c

diff --git a/src/anim.c b/src/anim.c
index d1ae06a105391ab6b4deda15d2199ce6ec1279fa..de1c40bff53c07c41cd9f4119c4cedfdcb1aef01 100644 (file)
--- a/src/anim.c
+++ b/src/anim.c
@@ -1003,6 +1003,13 @@ static boolean isClickedPart(struct GlobalAnimPartControlInfo *part,
   return TRUE;
 }
 
+static boolean setPartClicked(struct GlobalAnimPartControlInfo *part)
+{
+  part->clicked = TRUE;
+
+  return (part->control_info.style & STYLE_PASSTHROUGH ? FALSE : TRUE);
+}
+
 int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, int state)
 {
   struct GlobalAnimControlInfo *ctrl = &global_anim_ctrl[part->mode_nr];
@@ -1476,6 +1483,7 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
 {
   boolean anything_clicked = FALSE;
   boolean any_part_clicked = FALSE;
+  boolean any_event_action = FALSE;
   int mode_nr;
 
   // check game modes in reverse draw order (to stop when clicked)
@@ -1510,7 +1518,7 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
 
        // always handle "any" click events (clicking anywhere on screen) ...
        if (isClickablePart(part, ANIM_EVENT_ANY))
-         anything_clicked = part->clicked = TRUE;
+         anything_clicked = setPartClicked(part);
 
        // ... but only handle the first (topmost) clickable animation
        if (any_part_clicked)
@@ -1523,14 +1531,14 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
                 part->control_info.anim_event_action);
 #endif
 
-         // after executing event action, force click to be ignored
-         if (DoGlobalAnim_EventAction(part))
-           return TRUE;
+         // after executing event action, ignore any further actions
+         if (!any_event_action && DoGlobalAnim_EventAction(part))
+           any_event_action = TRUE;
 
          any_part_clicked = TRUE;
 
          if (isClickablePart(part, ANIM_EVENT_SELF))
-           anything_clicked = part->clicked = TRUE;
+           anything_clicked = setPartClicked(part);
 
          // check if this click is defined to trigger other animations
          int gic_anim_nr = part->old_anim_nr + 1;      // X as in "anim_X"
@@ -1556,16 +1564,16 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
 
              if (isClickablePart(part2, mask))
              {
-               anything_clicked = part2->clicked = TRUE;
+               setPartClicked(part2);
 
 #if 0
                printf("::: %d.%d TRIGGER CLICKED [%d]\n", anim2_nr, part2_nr,
                       part2->control_info.anim_event_action);
 #endif
 
-               // after executing event action, force click to be ignored
-               if (DoGlobalAnim_EventAction(part2))
-                 return TRUE;
+               // after executing event action, ignore any further actions
+               if (!any_event_action && DoGlobalAnim_EventAction(part2))
+                 any_event_action = TRUE;
              }
 
 #if 0