X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fanim.c;h=0aa1c0f4ff12a0970415d9c2b5f67f87429f8b04;hb=1ca0fee4ac95ccdbcd409ea064c1a2c4de68fc91;hp=8256ce7f60f5ec62fda3ebf49adb086a5450cc3b;hpb=98ae5fc5e9274fea99a2ed8873b78fc2110ce3ce;p=rocksndiamonds.git diff --git a/src/anim.c b/src/anim.c index 8256ce7f..0aa1c0f4 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) @@ -866,14 +880,21 @@ static boolean SetGlobalAnimPart_Viewport(struct GlobalAnimPartControlInfo *part 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; + // 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")) { @@ -917,7 +938,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; @@ -1112,7 +1134,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) { @@ -1136,13 +1158,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", @@ -1192,11 +1214,11 @@ 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); } @@ -1737,7 +1759,7 @@ static void InitGlobalAnim_Clickable(void) static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event) { - boolean anything_clicked = FALSE; + boolean click_consumed = FALSE; boolean any_part_clicked = FALSE; boolean any_event_action = FALSE; int mode_nr; @@ -1769,7 +1791,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) ... @@ -1782,7 +1804,7 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event) #endif part->clicked = TRUE; - anything_clicked = clickConsumed(part); + click_consumed |= clickConsumed(part); } // always handle "unclick:any" events (releasing anywhere on screen) ... @@ -1795,7 +1817,7 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event) #endif part->clicked = TRUE; - anything_clicked = clickConsumed(part); + click_consumed |= clickConsumed(part); } // ... but only handle the first (topmost) clickable animation @@ -1815,7 +1837,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)) { @@ -1825,18 +1847,18 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event) #endif part->clicked = TRUE; - anything_clicked = clickConsumed(part); + 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"); } } } } - if (anything_clicked) + if (click_consumed) { handle_click = TRUE; @@ -1845,7 +1867,7 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event) handle_click = FALSE; } - return (anything_clicked || any_event_action); + return (click_consumed || any_event_action); } static void ResetGlobalAnim_Clickable(void)