X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fanim.c;h=3e2f1222ee1bc82b0ced39b0f20c0313cef0203a;hb=77c74cbf7569a65f71e004fab915a8b6ee73cbed;hp=be6c98f6d4ee82587a1b3c0cd3b23ad18e3fcdd3;hpb=3cc2ee99e57014c6962d26365e92bd3eac36a492;p=rocksndiamonds.git

diff --git a/src/anim.c b/src/anim.c
index be6c98f6..3e2f1222 100644
--- a/src/anim.c
+++ b/src/anim.c
@@ -230,6 +230,8 @@ static int anim_classes_last = ANIM_CLASS_NONE;
 
 static boolean drawing_to_fading_buffer = FALSE;
 
+static boolean handle_click = FALSE;
+
 
 // ============================================================================
 // generic animation frame calculation
@@ -240,6 +242,9 @@ int getAnimationFrame(int num_frames, int delay, int mode, int start_frame,
 {
   int frame = 0;
 
+  if (delay < 1)			// delay must be at least 1
+    delay = 1;
+
   sync_frame += start_frame * delay;
 
   if (mode & ANIM_LOOP)			// looping animation
@@ -534,6 +539,20 @@ static void InitGlobalAnimControls(void)
 	  anim->base = *part;
 	  anim->has_base = TRUE;
 	}
+
+	// apply special settings for pointer-style animations
+	if (part->control_info.class == get_hash_from_key("pointer"))
+	{
+	  // force animation to be on top (must set anim and part control)
+	  if (anim->control_info.draw_order == 0)
+	    anim->control_info.draw_order = 1000000;
+	  if (part->control_info.draw_order == 0)
+	    part->control_info.draw_order = 1000000;
+
+	  // force animation to pass-through clicks (must set part control)
+	  if (part->control_info.style == STYLE_DEFAULT)
+	    part->control_info.style |= STYLE_PASSTHROUGH;
+	}
       }
 
       if (anim->num_parts > 0 || anim->has_base)
