added setting draw order and style for pointer-style global animations

[rocksndiamonds.git] / src / anim.c

diff --git a/src/anim.c b/src/anim.c
index d226d5cddcc82626191dde2c34abb6edcca32f48..454389d573d4b2bd757fec251f758f8b4ceaf261 100644 (file)
--- a/src/anim.c
+++ b/src/anim.c
@@ -536,6 +536,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)
@@ -863,8 +877,11 @@ 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);
+
+    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;