static boolean drawing_to_fading_buffer = FALSE;
+static boolean handle_click = FALSE;
+
// ============================================================================
// generic animation frame calculation
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)
void DrawGlobalAnimations(int drawing_target, int drawing_stage)
{
+ int last_cursor_mode_override = gfx.cursor_mode_override;
+
if (drawing_stage == DRAW_GLOBAL_ANIM_STAGE_1)
+ {
ResetGlobalAnim_Clickable();
+ gfx.cursor_mode_override = CURSOR_UNDEFINED;
+ }
+
DrawGlobalAnimationsExt(drawing_target, drawing_stage);
if (drawing_stage == DRAW_GLOBAL_ANIM_STAGE_2)
+ {
ResetGlobalAnim_Clicked();
+ }
+
+ if (gfx.cursor_mode_override != last_cursor_mode_override)
+ SetMouseCursor(gfx.cursor_mode);
}
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;
+
+ // 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"))
{
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;
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;
}
}
+ if (anything_clicked)
+ {
+ handle_click = TRUE;
+
+ HandleGlobalAnim(ANIM_CONTINUE, game_status);
+
+ handle_click = FALSE;
+ }
+
return (anything_clicked || any_event_action);
}