// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
-// http://www.artsoft.org/
+// https://www.artsoft.org/
// ----------------------------------------------------------------------------
// anim.c
// ============================================================================
int step_xoffset, step_yoffset;
unsigned int initial_anim_sync_frame;
+ unsigned int anim_random_frame;
unsigned int step_delay, step_delay_value;
int init_delay_counter;
{
int frame = 0;
+ if (delay < 1) // delay must be at least 1
+ delay = 1;
+
sync_frame += start_frame * delay;
if (mode & ANIM_LOOP) // looping animation
part->control_info.y = ARG_UNDEFINED_VALUE;
part->initial_anim_sync_frame = 0;
+ part->anim_random_frame = -1;
part->step_delay = 0;
part->step_delay_value = graphic_info[control].step_delay;
part->control_info = graphic_info[control];
part->initial_anim_sync_frame = 0;
+ part->anim_random_frame = -1;
part->step_delay = 0;
part->step_delay_value = graphic_info[control].step_delay;
(g->draw_masked ? BlitBitmapMasked : BlitBitmap);
void (*blit_screen)(Bitmap *, int, int, int, int, int, int) =
(g->draw_masked ? BlitToScreenMasked : BlitToScreen);
+ int last_anim_random_frame = gfx.anim_random_frame;
if (!(part->state & ANIM_STATE_RUNNING))
continue;
dst_y += part->viewport_y;
sync_frame = anim_sync_frame - part->initial_anim_sync_frame;
+
+ // re-initialize random animation frame after animation delay
+ if (g->anim_mode == ANIM_RANDOM &&
+ sync_frame % g->anim_delay == 0 &&
+ sync_frame > 0)
+ part->anim_random_frame = GetSimpleRandom(g->anim_frames);
+
+ gfx.anim_random_frame = part->anim_random_frame;
+
frame = getAnimationFrame(g->anim_frames, g->anim_delay,
g->anim_mode, g->anim_start_frame,
sync_frame);
+ gfx.anim_random_frame = last_anim_random_frame;
+
getFixedGraphicSource(part->graphic, frame, &src_bitmap,
&src_x, &src_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;
return TRUE;
}
+static boolean clickBlocked(struct GlobalAnimPartControlInfo *part)
+{
+ return (part->control_info.style & STYLE_BLOCK ? TRUE : FALSE);
+}
+
static boolean clickConsumed(struct GlobalAnimPartControlInfo *part)
{
return (part->control_info.style & STYLE_PASSTHROUGH ? FALSE : TRUE);
}
static void InitGlobalAnim_Triggered(struct GlobalAnimPartControlInfo *part,
- boolean *anything_clicked,
+ boolean *click_consumed,
boolean *any_event_action,
int event_value, char *info_text)
{
{
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",
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);
}
part->initial_anim_sync_frame =
(g->anim_global_sync ? 0 : anim_sync_frame + part->init_delay_counter);
+ // do not re-initialize random animation frame after fade-in
+ if (part->anim_random_frame == -1)
+ part->anim_random_frame = GetSimpleRandom(g->anim_frames);
+
if (c->direction & MV_HORIZONTAL)
{
int pos_bottom = part->viewport_height - g->height;
static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event)
{
+ boolean click_consumed = FALSE;
boolean anything_clicked = FALSE;
boolean any_part_clicked = FALSE;
boolean any_event_action = FALSE;
int mode_nr;
+ int i;
// check game modes in reverse draw order (to stop when clicked)
for (mode_nr = NUM_GAME_MODES - 1; mode_nr >= 0; mode_nr--)
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) ...
part->old_anim_nr + 1, part->old_nr + 1);
#endif
- part->clicked = TRUE;
- anything_clicked = clickConsumed(part);
+ anything_clicked = part->clicked = TRUE;
+ click_consumed |= clickConsumed(part);
}
// always handle "unclick:any" events (releasing anywhere on screen) ...
part->old_anim_nr + 1, part->old_nr + 1);
#endif
- part->clicked = TRUE;
- anything_clicked = clickConsumed(part);
+ anything_clicked = part->clicked = TRUE;
+ click_consumed |= clickConsumed(part);
}
// ... but only handle the first (topmost) clickable animation
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))
{
part->old_anim_nr + 1, part->old_nr + 1);
#endif
- part->clicked = TRUE;
- anything_clicked = clickConsumed(part);
+ anything_clicked = part->clicked = TRUE;
+ click_consumed |= clickConsumed(part);
}
+ // determine if mouse clicks should be blocked by this animation
+ click_consumed |= clickBlocked(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");
}
}
{
handle_click = TRUE;
- HandleGlobalAnim(ANIM_CONTINUE, game_status);
+ for (i = 0; i < NUM_GAME_MODES; i++)
+ HandleGlobalAnim(ANIM_CONTINUE, i);
handle_click = FALSE;
+
+ // prevent ignoring release event if processed within same game frame
+ StopProcessingEvents();
}
- return (anything_clicked || any_event_action);
+ return (click_consumed || any_event_action);
}
static void ResetGlobalAnim_Clickable(void)
projects / rocksndiamonds.git / blobdiff