-/***********************************************************
-* 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"
}
else if (mode & ANIM_PINGPONG) /* oscillate (border frames once) */
{
- int max_anim_frames = 2 * num_frames - 2;
+ int max_anim_frames = (num_frames > 1 ? 2 * num_frames - 2 : 1);
frame = (sync_frame % (delay * max_anim_frames)) / delay;
frame = (frame < num_frames ? frame : max_anim_frames - frame);
{
/* note: expect different frames for the same delay cycle! */
- if (anim.random_frame < 0)
- frame = SimpleRND(num_frames);
+ if (gfx.anim_random_frame < 0)
+ frame = GetSimpleRandom(num_frames);
else
- frame = anim.random_frame % num_frames;
+ frame = gfx.anim_random_frame % num_frames;
+ }
+ else if (mode & (ANIM_CE_VALUE | ANIM_CE_SCORE | ANIM_CE_DELAY))
+ {
+ frame = sync_frame % num_frames;
}
if (mode & ANIM_REVERSE) /* use reverse animation direction */
/* toon animation functions */
/* ========================================================================= */
-static int get_toon_direction(char *direction_raw)
+static int get_toon_direction(char *direction_string_raw)
{
- static char *direction = NULL;
+ char *direction_string = getStringToLower(direction_string_raw);
+ 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);
- /* !!! MEMORY LEAK HERE! FIX IT! !!! */
- setString(&direction, getStringToLower(direction_raw));
+ free(direction_string);
- return (strcmp(direction, "left") == 0 ? MV_LEFT :
- strcmp(direction, "right") == 0 ? MV_RIGHT :
- strcmp(direction, "up") == 0 ? MV_UP :
- strcmp(direction, "down") == 0 ? MV_DOWN : MV_NO_MOVING);
+ return direction;
}
void InitToonScreen(Bitmap *save_buffer,
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;
#if 1
+ int buffer_x = 0;
+ int buffer_y = 0;
+#else
+ int buffer_x = DOOR_GFX_PAGEX3;
+ int buffer_y = DOOR_GFX_PAGEY1;
+#endif
+
+#if 0
+ printf("::: (%d, %d), (%d, %d), (%d, %d), (%d, %d) -> (%d, %d), (%d, %d), (%d, %d)\n",
+ src_x, src_y,
+ width, height,
+ dest_x, dest_y,
+ pad_x, pad_y,
+
+ pad_dest_x, pad_dest_y,
+ pad_width, pad_height,
+ buffer_x, buffer_y);
+#endif
+
+ /* 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);
+ 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, 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);
-#else
- /* normal method, causing 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, buf_x-src_x+pad_x,buf_y-src_y+pad_y);
- BlitBitmapMasked(toon_bitmap, screen_info.save_buffer,
- src_x, src_y, width, height, buf_x+pad_x, buf_y+pad_y);
- BlitBitmap(screen_info.save_buffer, window, buf_x, buf_y,
- width+2*pad_x, height+2*pad_y, dest_x-pad_x, dest_y-pad_y);
-#endif
+ BlitBitmap(screen_info.save_buffer, backbuffer, buffer_x, buffer_y,
+ pad_width, pad_height, pad_dest_x, pad_dest_y);
FlushDisplay();
}
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;
{
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)
{
{
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)
{
else
{
delta_y = -anim->step_offset;
- pos_y = screen_info.width + delta_y;
+ pos_y = screen_info.height + delta_y;
}
delta_x = 0;
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)
+ if (!setup.toons || screen_info.num_toons == 0)
return;
/* this may happen after reloading graphics and redefining "num_toons" */
{
case ANIM_START:
screen_info.prepare_backbuffer_function();
+
+ anim_running = TRUE;
anim_restart = TRUE;
reset_delay = TRUE;
return;
case ANIM_CONTINUE:
+ if (!anim_running)
+ return;
+
break;
case ANIM_STOP:
- redraw_mask |= (REDRAW_FIELD | REDRAW_FROM_BACKBUFFER);
+ if (anim_running)
+ {
+#if 1
+ redraw_mask |= (REDRAW_FIELD | REDRAW_FROM_BACKBUFFER);
- /* 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();
+#endif
+
+ anim_running = FALSE;
+ }
return;
if (reset_delay)
{
animstart_delay = Counter();
- animstart_delay_value = SimpleRND(3000);
+ animstart_delay_value = GetSimpleRandom(3000);
reset_delay = FALSE;
}
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);
projects / rocksndiamonds.git / blobdiff