added ignoring gadgets if click already caused animation event action

[rocksndiamonds.git] / src / anim.c

diff --git a/src/anim.c b/src/anim.c
index 0a4946a2a1da9a739a0c80f44f8edf0690d82efb..50cbba7b73521e650248525867e655b447f16e7e 100644 (file)
--- a/src/anim.c
+++ b/src/anim.c
@@ -1003,10 +1003,8 @@ static boolean isClickedPart(struct GlobalAnimPartControlInfo *part,
   return TRUE;
 }
 
-static boolean setPartClicked(struct GlobalAnimPartControlInfo *part)
+static boolean clickConsumed(struct GlobalAnimPartControlInfo *part)
 {
-  part->clicked = TRUE;
-
   return (part->control_info.style & STYLE_PASSTHROUGH ? FALSE : TRUE);
 }
 
@@ -1452,7 +1450,8 @@ static boolean DoGlobalAnim_EventAction(struct GlobalAnimPartControlInfo *part)
   if (anim_event_action == -1)
     return FALSE;
 
-  return DoGadgetAction(anim_event_action);
+  return (DoGadgetAction(anim_event_action) ||
+         DoScreenAction(anim_event_action));
 }
 
 static void InitGlobalAnim_Clickable()
@@ -1483,6 +1482,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)
@@ -1517,7 +1517,10 @@ 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 = setPartClicked(part);
+       {
+         part->clicked = TRUE;
+         anything_clicked = clickConsumed(part);
+       }
 
        // ... but only handle the first (topmost) clickable animation
        if (any_part_clicked)
@@ -1530,14 +1533,17 @@ 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 = setPartClicked(part);
+         {
+           part->clicked = TRUE;
+           anything_clicked = clickConsumed(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"
@@ -1563,16 +1569,17 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
 
              if (isClickablePart(part2, mask))
              {
-               setPartClicked(part2);
+               part2->clicked = TRUE;
+               anything_clicked = clickConsumed(part); // click was on "part"!
 
 #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
@@ -1594,7 +1601,7 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
     }
   }
 
-  return anything_clicked;
+  return (anything_clicked || any_event_action);
 }
 
 static void ResetGlobalAnim_Clickable()