}
else if (mode & ANIM_PINGPONG) /* oscillate (border frames once) */
{
-#if 1
int max_anim_frames = (num_frames > 1 ? 2 * num_frames - 2 : 1);
-#else
- int max_anim_frames = 2 * num_frames - 2;
-#endif
frame = (sync_frame % (delay * max_anim_frames)) / delay;
frame = (frame < num_frames ? frame : max_anim_frames - frame);
else
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 */
frame = num_frames - frame - 1;
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 :
- MV_NO_MOVING);
+ 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);
{
int buf_x = DOOR_GFX_PAGEX3, buf_y = DOOR_GFX_PAGEY1;
-#if 1
/* 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);
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
FlushDisplay();
}
{
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)
+ else if (strEqual(anim->position, "upper"))
pos_y = SimpleRND(pos_bottom / 2);
- else if (strcmp(anim->position, "lower") == 0)
+ else if (strEqual(anim->position, "lower"))
pos_y = pos_bottom / 2 + SimpleRND(pos_bottom / 2);
else
pos_y = SimpleRND(pos_bottom);
{
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);
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" */