@@ -861,14 +880,24 @@ static boolean SetGlobalAnimPart_Viewport(struct GlobalAnimPartControlInfo *part
   }
   else if (part->control_info.class == get_hash_from_key("pointer"))
   {
-    viewport_x = gfx.mouse_x + part->control_info.x;
-    viewport_y = gfx.mouse_y + part->control_info.y;
+    int mx = MIN(MAX(0, gfx.mouse_x), WIN_XSIZE - 1);
+    int my = MIN(MAX(0, gfx.mouse_y), WIN_YSIZE - 1);
+
+    // prevent displaying off-screen custom mouse cursor in upper left corner
+    if (gfx.mouse_x == POS_OFFSCREEN &&
+	gfx.mouse_y == POS_OFFSCREEN)
+      mx = my = POS_OFFSCREEN;
+
+    viewport_x = mx - part->control_info.x;
+    viewport_y = my - part->control_info.y;
     viewport_width  = part->graphic_info.width;
     viewport_height = part->graphic_info.height;
 
     part->drawing_stage = DRAW_GLOBAL_ANIM_STAGE_2;
 
-    gfx.cursor_mode_override = CURSOR_NONE;
+    // do not use global animation mouse pointer when reloading artwork
+    if (global.anim_status != GAME_MODE_LOADING)
+      gfx.cursor_mode_override = CURSOR_NONE;
   }
   else if (part->control_info.class == get_hash_from_key("door_1"))
   {
@@ -912,7 +941,8 @@ static boolean SetGlobalAnimPart_Viewport(struct GlobalAnimPartControlInfo *part
     part->viewport_width  = viewport_width;
     part->viewport_height = viewport_height;
 
-    changed = TRUE;
+    if (part->control_info.class != get_hash_from_key("pointer"))
+      changed = TRUE;
   }
 
   return changed;
@@ -1107,7 +1137,7 @@ static boolean clickConsumed(struct GlobalAnimPartControlInfo *part)
 }
 
 static void InitGlobalAnim_Triggered(struct GlobalAnimPartControlInfo *part,
-				     boolean *anything_clicked,
+				     boolean *click_consumed,
 				     boolean *any_event_action,
 				     int event_value, char *info_text)
 {
@@ -1131,13 +1161,13 @@ static void InitGlobalAnim_Triggered(struct GlobalAnimPartControlInfo *part,
     {
       struct GlobalAnimPartControlInfo *part2 = &anim2->part[part2_nr];
 
-      if (part2->state != ANIM_STATE_RUNNING)
+      if (!(part2->state & ANIM_STATE_RUNNING))
 	continue;
 
       if (isClickablePart(part2, mask))
       {
 	part2->triggered = TRUE;
-	*anything_clicked = clickConsumed(part); 	// click was on "part"!
+	*click_consumed |= clickConsumed(part); 	// click was on "part"!
 
 #if DEBUG_ANIM_EVENTS
 	printf("::: => %d.%d TRIGGERED BY %s OF %d.%d\n",
@@ -1187,17 +1217,20 @@ static void HandleGlobalAnimEvent(struct GlobalAnimPartControlInfo *part,
   printf("::: %d.%d %s\n", part->old_anim_nr + 1, part->old_nr + 1, info_text);
 #endif
 
-  boolean anything_clicked = FALSE;
+  boolean click_consumed = FALSE;
   boolean any_event_action = FALSE;
 
   // check if this event is defined to trigger other animations
-  InitGlobalAnim_Triggered(part, &anything_clicked, &any_event_action,
+  InitGlobalAnim_Triggered(part, &click_consumed, &any_event_action,
 			   event_value, info_text);
 }
 
 static int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part,
 				 int state)
 {
+  if (handle_click && !part->clicked)
+    return state;
+
   struct GlobalAnimControlInfo *ctrl = &global_anim_ctrl[part->mode_nr];
   struct GlobalAnimMainControlInfo *anim = &ctrl->anim[part->anim_nr];
   struct GraphicInfo *g = &part->graphic_info;
@@ -1729,10 +1762,12 @@ static void InitGlobalAnim_Clickable(void)
 
 static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event)
 {
+  boolean click_consumed = FALSE;
   boolean anything_clicked = FALSE;
   boolean any_part_clicked = FALSE;
   boolean any_event_action = FALSE;
   int mode_nr;
+  int i;
 
   // check game modes in reverse draw order (to stop when clicked)
   for (mode_nr = NUM_GAME_MODES - 1; mode_nr >= 0; mode_nr--)
@@ -1761,7 +1796,7 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event)
 	if (!part->clickable)
 	  continue;
 
-	if (part->state != ANIM_STATE_RUNNING)
+	if (!(part->state & ANIM_STATE_RUNNING))
 	  continue;
 
 	// always handle "any" click events (clicking anywhere on screen) ...
@@ -1773,8 +1808,8 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event)
 		 part->old_anim_nr + 1, part->old_nr + 1);
 #endif
 
-	  part->clicked = TRUE;
-	  anything_clicked = clickConsumed(part);
+	  anything_clicked = part->clicked = TRUE;
+	  click_consumed |= clickConsumed(part);
 	}
 
 	// always handle "unclick:any" events (releasing anywhere on screen) ...
@@ -1786,8 +1821,8 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event)
 		 part->old_anim_nr + 1, part->old_nr + 1);
 #endif
 
-	  part->clicked = TRUE;
-	  anything_clicked = clickConsumed(part);
+	  anything_clicked = part->clicked = TRUE;
+	  click_consumed |= clickConsumed(part);
 	}
 
 	// ... but only handle the first (topmost) clickable animation
@@ -1807,7 +1842,7 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event)
 	    any_event_action = TRUE;
 
 	  // determine if mouse clicks should be blocked from other animations
-	  any_part_clicked = clickConsumed(part);
+	  any_part_clicked |= clickConsumed(part);
 
 	  if (isClickablePart(part, ANIM_EVENT_SELF))
 	  {
@@ -1816,19 +1851,32 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event)
 		   part->old_anim_nr + 1, part->old_nr + 1);
 #endif
 
-	    part->clicked = TRUE;
-	    anything_clicked = clickConsumed(part);
+	    anything_clicked = part->clicked = TRUE;
+	    click_consumed |= clickConsumed(part);
 	  }
 
 	  // check if this click is defined to trigger other animations
-	  InitGlobalAnim_Triggered(part, &anything_clicked, &any_event_action,
+	  InitGlobalAnim_Triggered(part, &click_consumed, &any_event_action,
 				   ANIM_EVENT_CLICK, "CLICK");
 	}
       }
     }
   }
 
-  return (anything_clicked || any_event_action);
+  if (anything_clicked)
+  {
+    handle_click = TRUE;
+
+    for (i = 0; i < NUM_GAME_MODES; i++)
+      HandleGlobalAnim(ANIM_CONTINUE, i);
+
+    handle_click = FALSE;
+
+    // prevent ignoring release event if processed within same game frame
+    StopProcessingEvents();
+  }
+
+  return (click_consumed || any_event_action);
 }
 
 static void ResetGlobalAnim_Clickable(void)