X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fanim.c;h=7ef6d6904b6a6243923e98dcfb5909aedbf6b32e;hb=2d49bde26882e981d844866672ddbc54f1cf4875;hp=6d761f43b296ce0783c5889aa24472d1844d81e6;hpb=9d401c32427061d43bfc14d72fe4a9df90490b7d;p=rocksndiamonds.git diff --git a/src/anim.c b/src/anim.c index 6d761f43..7ef6d690 100644 --- a/src/anim.c +++ b/src/anim.c @@ -398,8 +398,8 @@ static boolean isPausedOnPlayfieldOrDoor(struct GlobalAnimPartControlInfo *part) if (!part->class_playfield_or_door) return FALSE; - // only pause animations when engine is paused or request dialog is open(ing) - if (!tape.pausing && !game.request_active_or_moving) + // only pause animations when engine is paused or request dialog is active + if (!tape.pausing && !game.request_active) return FALSE; return TRUE; @@ -2139,6 +2139,11 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event) { struct GlobalAnimPartControlInfo *part = &anim->part[part_nr]; + // if request dialog is active, only handle pointer-style animations + if (game.request_active && + part->control_info.class != get_hash_from_key("pointer")) + continue; + if (clicked_event == ANIM_CLICKED_RESET) { part->clicked = FALSE;