X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Ftoons.c;h=34fa8fbb675f157256375535116f9938538f239e;hp=6f4fd2f7c49e3e79b7d0b340ded7ade00cf45829;hb=29519e4b412b6fd0b2a18145f010f53ca09fa456;hpb=37a06df577bbfd00f4b361f92cacb0d97036ba93 diff --git a/src/libgame/toons.c b/src/libgame/toons.c index 6f4fd2f7..34fa8fbb 100644 --- a/src/libgame/toons.c +++ b/src/libgame/toons.c @@ -1,26 +1,18 @@ -/*********************************************************** -* Artsoft Retro-Game Library * -*----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* toons.c * -***********************************************************/ +// ============================================================================ +// Artsoft Retro-Game Library +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// toons.c +// ============================================================================ #include "toons.h" #include "misc.h" -/* values for toon animation */ -#define ANIM_START 0 -#define ANIM_CONTINUE 1 -#define ANIM_STOP 2 - - static struct ToonScreenInfo screen_info; @@ -65,11 +57,11 @@ int getAnimationFrame(int num_frames, int delay, int mode, int start_frame, /* note: expect different frames for the same delay cycle! */ if (gfx.anim_random_frame < 0) - frame = SimpleRND(num_frames); + frame = GetSimpleRandom(num_frames); else frame = gfx.anim_random_frame % num_frames; } - else if (mode & (ANIM_CE_VALUE | ANIM_CE_SCORE)) + else if (mode & (ANIM_CE_VALUE | ANIM_CE_SCORE | ANIM_CE_DELAY)) { frame = sync_frame % num_frames; } @@ -88,10 +80,10 @@ int getAnimationFrame(int num_frames, int delay, int mode, int start_frame, static int get_toon_direction(char *direction_string_raw) { char *direction_string = getStringToLower(direction_string_raw); - int direction = (strcmp(direction_string, "left") == 0 ? MV_LEFT : - strcmp(direction_string, "right") == 0 ? MV_RIGHT : - strcmp(direction_string, "up") == 0 ? MV_UP : - strcmp(direction_string, "down") == 0 ? MV_DOWN : + int direction = (strEqual(direction_string, "left") ? MV_LEFT : + strEqual(direction_string, "right") ? MV_RIGHT : + strEqual(direction_string, "up") ? MV_UP : + strEqual(direction_string, "down") ? MV_DOWN : MV_NONE); free(direction_string); @@ -121,38 +113,60 @@ void InitToonScreen(Bitmap *save_buffer, screen_info.frame_delay_value = frame_delay_value; } -void DrawAnim(Bitmap *toon_bitmap, GC toon_clip_gc, - int src_x, int src_y, int width, int height, +void DrawAnim(Bitmap *toon_bitmap, int src_x, int src_y, int width, int height, int dest_x, int dest_y, int pad_x, int pad_y) { - int buf_x = DOOR_GFX_PAGEX3, buf_y = DOOR_GFX_PAGEY1; + int pad_dest_x = dest_x - pad_x; + int pad_dest_y = dest_y - pad_y; + int pad_width = width + 2 * pad_x; + int pad_height = height + 2 * pad_y; + int buffer_x = 0; + int buffer_y = 0; + + /* correct values to avoid off-screen blitting (start position) */ + if (pad_dest_x < screen_info.startx) + { + pad_width -= (screen_info.startx - pad_dest_x); + pad_dest_x = screen_info.startx; + } + if (pad_dest_y < screen_info.starty) + { + pad_height -= (screen_info.starty - pad_dest_y); + pad_dest_y = screen_info.starty; + } + + /* correct values to avoid off-screen blitting (blit size) */ + if (pad_width > screen_info.width) + pad_width = screen_info.width; + if (pad_height > screen_info.height) + pad_height = screen_info.height; /* special method to avoid flickering interference with BackToFront() */ - BlitBitmap(backbuffer, screen_info.save_buffer, dest_x-pad_x, dest_y-pad_y, - width+2*pad_x, height+2*pad_y, buf_x, buf_y); - SetClipOrigin(toon_bitmap, toon_clip_gc, dest_x-src_x, dest_y-src_y); - BlitBitmapMasked(toon_bitmap, backbuffer, - src_x, src_y, width, height, dest_x, dest_y); - BlitBitmap(backbuffer, window, dest_x-pad_x, dest_y-pad_y, - width+2*pad_x, height+2*pad_y, dest_x-pad_x, dest_y-pad_y); + BlitBitmap(backbuffer, screen_info.save_buffer, pad_dest_x, pad_dest_y, + pad_width, pad_height, buffer_x, buffer_y); + BlitBitmapMasked(toon_bitmap, backbuffer, src_x, src_y, width, height, + dest_x, dest_y); + BlitBitmap(backbuffer, window, pad_dest_x, pad_dest_y, pad_width, pad_height, + pad_dest_x, pad_dest_y); screen_info.update_function(); - BlitBitmap(screen_info.save_buffer, backbuffer, buf_x, buf_y, - width+2*pad_x, height+2*pad_y, dest_x-pad_x, dest_y-pad_y); + BlitBitmap(screen_info.save_buffer, backbuffer, buffer_x, buffer_y, + pad_width, pad_height, pad_dest_x, pad_dest_y); - FlushDisplay(); + /* prevent immediate redraw of restored toon area in backbuffer */ + redraw_mask = REDRAW_NONE; } boolean AnimateToon(int toon_nr, boolean restart) { - static unsigned long animation_frame_counter = 0; + static unsigned int animation_frame_counter = 0; static int pos_x = 0, pos_y = 0; static int delta_x = 0, delta_y = 0; static int frame = 0; static boolean horiz_move, vert_move; - static unsigned long anim_delay = 0; - static unsigned long anim_delay_value = 0; + static unsigned int anim_delay = 0; + static unsigned int anim_delay_value = 0; static int width,height; static int pad_x,pad_y; static int cut_x,cut_y; @@ -160,7 +174,6 @@ boolean AnimateToon(int toon_nr, boolean restart) static int dest_x, dest_y; struct ToonInfo *anim = &screen_info.toons[toon_nr]; Bitmap *anim_bitmap = screen_info.toons[toon_nr].bitmap; - GC anim_clip_gc = anim_bitmap->stored_clip_gc; int direction = get_toon_direction(anim->direction); if (restart) @@ -177,16 +190,16 @@ boolean AnimateToon(int toon_nr, boolean restart) { int pos_bottom = screen_info.height - anim->height; - if (strcmp(anim->position, "top") == 0) + if (strEqual(anim->position, "top")) pos_y = 0; - else if (strcmp(anim->position, "bottom") == 0) + else if (strEqual(anim->position, "bottom")) pos_y = pos_bottom; - else if (strcmp(anim->position, "upper") == 0) - pos_y = SimpleRND(pos_bottom / 2); - else if (strcmp(anim->position, "lower") == 0) - pos_y = pos_bottom / 2 + SimpleRND(pos_bottom / 2); + else if (strEqual(anim->position, "upper")) + pos_y = GetSimpleRandom(pos_bottom / 2); + else if (strEqual(anim->position, "lower")) + pos_y = pos_bottom / 2 + GetSimpleRandom(pos_bottom / 2); else - pos_y = SimpleRND(pos_bottom); + pos_y = GetSimpleRandom(pos_bottom); if (direction == MV_RIGHT) { @@ -205,12 +218,12 @@ boolean AnimateToon(int toon_nr, boolean restart) { int pos_right = screen_info.width - anim->width; - if (strcmp(anim->position, "left") == 0) + if (strEqual(anim->position, "left")) pos_x = 0; - else if (strcmp(anim->position, "right") == 0) + else if (strEqual(anim->position, "right")) pos_x = pos_right; else - pos_x = SimpleRND(pos_right); + pos_x = GetSimpleRandom(pos_right); if (direction == MV_DOWN) { @@ -220,7 +233,7 @@ boolean AnimateToon(int toon_nr, boolean restart) else { delta_y = -anim->step_offset; - pos_y = screen_info.width + delta_y; + pos_y = screen_info.height + delta_y; } delta_x = 0; @@ -236,7 +249,7 @@ boolean AnimateToon(int toon_nr, boolean restart) if (!DelayReached(&anim_delay, anim_delay_value)) { if (screen_info.redraw_needed_function() && !restart) - DrawAnim(anim_bitmap, anim_clip_gc, + DrawAnim(anim_bitmap, src_x + cut_x, src_y + cut_y, width, height, screen_info.startx + dest_x, @@ -283,7 +296,7 @@ boolean AnimateToon(int toon_nr, boolean restart) else if (pos_y > screen_info.height - anim->height) height -= (pos_y - (screen_info.height - anim->height)); - DrawAnim(anim_bitmap, anim_clip_gc, + DrawAnim(anim_bitmap, src_x + cut_x, src_y + cut_y, width, height, screen_info.startx + dest_x, @@ -302,13 +315,12 @@ boolean AnimateToon(int toon_nr, boolean restart) void HandleAnimation(int mode) { - static unsigned long animstart_delay = -1; - static unsigned long animstart_delay_value = 0; + static unsigned int animstart_delay = -1; + static unsigned int animstart_delay_value = 0; static boolean anim_running = FALSE; static boolean anim_restart = TRUE; static boolean reset_delay = TRUE; static int toon_nr = 0; - int draw_mode; if (!setup.toons || screen_info.num_toons == 0) return; @@ -335,15 +347,14 @@ void HandleAnimation(int mode) break; case ANIM_STOP: - redraw_mask |= (REDRAW_FIELD | REDRAW_FROM_BACKBUFFER); + if (anim_running) + { + redraw_mask |= REDRAW_FIELD; - /* Redraw background even when in direct drawing mode */ - draw_mode = setup.direct_draw; - setup.direct_draw = FALSE; - screen_info.update_function(); - setup.direct_draw = draw_mode; + screen_info.update_function(); - anim_running = FALSE; + anim_running = FALSE; + } return; @@ -354,7 +365,7 @@ void HandleAnimation(int mode) if (reset_delay) { animstart_delay = Counter(); - animstart_delay_value = SimpleRND(3000); + animstart_delay_value = GetSimpleRandom(3000); reset_delay = FALSE; } @@ -363,23 +374,8 @@ void HandleAnimation(int mode) if (!DelayReached(&animstart_delay, animstart_delay_value)) return; - toon_nr = SimpleRND(screen_info.num_toons); + toon_nr = GetSimpleRandom(screen_info.num_toons); } anim_restart = reset_delay = AnimateToon(toon_nr, anim_restart); } - -void InitAnimation() -{ - HandleAnimation(ANIM_START); -} - -void StopAnimation() -{ - HandleAnimation(ANIM_STOP); -} - -void DoAnimation() -{ - HandleAnimation(ANIM_CONTINUE); -}