/* 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;
}
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);
+ 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;
else if (strEqual(anim->position, "bottom"))
pos_y = pos_bottom;
else if (strEqual(anim->position, "upper"))
- pos_y = SimpleRND(pos_bottom / 2);
+ pos_y = GetSimpleRandom(pos_bottom / 2);
else if (strEqual(anim->position, "lower"))
- pos_y = pos_bottom / 2 + SimpleRND(pos_bottom / 2);
+ pos_y = pos_bottom / 2 + GetSimpleRandom(pos_bottom / 2);
else
- pos_y = SimpleRND(pos_bottom);
+ pos_y = GetSimpleRandom(pos_bottom);
if (direction == MV_RIGHT)
{
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 || screen_info.num_toons == 0)
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;
+ 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);