X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fanim.c;h=132ba13b4c490736c706b8cfe7310659107186d5;hb=d40a3c067e0be6dcfb245b0793f872e3f33cca45;hp=8256ce7f60f5ec62fda3ebf49adb086a5450cc3b;hpb=98ae5fc5e9274fea99a2ed8873b78fc2110ce3ce;p=rocksndiamonds.git

diff --git a/src/anim.c b/src/anim.c
index 8256ce7f..132ba13b 100644
--- 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)
@@ -873,7 +887,9 @@ static boolean SetGlobalAnimPart_Viewport(struct GlobalAnimPartControlInfo *part
 
     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"))
   {