X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fanim.c;h=01434554fc94a36b62ba966044442355baef48ee;hp=d5b3d74a7fe36163cb25939413f9dacf8c93b82d;hb=67f3bfab902e53e0dc24a01eb6c0e4d274030a47;hpb=22d06801587ab712d58e2843877e993ccdde0b46 diff --git a/src/anim.c b/src/anim.c index d5b3d74a..01434554 100644 --- a/src/anim.c +++ b/src/anim.c @@ -4,7 +4,7 @@ // (c) 1995-2014 by Artsoft Entertainment // Holger Schemel // info@artsoft.org -// http://www.artsoft.org/ +// https://www.artsoft.org/ // ---------------------------------------------------------------------------- // anim.c // ============================================================================ @@ -108,6 +108,7 @@ struct GlobalAnimPartControlInfo 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; @@ -242,6 +243,9 @@ int getAnimationFrame(int num_frames, int delay, int mode, int start_frame, { 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 @@ -409,6 +413,7 @@ static void InitToonControls(void) 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; @@ -489,13 +494,15 @@ static void InitGlobalAnimControls(void) continue; #if 0 - printf("::: mode == %d, anim = %d, part = %d [%d, %d, %d] [%d]\n", - m, a, p, mode_nr, anim_nr, part_nr, control); + Debug("anim:InitGlobalAnimControls", + "mode == %d, anim = %d, part = %d [%d, %d, %d] [%d]", + m, a, p, mode_nr, anim_nr, part_nr, control); #endif #if 0 - printf("::: mode == %d, anim = %d, part = %d [%d, %d, %d] [%d]\n", - m, a, p, mode_nr, anim_nr, part_nr, sound); + Debug("anim:InitGlobalAnimControls", + "mode == %d, anim = %d, part = %d [%d, %d, %d] [%d]", + m, a, p, mode_nr, anim_nr, part_nr, sound); #endif part->old_nr = p; @@ -513,6 +520,7 @@ static void InitGlobalAnimControls(void) 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; @@ -764,6 +772,7 @@ static void DrawGlobalAnimationsExt(int drawing_target, int drawing_stage) (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; @@ -796,10 +805,21 @@ static void DrawGlobalAnimationsExt(int drawing_target, int drawing_stage) 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); @@ -963,7 +983,7 @@ static void PlayGlobalAnimSound(struct GlobalAnimPartControlInfo *part) PlaySound(sound); #if 0 - printf("::: PLAY SOUND %d.%d.%d: %d\n", + Debug("anim:PlayGlobalAnimSound", "PLAY SOUND %d.%d.%d: %d", part->anim_nr, part->nr, part->mode_nr, sound); #endif } @@ -978,8 +998,8 @@ static void StopGlobalAnimSound(struct GlobalAnimPartControlInfo *part) StopSound(sound); #if 0 - printf("::: STOP SOUND %d.%d.%d: %d\n", - part->anim_nr, part->nr, part->mode_nr, sound); + Debug("anim:StopGlobalAnimSound", "STOP SOUND %d.%d.%d: %d", + part->anim_nr, part->nr, part->mode_nr, sound); #endif } @@ -999,8 +1019,8 @@ static void PlayGlobalAnimMusic(struct GlobalAnimPartControlInfo *part) PlayMusic(music); #if 0 - printf("::: PLAY MUSIC %d.%d.%d: %d\n", - part->anim_nr, part->nr, part->mode_nr, music); + Debug("anim:PlayGlobalAnimMusic", "PLAY MUSIC %d.%d.%d: %d", + part->anim_nr, part->nr, part->mode_nr, music); #endif } @@ -1014,8 +1034,8 @@ static void StopGlobalAnimMusic(struct GlobalAnimPartControlInfo *part) StopMusic(); #if 0 - printf("::: STOP MUSIC %d.%d.%d: %d\n", - part->anim_nr, part->nr, part->mode_nr, music); + Debug("anim:StopGlobalAnimMusic", "STOP MUSIC %d.%d.%d: %d", + part->anim_nr, part->nr, part->mode_nr, music); #endif } @@ -1128,6 +1148,11 @@ static boolean isClickedPart(struct GlobalAnimPartControlInfo *part, 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); @@ -1167,13 +1192,15 @@ static void InitGlobalAnim_Triggered(struct GlobalAnimPartControlInfo *part, *click_consumed |= clickConsumed(part); // click was on "part"! #if DEBUG_ANIM_EVENTS - printf("::: => %d.%d TRIGGERED BY %s OF %d.%d\n", - part2->old_anim_nr + 1, part2->old_nr + 1, info_text, - part->old_anim_nr + 1, part->old_nr + 1); + Debug("anim:InitGlobalAnim_Triggered", + "%d.%d TRIGGERED BY %s OF %d.%d", + part2->old_anim_nr + 1, part2->old_nr + 1, info_text, + part->old_anim_nr + 1, part->old_nr + 1); #endif #if 0 - printf("::: %d.%d TRIGGER CLICKED [%d]\n", anim2_nr, part2_nr, - part2->control_info.anim_event_action); + Debug("anim:InitGlobalAnim_Triggered", + "%d.%d TRIGGER CLICKED [%d]", anim2_nr, part2_nr, + part2->control_info.anim_event_action); #endif // after executing event action, ignore any further actions @@ -1184,14 +1211,15 @@ static void InitGlobalAnim_Triggered(struct GlobalAnimPartControlInfo *part, #if 0 struct GraphicInfo *c = &part2->control_info; - printf("::: - %d.%d: 0x%08x, 0x%08x [0x%08x]", - anim2_nr, part2_nr, c->init_event, c->anim_event, mask); - if (isClickablePart(part2, mask)) - printf(" <--- TRIGGERED BY %d.%d", - anim_nr, part_nr); - - printf("\n"); + Debug("anim:InitGlobalAnim_Triggered", + "%d.%d: 0x%08x, 0x%08x [0x%08x] <--- TRIGGERED BY %d.%d", + anim2_nr, part2_nr, c->init_event, c->anim_event, mask, + anim_nr, part_nr); + else + Debug("anim:InitGlobalAnim_Triggered", + "%d.%d: 0x%08x, 0x%08x [0x%08x]", + anim2_nr, part2_nr, c->init_event, c->anim_event, mask); #endif } } @@ -1201,7 +1229,8 @@ static void HandleGlobalAnimDelay(struct GlobalAnimPartControlInfo *part, int delay_type, char *info_text) { #if DEBUG_ANIM_DELAY - printf("::: %d.%d %s\n", part->old_anim_nr + 1, part->old_nr + 1, info_text); + Debug("anim:HandleGlobalAnimDelay", "%d.%d %s", + part->old_anim_nr + 1, part->old_nr + 1, info_text); #endif DoGlobalAnim_DelayAction(part, delay_type); @@ -1211,7 +1240,8 @@ static void HandleGlobalAnimEvent(struct GlobalAnimPartControlInfo *part, int event_value, char *info_text) { #if DEBUG_ANIM_EVENTS - printf("::: %d.%d %s\n", part->old_anim_nr + 1, part->old_nr + 1, info_text); + Debug("anim:HandleGlobalAnimEvent", "%d.%d %s", + part->old_anim_nr + 1, part->old_nr + 1, info_text); #endif boolean click_consumed = FALSE; @@ -1260,6 +1290,10 @@ static int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, 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; @@ -1481,8 +1515,8 @@ static int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, static unsigned int last_counter = -1; unsigned int counter = Counter(); - printf("::: NEXT ANIM PART [%d, %d]\n", - anim_sync_frame, counter - last_counter); + Debug("anim:HandleGlobalAnim_Part", "NEXT ANIM PART [%d, %d]", + anim_sync_frame, counter - last_counter); last_counter = counter; } @@ -1507,21 +1541,22 @@ static void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, int i; #if 0 - printf("::: HandleGlobalAnim_Main: %d, %d => %d\n", + Debug("anim:HandleGlobalAnim_Main", "%d, %d => %d", anim->mode_nr, anim->nr, anim->num_parts); - printf("::: %d, %d, %d\n", global.num_toons, setup.toons, num_toons); + Debug("anim:HandleGlobalAnim_Main", + "%d, %d, %d", global.num_toons, setup.toons, num_toons); #endif #if 0 - printf("::: %s(%d): %d, %d, %d [%d]\n", - (action == ANIM_START ? "ANIM_START" : - action == ANIM_CONTINUE ? "ANIM_CONTINUE" : - action == ANIM_STOP ? "ANIM_STOP" : "(should not happen)"), - anim->nr, - anim->state & ANIM_STATE_RESTART, - anim->state & ANIM_STATE_WAITING, - anim->state & ANIM_STATE_RUNNING, - anim->num_parts); + Debug("anim:HandleGlobalAnim_Main", "%s(%d): %d, %d, %d [%d]", + (action == ANIM_START ? "ANIM_START" : + action == ANIM_CONTINUE ? "ANIM_CONTINUE" : + action == ANIM_STOP ? "ANIM_STOP" : "(should not happen)"), + anim->nr, + anim->state & ANIM_STATE_RESTART, + anim->state & ANIM_STATE_WAITING, + anim->state & ANIM_STATE_RUNNING, + anim->num_parts); #endif switch (action) @@ -1557,8 +1592,8 @@ static void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, if (c->anim_mode & ANIM_ALL || anim->num_parts == 0) { #if 0 - printf("::: HandleGlobalAnim_Main: %d, %d => %d\n", - anim->mode_nr, anim->nr, num_parts); + Debug("anim:HandleGlobalAnim_Main", "%d, %d => %d", + anim->mode_nr, anim->nr, num_parts); #endif for (i = 0; i < num_parts; i++) @@ -1655,8 +1690,7 @@ static void HandleGlobalAnim_Mode(struct GlobalAnimControlInfo *ctrl, int action int i; #if 0 - printf("::: HandleGlobalAnim_Mode: %d => %d\n", - ctrl->nr, ctrl->num_anims); + Debug("anim:HandleGlobalAnim_Mode", "%d => %d", ctrl->nr, ctrl->num_anims); #endif for (i = 0; i < ctrl->num_anims; i++) @@ -1666,7 +1700,7 @@ static void HandleGlobalAnim_Mode(struct GlobalAnimControlInfo *ctrl, int action static void HandleGlobalAnim(int action, int game_mode) { #if 0 - printf("::: HandleGlobalAnim [mode == %d]\n", game_status); + Debug("anim:HandleGlobalAnim", "mode == %d", game_status); #endif HandleGlobalAnim_Mode(&global_anim_ctrl[game_mode], action); @@ -1677,7 +1711,7 @@ static void DoAnimationExt(void) int i; #if 0 - printf("::: DoAnimation [%d, %d]\n", anim_sync_frame, Counter()); + Debug("anim:DoAnimationExt", "%d, %d", anim_sync_frame, Counter()); #endif // global animations now synchronized with frame delay of screen update @@ -1764,6 +1798,7 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event) 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--) @@ -1800,8 +1835,8 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event) isClickablePart(part, ANIM_EVENT_ANY)) { #if DEBUG_ANIM_EVENTS - printf("::: => %d.%d TRIGGERED BY ANY\n", - part->old_anim_nr + 1, part->old_nr + 1); + Debug("anim:InitGlobalAnim_Clicked", "%d.%d TRIGGERED BY ANY", + part->old_anim_nr + 1, part->old_nr + 1); #endif anything_clicked = part->clicked = TRUE; @@ -1813,8 +1848,8 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event) isClickablePart(part, ANIM_EVENT_UNCLICK_ANY)) { #if DEBUG_ANIM_EVENTS - printf("::: => %d.%d TRIGGERED BY UNCLICK:ANY\n", - part->old_anim_nr + 1, part->old_nr + 1); + Debug("anim:InitGlobalAnim_Clicked", "%d.%d TRIGGERED BY UNCLICK:ANY", + part->old_anim_nr + 1, part->old_nr + 1); #endif anything_clicked = part->clicked = TRUE; @@ -1829,8 +1864,8 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event) isClickedPart(part, mx, my, TRUE)) { #if 0 - printf("::: %d.%d CLICKED [%d]\n", anim_nr, part_nr, - part->control_info.anim_event_action); + Debug("anim:InitGlobalAnim_Clicked", "%d.%d CLICKED [%d]", + anim_nr, part_nr, part->control_info.anim_event_action); #endif // after executing event action, ignore any further actions @@ -1843,14 +1878,17 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event) if (isClickablePart(part, ANIM_EVENT_SELF)) { #if DEBUG_ANIM_EVENTS - printf("::: => %d.%d TRIGGERED BY SELF\n", - part->old_anim_nr + 1, part->old_nr + 1); + Debug("anim:InitGlobalAnim_Clicked", "%d.%d TRIGGERED BY SELF", + part->old_anim_nr + 1, part->old_nr + 1); #endif 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, &click_consumed, &any_event_action, ANIM_EVENT_CLICK, "CLICK"); @@ -1863,9 +1901,13 @@ static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event) { 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 (click_consumed || any_event_action);