static struct GadgetInfo *tool_gadget[NUM_TOOL_BUTTONS];
static int request_gadget_id = -1;
-static int preview_tilesize = TILEX / 4;
-
static char *print_if_not_empty(int element)
{
static char *s = NULL;
BackToFront();
}
-void FadeIn(int fade_delay)
+void FadeExt(int fade_mask, int fade_mode)
{
- if (fade_delay == 0)
- {
- BackToFront();
+ Bitmap *bitmap = (fade_mode == FADE_MODE_CROSSFADE ? bitmap_db_cross : NULL);
+ int fade_delay = menu.fade_delay;
+ int post_delay = (fade_mode == FADE_MODE_FADE_OUT ? menu.post_delay : 0);
+ int x, y, width, height;
- return;
+ if (fade_mask & REDRAW_ALL)
+ {
+ x = 0;
+ y = 0;
+ width = WIN_XSIZE;
+ height = WIN_YSIZE;
+ }
+ else if (fade_mask & REDRAW_FIELD)
+ {
+ x = REAL_SX;
+ y = REAL_SY;
+ width = FULL_SXSIZE;
+ height = FULL_SYSIZE;
}
- FadeScreen(NULL, FADE_MODE_FADE_IN, fade_delay, 0);
-
- redraw_mask = REDRAW_NONE;
-}
+ redraw_mask |= fade_mask;
-void FadeOut(int fade_delay, int post_delay)
-{
if (fade_delay == 0)
{
- ClearRectangle(backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE);
+ if (fade_mode == FADE_MODE_FADE_OUT)
+ ClearRectangle(backbuffer, x, y, width, height);
+
BackToFront();
return;
}
- FadeScreen(NULL, FADE_MODE_FADE_OUT, fade_delay, post_delay);
+ FadeRectangle(bitmap, x, y, width, height, fade_mode, fade_delay, post_delay);
- redraw_mask = REDRAW_NONE;
+ redraw_mask &= ~fade_mask;
}
-void FadeCross(int fade_delay)
+void FadeIn(int fade_mask)
{
- if (fade_delay == 0)
- {
- BlitBitmap(bitmap_db_title, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
- BackToFront();
+ FadeExt(fade_mask, FADE_MODE_FADE_IN);
+}
- return;
- }
+void FadeOut(int fade_mask)
+{
+ FadeExt(fade_mask, FADE_MODE_FADE_OUT);
+}
- FadeScreen(bitmap_db_title, FADE_MODE_CROSSFADE, fade_delay, 0);
+void FadeCross(int fade_mask)
+{
+ FadeExt(fade_mask, FADE_MODE_CROSSFADE);
+}
- redraw_mask = REDRAW_NONE;
+void FadeCrossSaveBackbuffer()
+{
+ BlitBitmap(backbuffer, bitmap_db_cross, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
}
void SetMainBackgroundImageIfDefined(int graphic)
graphic_info[IMG_BACKGROUND].bitmap);
}
+void SetPanelBackground()
+{
+ BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, bitmap_db_panel,
+ DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, 0, 0);
+
+ SetDoorBackgroundBitmap(bitmap_db_panel);
+}
+
void DrawBackground(int dst_x, int dst_y, int width, int height)
{
+#if 1
+ ClearRectangleOnBackground(drawto, dst_x, dst_y, width, height);
+#else
ClearRectangleOnBackground(backbuffer, dst_x, dst_y, width, height);
+#endif
redraw_mask |= REDRAW_FIELD;
}
BackToFront();
}
-void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
-{
- Bitmap *src_bitmap = graphic_info[graphic].bitmap;
- int mini_startx = src_bitmap->width * 3 / 4;
- int mini_starty = src_bitmap->height * 2 / 3;
- int src_x = mini_startx + graphic_info[graphic].src_x / 8;
- int src_y = mini_starty + graphic_info[graphic].src_y / 8;
-
- *bitmap = src_bitmap;
- *x = src_x;
- *y = src_y;
-}
-
void getPreviewGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y,
int tilesize)
{
*y = src_y;
}
-void DrawMicroElement(int xpos, int ypos, int element)
-{
- Bitmap *src_bitmap;
- int src_x, src_y;
- int graphic = el2preimg(element);
-
- getMicroGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
- BlitBitmap(src_bitmap, drawto, src_x, src_y, MICRO_TILEX, MICRO_TILEY,
- xpos, ypos);
-}
-
-void DrawPreviewElement(int xpos, int ypos, int element, int tilesize)
+void DrawPreviewElement(int dst_x, int dst_y, int element, int tilesize)
{
Bitmap *src_bitmap;
int src_x, src_y;
int graphic = el2preimg(element);
getPreviewGraphicSource(graphic, &src_bitmap, &src_x, &src_y, tilesize);
- BlitBitmap(src_bitmap, drawto, src_x, src_y, tilesize, tilesize, xpos, ypos);
+ BlitBitmap(src_bitmap, drawto, src_x, src_y, tilesize, tilesize, dst_x,dst_y);
}
void DrawLevel()
redraw_mask |= REDRAW_FIELD;
}
-static void DrawMicroLevelExt(int xpos, int ypos, int from_x, int from_y)
+static void DrawPreviewLevelExt(int from_x, int from_y)
{
boolean show_level_border = (BorderElement != EL_EMPTY);
- int level_size_x = lev_fieldx + (show_level_border ? 2 : 0);
- int level_size_y = lev_fieldy + (show_level_border ? 2 : 0);
- int preview_size_x = MICROLEVEL_XSIZE / preview_tilesize;
- int preview_size_y = MICROLEVEL_YSIZE / preview_tilesize;
- int real_preview_size_x = MIN(level_size_x, preview_size_x);
- int real_preview_size_y = MIN(level_size_y, preview_size_y);
+ int dst_x = preview.x;
+ int dst_y = preview.y;
+ int level_xsize = lev_fieldx + (show_level_border ? 2 : 0);
+ int level_ysize = lev_fieldy + (show_level_border ? 2 : 0);
+ int tile_size = preview.tile_size;
+ int preview_width = preview.xsize * tile_size;
+ int preview_height = preview.ysize * tile_size;
+ int real_preview_xsize = MIN(level_xsize, preview.xsize);
+ int real_preview_ysize = MIN(level_ysize, preview.ysize);
int x, y;
- DrawBackground(xpos, ypos, MICROLEVEL_XSIZE, MICROLEVEL_YSIZE);
+ DrawBackground(dst_x, dst_y, preview_width, preview_height);
- xpos += (MICROLEVEL_XSIZE - real_preview_size_x * preview_tilesize) / 2;
- ypos += (MICROLEVEL_YSIZE - real_preview_size_y * preview_tilesize) / 2;
+ dst_x += (preview_width - real_preview_xsize * tile_size) / 2;
+ dst_y += (preview_height - real_preview_ysize * tile_size) / 2;
- for (x = 0; x < real_preview_size_x; x++)
+ for (x = 0; x < real_preview_xsize; x++)
{
- for (y = 0; y < real_preview_size_y; y++)
+ for (y = 0; y < real_preview_ysize; y++)
{
int lx = from_x + x + (show_level_border ? -1 : 0);
int ly = from_y + y + (show_level_border ? -1 : 0);
int element = (IN_LEV_FIELD(lx, ly) ? level.field[lx][ly] :
getBorderElement(lx, ly));
- DrawPreviewElement(xpos + x * preview_tilesize,
- ypos + y * preview_tilesize,
- element, preview_tilesize);
+ DrawPreviewElement(dst_x + x * tile_size, dst_y + y * tile_size,
+ element, tile_size);
}
}
#define MICROLABEL_IMPORTED_BY_HEAD 6
#define MICROLABEL_IMPORTED_BY 7
-static void DrawMicroLevelLabelExt(int mode)
+static void DrawPreviewLevelLabelExt(int mode)
{
char label_text[MAX_OUTPUT_LINESIZE + 1];
int max_len_label_text;
redraw_mask |= REDRAW_MICROLEVEL;
}
-void DrawMicroLevel(int xpos, int ypos, boolean restart)
+void DrawPreviewLevel(boolean restart)
{
static unsigned long scroll_delay = 0;
static unsigned long label_delay = 0;
static int from_x, from_y, scroll_direction;
static int label_state, label_counter;
- int delay_factor = preview_tilesize / MICRO_TILESIZE;
- unsigned long scroll_delay_value = MICROLEVEL_SCROLL_DELAY * delay_factor;
+ unsigned long scroll_delay_value = preview.step_delay;
boolean show_level_border = (BorderElement != EL_EMPTY);
- int level_size_x = lev_fieldx + (show_level_border ? 2 : 0);
- int level_size_y = lev_fieldy + (show_level_border ? 2 : 0);
- int preview_size_x = MICROLEVEL_XSIZE / preview_tilesize;
- int preview_size_y = MICROLEVEL_YSIZE / preview_tilesize;
- int last_game_status = game_status; /* save current game status */
+ int level_xsize = lev_fieldx + (show_level_border ? 2 : 0);
+ int level_ysize = lev_fieldy + (show_level_border ? 2 : 0);
+ int last_game_status = game_status; /* save current game status */
/* force PREVIEW font on preview level */
game_status = GAME_MODE_PSEUDO_PREVIEW;
label_state = 1;
label_counter = 0;
- DrawMicroLevelExt(xpos, ypos, from_x, from_y);
- DrawMicroLevelLabelExt(label_state);
+ DrawPreviewLevelExt(from_x, from_y);
+ DrawPreviewLevelLabelExt(label_state);
/* initialize delay counters */
DelayReached(&scroll_delay, 0);
return;
}
- /* scroll micro level, if needed */
- if ((level_size_x > preview_size_x || level_size_y > preview_size_y) &&
+ /* scroll preview level, if needed */
+ if ((level_xsize > preview.xsize || level_ysize > preview.ysize) &&
DelayReached(&scroll_delay, scroll_delay_value))
{
switch (scroll_direction)
{
case MV_LEFT:
if (from_x > 0)
- from_x--;
+ {
+ from_x -= preview.step_offset;
+ from_x = (from_x < 0 ? 0 : from_x);
+ }
else
scroll_direction = MV_UP;
break;
case MV_RIGHT:
- if (from_x < level_size_x - preview_size_x)
- from_x++;
+ if (from_x < level_xsize - preview.xsize)
+ {
+ from_x += preview.step_offset;
+ from_x = (from_x > level_xsize - preview.xsize ?
+ level_xsize - preview.xsize : from_x);
+ }
else
scroll_direction = MV_DOWN;
break;
case MV_UP:
if (from_y > 0)
- from_y--;
+ {
+ from_y -= preview.step_offset;
+ from_y = (from_y < 0 ? 0 : from_y);
+ }
else
scroll_direction = MV_RIGHT;
break;
case MV_DOWN:
- if (from_y < level_size_y - preview_size_y)
- from_y++;
+ if (from_y < level_ysize - preview.ysize)
+ {
+ from_y += preview.step_offset;
+ from_y = (from_y > level_ysize - preview.ysize ?
+ level_ysize - preview.ysize : from_y);
+ }
else
scroll_direction = MV_LEFT;
break;
break;
}
- DrawMicroLevelExt(xpos, ypos, from_x, from_y);
+ DrawPreviewLevelExt(from_x, from_y);
}
/* !!! THIS ALL SUCKS -- SHOULD BE CLEANLY REWRITTEN !!! */
label_state = (label_state == MICROLABEL_IMPORTED_FROM_HEAD ?
MICROLABEL_IMPORTED_BY_HEAD : MICROLABEL_IMPORTED_BY);
- DrawMicroLevelLabelExt(label_state);
+ DrawPreviewLevelLabelExt(label_state);
}
game_status = last_game_status; /* restore current game status */
GfxElement[jx][jy] = EL_UNDEFINED;
/* make sure that pushed elements are drawn with correct frame rate */
+#if 1
+ graphic = el_act_dir2img(element, ACTION_PUSHING, move_dir);
+
+ if (player->is_pushing && player->is_moving && !IS_ANIM_MODE_CE(graphic))
+ GfxFrame[jx][jy] = player->StepFrame;
+#else
if (player->is_pushing && player->is_moving)
GfxFrame[jx][jy] = player->StepFrame;
+#endif
DrawLevelField(jx, jy);
}
int px = SCREENX(jx), py = SCREENY(jy);
int pxx = (TILEX - ABS(sxx)) * dx;
int pyy = (TILEY - ABS(syy)) * dy;
+ int gfx_frame = GfxFrame[jx][jy];
int graphic;
+ int sync_frame;
int frame;
if (!IS_MOVING(jx, jy)) /* push movement already finished */
+ {
element = Feld[next_jx][next_jy];
+ gfx_frame = GfxFrame[next_jx][next_jy];
+ }
graphic = el_act_dir2img(element, ACTION_PUSHING, move_dir);
+
+#if 1
+ sync_frame = (IS_ANIM_MODE_CE(graphic) ? gfx_frame : player->StepFrame);
+ frame = getGraphicAnimationFrame(graphic, sync_frame);
+#else
frame = getGraphicAnimationFrame(graphic, player->StepFrame);
+#endif
/* draw background element under pushed element (like the Sokoban field) */
if (Back[next_jx][next_jy])
DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1);
}
+#if 1
+ SetDoorBackgroundImage(IMG_BACKGROUND_DOOR);
+#endif
+
SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
/* clear door drawing field */
if (!(req_state & REQUEST_WAIT_FOR_INPUT))
{
- SetDrawBackgroundMask(REDRAW_FIELD);
+ if (game_status == GAME_MODE_PLAYING)
+ {
+ SetPanelBackground();
+ SetDrawBackgroundMask(REDRAW_DOOR_1);
+ }
+ else
+ {
+ SetDrawBackgroundMask(REDRAW_FIELD);
+ }
return FALSE;
}
RemapAllGadgets();
- SetDrawBackgroundMask(REDRAW_FIELD);
+ if (game_status == GAME_MODE_PLAYING)
+ {
+ SetPanelBackground();
+ SetDrawBackgroundMask(REDRAW_DOOR_1);
+ }
+ else
+ {
+ SetDrawBackgroundMask(REDRAW_FIELD);
+ }
#if defined(NETWORK_AVALIABLE)
/* continue network game after request */