X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fanim.c;h=d1ae06a105391ab6b4deda15d2199ce6ec1279fa;hb=8996c42ebfda1439fbf40a6a4c13129f760ecf2d;hp=fa124cb6ab692e957125a060b0d8ffe0a013ef96;hpb=8b3a64c55ed158de2659a0479a232ee4d335ce48;p=rocksndiamonds.git

diff --git a/src/anim.c b/src/anim.c
index fa124cb6..d1ae06a1 100644
--- a/src/anim.c
+++ b/src/anim.c
@@ -1353,6 +1353,11 @@ void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, int action)
 
   part = &anim->part[anim->active_part_nr];
 
+  // first set all animation parts to "inactive", ...
+  for (i = 0; i < num_parts; i++)
+    anim->part[i].state = ANIM_STATE_INACTIVE;
+
+  // ... then set current animation parts to "running"
   part->state = ANIM_STATE_RUNNING;
 
   anim->state = HandleGlobalAnim_Part(part, anim->state);
@@ -1433,6 +1438,16 @@ static void DoAnimationExt()
 #endif
 }
 
+static boolean DoGlobalAnim_EventAction(struct GlobalAnimPartControlInfo *part)
+{
+  int anim_event_action = part->control_info.anim_event_action;
+
+  if (anim_event_action == -1)
+    return FALSE;
+
+  return DoGadgetAction(anim_event_action);
+}
+
 static void InitGlobalAnim_Clickable()
 {
   int mode_nr;
@@ -1490,6 +1505,9 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
 	if (!part->clickable)
 	  continue;
 
+	if (part->state != ANIM_STATE_RUNNING)
+	  continue;
+
 	// always handle "any" click events (clicking anywhere on screen) ...
 	if (isClickablePart(part, ANIM_EVENT_ANY))
 	  anything_clicked = part->clicked = TRUE;
@@ -1501,9 +1519,14 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
 	if (isClickedPart(part, mx, my, clicked))
 	{
 #if 0
-	  printf("::: %d.%d CLICKED\n", anim_nr, part_nr);
+	  printf("::: %d.%d CLICKED [%d]\n", anim_nr, part_nr,
+		 part->control_info.anim_event_action);
 #endif
 
+	  // after executing event action, force click to be ignored
+	  if (DoGlobalAnim_EventAction(part))
+	    return TRUE;
+
 	  any_part_clicked = TRUE;
 
 	  if (isClickablePart(part, ANIM_EVENT_SELF))
@@ -1528,9 +1551,23 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
 	    {
 	      struct GlobalAnimPartControlInfo *part2 = &anim2->part[part2_nr];
 
+	      if (part2->state != ANIM_STATE_RUNNING)
+		continue;
+
 	      if (isClickablePart(part2, mask))
+	      {
 		anything_clicked = part2->clicked = TRUE;
 
+#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;
+	      }
+
 #if 0
 	      struct GraphicInfo *c = &part2->control_info;