X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.c;h=7de35d14cf77d78cd7d51d80add15c9dae05835f;hp=b26add564164aa3468f02f09a5e8bb8c9cf2fff5;hb=3ff2e8a0b5c27b99a9920bdf5ed82bc41bf40181;hpb=0448c027347ae76facf5475a21884ca2476f035f diff --git a/src/tools.c b/src/tools.c index b26add56..7de35d14 100644 --- a/src/tools.c +++ b/src/tools.c @@ -1,19 +1,20 @@ -/*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * -*----------------------------------------------------------* -* (c) 1995-2006 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* tools.c * -***********************************************************/ +// ============================================================================ +// Rocks'n'Diamonds - McDuffin Strikes Back! +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// tools.c +// ============================================================================ + +#include #include "libgame/libgame.h" #include "tools.h" +#include "init.h" #include "game.h" #include "events.h" #include "cartoons.h" @@ -36,6 +37,133 @@ #define NUM_TOOL_BUTTONS 7 +/* constants for number of doors and door parts */ +#define NUM_DOORS 2 +#define NUM_PANELS NUM_DOORS +// #define NUM_PANELS 0 +#define MAX_PARTS_PER_DOOR 8 +#define MAX_DOOR_PARTS (NUM_DOORS * MAX_PARTS_PER_DOOR + NUM_PANELS) +#define DOOR_PART_IS_PANEL(i) ((i) >= NUM_DOORS * MAX_PARTS_PER_DOOR) + + +struct DoorPartOrderInfo +{ + int nr; + int sort_priority; +}; + +static struct DoorPartOrderInfo door_part_order[MAX_DOOR_PARTS]; + +struct DoorPartControlInfo +{ + int door_token; + int graphic; + struct DoorPartPosInfo *pos; +}; + +static struct DoorPartControlInfo door_part_controls[] = +{ + { + DOOR_1, + IMG_DOOR_1_GFX_PART_1, + &door_1.part_1 + }, + { + DOOR_1, + IMG_DOOR_1_GFX_PART_2, + &door_1.part_2 + }, + { + DOOR_1, + IMG_DOOR_1_GFX_PART_3, + &door_1.part_3 + }, + { + DOOR_1, + IMG_DOOR_1_GFX_PART_4, + &door_1.part_4 + }, + { + DOOR_1, + IMG_DOOR_1_GFX_PART_5, + &door_1.part_5 + }, + { + DOOR_1, + IMG_DOOR_1_GFX_PART_6, + &door_1.part_6 + }, + { + DOOR_1, + IMG_DOOR_1_GFX_PART_7, + &door_1.part_7 + }, + { + DOOR_1, + IMG_DOOR_1_GFX_PART_8, + &door_1.part_8 + }, + + { + DOOR_2, + IMG_DOOR_2_GFX_PART_1, + &door_2.part_1 + }, + { + DOOR_2, + IMG_DOOR_2_GFX_PART_2, + &door_2.part_2 + }, + { + DOOR_2, + IMG_DOOR_2_GFX_PART_3, + &door_2.part_3 + }, + { + DOOR_2, + IMG_DOOR_2_GFX_PART_4, + &door_2.part_4 + }, + { + DOOR_2, + IMG_DOOR_2_GFX_PART_5, + &door_2.part_5 + }, + { + DOOR_2, + IMG_DOOR_2_GFX_PART_6, + &door_2.part_6 + }, + { + DOOR_2, + IMG_DOOR_2_GFX_PART_7, + &door_2.part_7 + }, + { + DOOR_2, + IMG_DOOR_2_GFX_PART_8, + &door_2.part_8 + }, + + { + DOOR_1, + IMG_BACKGROUND_PANEL, + &door_1.panel + }, + { + DOOR_2, + IMG_BACKGROUND_TAPE, + &door_2.panel + }, + + { + -1, + -1, + NULL + } +}; + + /* forward declaration for internal use */ static void UnmapToolButtons(); static void HandleToolButtons(struct GadgetInfo *); @@ -107,14 +235,14 @@ void SetDrawtoField(int mode) { if (mode == DRAW_BUFFERED && setup.soft_scrolling) { - FX = TILEX; - FY = TILEY; - BX1 = -1; - BY1 = -1; - BX2 = SCR_FIELDX; - BY2 = SCR_FIELDY; - redraw_x1 = 1; - redraw_y1 = 1; + FX = 2 * TILEX_VAR; + FY = 2 * TILEY_VAR; + BX1 = -2; + BY1 = -2; + BX2 = SCR_FIELDX + 1; + BY2 = SCR_FIELDY + 1; + redraw_x1 = 2; + redraw_y1 = 2; drawto_field = fieldbuffer; } @@ -133,60 +261,31 @@ void SetDrawtoField(int mode) } } -void RedrawPlayfield(boolean force_redraw, int x, int y, int width, int height) +static void RedrawPlayfield_RND() { - if (game_status == GAME_MODE_PLAYING && - level.game_engine_type == GAME_ENGINE_TYPE_EM) - { - /* currently there is no partial redraw -- always redraw whole playfield */ - RedrawPlayfield_EM(TRUE); - - /* blit playfield from scroll buffer to normal back buffer for fading in */ - BlitScreenToBitmap_EM(backbuffer); - } - else if (game_status == GAME_MODE_PLAYING && !game.envelope_active) - { - if (force_redraw) - { - x = gfx.sx - TILEX; - y = gfx.sy - TILEY; - width = gfx.sxsize + 2 * TILEX; - height = gfx.sysize + 2 * TILEY; - } - - if (force_redraw) - { - int xx, yy; - int x1 = (x - SX) / TILEX, y1 = (y - SY) / TILEY; - int x2 = (x - SX + width) / TILEX, y2 = (y - SY + height) / TILEY; - - for (xx = BX1; xx <= BX2; xx++) - for (yy = BY1; yy <= BY2; yy++) - if (xx >= x1 && xx <= x2 && yy >= y1 && yy <= y2) - DrawScreenField(xx, yy); - DrawAllPlayers(); - } + if (game.envelope_active) + return; - if (setup.soft_scrolling) - { - int fx = FX, fy = FY; + DrawLevel(REDRAW_ALL); + DrawAllPlayers(); +} - fx += (ScreenMovDir & (MV_LEFT|MV_RIGHT) ? ScreenGfxPos : 0); - fy += (ScreenMovDir & (MV_UP|MV_DOWN) ? ScreenGfxPos : 0); +void RedrawPlayfield() +{ + if (game_status != GAME_MODE_PLAYING) + return; - BlitBitmap(fieldbuffer, backbuffer, fx,fy, SXSIZE,SYSIZE, SX,SY); - } - } + if (level.game_engine_type == GAME_ENGINE_TYPE_EM) + RedrawPlayfield_EM(TRUE); + else if (level.game_engine_type == GAME_ENGINE_TYPE_SP) + RedrawPlayfield_SP(TRUE); + else if (level.game_engine_type == GAME_ENGINE_TYPE_RND) + RedrawPlayfield_RND(); - if (force_redraw) - { - x = gfx.sx; - y = gfx.sy; - width = gfx.sxsize; - height = gfx.sysize; - } + BlitScreenToBitmap(backbuffer); - BlitBitmap(drawto, window, x, y, width, height, x, y); + BlitBitmap(drawto, window, gfx.sx, gfx.sy, gfx.sxsize, gfx.sysize, + gfx.sx, gfx.sy); } void DrawMaskedBorder_Rect(int x, int y, int width, int height) @@ -240,6 +339,11 @@ void DrawMaskedBorder(int redraw_mask) effectiveGameStatus() == GAME_MODE_TITLE) return; + /* never draw masked screen borders when displaying request outside door */ + if (effectiveGameStatus() == GAME_MODE_PSEUDO_DOOR && + global.use_envelope_request) + return; + if (redraw_mask & REDRAW_ALL) DrawMaskedBorder_ALL(); else @@ -255,23 +359,114 @@ void DrawMaskedBorder(int redraw_mask) } } +static void BlitScreenToBitmap_RND(Bitmap *target_bitmap) +{ + DrawBuffer *buffer = (drawto_field == window ? backbuffer : drawto_field); + int fx = FX, fy = FY; + int full_lev_fieldx = lev_fieldx + (BorderElement != EL_EMPTY ? 2 : 0); + int full_lev_fieldy = lev_fieldy + (BorderElement != EL_EMPTY ? 2 : 0); + + int dx = (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0); + int dy = (ScreenMovDir & (MV_UP | MV_DOWN) ? ScreenGfxPos : 0); + int dx_var = dx * TILESIZE_VAR / TILESIZE; + int dy_var = dy * TILESIZE_VAR / TILESIZE; + int ffx, ffy; + + ffx = (scroll_x - SBX_Left) * TILEX_VAR + dx_var; + ffy = (scroll_y - SBY_Upper) * TILEY_VAR + dy_var; + + if (EVEN(SCR_FIELDX)) + { + if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2 + TILEX_VAR) + fx += dx_var - MIN(ffx, TILEX_VAR / 2) + TILEX_VAR; + else + fx += (dx_var > 0 ? TILEX_VAR : 0); + } + else + { + fx += dx_var; + } + + if (EVEN(SCR_FIELDY)) + { + if (ffy < SBY_Lower * TILEY_VAR + TILEY_VAR / 2 + TILEY_VAR) + fy += dy_var - MIN(ffy, TILEY_VAR / 2) + TILEY_VAR; + else + fy += (dy_var > 0 ? TILEY_VAR : 0); + } + else + { + fy += dy_var; + } + + if (full_lev_fieldx <= SCR_FIELDX) + { + if (EVEN(SCR_FIELDX)) + fx = 2 * TILEX_VAR - (ODD(lev_fieldx) ? TILEX_VAR / 2 : 0); + else + fx = 2 * TILEX_VAR - (EVEN(lev_fieldx) ? TILEX_VAR / 2 : 0); + } + + if (full_lev_fieldy <= SCR_FIELDY) + { + if (EVEN(SCR_FIELDY)) + fy = 2 * TILEY_VAR - (ODD(lev_fieldy) ? TILEY_VAR / 2 : 0); + else + fy = 2 * TILEY_VAR - (EVEN(lev_fieldy) ? TILEY_VAR / 2 : 0); + } + + if (border.draw_masked[GAME_MODE_PLAYING]) + { + if (buffer != backbuffer) + { + /* copy playfield buffer to backbuffer to add masked border */ + BlitBitmap(buffer, backbuffer, fx, fy, SXSIZE, SYSIZE, SX, SY); + DrawMaskedBorder(REDRAW_FIELD); + } + + BlitBitmap(backbuffer, target_bitmap, + REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE, + REAL_SX, REAL_SY); + } + else + { + BlitBitmap(buffer, target_bitmap, fx, fy, SXSIZE, SYSIZE, SX, SY); + } +} + +void BlitScreenToBitmap(Bitmap *target_bitmap) +{ + if (level.game_engine_type == GAME_ENGINE_TYPE_EM) + BlitScreenToBitmap_EM(target_bitmap); + else if (level.game_engine_type == GAME_ENGINE_TYPE_SP) + BlitScreenToBitmap_SP(target_bitmap); + else if (level.game_engine_type == GAME_ENGINE_TYPE_RND) + BlitScreenToBitmap_RND(target_bitmap); +} + void BackToFront() { int x, y; DrawBuffer *buffer = (drawto_field == window ? backbuffer : drawto_field); + if (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD) + redraw_mask |= REDRAW_FIELD; + #if 0 - printf("::: TILES TO REFRESH: %d\n", redraw_tiles); - for (x = 0; x < SCR_FIELDX; x++) - for (y = 0 ; y < SCR_FIELDY; y++) - if (redraw[redraw_x1 + x][redraw_y1 + y]) - printf("::: - %d, %d [%s]\n", - LEVELX(x), LEVELY(y), - EL_NAME(Feld[LEVELX(x)][LEVELY(y)])); + // never redraw single tiles, always redraw the whole field + // (redrawing single tiles up to a certain threshold was faster on old, + // now legacy graphics, but slows things down on modern graphics now) + // UPDATE: this is now globally defined by value of REDRAWTILES_THRESHOLD + if (redraw_mask & REDRAW_TILES) + redraw_mask |= REDRAW_FIELD; #endif - if (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD) +#if 0 + /* !!! TEST ONLY !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */ + /* (force full redraw) */ + if (game_status == GAME_MODE_PLAYING) redraw_mask |= REDRAW_FIELD; +#endif if (redraw_mask & REDRAW_FIELD) redraw_mask &= ~REDRAW_TILES; @@ -279,6 +474,23 @@ void BackToFront() if (redraw_mask == REDRAW_NONE) return; +#if 0 + printf("::: "); + if (redraw_mask & REDRAW_ALL) + printf("[REDRAW_ALL]"); + if (redraw_mask & REDRAW_FIELD) + printf("[REDRAW_FIELD]"); + if (redraw_mask & REDRAW_TILES) + printf("[REDRAW_TILES]"); + if (redraw_mask & REDRAW_DOOR_1) + printf("[REDRAW_DOOR_1]"); + if (redraw_mask & REDRAW_DOOR_2) + printf("[REDRAW_DOOR_2]"); + if (redraw_mask & REDRAW_FROM_BACKBUFFER) + printf("[REDRAW_FROM_BACKBUFFER]"); + printf(" [%d]\n", FrameCounter); +#endif + if (redraw_mask & REDRAW_TILES && game_status == GAME_MODE_PLAYING && border.draw_masked[GAME_MODE_PLAYING]) @@ -321,7 +533,7 @@ void BackToFront() SyncDisplay(); - /* prevent drawing masked border to backbuffer when using playfield buffer */ + /* never draw masked border to backbuffer when using playfield buffer */ if (game_status != GAME_MODE_PLAYING || redraw_mask & REDRAW_FROM_BACKBUFFER || buffer == backbuffer) @@ -346,51 +558,7 @@ void BackToFront() } else { - int fx = FX, fy = FY; - - if (setup.soft_scrolling) - { - fx += (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0); - fy += (ScreenMovDir & (MV_UP | MV_DOWN) ? ScreenGfxPos : 0); - } - - if (setup.soft_scrolling || - ABS(ScreenMovPos) + ScrollStepSize == TILEX || - ABS(ScreenMovPos) == ScrollStepSize || - redraw_tiles > REDRAWTILES_THRESHOLD) - { - if (border.draw_masked[GAME_MODE_PLAYING]) - { - if (buffer != backbuffer) - { - /* copy playfield buffer to backbuffer to add masked border */ - BlitBitmap(buffer, backbuffer, fx, fy, SXSIZE, SYSIZE, SX, SY); - DrawMaskedBorder(REDRAW_FIELD); - } - - BlitBitmap(backbuffer, window, - REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE, - REAL_SX, REAL_SY); - } - else - { - BlitBitmap(buffer, window, fx, fy, SXSIZE, SYSIZE, SX, SY); - } - -#if 0 -#ifdef DEBUG - printf("redrawing all (ScreenGfxPos == %d) because %s\n", - ScreenGfxPos, - (setup.soft_scrolling ? - "setup.soft_scrolling" : - ABS(ScreenGfxPos) + ScrollStepSize == TILEX ? - "ABS(ScreenGfxPos) + ScrollStepSize == TILEX" : - ABS(ScreenGfxPos) == ScrollStepSize ? - "ABS(ScreenGfxPos) == ScrollStepSize" : - "redraw_tiles > REDRAWTILES_THRESHOLD")); -#endif -#endif - } + BlitScreenToBitmap_RND(window); } redraw_mask &= ~REDRAW_MAIN; @@ -420,12 +588,66 @@ void BackToFront() if (redraw_mask & REDRAW_TILES) { - for (x = 0; x < SCR_FIELDX; x++) - for (y = 0 ; y < SCR_FIELDY; y++) + int sx = SX; + int sy = SY; + + int dx = 0, dy = 0; + int dx_var = dx * TILESIZE_VAR / TILESIZE; + int dy_var = dy * TILESIZE_VAR / TILESIZE; + int ffx, ffy; + int fx = FX, fy = FY; + + int scr_fieldx = SCR_FIELDX + (EVEN(SCR_FIELDX) ? 2 : 0); + int scr_fieldy = SCR_FIELDY + (EVEN(SCR_FIELDY) ? 2 : 0); + + InitGfxClipRegion(TRUE, SX, SY, SXSIZE, SYSIZE); + + ffx = (scroll_x - SBX_Left) * TILEX_VAR + dx_var; + ffy = (scroll_y - SBY_Upper) * TILEY_VAR + dy_var; + + if (EVEN(SCR_FIELDX)) + { + if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2 + TILEX_VAR) + { + fx += dx_var - MIN(ffx, TILEX_VAR / 2) + TILEX_VAR; + + if (fx % TILEX_VAR) + sx -= TILEX_VAR / 2; + else + sx -= TILEX_VAR; + } + else + { + fx += (dx_var > 0 ? TILEX_VAR : 0); + } + } + + if (EVEN(SCR_FIELDY)) + { + if (ffy < SBY_Lower * TILEY_VAR + TILEY_VAR / 2 + TILEY_VAR) + { + fy += dy_var - MIN(ffy, TILEY_VAR / 2) + TILEY_VAR; + + if (fy % TILEY_VAR) + sy -= TILEY_VAR / 2; + else + sy -= TILEY_VAR; + } + else + { + fy += (dy_var > 0 ? TILEY_VAR : 0); + } + } + + for (x = 0; x < scr_fieldx; x++) + for (y = 0 ; y < scr_fieldy; y++) if (redraw[redraw_x1 + x][redraw_y1 + y]) BlitBitmap(buffer, window, - FX + x * TILEX, FY + y * TILEY, TILEX, TILEY, - SX + x * TILEX, SY + y * TILEY); + FX + x * TILEX_VAR, FY + y * TILEY_VAR, + TILEX_VAR, TILEY_VAR, + sx + x * TILEX_VAR, sy + y * TILEY_VAR); + + InitGfxClipRegion(FALSE, -1, -1, -1, -1); } if (redraw_mask & REDRAW_FPS) /* display frames per second */ @@ -438,11 +660,8 @@ void BackToFront() info1[0] = '\0'; sprintf(text, "%04.1f fps%s", global.frames_per_second, info1); -#if 1 + DrawTextExt(window, SX + SXSIZE + SX, 0, text, FONT_TEXT_2, BLIT_OPAQUE); -#else - DrawTextExt(window, SX, SY, text, FONT_TEXT_2, BLIT_OPAQUE); -#endif } FlushDisplay(); @@ -471,10 +690,6 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type) { if (fade_type_skip != FADE_TYPE_NONE) { -#if 0 - printf("::: skipping %d ... [%d] (X)\n", fade_mode, fade_type_skip); -#endif - /* skip all fade operations until specified fade operation */ if (fade_type & fade_type_skip) fade_type_skip = FADE_TYPE_NONE; @@ -494,58 +709,28 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type) if (fade_type == FADE_TYPE_SKIP) { -#if 0 - printf("::: will skip %d ... [%d]\n", fade_mode, fade_type_skip); -#endif - fade_type_skip = fade_mode; return; } + fade_delay = fading.fade_delay; + post_delay = (fade_mode == FADE_MODE_FADE_OUT ? fading.post_delay : 0); + if (fade_type_skip != FADE_TYPE_NONE) { -#if 0 - printf("::: skipping %d ... [%d]\n", fade_mode, fade_type_skip); -#endif - /* skip all fade operations until specified fade operation */ if (fade_type & fade_type_skip) fade_type_skip = FADE_TYPE_NONE; - return; + fade_delay = 0; } -#if 1 if (global.autoplay_leveldir) { - // fading.fade_mode = FADE_MODE_NONE; - - return; - } -#endif - -#if 0 - if (fading.fade_mode == FADE_MODE_NONE) - { - BackToFront(); - return; } -#endif - - /* !!! what abount fade_mask == REDRAW_FIELD | REDRAW_ALL ??? !!! */ - -#if 0 - printf("::: NOW FADING %d ... [%d]\n", fade_mode, fade_type); -#endif -#if 0 - if (fade_mask == REDRAW_NONE) - fade_mask = REDRAW_FIELD; -#endif - - // if (fade_mask & REDRAW_FIELD) if (fade_mask == REDRAW_FIELD) { x = REAL_SX; @@ -553,9 +738,6 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type) width = FULL_SXSIZE; height = FULL_SYSIZE; - fade_delay = fading.fade_delay; - post_delay = (fade_mode == FADE_MODE_FADE_OUT ? fading.post_delay : 0); - if (border.draw_masked_when_fading) draw_border_function = DrawMaskedBorder_FIELD; /* update when fading */ else @@ -567,34 +749,18 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type) y = 0; width = WIN_XSIZE; height = WIN_YSIZE; - - fade_delay = fading.fade_delay; - post_delay = (fade_mode == FADE_MODE_FADE_OUT ? fading.post_delay : 0); } -#if 1 if (!setup.fade_screens || fade_delay == 0 || fading.fade_mode == FADE_MODE_NONE) -#else - if (!setup.fade_screens || fade_delay == 0) -#endif { if (fade_mode == FADE_MODE_FADE_OUT) return; -#if 0 - if (fade_mode == FADE_MODE_FADE_OUT && - fading.fade_mode != FADE_MODE_NONE) - ClearRectangle(backbuffer, x, y, width, height); -#endif - -#if 1 BlitBitmap(backbuffer, window, x, y, width, height, x, y); - redraw_mask = REDRAW_NONE; -#else - BackToFront(); -#endif + + redraw_mask &= ~fade_mask; return; } @@ -637,10 +803,6 @@ void FadeSetEnterMenu() { fading = menu.enter_menu; -#if 0 - printf("::: storing enter_menu\n"); -#endif - FadeSetLeaveNext(fading, TRUE); /* (keep same fade mode) */ } @@ -648,10 +810,6 @@ void FadeSetLeaveMenu() { fading = menu.leave_menu; -#if 0 - printf("::: storing leave_menu\n"); -#endif - FadeSetLeaveNext(fading, TRUE); /* (keep same fade mode) */ } @@ -659,10 +817,6 @@ void FadeSetEnterScreen() { fading = menu.enter_screen[game_status]; -#if 0 - printf("::: storing leave_screen[%d]\n", game_status); -#endif - FadeSetLeaveNext(menu.leave_screen[game_status], TRUE); /* store */ } @@ -670,20 +824,12 @@ void FadeSetNextScreen() { fading = menu.next_screen; -#if 0 - printf("::: storing next_screen\n"); -#endif - // (do not overwrite fade mode set by FadeSetEnterScreen) // FadeSetLeaveNext(fading, TRUE); /* (keep same fade mode) */ } void FadeSetLeaveScreen() { -#if 0 - printf("::: recalling last stored value\n"); -#endif - FadeSetLeaveNext(menu.leave_screen[game_status], FALSE); /* recall */ } @@ -758,23 +904,27 @@ void SetDoorBackgroundImage(int graphic) void SetPanelBackground() { - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, bitmap_db_panel, - DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, 0, 0); + struct GraphicInfo *gfx = &graphic_info[IMG_BACKGROUND_PANEL]; + + BlitBitmapTiled(gfx->bitmap, bitmap_db_panel, gfx->src_x, gfx->src_y, + gfx->width, gfx->height, 0, 0, DXSIZE, DYSIZE); SetDoorBackgroundBitmap(bitmap_db_panel); } void DrawBackground(int x, int y, int width, int height) { - /* !!! "drawto" might still point to playfield buffer here (see below) !!! */ - /* (when entering hall of fame after playing) */ -#if 0 - ClearRectangleOnBackground(drawto, x, y, width, height); -#else + /* "drawto" might still point to playfield buffer here (hall of fame) */ ClearRectangleOnBackground(backbuffer, x, y, width, height); -#endif - redraw_mask |= REDRAW_FIELD; + if (IN_GFX_FIELD_FULL(x, y)) + redraw_mask |= REDRAW_FIELD; + else if (IN_GFX_DOOR_1(x, y)) + redraw_mask |= REDRAW_DOOR_1; + else if (IN_GFX_DOOR_2(x, y)) + redraw_mask |= REDRAW_DOOR_2; + else if (IN_GFX_DOOR_3(x, y)) + redraw_mask |= REDRAW_DOOR_3; } void DrawBackgroundForFont(int x, int y, int width, int height, int font_nr) @@ -895,8 +1045,9 @@ inline int getGraphicAnimationFrame(int graphic, int sync_frame) sync_frame); } -void getSizedGraphicSource(int graphic, int frame, int tilesize_raw, - Bitmap **bitmap, int *x, int *y) +void getSizedGraphicSourceExt(int graphic, int frame, int tilesize_raw, + Bitmap **bitmap, int *x, int *y, + boolean get_backside) { struct { @@ -916,22 +1067,50 @@ void getSizedGraphicSource(int graphic, int frame, int tilesize_raw, Bitmap *src_bitmap = g->bitmap; int tilesize = MIN(MAX(1, tilesize_raw), TILESIZE); int offset_calc_pos = log_2(tilesize); + int bitmap_width = src_bitmap->width; + int bitmap_height = src_bitmap->height; int width_mult = offset_calc[offset_calc_pos].width_mult; int width_div = offset_calc[offset_calc_pos].width_div; int height_mult = offset_calc[offset_calc_pos].height_mult; int height_div = offset_calc[offset_calc_pos].height_div; - int startx = src_bitmap->width * width_mult / width_div; - int starty = src_bitmap->height * height_mult / height_div; - int src_x = g->src_x * tilesize / TILESIZE; - int src_y = g->src_y * tilesize / TILESIZE; - int width = g->width * tilesize / TILESIZE; - int height = g->height * tilesize / TILESIZE; - int offset_x = g->offset_x * tilesize / TILESIZE; - int offset_y = g->offset_y * tilesize / TILESIZE; + int startx = bitmap_width * width_mult / width_div; + int starty = bitmap_height * height_mult / height_div; + int src_x = (g->src_x + (get_backside ? g->offset2_x : 0)) * + tilesize_raw / TILESIZE; + int src_y = (g->src_y + (get_backside ? g->offset2_y : 0)) * + tilesize_raw / TILESIZE; + int width = g->width * tilesize_raw / TILESIZE; + int height = g->height * tilesize_raw / TILESIZE; + int offset_x = g->offset_x * tilesize_raw / TILESIZE; + int offset_y = g->offset_y * tilesize_raw / TILESIZE; + + if (game.tile_size != TILESIZE) + { + int bitmap_width_std = + bitmap_width * TILESIZE / (TILESIZE + game.tile_size); + int bitmap_height_std = + bitmap_height * TILESIZE / game.tile_size * 3 / 2; + + if (tilesize_raw == game.tile_size) + { + startx = bitmap_width_std; + starty = 0; + } + else + { + bitmap_width = bitmap_width_std; - if (g->offset_y == 0) /* frames are ordered horizontally */ - { - int max_width = g->anim_frames_per_line * width; + if (game.tile_size > TILESIZE * 3 / 2) + bitmap_height = bitmap_height_std; + + startx = bitmap_width * width_mult / width_div; + starty = bitmap_height * height_mult / height_div; + } + } + + if (g->offset_y == 0) /* frames are ordered horizontally */ + { + int max_width = g->anim_frames_per_line * width; int pos = (src_y / height) * max_width + src_x + frame * offset_x; src_x = pos % max_width; @@ -956,19 +1135,28 @@ void getSizedGraphicSource(int graphic, int frame, int tilesize_raw, *y = starty + src_y; } +void getFixedGraphicSourceExt(int graphic, int frame, Bitmap **bitmap, + int *x, int *y, boolean get_backside) +{ + getSizedGraphicSourceExt(graphic, frame, TILESIZE, bitmap, x, y, + get_backside); +} + +void getSizedGraphicSource(int graphic, int frame, int tilesize_raw, + Bitmap **bitmap, int *x, int *y) +{ + getSizedGraphicSourceExt(graphic, frame, tilesize_raw, bitmap, x, y, FALSE); +} + +void getFixedGraphicSource(int graphic, int frame, + Bitmap **bitmap, int *x, int *y) +{ + getSizedGraphicSourceExt(graphic, frame, TILESIZE, bitmap, x, y, FALSE); +} + void getMiniGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y) { -#if 1 getSizedGraphicSource(graphic, 0, MINI_TILESIZE, bitmap, x, y); -#else - struct GraphicInfo *g = &graphic_info[graphic]; - int mini_startx = 0; - int mini_starty = g->bitmap->height * 2 / 3; - - *bitmap = g->bitmap; - *x = mini_startx + g->src_x / 2; - *y = mini_starty + g->src_y / 2; -#endif } inline void getGraphicSourceExt(int graphic, int frame, Bitmap **bitmap, @@ -978,6 +1166,10 @@ inline void getGraphicSourceExt(int graphic, int frame, Bitmap **bitmap, int src_x = g->src_x + (get_backside ? g->offset2_x : 0); int src_y = g->src_y + (get_backside ? g->offset2_y : 0); + if (TILESIZE_VAR != TILESIZE) + return getSizedGraphicSourceExt(graphic, frame, TILESIZE_VAR, bitmap, x, y, + get_backside); + *bitmap = g->bitmap; if (g->offset_y == 0) /* frames are ordered horizontally */ @@ -1019,7 +1211,25 @@ void DrawGraphic(int x, int y, int graphic, int frame) } #endif - DrawGraphicExt(drawto_field, FX + x * TILEX, FY + y * TILEY, graphic, frame); + DrawGraphicExt(drawto_field, FX + x * TILEX_VAR, FY + y * TILEY_VAR, graphic, + frame); + + MarkTileDirty(x, y); +} + +void DrawFixedGraphic(int x, int y, int graphic, int frame) +{ +#if DEBUG + if (!IN_SCR_FIELD(x, y)) + { + printf("DrawGraphic(): x = %d, y = %d, graphic = %d\n", x, y, graphic); + printf("DrawGraphic(): This should never happen!\n"); + return; + } +#endif + + DrawFixedGraphicExt(drawto_field, FX + x * TILEX, FY + y * TILEY, graphic, + frame); MarkTileDirty(x, y); } @@ -1030,6 +1240,17 @@ void DrawGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic, int src_x, src_y; getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); + + BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX_VAR, TILEY_VAR, x, y); +} + +void DrawFixedGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic, + int frame) +{ + Bitmap *src_bitmap; + int src_x, src_y; + + getFixedGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX, TILEY, x, y); } @@ -1044,8 +1265,25 @@ void DrawGraphicThruMask(int x, int y, int graphic, int frame) } #endif - DrawGraphicThruMaskExt(drawto_field, FX + x * TILEX, FY + y *TILEY, graphic, - frame); + DrawGraphicThruMaskExt(drawto_field, FX + x * TILEX_VAR, FY + y * TILEY_VAR, + graphic, frame); + + MarkTileDirty(x, y); +} + +void DrawFixedGraphicThruMask(int x, int y, int graphic, int frame) +{ +#if DEBUG + if (!IN_SCR_FIELD(x, y)) + { + printf("DrawGraphicThruMask(): x = %d,y = %d, graphic = %d\n",x,y,graphic); + printf("DrawGraphicThruMask(): This should never happen!\n"); + return; + } +#endif + + DrawFixedGraphicThruMaskExt(drawto_field, FX + x * TILEX, FY + y * TILEY, + graphic, frame); MarkTileDirty(x, y); } @@ -1057,6 +1295,21 @@ void DrawGraphicThruMaskExt(DrawBuffer *d, int dst_x, int dst_y, int graphic, getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); + SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc, + dst_x - src_x, dst_y - src_y); + + BlitBitmapMasked(src_bitmap, d, src_x, src_y, TILEX_VAR, TILEY_VAR, + dst_x, dst_y); +} + +void DrawFixedGraphicThruMaskExt(DrawBuffer *d, int dst_x, int dst_y, + int graphic, int frame) +{ + Bitmap *src_bitmap; + int src_x, src_y; + + getFixedGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); + SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc, dst_x - src_x, dst_y - src_y); BlitBitmapMasked(src_bitmap, d, src_x, src_y, TILEX, TILEY, dst_x, dst_y); @@ -1177,6 +1430,13 @@ inline static void DrawGraphicShiftedNormal(int x, int y, int dx, int dy, } #endif + width = width * TILESIZE_VAR / TILESIZE; + height = height * TILESIZE_VAR / TILESIZE; + cx = cx * TILESIZE_VAR / TILESIZE; + cy = cy * TILESIZE_VAR / TILESIZE; + dx = dx * TILESIZE_VAR / TILESIZE; + dy = dy * TILESIZE_VAR / TILESIZE; + if (width > 0 && height > 0) { getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); @@ -1184,8 +1444,8 @@ inline static void DrawGraphicShiftedNormal(int x, int y, int dx, int dy, src_x += cx; src_y += cy; - dst_x = FX + x * TILEX + dx; - dst_y = FY + y * TILEY + dy; + dst_x = FX + x * TILEX_VAR + dx; + dst_y = FY + y * TILEY_VAR + dy; if (mask_mode == USE_MASKING) { @@ -1209,13 +1469,21 @@ inline static void DrawGraphicShiftedDouble(int x, int y, int dx, int dy, Bitmap *src_bitmap; int src_x, src_y; int dst_x, dst_y; - int width = TILEX, height = TILEY; + int width = TILEX_VAR, height = TILEY_VAR; int x1 = x; int y1 = y; int x2 = x + SIGN(dx); int y2 = y + SIGN(dy); + + /* movement with two-tile animations must be sync'ed with movement position, + not with current GfxFrame (which can be higher when using slow movement) */ + int anim_pos = (dx ? ABS(dx) : ABS(dy)); int anim_frames = graphic_info[graphic].anim_frames; - int sync_frame = (dx ? ABS(dx) : ABS(dy)) * anim_frames / TILESIZE; + + /* (we also need anim_delay here for movement animations with less frames) */ + int anim_delay = graphic_info[graphic].anim_delay; + int sync_frame = anim_pos * anim_frames * anim_delay / TILESIZE; + boolean draw_start_tile = (cut_mode != CUT_ABOVE); /* only for falling! */ boolean draw_end_tile = (cut_mode != CUT_BELOW); /* only for falling! */ @@ -1227,8 +1495,8 @@ inline static void DrawGraphicShiftedDouble(int x, int y, int dx, int dy, { getGraphicSourceExt(graphic, frame, &src_bitmap, &src_x, &src_y, TRUE); - dst_x = FX + x1 * TILEX; - dst_y = FY + y1 * TILEY; + dst_x = FX + x1 * TILEX_VAR; + dst_y = FY + y1 * TILEY_VAR; if (mask_mode == USE_MASKING) { @@ -1249,8 +1517,8 @@ inline static void DrawGraphicShiftedDouble(int x, int y, int dx, int dy, { getGraphicSourceExt(graphic, frame, &src_bitmap, &src_x, &src_y, FALSE); - dst_x = FX + x2 * TILEX; - dst_y = FY + y2 * TILEY; + dst_x = FX + x2 * TILEX_VAR; + dst_y = FY + y2 * TILEY_VAR; if (mask_mode == USE_MASKING) { @@ -1385,14 +1653,132 @@ void DrawLevelFieldThruMask(int x, int y) (e) == EL_QUICKSAND_EMPTYING || \ (e) == EL_QUICKSAND_FAST_EMPTYING)) -static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) +static void DrawLevelFieldCrumbledInnerCorners(int x, int y, int dx, int dy, + int graphic) { Bitmap *src_bitmap; int src_x, src_y; + int width, height, cx, cy; + int sx = SCREENX(x), sy = SCREENY(y); + int crumbled_border_size = graphic_info[graphic].border_size; + int i; + + getGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y); + + for (i = 1; i < 4; i++) + { + int dxx = (i & 1 ? dx : 0); + int dyy = (i & 2 ? dy : 0); + int xx = x + dxx; + int yy = y + dyy; + int element = (IN_LEV_FIELD(xx, yy) ? TILE_GFX_ELEMENT(xx, yy) : + BorderElement); + + /* check if neighbour field is of same crumble type */ + boolean same = (IS_CRUMBLED_TILE(xx, yy, element) && + graphic_info[graphic].class == + graphic_info[el_act2crm(element, ACTION_DEFAULT)].class); + + /* return if check prevents inner corner */ + if (same == (dxx == dx && dyy == dy)) + return; + } + + /* if we reach this point, we have an inner corner */ + + getGraphicSource(graphic, 1, &src_bitmap, &src_x, &src_y); + + width = crumbled_border_size * TILESIZE_VAR / TILESIZE; + height = crumbled_border_size * TILESIZE_VAR / TILESIZE; + cx = (dx > 0 ? TILESIZE_VAR - width : 0); + cy = (dy > 0 ? TILESIZE_VAR - height : 0); + + BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, + width, height, FX + sx * TILEX_VAR + cx, FY + sy * TILEY_VAR + cy); +} + +static void DrawLevelFieldCrumbledBorders(int x, int y, int graphic, int frame, + int dir) +{ + Bitmap *src_bitmap; + int src_x, src_y; + int width, height, bx, by, cx, cy; int sx = SCREENX(x), sy = SCREENY(y); - int element; - int width, height, cx, cy, i; int crumbled_border_size = graphic_info[graphic].border_size; + int crumbled_border_size_var = crumbled_border_size * TILESIZE_VAR / TILESIZE; + int crumbled_border_pos_var = TILESIZE_VAR - crumbled_border_size_var; + int i; + + getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); + + /* draw simple, sloppy, non-corner-accurate crumbled border */ + + width = (dir == 1 || dir == 2 ? crumbled_border_size_var : TILESIZE_VAR); + height = (dir == 0 || dir == 3 ? crumbled_border_size_var : TILESIZE_VAR); + cx = (dir == 2 ? crumbled_border_pos_var : 0); + cy = (dir == 3 ? crumbled_border_pos_var : 0); + + BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, width, height, + FX + sx * TILEX_VAR + cx, + FY + sy * TILEY_VAR + cy); + + /* (remaining middle border part must be at least as big as corner part) */ + if (!(graphic_info[graphic].style & STYLE_ACCURATE_BORDERS) || + crumbled_border_size >= TILESIZE / 3) + return; + + /* correct corners of crumbled border, if needed */ + + for (i = -1; i <= 1; i += 2) + { + int xx = x + (dir == 0 || dir == 3 ? i : 0); + int yy = y + (dir == 1 || dir == 2 ? i : 0); + int element = (IN_LEV_FIELD(xx, yy) ? TILE_GFX_ELEMENT(xx, yy) : + BorderElement); + + /* check if neighbour field is of same crumble type */ + if (IS_CRUMBLED_TILE(xx, yy, element) && + graphic_info[graphic].class == + graphic_info[el_act2crm(element, ACTION_DEFAULT)].class) + { + /* no crumbled corner, but continued crumbled border */ + + int c1 = (dir == 2 || dir == 3 ? crumbled_border_pos_var : 0); + int c2 = (i == 1 ? crumbled_border_pos_var : 0); + int b1 = (i == 1 ? crumbled_border_size_var : + TILESIZE_VAR - 2 * crumbled_border_size_var); + + width = crumbled_border_size_var; + height = crumbled_border_size_var; + + if (dir == 1 || dir == 2) + { + cx = c1; + cy = c2; + bx = cx; + by = b1; + } + else + { + cx = c2; + cy = c1; + bx = b1; + by = cy; + } + + BlitBitmap(src_bitmap, drawto_field, src_x + bx, src_y + by, + width, height, + FX + sx * TILEX_VAR + cx, + FY + sy * TILEY_VAR + cy); + } + } +} + +static void DrawLevelFieldCrumbledExt(int x, int y, int graphic, int frame) +{ + int sx = SCREENX(x), sy = SCREENY(y); + int element; + int i; static int xy[4][2] = { { 0, -1 }, @@ -1407,17 +1793,11 @@ static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) element = TILE_GFX_ELEMENT(x, y); /* crumble field itself */ -#if 1 if (IS_CRUMBLED_TILE(x, y, element)) -#else - if (GFX_CRUMBLED(element) && !IS_MOVING(x, y)) -#endif { if (!IN_SCR_FIELD(sx, sy)) return; - getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); - for (i = 0; i < 4; i++) { int xx = x + xy[i][0]; @@ -1426,37 +1806,30 @@ static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) element = (IN_LEV_FIELD(xx, yy) ? TILE_GFX_ELEMENT(xx, yy) : BorderElement); - /* check if neighbour field is of same type */ -#if 1 - if (IS_CRUMBLED_TILE(xx, yy, element)) - continue; -#else - if (GFX_CRUMBLED(element) && !IS_MOVING(xx, yy)) + /* check if neighbour field is of same crumble type */ + if (IS_CRUMBLED_TILE(xx, yy, element) && + graphic_info[graphic].class == + graphic_info[el_act2crm(element, ACTION_DEFAULT)].class) continue; -#endif - if (i == 1 || i == 2) - { - width = crumbled_border_size; - height = TILEY; - cx = (i == 2 ? TILEX - crumbled_border_size : 0); - cy = 0; - } - else + DrawLevelFieldCrumbledBorders(x, y, graphic, frame, i); + } + + if ((graphic_info[graphic].style & STYLE_INNER_CORNERS) && + graphic_info[graphic].anim_frames == 2) + { + for (i = 0; i < 4; i++) { - width = TILEX; - height = crumbled_border_size; - cx = 0; - cy = (i == 3 ? TILEY - crumbled_border_size : 0); - } + int dx = (i & 1 ? +1 : -1); + int dy = (i & 2 ? +1 : -1); - BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, - width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy); + DrawLevelFieldCrumbledInnerCorners(x, y, dx, dy, graphic); + } } MarkTileDirty(sx, sy); } - else /* crumble neighbour fields */ + else /* center field not crumbled -- crumble neighbour fields */ { for (i = 0; i < 4; i++) { @@ -1465,94 +1838,50 @@ static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) int sxx = sx + xy[i][0]; int syy = sy + xy[i][1]; -#if 1 if (!IN_LEV_FIELD(xx, yy) || !IN_SCR_FIELD(sxx, syy)) continue; -#else - if (!IN_LEV_FIELD(xx, yy) || - !IN_SCR_FIELD(sxx, syy) || - IS_MOVING(xx, yy)) - continue; -#endif if (Feld[xx][yy] == EL_ELEMENT_SNAPPING) continue; element = TILE_GFX_ELEMENT(xx, yy); -#if 1 if (!IS_CRUMBLED_TILE(xx, yy, element)) continue; -#else - if (!GFX_CRUMBLED(element)) - continue; -#endif graphic = el_act2crm(element, ACTION_DEFAULT); - crumbled_border_size = graphic_info[graphic].border_size; - - getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); - - if (i == 1 || i == 2) - { - width = crumbled_border_size; - height = TILEY; - cx = (i == 1 ? TILEX - crumbled_border_size : 0); - cy = 0; - } - else - { - width = TILEX; - height = crumbled_border_size; - cx = 0; - cy = (i == 0 ? TILEY - crumbled_border_size : 0); - } - BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, - width, height, FX + sxx * TILEX + cx, FY + syy * TILEY + cy); + DrawLevelFieldCrumbledBorders(xx, yy, graphic, 0, 3 - i); MarkTileDirty(sxx, syy); } } } -void DrawLevelFieldCrumbledSand(int x, int y) +void DrawLevelFieldCrumbled(int x, int y) { int graphic; if (!IN_LEV_FIELD(x, y)) return; -#if 1 - /* !!! CHECK THIS !!! */ - - /* - if (Feld[x][y] == EL_ELEMENT_SNAPPING && - GFX_CRUMBLED(GfxElement[x][y])) - */ - if (Feld[x][y] == EL_ELEMENT_SNAPPING && GfxElement[x][y] != EL_UNDEFINED && GFX_CRUMBLED(GfxElement[x][y])) { - DrawLevelFieldCrumbledSandDigging(x, y, GfxDir[x][y], GfxFrame[x][y]); + DrawLevelFieldCrumbledDigging(x, y, GfxDir[x][y], GfxFrame[x][y]); return; } -#endif -#if 1 graphic = el_act2crm(TILE_GFX_ELEMENT(x, y), ACTION_DEFAULT); -#else - graphic = el_act2crm(Feld[x][y], ACTION_DEFAULT); -#endif - DrawLevelFieldCrumbledSandExt(x, y, graphic, 0); + DrawLevelFieldCrumbledExt(x, y, graphic, 0); } -void DrawLevelFieldCrumbledSandDigging(int x, int y, int direction, - int step_frame) +void DrawLevelFieldCrumbledDigging(int x, int y, int direction, + int step_frame) { int graphic1 = el_act_dir2img(GfxElement[x][y], ACTION_DIGGING, direction); int graphic2 = el_act_dir2crm(GfxElement[x][y], ACTION_DIGGING, direction); @@ -1561,10 +1890,10 @@ void DrawLevelFieldCrumbledSandDigging(int x, int y, int direction, int sx = SCREENX(x), sy = SCREENY(y); DrawGraphic(sx, sy, graphic1, frame1); - DrawLevelFieldCrumbledSandExt(x, y, graphic2, frame2); + DrawLevelFieldCrumbledExt(x, y, graphic2, frame2); } -void DrawLevelFieldCrumbledSandNeighbours(int x, int y) +void DrawLevelFieldCrumbledNeighbours(int x, int y) { int sx = SCREENX(x), sy = SCREENY(y); static int xy[4][2] = @@ -1619,7 +1948,7 @@ static int getBorderElement(int x, int y) void DrawScreenElement(int x, int y, int element) { DrawScreenElementExt(x, y, 0, 0, element, NO_CUTTING, NO_MASKING); - DrawLevelFieldCrumbledSand(LEVELX(x), LEVELY(y)); + DrawLevelFieldCrumbled(LEVELX(x), LEVELY(y)); } void DrawLevelElement(int x, int y, int element) @@ -1667,22 +1996,8 @@ void DrawScreenField(int x, int y) element == EL_DC_MAGIC_WALL_FILLING) cut_mode = CUT_BELOW; -#if 0 - if (lx == 9 && ly == 1) - printf("::: %s [%d] [%d, %d] [%d]\n", - EL_NAME(TILE_GFX_ELEMENT(lx, ly)), - el_act2crm(TILE_GFX_ELEMENT(lx, ly), ACTION_DEFAULT), - element_info[EL_QUICKSAND_EMPTYING].graphic[ACTION_DEFAULT], - element_info[EL_QUICKSAND_EMPTYING].crumbled[ACTION_DEFAULT], - GFX_CRUMBLED(TILE_GFX_ELEMENT(lx, ly))); -#endif - if (cut_mode == CUT_ABOVE) -#if 1 DrawScreenElement(x, y, element); -#else - DrawScreenElementShifted(x, y, 0, 0, element, NO_CUTTING); -#endif else DrawScreenElement(x, y, EL_EMPTY); @@ -1694,11 +2009,9 @@ void DrawScreenField(int x, int y) { DrawScreenElementShifted(x, y, 0, MovPos[lx][ly], content, cut_mode); -#if 1 if (cut_mode == CUT_BELOW && IN_LEV_FIELD(lx, ly + 1) && IN_SCR_FIELD(x, y + 1)) DrawLevelElement(lx, ly + 1, element); -#endif } if (content == EL_ACID) @@ -1795,49 +2108,59 @@ void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y) DrawMiniGraphic(sx, sy, el2edimg(getBorderElement(x, y))); } -void DrawEnvelopeBackground(int envelope_nr, int startx, int starty, - int x, int y, int xsize, int ysize, int font_nr) +void DrawEnvelopeBackgroundTiles(int graphic, int startx, int starty, + int x, int y, int xsize, int ysize, + int tile_width, int tile_height) { - int font_width = getFontWidth(font_nr); - int font_height = getFontHeight(font_nr); - int graphic = IMG_BACKGROUND_ENVELOPE_1 + envelope_nr; Bitmap *src_bitmap; int src_x, src_y; - int dst_x = SX + startx + x * font_width; - int dst_y = SY + starty + y * font_height; + int dst_x = startx + x * tile_width; + int dst_y = starty + y * tile_height; int width = graphic_info[graphic].width; int height = graphic_info[graphic].height; - int inner_width = MAX(width - 2 * font_width, font_width); - int inner_height = MAX(height - 2 * font_height, font_height); - int inner_sx = (width >= 3 * font_width ? font_width : 0); - int inner_sy = (height >= 3 * font_height ? font_height : 0); + int inner_width_raw = MAX(width - 2 * tile_width, tile_width); + int inner_height_raw = MAX(height - 2 * tile_height, tile_height); + int inner_width = inner_width_raw - (inner_width_raw % tile_width); + int inner_height = inner_height_raw - (inner_height_raw % tile_height); + int inner_sx = (width >= 3 * tile_width ? tile_width : 0); + int inner_sy = (height >= 3 * tile_height ? tile_height : 0); boolean draw_masked = graphic_info[graphic].draw_masked; - getGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y); + getFixedGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y); - if (src_bitmap == NULL || width < font_width || height < font_height) + if (src_bitmap == NULL || width < tile_width || height < tile_height) { - ClearRectangle(drawto, dst_x, dst_y, font_width, font_height); + ClearRectangle(drawto, dst_x, dst_y, tile_width, tile_height); return; } - src_x += (x == 0 ? 0 : x == xsize - 1 ? width - font_width : - inner_sx + (x - 1) * font_width % inner_width); - src_y += (y == 0 ? 0 : y == ysize - 1 ? height - font_height : - inner_sy + (y - 1) * font_height % inner_height); + src_x += (x == 0 ? 0 : x == xsize - 1 ? width - tile_width : + inner_sx + (x - 1) * tile_width % inner_width); + src_y += (y == 0 ? 0 : y == ysize - 1 ? height - tile_height : + inner_sy + (y - 1) * tile_height % inner_height); if (draw_masked) { SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc, dst_x - src_x, dst_y - src_y); - BlitBitmapMasked(src_bitmap, drawto, src_x, src_y, font_width, font_height, + BlitBitmapMasked(src_bitmap, drawto, src_x, src_y, tile_width, tile_height, dst_x, dst_y); } else - BlitBitmap(src_bitmap, drawto, src_x, src_y, font_width, font_height, + BlitBitmap(src_bitmap, drawto, src_x, src_y, tile_width, tile_height, dst_x, dst_y); } +void DrawEnvelopeBackground(int graphic, int startx, int starty, + int x, int y, int xsize, int ysize, int font_nr) +{ + int font_width = getFontWidth(font_nr); + int font_height = getFontHeight(font_nr); + + DrawEnvelopeBackgroundTiles(graphic, startx, starty, x, y, xsize, ysize, + font_width, font_height); +} + void AnimateEnvelope(int envelope_nr, int anim_mode, int action) { int graphic = IMG_BACKGROUND_ENVELOPE_1 + envelope_nr; @@ -1845,7 +2168,7 @@ void AnimateEnvelope(int envelope_nr, int anim_mode, int action) int mask_mode = (src_bitmap != NULL ? BLIT_MASKED : BLIT_ON_BACKGROUND); boolean ffwd_delay = (tape.playing && tape.fast_forward); boolean no_delay = (tape.warp_forward); - unsigned long anim_delay = 0; + unsigned int anim_delay = 0; int frame_delay_value = (ffwd_delay ? FfwdFrameDelay : GameFrameDelay); int anim_delay_value = (no_delay ? 0 : frame_delay_value); int font_nr = FONT_ENVELOPE_1 + envelope_nr; @@ -1865,30 +2188,25 @@ void AnimateEnvelope(int envelope_nr, int anim_mode, int action) { int xsize = (action == ACTION_CLOSING ? xend - (x - xstart) : x) + 2; int ysize = (action == ACTION_CLOSING ? yend - (y - ystart) : y) + 2; - int sx = (SXSIZE - xsize * font_width) / 2; - int sy = (SYSIZE - ysize * font_height) / 2; + int sx = SX + (SXSIZE - xsize * font_width) / 2; + int sy = SY + (SYSIZE - ysize * font_height) / 2; int xx, yy; SetDrawtoField(DRAW_BUFFERED); - BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY); + BlitScreenToBitmap(backbuffer); SetDrawtoField(DRAW_BACKBUFFER); - for (yy = 0; yy < ysize; yy++) for (xx = 0; xx < xsize; xx++) - DrawEnvelopeBackground(envelope_nr, sx,sy, xx,yy, xsize, ysize, font_nr); + for (yy = 0; yy < ysize; yy++) + for (xx = 0; xx < xsize; xx++) + DrawEnvelopeBackground(graphic, sx, sy, xx, yy, xsize, ysize, font_nr); -#if 1 - DrawTextBuffer(SX + sx + font_width, SY + sy + font_height, + DrawTextBuffer(sx + font_width, sy + font_height, level.envelope[envelope_nr].text, font_nr, max_xsize, - xsize - 2, ysize - 2, mask_mode, + xsize - 2, ysize - 2, 0, mask_mode, level.envelope[envelope_nr].autowrap, level.envelope[envelope_nr].centered, FALSE); -#else - DrawTextToTextArea(SX + sx + font_width, SY + sy + font_height, - level.envelope[envelope_nr].text, font_nr, max_xsize, - xsize - 2, ysize - 2, mask_mode); -#endif redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; BackToFront(); @@ -1941,68 +2259,336 @@ void ShowEnvelope(int envelope_nr) BackToFront(); } -void DrawPreviewElement(int dst_x, int dst_y, int element, int tilesize) +static void setRequestPosition(int *x, int *y, boolean add_border_size) { - Bitmap *src_bitmap; - int src_x, src_y; - int graphic = el2preimg(element); + int border_size = request.border_size; + int sx_center = (request.x != -1 ? request.x : SX + SXSIZE / 2); + int sy_center = (request.y != -1 ? request.y : SY + SYSIZE / 2); + int sx = sx_center - request.width / 2; + int sy = sy_center - request.height / 2; - getSizedGraphicSource(graphic, 0, tilesize, &src_bitmap, &src_x, &src_y); - BlitBitmap(src_bitmap, drawto, src_x, src_y, tilesize, tilesize, dst_x,dst_y); + if (add_border_size) + { + sx += border_size; + sy += border_size; + } + + *x = sx; + *y = sy; } -void DrawLevel() +void DrawEnvelopeRequest(char *text) { - int x,y; + char *text_final = text; + char *text_door_style = NULL; + int graphic = IMG_BACKGROUND_REQUEST; + Bitmap *src_bitmap = graphic_info[graphic].bitmap; + int mask_mode = (src_bitmap != NULL ? BLIT_MASKED : BLIT_ON_BACKGROUND); + int font_nr = FONT_REQUEST; + int font_width = getFontWidth(font_nr); + int font_height = getFontHeight(font_nr); + int border_size = request.border_size; + int line_spacing = request.line_spacing; + int line_height = font_height + line_spacing; + int text_width = request.width - 2 * border_size; + int text_height = request.height - 2 * border_size; + int line_length = text_width / font_width; + int max_lines = text_height / line_height; + int width = request.width; + int height = request.height; + int tile_size = request.step_offset; + int x_steps = width / tile_size; + int y_steps = height / tile_size; + int sx, sy; + int i, x, y; + + if (request.wrap_single_words) + { + char *src_text_ptr, *dst_text_ptr; + + text_door_style = checked_malloc(2 * strlen(text) + 1); + + src_text_ptr = text; + dst_text_ptr = text_door_style; + + while (*src_text_ptr) + { + if (*src_text_ptr == ' ' || + *src_text_ptr == '?' || + *src_text_ptr == '!') + *dst_text_ptr++ = '\n'; -#if 1 - SetMainBackgroundImage(IMG_BACKGROUND_PLAYING); - SetDrawBackgroundMask(REDRAW_FIELD); -#else - SetDrawBackgroundMask(REDRAW_NONE); -#endif + if (*src_text_ptr != ' ') + *dst_text_ptr++ = *src_text_ptr; - ClearField(); + src_text_ptr++; + } - for (x = BX1; x <= BX2; x++) - for (y = BY1; y <= BY2; y++) - DrawScreenField(x, y); + *dst_text_ptr = '\0'; - redraw_mask |= REDRAW_FIELD; -} + text_final = text_door_style; + } -void DrawMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y) -{ - int x,y; + setRequestPosition(&sx, &sy, FALSE); - for (x = 0; x < size_x; x++) - for (y = 0; y < size_y; y++) - DrawMiniElementOrWall(x, y, scroll_x, scroll_y); + ClearRectangle(backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE); - redraw_mask |= REDRAW_FIELD; + for (y = 0; y < y_steps; y++) + for (x = 0; x < x_steps; x++) + DrawEnvelopeBackgroundTiles(graphic, sx, sy, + x, y, x_steps, y_steps, + tile_size, tile_size); + + DrawTextBuffer(sx + border_size, sy + border_size, text_final, font_nr, + line_length, -1, max_lines, line_spacing, mask_mode, + request.autowrap, request.centered, FALSE); + + for (i = 0; i < NUM_TOOL_BUTTONS; i++) + RedrawGadget(tool_gadget[i]); + + // store readily prepared envelope request for later use when animating + BlitBitmap(backbuffer, bitmap_db_cross, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); + + if (text_door_style) + free(text_door_style); } -static void DrawPreviewLevelExt(int from_x, int from_y) +void AnimateEnvelopeRequest(int anim_mode, int action) { - boolean show_level_border = (BorderElement != EL_EMPTY); - 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 dst_x = SX + ALIGNED_XPOS(preview.x, preview_width, preview.align); - int dst_y = SY + ALIGNED_YPOS(preview.y, preview_height, preview.valign); + int graphic = IMG_BACKGROUND_REQUEST; + boolean draw_masked = graphic_info[graphic].draw_masked; + int delay_value_normal = request.step_delay; + int delay_value_fast = delay_value_normal / 2; + boolean ffwd_delay = (tape.playing && tape.fast_forward); + boolean no_delay = (tape.warp_forward); + int delay_value = (ffwd_delay ? delay_value_fast : delay_value_normal); + int anim_delay_value = (no_delay ? 0 : delay_value + 500 * 0); + unsigned int anim_delay = 0; + + int width = request.width; + int height = request.height; + int tile_size = request.step_offset; + int max_xsize = width / tile_size; + int max_ysize = height / tile_size; + int max_xsize_inner = max_xsize - 2; + int max_ysize_inner = max_ysize - 2; + + int xstart = (anim_mode & ANIM_VERTICAL ? max_xsize_inner : 0); + int ystart = (anim_mode & ANIM_HORIZONTAL ? max_ysize_inner : 0); + int xend = max_xsize_inner; + int yend = (anim_mode != ANIM_DEFAULT ? max_ysize_inner : 0); + int xstep = (xstart < xend ? 1 : 0); + int ystep = (ystart < yend || xstep == 0 ? 1 : 0); int x, y; - DrawBackground(dst_x, dst_y, preview_width, preview_height); + for (x = xstart, y = ystart; x <= xend && y <= yend; x += xstep, y += ystep) + { + int xsize = (action == ACTION_CLOSING ? xend - (x - xstart) : x) + 2; + int ysize = (action == ACTION_CLOSING ? yend - (y - ystart) : y) + 2; + int sx_center = (request.x != -1 ? request.x : SX + SXSIZE / 2); + int sy_center = (request.y != -1 ? request.y : SY + SYSIZE / 2); + int src_x = sx_center - width / 2; + int src_y = sy_center - height / 2; + int dst_x = sx_center - xsize * tile_size / 2; + int dst_y = sy_center - ysize * tile_size / 2; + int xsize_size_left = (xsize - 1) * tile_size; + int ysize_size_top = (ysize - 1) * tile_size; + int max_xsize_pos = (max_xsize - 1) * tile_size; + int max_ysize_pos = (max_ysize - 1) * tile_size; + int xx, yy; - dst_x += (preview_width - real_preview_xsize * tile_size) / 2; - dst_y += (preview_height - real_preview_ysize * tile_size) / 2; + BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); - for (x = 0; x < real_preview_xsize; x++) - { + for (yy = 0; yy < 2; yy++) + { + for (xx = 0; xx < 2; xx++) + { + int src_xx = src_x + xx * max_xsize_pos; + int src_yy = src_y + yy * max_ysize_pos; + int dst_xx = dst_x + xx * xsize_size_left; + int dst_yy = dst_y + yy * ysize_size_top; + int xx_size = (xx ? tile_size : xsize_size_left); + int yy_size = (yy ? tile_size : ysize_size_top); + + if (draw_masked) + BlitBitmapMasked(bitmap_db_cross, backbuffer, + src_xx, src_yy, xx_size, yy_size, dst_xx, dst_yy); + else + BlitBitmap(bitmap_db_cross, backbuffer, + src_xx, src_yy, xx_size, yy_size, dst_xx, dst_yy); + } + } + + redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; + + DoAnimation(); + BackToFront(); + + WaitUntilDelayReached(&anim_delay, anim_delay_value / 2); + } +} + + +void ShowEnvelopeRequest(char *text, unsigned int req_state, int action) +{ + int last_game_status = game_status; /* save current game status */ + int graphic = IMG_BACKGROUND_REQUEST; + int sound_opening = SND_REQUEST_OPENING; + int sound_closing = SND_REQUEST_CLOSING; + int anim_mode = graphic_info[graphic].anim_mode; + int main_anim_mode = (anim_mode == ANIM_NONE ? ANIM_VERTICAL|ANIM_HORIZONTAL: + anim_mode == ANIM_DEFAULT ? ANIM_VERTICAL : anim_mode); + + if (game_status == GAME_MODE_PLAYING) + BlitScreenToBitmap(backbuffer); + + SetDrawtoField(DRAW_BACKBUFFER); + + // SetDrawBackgroundMask(REDRAW_NONE); + + if (action == ACTION_OPENING) + { + BlitBitmap(backbuffer, bitmap_db_store, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); + + if (req_state & REQ_ASK) + { + MapGadget(tool_gadget[TOOL_CTRL_ID_YES]); + MapGadget(tool_gadget[TOOL_CTRL_ID_NO]); + } + else if (req_state & REQ_CONFIRM) + { + MapGadget(tool_gadget[TOOL_CTRL_ID_CONFIRM]); + } + else if (req_state & REQ_PLAYER) + { + MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_1]); + MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_2]); + MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_3]); + MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_4]); + } + + DrawEnvelopeRequest(text); + + if (game_status != GAME_MODE_MAIN) + InitAnimation(); + } + + /* force DOOR font inside door area */ + game_status = GAME_MODE_PSEUDO_DOOR; + + game.envelope_active = TRUE; /* needed for RedrawPlayfield() events */ + + if (action == ACTION_OPENING) + { + PlayMenuSoundStereo(sound_opening, SOUND_MIDDLE); + + if (anim_mode == ANIM_DEFAULT) + AnimateEnvelopeRequest(ANIM_DEFAULT, ACTION_OPENING); + + AnimateEnvelopeRequest(main_anim_mode, ACTION_OPENING); + + } + else + { + PlayMenuSoundStereo(sound_closing, SOUND_MIDDLE); + + if (anim_mode != ANIM_NONE) + AnimateEnvelopeRequest(main_anim_mode, ACTION_CLOSING); + + if (anim_mode == ANIM_DEFAULT) + AnimateEnvelopeRequest(ANIM_DEFAULT, ACTION_CLOSING); + } + + game.envelope_active = FALSE; + + game_status = last_game_status; /* restore current game status */ + + if (action == ACTION_CLOSING) + { + if (game_status != GAME_MODE_MAIN) + StopAnimation(); + + BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); + } + + // SetDrawBackgroundMask(last_draw_background_mask); + + redraw_mask |= REDRAW_FIELD; + + if (game_status == GAME_MODE_MAIN) + DoAnimation(); + + BackToFront(); + + if (action == ACTION_CLOSING && + game_status == GAME_MODE_PLAYING && + level.game_engine_type == GAME_ENGINE_TYPE_RND) + SetDrawtoField(DRAW_BUFFERED); +} + +void DrawPreviewElement(int dst_x, int dst_y, int element, int tilesize) +{ + Bitmap *src_bitmap; + int src_x, src_y; + int graphic = el2preimg(element); + + getSizedGraphicSource(graphic, 0, tilesize, &src_bitmap, &src_x, &src_y); + BlitBitmap(src_bitmap, drawto, src_x, src_y, tilesize, tilesize, dst_x,dst_y); +} + +void DrawLevel(int draw_background_mask) +{ + int x,y; + + SetMainBackgroundImage(IMG_BACKGROUND_PLAYING); + SetDrawBackgroundMask(draw_background_mask); + + ClearField(); + + for (x = BX1; x <= BX2; x++) + for (y = BY1; y <= BY2; y++) + DrawScreenField(x, y); + + redraw_mask |= REDRAW_FIELD; +} + +void DrawMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y) +{ + int x,y; + + for (x = 0; x < size_x; x++) + for (y = 0; y < size_y; y++) + DrawMiniElementOrWall(x, y, scroll_x, scroll_y); + + redraw_mask |= REDRAW_FIELD; +} + +static void DrawPreviewLevelPlayfieldExt(int from_x, int from_y) +{ + boolean show_level_border = (BorderElement != EL_EMPTY); + 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 real_preview_width = real_preview_xsize * tile_size; + int real_preview_height = real_preview_ysize * tile_size; + int dst_x = SX + ALIGNED_XPOS(preview.x, preview_width, preview.align); + int dst_y = SY + ALIGNED_YPOS(preview.y, preview_height, preview.valign); + int x, y; + + if (!IN_GFX_FIELD_FULL(dst_x, dst_y + preview_height - 1)) + return; + + DrawBackground(dst_x, dst_y, preview_width, preview_height); + + dst_x += (preview_width - real_preview_width) / 2; + dst_y += (preview_height - real_preview_height) / 2; + + for (x = 0; x < real_preview_xsize; x++) + { for (y = 0; y < real_preview_ysize; y++) { int lx = from_x + x + (show_level_border ? -1 : 0); @@ -2047,50 +2633,28 @@ static void DrawPreviewLevelLabelExt(int mode) struct TextPosInfo *pos = &menu.main.text.level_info_2; char label_text[MAX_OUTPUT_LINESIZE + 1]; int max_len_label_text; -#if 1 int font_nr = pos->font; int i; - if (mode == MICROLABEL_LEVEL_AUTHOR_HEAD || - mode == MICROLABEL_IMPORTED_FROM_HEAD || - mode == MICROLABEL_IMPORTED_BY_HEAD) - font_nr = pos->font_alt; -#else - int font_nr = FONT_TEXT_2; - int i; + if (!IN_GFX_FIELD_FULL(pos->x, pos->y + getFontHeight(pos->font))) + return; if (mode == MICROLABEL_LEVEL_AUTHOR_HEAD || mode == MICROLABEL_IMPORTED_FROM_HEAD || mode == MICROLABEL_IMPORTED_BY_HEAD) - font_nr = FONT_TEXT_3; -#endif + font_nr = pos->font_alt; -#if 1 max_len_label_text = getMaxTextLength(pos, font_nr); -#else - max_len_label_text = SXSIZE / getFontWidth(font_nr); -#endif -#if 1 if (pos->size != -1) max_len_label_text = pos->size; -#endif for (i = 0; i < max_len_label_text; i++) label_text[i] = ' '; label_text[max_len_label_text] = '\0'; if (strlen(label_text) > 0) - { -#if 1 DrawTextSAligned(pos->x, pos->y, label_text, font_nr, pos->align); -#else - int lxpos = SX + (SXSIZE - getTextWidth(label_text, font_nr)) / 2; - int lypos = MICROLABEL2_YPOS; - - DrawText(lxpos, lypos, label_text, font_nr); -#endif - } strncpy(label_text, (mode == MICROLABEL_LEVEL_NAME ? level.name : @@ -2104,37 +2668,23 @@ static void DrawPreviewLevelLabelExt(int mode) label_text[max_len_label_text] = '\0'; if (strlen(label_text) > 0) - { -#if 1 DrawTextSAligned(pos->x, pos->y, label_text, font_nr, pos->align); -#else - int lxpos = SX + (SXSIZE - getTextWidth(label_text, font_nr)) / 2; - int lypos = MICROLABEL2_YPOS; - - DrawText(lxpos, lypos, label_text, font_nr); -#endif - } redraw_mask |= REDRAW_MICROLEVEL; } -void DrawPreviewLevel(boolean restart) +static void DrawPreviewLevelExt(boolean restart) { - static unsigned long scroll_delay = 0; - static unsigned long label_delay = 0; + static unsigned int scroll_delay = 0; + static unsigned int label_delay = 0; static int from_x, from_y, scroll_direction; static int label_state, label_counter; - unsigned long scroll_delay_value = preview.step_delay; + unsigned int scroll_delay_value = preview.step_delay; boolean show_level_border = (BorderElement != EL_EMPTY); 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 */ -#if 0 - /* force PREVIEW font on preview level */ - game_status = GAME_MODE_PSEUDO_PREVIEW; -#endif - if (restart) { from_x = 0; @@ -2155,7 +2705,7 @@ void DrawPreviewLevel(boolean restart) label_state = 1; label_counter = 0; - DrawPreviewLevelExt(from_x, from_y); + DrawPreviewLevelPlayfieldExt(from_x, from_y); DrawPreviewLevelLabelExt(label_state); /* initialize delay counters */ @@ -2166,37 +2716,17 @@ void DrawPreviewLevel(boolean restart) { struct TextPosInfo *pos = &menu.main.text.level_info_1; char label_text[MAX_OUTPUT_LINESIZE + 1]; -#if 1 int font_nr = pos->font; -#else - int font_nr = FONT_TEXT_1; -#endif -#if 1 int max_len_label_text = getMaxTextLength(pos, font_nr); -#else - int max_len_label_text = SXSIZE / getFontWidth(font_nr); -#endif -#if 0 - int text_width; - int lxpos, lypos; -#endif -#if 1 if (pos->size != -1) max_len_label_text = pos->size; -#endif strncpy(label_text, leveldir_current->name, max_len_label_text); label_text[max_len_label_text] = '\0'; -#if 1 - DrawTextSAligned(pos->x, pos->y, label_text, font_nr, pos->align); -#else - lxpos = SX + (SXSIZE - getTextWidth(label_text, font_nr)) / 2; - lypos = SY + MICROLABEL1_YPOS; - - DrawText(lxpos, lypos, label_text, font_nr); -#endif + if (IN_GFX_FIELD_FULL(pos->x, pos->y + getFontHeight(pos->font))) + DrawTextSAligned(pos->x, pos->y, label_text, font_nr, pos->align); } game_status = last_game_status; /* restore current game status */ @@ -2257,7 +2787,7 @@ void DrawPreviewLevel(boolean restart) break; } - DrawPreviewLevelExt(from_x, from_y); + DrawPreviewLevelPlayfieldExt(from_x, from_y); } /* !!! THIS ALL SUCKS -- SHOULD BE CLEANLY REWRITTEN !!! */ @@ -2304,6 +2834,16 @@ void DrawPreviewLevel(boolean restart) game_status = last_game_status; /* restore current game status */ } +void DrawPreviewLevelInitial() +{ + DrawPreviewLevelExt(TRUE); +} + +void DrawPreviewLevelAnimation() +{ + DrawPreviewLevelExt(FALSE); +} + inline void DrawGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y, int graphic, int sync_frame, int mask_mode) { @@ -2315,10 +2855,35 @@ inline void DrawGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y, DrawGraphicExt(dst_bitmap, x, y, graphic, frame); } +inline void DrawFixedGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y, + int graphic, int sync_frame, + int mask_mode) +{ + int frame = getGraphicAnimationFrame(graphic, sync_frame); + + if (mask_mode == USE_MASKING) + DrawFixedGraphicThruMaskExt(dst_bitmap, x, y, graphic, frame); + else + DrawFixedGraphicExt(dst_bitmap, x, y, graphic, frame); +} + inline void DrawGraphicAnimation(int x, int y, int graphic) { int lx = LEVELX(x), ly = LEVELY(y); + if (!IN_SCR_FIELD(x, y)) + return; + + DrawGraphicAnimationExt(drawto_field, FX + x * TILEX_VAR, FY + y * TILEY_VAR, + graphic, GfxFrame[lx][ly], NO_MASKING); + + MarkTileDirty(x, y); +} + +inline void DrawFixedGraphicAnimation(int x, int y, int graphic) +{ + int lx = LEVELX(x), ly = LEVELY(y); + if (!IN_SCR_FIELD(x, y)) return; @@ -2353,10 +2918,10 @@ inline void DrawLevelGraphicAnimationIfNeeded(int x, int y, int graphic) #if 1 if (GFX_CRUMBLED(TILE_GFX_ELEMENT(x, y))) - DrawLevelFieldCrumbledSand(x, y); + DrawLevelFieldCrumbled(x, y); #else if (GFX_CRUMBLED(Feld[x][y])) - DrawLevelFieldCrumbledSand(x, y); + DrawLevelFieldCrumbled(x, y); #endif } @@ -2376,7 +2941,7 @@ void DrawLevelElementAnimationIfNeeded(int x, int y, int element) DrawGraphicAnimation(sx, sy, graphic); if (GFX_CRUMBLED(element)) - DrawLevelFieldCrumbledSand(x, y); + DrawLevelFieldCrumbled(x, y); } static int getPlayerGraphic(struct PlayerInfo *player, int move_dir) @@ -2433,6 +2998,8 @@ void DrawPlayerField(int x, int y) DrawPlayer(PLAYERINFO(x, y)); } +#define DRAW_PLAYER_OVER_PUSHED_ELEMENT 1 + void DrawPlayer(struct PlayerInfo *player) { int jx = player->jx; @@ -2546,7 +3113,7 @@ void DrawPlayer(struct PlayerInfo *player) int frame = getGraphicAnimationFrame(old_graphic, player->StepFrame); if (GFX_CRUMBLED(old_element)) - DrawLevelFieldCrumbledSandDigging(jx, jy, move_dir, player->StepFrame); + DrawLevelFieldCrumbledDigging(jx, jy, move_dir, player->StepFrame); else DrawGraphic(sx, sy, old_graphic, frame); @@ -2558,20 +3125,16 @@ void DrawPlayer(struct PlayerInfo *player) 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); } } +#if !DRAW_PLAYER_OVER_PUSHED_ELEMENT /* ----------------------------------------------------------------------- */ /* draw player himself */ /* ----------------------------------------------------------------------- */ @@ -2609,18 +3172,22 @@ void DrawPlayer(struct PlayerInfo *player) DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING); } +#endif + +#if DRAW_PLAYER_OVER_PUSHED_ELEMENT + if (player->GfxPos) + { + if (move_dir == MV_LEFT || move_dir == MV_RIGHT) + sxx = player->GfxPos; + else + syy = player->GfxPos; + } +#endif /* ----------------------------------------------------------------------- */ /* draw things the player is pushing, if needed */ /* ----------------------------------------------------------------------- */ -#if 0 - printf("::: %d, %d [%d, %d] [%d]\n", - player->is_pushing, player_is_moving, player->GfxAction, - player->is_moving, player_is_moving); -#endif - -#if 1 if (player->is_pushing && player->is_moving) { int px = SCREENX(jx), py = SCREENY(jy); @@ -2640,41 +3207,100 @@ void DrawPlayer(struct PlayerInfo *player) 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]) + if (game.use_masked_pushing && IS_MOVING(jx, jy)) + { + /* this allows transparent pushing animation over non-black background */ + + if (Back[jx][jy]) + DrawLevelElement(jx, jy, Back[jx][jy]); + else + DrawLevelElement(jx, jy, EL_EMPTY); + + if (Back[next_jx][next_jy]) + DrawLevelElement(next_jx, next_jy, Back[next_jx][next_jy]); + else + DrawLevelElement(next_jx, next_jy, EL_EMPTY); + } + else if (Back[next_jx][next_jy]) DrawLevelElement(next_jx, next_jy, Back[next_jx][next_jy]); +#if 1 + /* do not draw (EM style) pushing animation when pushing is finished */ + /* (two-tile animations usually do not contain start and end frame) */ + if (graphic_info[graphic].double_movement && !IS_MOVING(jx, jy)) + DrawLevelElement(next_jx, next_jy, Feld[next_jx][next_jy]); + else + DrawGraphicShiftedThruMask(px, py, pxx, pyy, graphic, frame, NO_CUTTING); +#else /* masked drawing is needed for EMC style (double) movement graphics */ + /* !!! (ONLY WHEN DRAWING PUSHED ELEMENT OVER THE PLAYER) !!! */ DrawGraphicShiftedThruMask(px, py, pxx, pyy, graphic, frame, NO_CUTTING); - } #endif + } +#if DRAW_PLAYER_OVER_PUSHED_ELEMENT /* ----------------------------------------------------------------------- */ - /* draw things in front of player (active dynamite or dynabombs) */ + /* draw player himself */ /* ----------------------------------------------------------------------- */ - if (IS_ACTIVE_BOMB(element)) - { - graphic = el2img(element); - frame = getGraphicAnimationFrame(graphic, GfxFrame[jx][jy]); + graphic = getPlayerGraphic(player, move_dir); - if (game.emulation == EMU_SUPAPLEX) - DrawGraphic(sx, sy, IMG_SP_DISK_RED, frame); + /* in the case of changed player action or direction, prevent the current + animation frame from being restarted for identical animations */ + if (player->Frame == 0 && equalGraphics(graphic, last_player_graphic)) + player->Frame = last_player_frame; + + frame = getGraphicAnimationFrame(graphic, player->Frame); + + if (player->GfxPos) + { + if (move_dir == MV_LEFT || move_dir == MV_RIGHT) + sxx = player->GfxPos; else - DrawGraphicThruMask(sx, sy, graphic, frame); + syy = player->GfxPos; } - if (player_is_moving && last_element == EL_EXPLOSION) - { - int element = (GfxElement[last_jx][last_jy] != EL_UNDEFINED ? - GfxElement[last_jx][last_jy] : EL_EMPTY); + if (!setup.soft_scrolling && ScreenMovPos) + sxx = syy = 0; + + if (player_is_opaque) + DrawGraphicShifted(sx, sy, sxx, syy, graphic, frame,NO_CUTTING,NO_MASKING); + else + DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING); + + if (SHIELD_ON(player)) + { + int graphic = (player->shield_deadly_time_left ? IMG_SHIELD_DEADLY_ACTIVE : + IMG_SHIELD_NORMAL_ACTIVE); + int frame = getGraphicAnimationFrame(graphic, -1); + + DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING); + } +#endif + + /* ----------------------------------------------------------------------- */ + /* draw things in front of player (active dynamite or dynabombs) */ + /* ----------------------------------------------------------------------- */ + + if (IS_ACTIVE_BOMB(element)) + { + graphic = el2img(element); + frame = getGraphicAnimationFrame(graphic, GfxFrame[jx][jy]); + + if (game.emulation == EMU_SUPAPLEX) + DrawGraphic(sx, sy, IMG_SP_DISK_RED, frame); + else + DrawGraphicThruMask(sx, sy, graphic, frame); + } + + if (player_is_moving && last_element == EL_EXPLOSION) + { + int element = (GfxElement[last_jx][last_jy] != EL_UNDEFINED ? + GfxElement[last_jx][last_jy] : EL_EMPTY); int graphic = el_act2img(element, ACTION_EXPLODING); int delay = (game.emulation == EMU_SUPAPLEX ? 3 : 2); int phase = ExplodePhase[last_jx][last_jy] - 1; @@ -2722,9 +3348,7 @@ void WaitForEventToContinue() button_status = MB_RELEASED; -#if 1 ClearEventQueue(); -#endif while (still_wait) { @@ -2766,163 +3390,16 @@ void WaitForEventToContinue() #define MAX_REQUEST_LINE_FONT1_LEN 7 #define MAX_REQUEST_LINE_FONT2_LEN 10 -boolean Request(char *text, unsigned int req_state) +static int RequestHandleEvents(unsigned int req_state) { - int mx, my, ty, result = -1; - unsigned int old_door_state; int last_game_status = game_status; /* save current game status */ - int max_request_line_len = MAX_REQUEST_LINE_FONT1_LEN; - int font_nr = FONT_TEXT_2; - int max_word_len = 0; - char *text_ptr; - - for (text_ptr = text; *text_ptr; text_ptr++) - { - max_word_len = (*text_ptr != ' ' ? max_word_len + 1 : 0); - - if (max_word_len > MAX_REQUEST_LINE_FONT1_LEN) - { - max_request_line_len = MAX_REQUEST_LINE_FONT2_LEN; -#if 1 - font_nr = FONT_TEXT_1; -#else - font_nr = FONT_LEVEL_NUMBER; -#endif - - break; - } - } - - if (game_status == GAME_MODE_PLAYING && - level.game_engine_type == GAME_ENGINE_TYPE_EM) - BlitScreenToBitmap_EM(backbuffer); - - /* disable deactivated drawing when quick-loading level tape recording */ - if (tape.playing && tape.deactivate_display) - TapeDeactivateDisplayOff(TRUE); - - SetMouseCursor(CURSOR_DEFAULT); - -#if defined(NETWORK_AVALIABLE) - /* pause network game while waiting for request to answer */ - if (options.network && - game_status == GAME_MODE_PLAYING && - req_state & REQUEST_WAIT_FOR_INPUT) - SendToServer_PausePlaying(); -#endif - - old_door_state = GetDoorState(); - - /* simulate releasing mouse button over last gadget, if still pressed */ - if (button_status) - HandleGadgets(-1, -1, 0); - - UnmapAllGadgets(); - - if (old_door_state & DOOR_OPEN_1) - { - CloseDoor(DOOR_CLOSE_1); - - /* save old door content */ - BlitBitmap(bitmap_db_door, bitmap_db_door, - DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, - DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1); - } - -#if 1 - SetDoorBackgroundImage(IMG_BACKGROUND_DOOR); -#endif - - SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1); - - /* clear door drawing field */ - DrawBackground(DX, DY, DXSIZE, DYSIZE); - - /* force DOOR font inside door area */ - game_status = GAME_MODE_PSEUDO_DOOR; - - /* write text for request */ - for (ty = 0; ty < MAX_REQUEST_LINES; ty++) - { - char text_line[max_request_line_len + 1]; - int tx, tl, tc = 0; - - if (!*text) - break; - - for (tl = 0, tx = 0; tx < max_request_line_len; tl++, tx++) - { - tc = *(text + tx); - if (!tc || tc == ' ') - break; - } - - if (!tl) - { - text++; - ty--; - continue; - } - - strncpy(text_line, text, tl); - text_line[tl] = 0; - - DrawText(DX + (DXSIZE - tl * getFontWidth(font_nr)) / 2, - DY + 8 + ty * (getFontHeight(font_nr) + 2), - text_line, font_nr); - - text += tl + (tc == ' ' ? 1 : 0); - } - - game_status = last_game_status; /* restore current game status */ - - if (req_state & REQ_ASK) - { - MapGadget(tool_gadget[TOOL_CTRL_ID_YES]); - MapGadget(tool_gadget[TOOL_CTRL_ID_NO]); - } - else if (req_state & REQ_CONFIRM) - { - MapGadget(tool_gadget[TOOL_CTRL_ID_CONFIRM]); - } - else if (req_state & REQ_PLAYER) - { - MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_1]); - MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_2]); - MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_3]); - MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_4]); - } - - /* copy request gadgets to door backbuffer */ - BlitBitmap(drawto, bitmap_db_door, - DX, DY, DXSIZE, DYSIZE, - DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1); - - OpenDoor(DOOR_OPEN_1); - - if (!(req_state & REQUEST_WAIT_FOR_INPUT)) - { - if (game_status == GAME_MODE_PLAYING) - { - SetPanelBackground(); - SetDrawBackgroundMask(REDRAW_DOOR_1); - } - else - { - SetDrawBackgroundMask(REDRAW_FIELD); - } - - return FALSE; - } - - if (game_status != GAME_MODE_MAIN) - InitAnimation(); + int result; + int mx, my; button_status = MB_RELEASED; request_gadget_id = -1; - - SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1); + result = -1; while (result < 0) { @@ -3005,10 +3482,16 @@ boolean Request(char *text, unsigned int req_state) break; case KSYM_Return: +#if defined(TARGET_SDL2) + case KSYM_Menu: +#endif result = 1; break; case KSYM_Escape: +#if defined(TARGET_SDL2) + case KSYM_Back: +#endif result = 0; break; @@ -3039,8 +3522,6 @@ boolean Request(char *text, unsigned int req_state) result = 0; } -#if 1 - if (game_status == GAME_MODE_PLAYING && local_player->LevelSolved_GameEnd) { HandleGameActions(); @@ -3053,97 +3534,529 @@ boolean Request(char *text, unsigned int req_state) Delay(10); } - BackToFront(); - -#else - - DoAnimation(); + game_status = GAME_MODE_PSEUDO_DOOR; -#if 1 - if (!PendingEvent()) /* delay only if no pending events */ - Delay(10); -#else - /* don't eat all CPU time */ - Delay(10); -#endif + BackToFront(); -#endif + game_status = last_game_status; /* restore current game status */ } - if (game_status != GAME_MODE_MAIN) - StopAnimation(); + return result; +} - UnmapToolButtons(); +static boolean RequestDoor(char *text, unsigned int req_state) +{ + unsigned int old_door_state; + int last_game_status = game_status; /* save current game status */ + int max_request_line_len = MAX_REQUEST_LINE_FONT1_LEN; + int font_nr = FONT_TEXT_2; + char *text_ptr; + int result; + int ty; - if (!(req_state & REQ_STAY_OPEN)) + if (maxWordLengthInString(text) > MAX_REQUEST_LINE_FONT1_LEN) { - CloseDoor(DOOR_CLOSE_1); - - if (((old_door_state & DOOR_OPEN_1) && !(req_state & REQ_STAY_CLOSED)) || - (req_state & REQ_REOPEN)) - OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK); + max_request_line_len = MAX_REQUEST_LINE_FONT2_LEN; + font_nr = FONT_TEXT_1; } - RemapAllGadgets(); - if (game_status == GAME_MODE_PLAYING) - { - SetPanelBackground(); - SetDrawBackgroundMask(REDRAW_DOOR_1); - } - else - { - SetDrawBackgroundMask(REDRAW_FIELD); - } + BlitScreenToBitmap(backbuffer); + + /* disable deactivated drawing when quick-loading level tape recording */ + if (tape.playing && tape.deactivate_display) + TapeDeactivateDisplayOff(TRUE); + + SetMouseCursor(CURSOR_DEFAULT); #if defined(NETWORK_AVALIABLE) - /* continue network game after request */ + /* pause network game while waiting for request to answer */ if (options.network && game_status == GAME_MODE_PLAYING && req_state & REQUEST_WAIT_FOR_INPUT) - SendToServer_ContinuePlaying(); + SendToServer_PausePlaying(); #endif - /* restore deactivated drawing when quick-loading level tape recording */ - if (tape.playing && tape.deactivate_display) - TapeDeactivateDisplayOn(); + old_door_state = GetDoorState(); - return result; -} + /* simulate releasing mouse button over last gadget, if still pressed */ + if (button_status) + HandleGadgets(-1, -1, 0); -unsigned int OpenDoor(unsigned int door_state) -{ - if (door_state & DOOR_COPY_BACK) - { - if (door_state & DOOR_OPEN_1) - BlitBitmap(bitmap_db_door, bitmap_db_door, - DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, - DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1); + UnmapAllGadgets(); - if (door_state & DOOR_OPEN_2) - BlitBitmap(bitmap_db_door, bitmap_db_door, - DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY2, VXSIZE, VYSIZE, - DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2); + /* draw released gadget before proceeding */ + // BackToFront(); - door_state &= ~DOOR_COPY_BACK; + if (old_door_state & DOOR_OPEN_1) + { + CloseDoor(DOOR_CLOSE_1); + + /* save old door content */ + BlitBitmap(bitmap_db_door_1, bitmap_db_door_1, + 0 * DXSIZE, 0, DXSIZE, DYSIZE, 1 * DXSIZE, 0); } - return MoveDoor(door_state); -} + SetDoorBackgroundImage(IMG_BACKGROUND_DOOR); + SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1); -unsigned int CloseDoor(unsigned int door_state) -{ - unsigned int old_door_state = GetDoorState(); + /* clear door drawing field */ + DrawBackground(DX, DY, DXSIZE, DYSIZE); - if (!(door_state & DOOR_NO_COPY_BACK)) - { - if (old_door_state & DOOR_OPEN_1) - BlitBitmap(backbuffer, bitmap_db_door, - DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1); + /* force DOOR font inside door area */ + game_status = GAME_MODE_PSEUDO_DOOR; + + /* write text for request */ + for (text_ptr = text, ty = 0; ty < MAX_REQUEST_LINES; ty++) + { + char text_line[max_request_line_len + 1]; + int tx, tl, tc = 0; + + if (!*text_ptr) + break; + + for (tl = 0, tx = 0; tx < max_request_line_len; tl++, tx++) + { + tc = *(text_ptr + tx); + // if (!tc || tc == ' ') + if (!tc || tc == ' ' || tc == '?' || tc == '!') + break; + } + + if ((tc == '?' || tc == '!') && tl == 0) + tl = 1; + + if (!tl) + { + text_ptr++; + ty--; + continue; + } + + strncpy(text_line, text_ptr, tl); + text_line[tl] = 0; + + DrawText(DX + (DXSIZE - tl * getFontWidth(font_nr)) / 2, + DY + 8 + ty * (getFontHeight(font_nr) + 2), + text_line, font_nr); + + text_ptr += tl + (tc == ' ' ? 1 : 0); + // text_ptr += tl + (tc == ' ' || tc == '?' || tc == '!' ? 1 : 0); + } + + game_status = last_game_status; /* restore current game status */ + + if (req_state & REQ_ASK) + { + MapGadget(tool_gadget[TOOL_CTRL_ID_YES]); + MapGadget(tool_gadget[TOOL_CTRL_ID_NO]); + } + else if (req_state & REQ_CONFIRM) + { + MapGadget(tool_gadget[TOOL_CTRL_ID_CONFIRM]); + } + else if (req_state & REQ_PLAYER) + { + MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_1]); + MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_2]); + MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_3]); + MapGadget(tool_gadget[TOOL_CTRL_ID_PLAYER_4]); + } + + /* copy request gadgets to door backbuffer */ + BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0); + + OpenDoor(DOOR_OPEN_1); + + if (!(req_state & REQUEST_WAIT_FOR_INPUT)) + { + if (game_status == GAME_MODE_PLAYING) + { + SetPanelBackground(); + SetDrawBackgroundMask(REDRAW_DOOR_1); + } + else + { + SetDrawBackgroundMask(REDRAW_FIELD); + } + + return FALSE; + } + + if (game_status != GAME_MODE_MAIN) + InitAnimation(); + + SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1); + + // ---------- handle request buttons ---------- + result = RequestHandleEvents(req_state); + + if (game_status != GAME_MODE_MAIN) + StopAnimation(); + + UnmapToolButtons(); + + if (!(req_state & REQ_STAY_OPEN)) + { + CloseDoor(DOOR_CLOSE_1); + + if (((old_door_state & DOOR_OPEN_1) && !(req_state & REQ_STAY_CLOSED)) || + (req_state & REQ_REOPEN)) + OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK); + } + + RemapAllGadgets(); + + if (game_status == GAME_MODE_PLAYING) + { + SetPanelBackground(); + SetDrawBackgroundMask(REDRAW_DOOR_1); + } + else + { + SetDrawBackgroundMask(REDRAW_FIELD); + } + +#if defined(NETWORK_AVALIABLE) + /* continue network game after request */ + if (options.network && + game_status == GAME_MODE_PLAYING && + req_state & REQUEST_WAIT_FOR_INPUT) + SendToServer_ContinuePlaying(); +#endif + + /* restore deactivated drawing when quick-loading level tape recording */ + if (tape.playing && tape.deactivate_display) + TapeDeactivateDisplayOn(); + + return result; +} + +static boolean RequestEnvelope(char *text, unsigned int req_state) +{ + int result; + + if (game_status == GAME_MODE_PLAYING) + BlitScreenToBitmap(backbuffer); + + /* disable deactivated drawing when quick-loading level tape recording */ + if (tape.playing && tape.deactivate_display) + TapeDeactivateDisplayOff(TRUE); + + SetMouseCursor(CURSOR_DEFAULT); + +#if defined(NETWORK_AVALIABLE) + /* pause network game while waiting for request to answer */ + if (options.network && + game_status == GAME_MODE_PLAYING && + req_state & REQUEST_WAIT_FOR_INPUT) + SendToServer_PausePlaying(); +#endif + + /* simulate releasing mouse button over last gadget, if still pressed */ + if (button_status) + HandleGadgets(-1, -1, 0); + + UnmapAllGadgets(); + + // (replace with setting corresponding request background) + // SetDoorBackgroundImage(IMG_BACKGROUND_DOOR); + // SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1); + + /* clear door drawing field */ + // DrawBackground(DX, DY, DXSIZE, DYSIZE); + + ShowEnvelopeRequest(text, req_state, ACTION_OPENING); + + if (!(req_state & REQUEST_WAIT_FOR_INPUT)) + { + if (game_status == GAME_MODE_PLAYING) + { + SetPanelBackground(); + SetDrawBackgroundMask(REDRAW_DOOR_1); + } + else + { + SetDrawBackgroundMask(REDRAW_FIELD); + } + + return FALSE; + } + + SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1); + + // ---------- handle request buttons ---------- + result = RequestHandleEvents(req_state); + + if (game_status != GAME_MODE_MAIN) + StopAnimation(); + + UnmapToolButtons(); + + ShowEnvelopeRequest(text, req_state, ACTION_CLOSING); + + RemapAllGadgets(); + + if (game_status == GAME_MODE_PLAYING) + { + SetPanelBackground(); + SetDrawBackgroundMask(REDRAW_DOOR_1); + } + else + { + SetDrawBackgroundMask(REDRAW_FIELD); + } + +#if defined(NETWORK_AVALIABLE) + /* continue network game after request */ + if (options.network && + game_status == GAME_MODE_PLAYING && + req_state & REQUEST_WAIT_FOR_INPUT) + SendToServer_ContinuePlaying(); +#endif + + /* restore deactivated drawing when quick-loading level tape recording */ + if (tape.playing && tape.deactivate_display) + TapeDeactivateDisplayOn(); + + return result; +} + +boolean Request(char *text, unsigned int req_state) +{ + if (global.use_envelope_request) + return RequestEnvelope(text, req_state); + else + return RequestDoor(text, req_state); +} + +static int compareDoorPartOrderInfo(const void *object1, const void *object2) +{ + const struct DoorPartOrderInfo *dpo1 = (struct DoorPartOrderInfo *)object1; + const struct DoorPartOrderInfo *dpo2 = (struct DoorPartOrderInfo *)object2; + int compare_result; + + if (dpo1->sort_priority != dpo2->sort_priority) + compare_result = dpo1->sort_priority - dpo2->sort_priority; + else + compare_result = dpo1->nr - dpo2->nr; + + return compare_result; +} + +void InitGraphicCompatibilityInfo_Doors() +{ + struct + { + int door_token; + int part_1, part_8; + struct DoorInfo *door; + } + doors[] = + { + { DOOR_1, IMG_DOOR_1_GFX_PART_1, IMG_DOOR_1_GFX_PART_8, &door_1 }, + { DOOR_2, IMG_DOOR_2_GFX_PART_1, IMG_DOOR_2_GFX_PART_8, &door_2 }, + + { -1, -1, -1, NULL } + }; + struct Rect door_rect_list[] = + { + { DX, DY, DXSIZE, DYSIZE }, + { VX, VY, VXSIZE, VYSIZE } + }; + int i, j; + + for (i = 0; doors[i].door_token != -1; i++) + { + int door_token = doors[i].door_token; + int door_index = DOOR_INDEX_FROM_TOKEN(door_token); + int part_1 = doors[i].part_1; + int part_8 = doors[i].part_8; + int part_2 = part_1 + 1; + int part_3 = part_1 + 2; + struct DoorInfo *door = doors[i].door; + struct Rect *door_rect = &door_rect_list[door_index]; + boolean door_gfx_redefined = FALSE; + + /* check if any door part graphic definitions have been redefined */ + + for (j = 0; door_part_controls[j].door_token != -1; j++) + { + struct DoorPartControlInfo *dpc = &door_part_controls[j]; + struct FileInfo *fi = getImageListEntryFromImageID(dpc->graphic); + + if (dpc->door_token == door_token && fi->redefined) + door_gfx_redefined = TRUE; + } + + /* check for old-style door graphic/animation modifications */ + + if (!door_gfx_redefined) + { + if (door->anim_mode & ANIM_STATIC_PANEL) + { + door->panel.step_xoffset = 0; + door->panel.step_yoffset = 0; + } + + if (door->anim_mode & (ANIM_HORIZONTAL | ANIM_VERTICAL)) + { + struct GraphicInfo *g_part_1 = &graphic_info[part_1]; + struct GraphicInfo *g_part_2 = &graphic_info[part_2]; + int num_door_steps, num_panel_steps; + + /* remove door part graphics other than the two default wings */ + + for (j = 0; door_part_controls[j].door_token != -1; j++) + { + struct DoorPartControlInfo *dpc = &door_part_controls[j]; + struct GraphicInfo *g = &graphic_info[dpc->graphic]; + + if (dpc->graphic >= part_3 && + dpc->graphic <= part_8) + g->bitmap = NULL; + } + + /* set graphics and screen positions of the default wings */ + + g_part_1->width = door_rect->width; + g_part_1->height = door_rect->height; + g_part_2->width = door_rect->width; + g_part_2->height = door_rect->height; + g_part_2->src_x = door_rect->width; + g_part_2->src_y = g_part_1->src_y; + + door->part_2.x = door->part_1.x; + door->part_2.y = door->part_1.y; + + if (door->width != -1) + { + g_part_1->width = door->width; + g_part_2->width = door->width; + + // special treatment for graphics and screen position of right wing + g_part_2->src_x += door_rect->width - door->width; + door->part_2.x += door_rect->width - door->width; + } + + if (door->height != -1) + { + g_part_1->height = door->height; + g_part_2->height = door->height; + + // special treatment for graphics and screen position of bottom wing + g_part_2->src_y += door_rect->height - door->height; + door->part_2.y += door_rect->height - door->height; + } + + /* set animation delays for the default wings and panels */ + + door->part_1.step_delay = door->step_delay; + door->part_2.step_delay = door->step_delay; + door->panel.step_delay = door->step_delay; + + /* set animation draw order for the default wings */ + + door->part_1.sort_priority = 2; /* draw left wing over ... */ + door->part_2.sort_priority = 1; /* ... right wing */ + + /* set animation draw offset for the default wings */ + + if (door->anim_mode & ANIM_HORIZONTAL) + { + door->part_1.step_xoffset = door->step_offset; + door->part_1.step_yoffset = 0; + door->part_2.step_xoffset = door->step_offset * -1; + door->part_2.step_yoffset = 0; + + num_door_steps = g_part_1->width / door->step_offset; + } + else // ANIM_VERTICAL + { + door->part_1.step_xoffset = 0; + door->part_1.step_yoffset = door->step_offset; + door->part_2.step_xoffset = 0; + door->part_2.step_yoffset = door->step_offset * -1; + + num_door_steps = g_part_1->height / door->step_offset; + } + + /* set animation draw offset for the default panels */ + + if (door->step_offset > 1) + { + num_panel_steps = 2 * door_rect->height / door->step_offset; + door->panel.start_step = num_panel_steps - num_door_steps; + } + else + { + num_panel_steps = door_rect->height / door->step_offset; + door->panel.start_step = num_panel_steps - num_door_steps / 2; + door->panel.step_delay *= 2; + } + } + } + } +} + +void InitDoors() +{ + int i; + + for (i = 0; door_part_controls[i].door_token != -1; i++) + { + struct DoorPartControlInfo *dpc = &door_part_controls[i]; + struct DoorPartOrderInfo *dpo = &door_part_order[i]; + + /* initialize "start_step_opening" and "start_step_closing", if needed */ + if (dpc->pos->start_step_opening == 0 && + dpc->pos->start_step_closing == 0) + { + // dpc->pos->start_step_opening = dpc->pos->start_step; + dpc->pos->start_step_closing = dpc->pos->start_step; + } + + /* fill structure for door part draw order (sorted below) */ + dpo->nr = i; + dpo->sort_priority = dpc->pos->sort_priority; + } + + /* sort door part controls according to sort_priority and graphic number */ + qsort(door_part_order, MAX_DOOR_PARTS, + sizeof(struct DoorPartOrderInfo), compareDoorPartOrderInfo); +} + +unsigned int OpenDoor(unsigned int door_state) +{ + if (door_state & DOOR_COPY_BACK) + { + if (door_state & DOOR_OPEN_1) + BlitBitmap(bitmap_db_door_1, bitmap_db_door_1, + 1 * DXSIZE, 0, DXSIZE, DYSIZE, 0 * DXSIZE, 0); + + if (door_state & DOOR_OPEN_2) + BlitBitmap(bitmap_db_door_2, bitmap_db_door_2, + 1 * VXSIZE, 0, VXSIZE, VYSIZE, 0 * VXSIZE, 0); + + door_state &= ~DOOR_COPY_BACK; + } + + return MoveDoor(door_state); +} + +unsigned int CloseDoor(unsigned int door_state) +{ + unsigned int old_door_state = GetDoorState(); + + if (!(door_state & DOOR_NO_COPY_BACK)) + { + if (old_door_state & DOOR_OPEN_1) + BlitBitmap(backbuffer, bitmap_db_door_1, + DX, DY, DXSIZE, DYSIZE, 0, 0); if (old_door_state & DOOR_OPEN_2) - BlitBitmap(backbuffer, bitmap_db_door, - VX, VY, VXSIZE, VYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2); + BlitBitmap(backbuffer, bitmap_db_door_2, + VX, VY, VXSIZE, VYSIZE, 0, 0); door_state &= ~DOOR_NO_COPY_BACK; } @@ -3161,13 +4074,23 @@ unsigned int SetDoorState(unsigned int door_state) return MoveDoor(door_state | DOOR_SET_STATE); } +int euclid(int a, int b) +{ + return (b ? euclid(b, a % b) : a); +} + unsigned int MoveDoor(unsigned int door_state) { + struct Rect door_rect_list[] = + { + { DX, DY, DXSIZE, DYSIZE }, + { VX, VY, VXSIZE, VYSIZE } + }; static int door1 = DOOR_OPEN_1; static int door2 = DOOR_CLOSE_2; - unsigned long door_delay = 0; - unsigned long door_delay_value; - int stepsize = 1; + unsigned int door_delay = 0; + unsigned int door_delay_value; + int i; if (door_1.width < 0 || door_1.width > DXSIZE) door_1.width = DXSIZE; @@ -3203,231 +4126,226 @@ unsigned int MoveDoor(unsigned int door_state) door_state &= ~DOOR_CLOSE_2; } - door_delay_value = (door_state & DOOR_ACTION_1 ? door_1.step_delay : - door_2.step_delay); - - if (setup.quick_doors) - { - stepsize = 20; /* must be chosen to always draw last frame */ - door_delay_value = 0; - } - if (global.autoplay_leveldir) { door_state |= DOOR_NO_DELAY; door_state &= ~DOOR_CLOSE_ALL; } -#if 1 if (game_status == GAME_MODE_EDITOR) door_state |= DOOR_NO_DELAY; -#endif if (door_state & DOOR_ACTION) { - boolean handle_door_1 = (door_state & DOOR_ACTION_1); - boolean handle_door_2 = (door_state & DOOR_ACTION_2); - boolean door_1_done = (!handle_door_1); - boolean door_2_done = (!handle_door_2); - boolean door_1_vertical = (door_1.anim_mode & ANIM_VERTICAL); - boolean door_2_vertical = (door_2.anim_mode & ANIM_VERTICAL); - int door_size_1 = (door_1_vertical ? door_1.height : door_1.width); - int door_size_2 = (door_2_vertical ? door_2.height : door_2.width); - int max_door_size_1 = (door_1_vertical ? DYSIZE : DXSIZE); - int max_door_size_2 = (door_2_vertical ? VYSIZE : VXSIZE); - int door_size = (handle_door_1 ? door_size_1 : door_size_2); - int max_door_size = (handle_door_1 ? max_door_size_1 : max_door_size_2); - int door_skip = max_door_size - door_size; - int end = door_size; - int start = ((door_state & DOOR_NO_DELAY) ? end : 0); + boolean door_panel_drawn[NUM_DOORS]; + boolean panel_has_doors[NUM_DOORS]; + boolean door_part_skip[MAX_DOOR_PARTS]; + boolean door_part_done[MAX_DOOR_PARTS]; + boolean door_part_done_all; + int num_steps[MAX_DOOR_PARTS]; + int max_move_delay = 0; // delay for complete animations of all doors + int max_step_delay = 0; // delay (ms) between two animation frames + int num_move_steps = 0; // number of animation steps for all doors + int current_move_delay = 0; int k; - if (!(door_state & DOOR_NO_DELAY) && !setup.quick_doors) + for (i = 0; i < NUM_DOORS; i++) + panel_has_doors[i] = FALSE; + + for (i = 0; i < MAX_DOOR_PARTS; i++) + { + struct DoorPartControlInfo *dpc = &door_part_controls[i]; + struct GraphicInfo *g = &graphic_info[dpc->graphic]; + int door_token = dpc->door_token; + + door_part_done[i] = FALSE; + door_part_skip[i] = (!(door_state & door_token) || + !g->bitmap); + } + + for (i = 0; i < MAX_DOOR_PARTS; i++) { - /* opening door sound has priority over simultaneously closing door */ - if (door_state & (DOOR_OPEN_1 | DOOR_OPEN_2)) - PlayMenuSoundStereo(SND_DOOR_OPENING, SOUND_MIDDLE); - else if (door_state & (DOOR_CLOSE_1 | DOOR_CLOSE_2)) - PlayMenuSoundStereo(SND_DOOR_CLOSING, SOUND_MIDDLE); + int nr = door_part_order[i].nr; + struct DoorPartControlInfo *dpc = &door_part_controls[nr]; + struct DoorPartPosInfo *pos = dpc->pos; + struct GraphicInfo *g = &graphic_info[dpc->graphic]; + int door_token = dpc->door_token; + int door_index = DOOR_INDEX_FROM_TOKEN(door_token); + boolean is_panel = DOOR_PART_IS_PANEL(nr); + int step_xoffset = ABS(pos->step_xoffset); + int step_yoffset = ABS(pos->step_yoffset); + int step_delay = pos->step_delay; + int current_door_state = door_state & door_token; + boolean door_opening = ((current_door_state & DOOR_OPEN) != 0); + boolean door_closing = ((current_door_state & DOOR_CLOSE) != 0); + boolean part_opening = (is_panel ? door_closing : door_opening); + int start_step = (part_opening ? pos->start_step_opening : + pos->start_step_closing); + float move_xsize = (step_xoffset ? g->width : 0); + float move_ysize = (step_yoffset ? g->height : 0); + int move_xsteps = (step_xoffset ? ceil(move_xsize / step_xoffset) : 0); + int move_ysteps = (step_yoffset ? ceil(move_ysize / step_yoffset) : 0); + int move_steps = (move_xsteps && move_ysteps ? + MIN(move_xsteps, move_ysteps) : + move_xsteps ? move_xsteps : move_ysteps) - start_step; + int move_delay = move_steps * step_delay; + + if (door_part_skip[nr]) + continue; + + if (!is_panel) + panel_has_doors[door_index] = TRUE; + + max_move_delay = MAX(max_move_delay, move_delay); + max_step_delay = (max_step_delay == 0 ? step_delay : + euclid(max_step_delay, step_delay)); + num_steps[nr] = move_steps; } - for (k = start; k <= end && !(door_1_done && door_2_done); k += stepsize) + num_move_steps = max_move_delay / max_step_delay; + + door_delay_value = max_step_delay; + + for (k = 0; k < num_move_steps; k++) { - int x = k; - Bitmap *bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap; - GC gc = bitmap->stored_clip_gc; + door_part_done_all = TRUE; + + for (i = 0; i < NUM_DOORS; i++) + door_panel_drawn[i] = FALSE; - if (door_state & DOOR_ACTION_1) + for (i = 0; i < MAX_DOOR_PARTS; i++) { - int a = MIN(x * door_1.step_offset, end); - int p = (door_state & DOOR_OPEN_1 ? end - a : a); - int i = p + door_skip; + int nr = door_part_order[i].nr; + struct DoorPartControlInfo *dpc = &door_part_controls[nr]; + struct DoorPartPosInfo *pos = dpc->pos; + struct GraphicInfo *g = &graphic_info[dpc->graphic]; + int door_token = dpc->door_token; + int door_index = DOOR_INDEX_FROM_TOKEN(door_token); + boolean is_panel = DOOR_PART_IS_PANEL(nr); + struct Rect *door_rect = &door_rect_list[door_index]; + Bitmap *bitmap_db_door = (door_token == DOOR_1 ? bitmap_db_door_1 : + bitmap_db_door_2); + Bitmap *bitmap = (is_panel ? bitmap_db_door : g->bitmap); + int current_door_state = door_state & door_token; + boolean door_opening = ((current_door_state & DOOR_OPEN) != 0); + boolean door_closing = !door_opening; + boolean part_opening = (is_panel ? door_closing : door_opening); + boolean part_closing = !part_opening; + int start_step = (part_opening ? pos->start_step_opening : + pos->start_step_closing); + int step_delay = pos->step_delay; + int step_factor = step_delay / max_step_delay; + int k1 = (step_factor ? k / step_factor + 1 : k); + int k2 = (part_opening ? k1 + start_step : num_steps[nr] - k1); + int kk = (k2 < 0 ? 0 : k2); + int src_x, src_y, src_xx, src_yy; + int dst_x, dst_y, dst_xx, dst_yy; + int width, height; + + if (door_part_skip[nr]) + continue; - if (door_1.anim_mode & ANIM_STATIC_PANEL) - { - BlitBitmap(bitmap_db_door, drawto, - DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, - DXSIZE, DYSIZE, DX, DY); - } - else if (x <= a) - { - BlitBitmap(bitmap_db_door, drawto, - DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1 + p / 2, - DXSIZE, DYSIZE - p / 2, DX, DY); + if (!(door_state & door_token)) + continue; - ClearRectangle(drawto, DX, DY + DYSIZE - p / 2, DXSIZE, p / 2); - } + if (!g->bitmap) + continue; + + // draw door panel - if (door_1.anim_mode & ANIM_HORIZONTAL && x <= DXSIZE) + if (!door_panel_drawn[door_index]) { - int src1_x = DXSIZE, src1_y = DOOR_GFX_PAGEY1; - int dst1_x = DX + DXSIZE - i, dst1_y = DY; - int src2_x = DXSIZE - i, src2_y = DOOR_GFX_PAGEY1; - int dst2_x = DX, dst2_y = DY; - int width = i, height = DYSIZE; - - SetClipOrigin(bitmap, gc, dst1_x - src1_x, dst1_y - src1_y); - BlitBitmapMasked(bitmap, drawto, src1_x, src1_y, width, height, - dst1_x, dst1_y); - - SetClipOrigin(bitmap, gc, dst2_x - src2_x, dst2_y - src2_y); - BlitBitmapMasked(bitmap, drawto, src2_x, src2_y, width, height, - dst2_x, dst2_y); + ClearRectangle(drawto, door_rect->x, door_rect->y, + door_rect->width, door_rect->height); + + door_panel_drawn[door_index] = TRUE; } - else if (door_1.anim_mode & ANIM_VERTICAL && x <= DYSIZE) + + // draw opening or closing door parts + + if (pos->step_xoffset < 0) // door part on right side { - int src1_x = DXSIZE, src1_y = DOOR_GFX_PAGEY1; - int dst1_x = DX, dst1_y = DY + DYSIZE - i; - int src2_x = 0, src2_y = DOOR_GFX_PAGEY1 + DYSIZE - i; - int dst2_x = DX, dst2_y = DY; - int width = DXSIZE, height = i; - - SetClipOrigin(bitmap, gc, dst1_x - src1_x, dst1_y - src1_y); - BlitBitmapMasked(bitmap, drawto, src1_x, src1_y, width, height, - dst1_x, dst1_y); - - SetClipOrigin(bitmap, gc, dst2_x - src2_x, dst2_y - src2_y); - BlitBitmapMasked(bitmap, drawto, src2_x, src2_y, width, height, - dst2_x, dst2_y); + src_xx = 0; + dst_xx = pos->x + ABS(kk * pos->step_xoffset); + width = g->width; + + if (dst_xx + width > door_rect->width) + width = door_rect->width - dst_xx; } - else if (x <= DXSIZE) /* ANIM_DEFAULT */ + else // door part on left side { - int j = (door_1.anim_mode == ANIM_DEFAULT ? (DXSIZE - i) / 3 : 0); - - SetClipOrigin(bitmap, gc, DX - i, (DY + j) - DOOR_GFX_PAGEY1); - BlitBitmapMasked(bitmap, drawto, - DXSIZE, DOOR_GFX_PAGEY1, i, 77, - DX + DXSIZE - i, DY + j); - BlitBitmapMasked(bitmap, drawto, - DXSIZE, DOOR_GFX_PAGEY1 + 140, i, 63, - DX + DXSIZE - i, DY + 140 + j); - SetClipOrigin(bitmap, gc, DX - DXSIZE + i, - DY - (DOOR_GFX_PAGEY1 + j)); - BlitBitmapMasked(bitmap, drawto, - DXSIZE - i, DOOR_GFX_PAGEY1 + j, i, 77 - j, - DX, DY); - BlitBitmapMasked(bitmap, drawto, - DXSIZE-i, DOOR_GFX_PAGEY1 + 140, i, 63, - DX, DY + 140 - j); - - BlitBitmapMasked(bitmap, drawto, - DXSIZE - i, DOOR_GFX_PAGEY1 + 77, i, 63, - DX, DY + 77 - j); - BlitBitmapMasked(bitmap, drawto, - DXSIZE - i, DOOR_GFX_PAGEY1 + 203, i, 77, - DX, DY + 203 - j); - SetClipOrigin(bitmap, gc, DX - i, (DY + j) - DOOR_GFX_PAGEY1); - BlitBitmapMasked(bitmap, drawto, - DXSIZE, DOOR_GFX_PAGEY1 + 77, i, 63, - DX + DXSIZE - i, DY + 77 + j); - BlitBitmapMasked(bitmap, drawto, - DXSIZE, DOOR_GFX_PAGEY1 + 203, i, 77 - j, - DX + DXSIZE - i, DY + 203 + j); - } + src_xx = 0; + dst_xx = pos->x - kk * pos->step_xoffset; - redraw_mask |= REDRAW_DOOR_1; - door_1_done = (a == end); - } + if (dst_xx < 0) + { + src_xx = ABS(dst_xx); + dst_xx = 0; + } - if (door_state & DOOR_ACTION_2) - { - int a = MIN(x * door_2.step_offset, door_size); - int p = (door_state & DOOR_OPEN_2 ? door_size - a : a); - int i = p + door_skip; + width = g->width - src_xx; - if (door_2.anim_mode & ANIM_STATIC_PANEL) + // printf("::: k == %d [%d] \n", k, start_step); + } + + if (pos->step_yoffset < 0) // door part on bottom side { - BlitBitmap(bitmap_db_door, drawto, - DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2, - VXSIZE, VYSIZE, VX, VY); + src_yy = 0; + dst_yy = pos->y + ABS(kk * pos->step_yoffset); + height = g->height; + + if (dst_yy + height > door_rect->height) + height = door_rect->height - dst_yy; } - else if (x <= VYSIZE) + else // door part on top side { - BlitBitmap(bitmap_db_door, drawto, - DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2 + p / 2, - VXSIZE, VYSIZE - p / 2, VX, VY); + src_yy = 0; + dst_yy = pos->y - kk * pos->step_yoffset; + + if (dst_yy < 0) + { + src_yy = ABS(dst_yy); + dst_yy = 0; + } - ClearRectangle(drawto, VX, VY + VYSIZE - p / 2, VXSIZE, p / 2); + height = g->height - src_yy; } - if (door_2.anim_mode & ANIM_HORIZONTAL && x <= VXSIZE) + if (is_panel) { - int src1_x = VXSIZE, src1_y = DOOR_GFX_PAGEY2; - int dst1_x = VX + VXSIZE - i, dst1_y = VY; - int src2_x = VXSIZE - i, src2_y = DOOR_GFX_PAGEY2; - int dst2_x = VX, dst2_y = VY; - int width = i, height = VYSIZE; - - SetClipOrigin(bitmap, gc, dst1_x - src1_x, dst1_y - src1_y); - BlitBitmapMasked(bitmap, drawto, src1_x, src1_y, width, height, - dst1_x, dst1_y); - - SetClipOrigin(bitmap, gc, dst2_x - src2_x, dst2_y - src2_y); - BlitBitmapMasked(bitmap, drawto, src2_x, src2_y, width, height, - dst2_x, dst2_y); + src_x = src_xx; + src_y = src_yy; } - else if (door_2.anim_mode & ANIM_VERTICAL && x <= VYSIZE) + else { - int src1_x = VXSIZE, src1_y = DOOR_GFX_PAGEY2; - int dst1_x = VX, dst1_y = VY + VYSIZE - i; - int src2_x = 0, src2_y = DOOR_GFX_PAGEY2 + VYSIZE - i; - int dst2_x = VX, dst2_y = VY; - int width = VXSIZE, height = i; - - SetClipOrigin(bitmap, gc, dst1_x - src1_x, dst1_y - src1_y); - BlitBitmapMasked(bitmap, drawto, src1_x, src1_y, width, height, - dst1_x, dst1_y); - - SetClipOrigin(bitmap, gc, dst2_x - src2_x, dst2_y - src2_y); - BlitBitmapMasked(bitmap, drawto, src2_x, src2_y, width, height, - dst2_x, dst2_y); + src_x = g->src_x + src_xx; + src_y = g->src_y + src_yy; } - else if (x <= VXSIZE) /* ANIM_DEFAULT */ + + dst_x = door_rect->x + dst_xx; + dst_y = door_rect->y + dst_yy; + + if (width >= 0 && width <= g->width && + height >= 0 && height <= g->height) { - int j = (door_2.anim_mode == ANIM_DEFAULT ? (VXSIZE - i) / 3 : 0); - - SetClipOrigin(bitmap, gc, VX - i, (VY + j) - DOOR_GFX_PAGEY2); - BlitBitmapMasked(bitmap, drawto, - VXSIZE, DOOR_GFX_PAGEY2, i, VYSIZE / 2, - VX + VXSIZE - i, VY + j); - SetClipOrigin(bitmap, gc, - VX - VXSIZE + i, VY - (DOOR_GFX_PAGEY2 + j)); - BlitBitmapMasked(bitmap, drawto, - VXSIZE - i, DOOR_GFX_PAGEY2 + j, i, VYSIZE / 2 - j, - VX, VY); - - BlitBitmapMasked(bitmap, drawto, - VXSIZE - i, DOOR_GFX_PAGEY2 + VYSIZE / 2, - i, VYSIZE / 2, VX, VY + VYSIZE / 2 - j); - SetClipOrigin(bitmap, gc, VX - i, (VY + j) - DOOR_GFX_PAGEY2); - BlitBitmapMasked(bitmap, drawto, - VXSIZE, DOOR_GFX_PAGEY2 + VYSIZE / 2, - i, VYSIZE / 2 - j, - VX + VXSIZE - i, VY + VYSIZE / 2 + j); + if (is_panel || !pos->draw_masked) + BlitBitmap(bitmap, drawto, src_x, src_y, width, height, + dst_x, dst_y); + else + BlitBitmapMasked(bitmap, drawto, src_x, src_y, width, height, + dst_x, dst_y); } - redraw_mask |= REDRAW_DOOR_2; - door_2_done = (a == VXSIZE); + redraw_mask |= REDRAW_DOOR_FROM_TOKEN(door_token); + + if ((part_opening && (width < 0 || height < 0)) || + (part_closing && (width >= g->width && height >= g->height))) + door_part_done[nr] = TRUE; + + // continue door part animations, but not panel after door has closed + if (!door_part_done[nr] && + !(is_panel && door_closing && panel_has_doors[door_index])) + door_part_done_all = FALSE; } if (!(door_state & DOOR_NO_DELAY)) @@ -3438,7 +4356,12 @@ unsigned int MoveDoor(unsigned int door_state) DoAnimation(); WaitUntilDelayReached(&door_delay, door_delay_value); + + current_move_delay += max_step_delay; } + + if (door_part_done_all) + break; } } @@ -3452,23 +4375,53 @@ unsigned int MoveDoor(unsigned int door_state) void DrawSpecialEditorDoor() { - /* draw bigger toolbox window */ - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, - DOOR_GFX_PAGEX7, 0, EXSIZE + 8, 8, - EX - 4, EY - 12); - BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, drawto, - EX - 6, VY - 4, EXSIZE + 12, EYSIZE - VYSIZE + 4, - EX - 6, EY - 4); + struct GraphicInfo *gfx1 = &graphic_info[IMG_DOOR_2_TOP_BORDER_CORRECTION]; + int top_border_width = gfx1->width; + int top_border_height = gfx1->height; + int outer_border = viewport.door_2[GAME_MODE_EDITOR].border_size; + int ex = EX - outer_border; + int ey = EY - outer_border; + int vy = VY - outer_border; + int exsize = EXSIZE + 2 * outer_border; + + CloseDoor(DOOR_CLOSE_2); + + /* draw bigger level editor toolbox window */ + BlitBitmap(gfx1->bitmap, drawto, gfx1->src_x, gfx1->src_y, + top_border_width, top_border_height, ex, ey - top_border_height); + BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, drawto, ex, vy, + exsize, EYSIZE - VYSIZE + outer_border, ex, ey); redraw_mask |= REDRAW_ALL; } void UndrawSpecialEditorDoor() { + struct GraphicInfo *gfx1 = &graphic_info[IMG_DOOR_2_TOP_BORDER_CORRECTION]; + int top_border_width = gfx1->width; + int top_border_height = gfx1->height; + int outer_border = viewport.door_2[GAME_MODE_EDITOR].border_size; + int ex = EX - outer_border; + int ey = EY - outer_border; + int ey_top = ey - top_border_height; + int exsize = EXSIZE + 2 * outer_border; + int eysize = EYSIZE + 2 * outer_border; + /* draw normal tape recorder window */ - BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, drawto, - EX - 6, EY - 12, EXSIZE + 12, EYSIZE - VYSIZE + 12, - EX - 6, EY - 12); + if (graphic_info[IMG_GLOBAL_BORDER].bitmap) + { + BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, drawto, + ex, ey_top, top_border_width, top_border_height, + ex, ey_top); + BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, drawto, + ex, ey, exsize, eysize, ex, ey); + } + else + { + // if screen background is set to "[NONE]", clear editor toolbox window + ClearRectangle(drawto, ex, ey_top, top_border_width, top_border_height); + ClearRectangle(drawto, ex, ey, exsize, eysize); + } redraw_mask |= REDRAW_ALL; } @@ -3476,102 +4429,41 @@ void UndrawSpecialEditorDoor() /* ---------- new tool button stuff ---------------------------------------- */ -/* graphic position values for tool buttons */ -#define TOOL_BUTTON_YES_XPOS 2 -#define TOOL_BUTTON_YES_YPOS 250 -#define TOOL_BUTTON_YES_GFX_YPOS 0 -#define TOOL_BUTTON_YES_XSIZE 46 -#define TOOL_BUTTON_YES_YSIZE 28 -#define TOOL_BUTTON_NO_XPOS 52 -#define TOOL_BUTTON_NO_YPOS TOOL_BUTTON_YES_YPOS -#define TOOL_BUTTON_NO_GFX_YPOS TOOL_BUTTON_YES_GFX_YPOS -#define TOOL_BUTTON_NO_XSIZE TOOL_BUTTON_YES_XSIZE -#define TOOL_BUTTON_NO_YSIZE TOOL_BUTTON_YES_YSIZE -#define TOOL_BUTTON_CONFIRM_XPOS TOOL_BUTTON_YES_XPOS -#define TOOL_BUTTON_CONFIRM_YPOS TOOL_BUTTON_YES_YPOS -#define TOOL_BUTTON_CONFIRM_GFX_YPOS 30 -#define TOOL_BUTTON_CONFIRM_XSIZE 96 -#define TOOL_BUTTON_CONFIRM_YSIZE TOOL_BUTTON_YES_YSIZE -#define TOOL_BUTTON_PLAYER_XSIZE 30 -#define TOOL_BUTTON_PLAYER_YSIZE 30 -#define TOOL_BUTTON_PLAYER_GFX_XPOS 5 -#define TOOL_BUTTON_PLAYER_GFX_YPOS 185 -#define TOOL_BUTTON_PLAYER_XPOS (5 + TOOL_BUTTON_PLAYER_XSIZE / 2) -#define TOOL_BUTTON_PLAYER_YPOS (215 - TOOL_BUTTON_PLAYER_YSIZE / 2) -#define TOOL_BUTTON_PLAYER1_XPOS (TOOL_BUTTON_PLAYER_XPOS \ - + 0 * TOOL_BUTTON_PLAYER_XSIZE) -#define TOOL_BUTTON_PLAYER2_XPOS (TOOL_BUTTON_PLAYER_XPOS \ - + 1 * TOOL_BUTTON_PLAYER_XSIZE) -#define TOOL_BUTTON_PLAYER3_XPOS (TOOL_BUTTON_PLAYER_XPOS \ - + 0 * TOOL_BUTTON_PLAYER_XSIZE) -#define TOOL_BUTTON_PLAYER4_XPOS (TOOL_BUTTON_PLAYER_XPOS \ - + 1 * TOOL_BUTTON_PLAYER_XSIZE) -#define TOOL_BUTTON_PLAYER1_YPOS (TOOL_BUTTON_PLAYER_YPOS \ - + 0 * TOOL_BUTTON_PLAYER_YSIZE) -#define TOOL_BUTTON_PLAYER2_YPOS (TOOL_BUTTON_PLAYER_YPOS \ - + 0 * TOOL_BUTTON_PLAYER_YSIZE) -#define TOOL_BUTTON_PLAYER3_YPOS (TOOL_BUTTON_PLAYER_YPOS \ - + 1 * TOOL_BUTTON_PLAYER_YSIZE) -#define TOOL_BUTTON_PLAYER4_YPOS (TOOL_BUTTON_PLAYER_YPOS \ - + 1 * TOOL_BUTTON_PLAYER_YSIZE) - static struct { - int xpos, ypos; - int x, y; - int width, height; + int graphic; + struct TextPosInfo *pos; int gadget_id; char *infotext; } toolbutton_info[NUM_TOOL_BUTTONS] = { { - TOOL_BUTTON_YES_XPOS, TOOL_BUTTON_YES_GFX_YPOS, - TOOL_BUTTON_YES_XPOS, TOOL_BUTTON_YES_YPOS, - TOOL_BUTTON_YES_XSIZE, TOOL_BUTTON_YES_YSIZE, - TOOL_CTRL_ID_YES, - "yes" + IMG_REQUEST_BUTTON_GFX_YES, &request.button.yes, + TOOL_CTRL_ID_YES, "yes" }, { - TOOL_BUTTON_NO_XPOS, TOOL_BUTTON_NO_GFX_YPOS, - TOOL_BUTTON_NO_XPOS, TOOL_BUTTON_NO_YPOS, - TOOL_BUTTON_NO_XSIZE, TOOL_BUTTON_NO_YSIZE, - TOOL_CTRL_ID_NO, - "no" + IMG_REQUEST_BUTTON_GFX_NO, &request.button.no, + TOOL_CTRL_ID_NO, "no" }, { - TOOL_BUTTON_CONFIRM_XPOS, TOOL_BUTTON_CONFIRM_GFX_YPOS, - TOOL_BUTTON_CONFIRM_XPOS, TOOL_BUTTON_CONFIRM_YPOS, - TOOL_BUTTON_CONFIRM_XSIZE, TOOL_BUTTON_CONFIRM_YSIZE, - TOOL_CTRL_ID_CONFIRM, - "confirm" + IMG_REQUEST_BUTTON_GFX_CONFIRM, &request.button.confirm, + TOOL_CTRL_ID_CONFIRM, "confirm" }, { - TOOL_BUTTON_PLAYER_GFX_XPOS,TOOL_BUTTON_PLAYER_GFX_YPOS, - TOOL_BUTTON_PLAYER1_XPOS, TOOL_BUTTON_PLAYER1_YPOS, - TOOL_BUTTON_PLAYER_XSIZE, TOOL_BUTTON_PLAYER_YSIZE, - TOOL_CTRL_ID_PLAYER_1, - "player 1" + IMG_REQUEST_BUTTON_GFX_PLAYER_1, &request.button.player_1, + TOOL_CTRL_ID_PLAYER_1, "player 1" }, { - TOOL_BUTTON_PLAYER_GFX_XPOS,TOOL_BUTTON_PLAYER_GFX_YPOS, - TOOL_BUTTON_PLAYER2_XPOS, TOOL_BUTTON_PLAYER2_YPOS, - TOOL_BUTTON_PLAYER_XSIZE, TOOL_BUTTON_PLAYER_YSIZE, - TOOL_CTRL_ID_PLAYER_2, - "player 2" + IMG_REQUEST_BUTTON_GFX_PLAYER_2, &request.button.player_2, + TOOL_CTRL_ID_PLAYER_2, "player 2" }, { - TOOL_BUTTON_PLAYER_GFX_XPOS,TOOL_BUTTON_PLAYER_GFX_YPOS, - TOOL_BUTTON_PLAYER3_XPOS, TOOL_BUTTON_PLAYER3_YPOS, - TOOL_BUTTON_PLAYER_XSIZE, TOOL_BUTTON_PLAYER_YSIZE, - TOOL_CTRL_ID_PLAYER_3, - "player 3" + IMG_REQUEST_BUTTON_GFX_PLAYER_3, &request.button.player_3, + TOOL_CTRL_ID_PLAYER_3, "player 3" }, { - TOOL_BUTTON_PLAYER_GFX_XPOS,TOOL_BUTTON_PLAYER_GFX_YPOS, - TOOL_BUTTON_PLAYER4_XPOS, TOOL_BUTTON_PLAYER4_YPOS, - TOOL_BUTTON_PLAYER_XSIZE, TOOL_BUTTON_PLAYER_YSIZE, - TOOL_CTRL_ID_PLAYER_4, - "player 4" + IMG_REQUEST_BUTTON_GFX_PLAYER_4, &request.button.player_4, + TOOL_CTRL_ID_PLAYER_4, "player 4" } }; @@ -3581,46 +4473,46 @@ void CreateToolButtons() for (i = 0; i < NUM_TOOL_BUTTONS; i++) { - Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap; + struct GraphicInfo *gfx = &graphic_info[toolbutton_info[i].graphic]; + struct TextPosInfo *pos = toolbutton_info[i].pos; + struct GadgetInfo *gi; Bitmap *deco_bitmap = None; int deco_x = 0, deco_y = 0, deco_xpos = 0, deco_ypos = 0; - struct GadgetInfo *gi; - unsigned long event_mask; - int gd_xoffset, gd_yoffset; - int gd_x1, gd_x2, gd_y; + unsigned int event_mask = GD_EVENT_RELEASED; + int dx = DX; + int dy = DY; + int gd_x = gfx->src_x; + int gd_y = gfx->src_y; + int gd_xp = gfx->src_x + gfx->pressed_xoffset; + int gd_yp = gfx->src_y + gfx->pressed_yoffset; int id = i; - event_mask = GD_EVENT_RELEASED; - - gd_xoffset = toolbutton_info[i].xpos; - gd_yoffset = toolbutton_info[i].ypos; - gd_x1 = DOOR_GFX_PAGEX4 + gd_xoffset; - gd_x2 = DOOR_GFX_PAGEX3 + gd_xoffset; - gd_y = DOOR_GFX_PAGEY1 + gd_yoffset; + if (global.use_envelope_request) + setRequestPosition(&dx, &dy, TRUE); if (id >= TOOL_CTRL_ID_PLAYER_1 && id <= TOOL_CTRL_ID_PLAYER_4) { int player_nr = id - TOOL_CTRL_ID_PLAYER_1; - getMiniGraphicSource(PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), - &deco_bitmap, &deco_x, &deco_y); - deco_xpos = (toolbutton_info[i].width - MINI_TILEX) / 2; - deco_ypos = (toolbutton_info[i].height - MINI_TILEY) / 2; + getSizedGraphicSource(PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0, + pos->size, &deco_bitmap, &deco_x, &deco_y); + deco_xpos = (gfx->width - pos->size) / 2; + deco_ypos = (gfx->height - pos->size) / 2; } gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_INFO_TEXT, toolbutton_info[i].infotext, - GDI_X, DX + toolbutton_info[i].x, - GDI_Y, DY + toolbutton_info[i].y, - GDI_WIDTH, toolbutton_info[i].width, - GDI_HEIGHT, toolbutton_info[i].height, + GDI_X, dx + GDI_ACTIVE_POS(pos->x), + GDI_Y, dy + GDI_ACTIVE_POS(pos->y), + GDI_WIDTH, gfx->width, + GDI_HEIGHT, gfx->height, GDI_TYPE, GD_TYPE_NORMAL_BUTTON, GDI_STATE, GD_BUTTON_UNPRESSED, - GDI_DESIGN_UNPRESSED, gd_bitmap, gd_x1, gd_y, - GDI_DESIGN_PRESSED, gd_bitmap, gd_x2, gd_y, + GDI_DESIGN_UNPRESSED, gfx->bitmap, gd_x, gd_y, + GDI_DESIGN_PRESSED, gfx->bitmap, gd_xp, gd_yp, GDI_DECORATION_DESIGN, deco_bitmap, deco_x, deco_y, GDI_DECORATION_POSITION, deco_xpos, deco_ypos, - GDI_DECORATION_SIZE, MINI_TILEX, MINI_TILEY, + GDI_DECORATION_SIZE, pos->size, pos->size, GDI_DECORATION_SHIFTING, 1, 1, GDI_DIRECT_DRAW, FALSE, GDI_EVENT_MASK, event_mask, @@ -4871,7 +5763,6 @@ em_object_mapping_list[] = Xsand_stonein_4, FALSE, TRUE, EL_ROCK, ACTION_FILLING, -1 }, -#if 1 { Xsand_stonesand_1, FALSE, FALSE, EL_QUICKSAND_EMPTYING, -1, -1 @@ -4896,24 +5787,6 @@ em_object_mapping_list[] = Xsand_stonesand_quickout_2, FALSE, FALSE, EL_QUICKSAND_EMPTYING, -1, -1 }, -#else - { - Xsand_stonesand_1, FALSE, FALSE, - EL_QUICKSAND_FULL, -1, -1 - }, - { - Xsand_stonesand_2, FALSE, FALSE, - EL_QUICKSAND_FULL, -1, -1 - }, - { - Xsand_stonesand_3, FALSE, FALSE, - EL_QUICKSAND_FULL, -1, -1 - }, - { - Xsand_stonesand_4, FALSE, FALSE, - EL_QUICKSAND_FULL, -1, -1 - }, -#endif { Xsand_stoneout_1, FALSE, FALSE, EL_ROCK, ACTION_EMPTYING, -1 @@ -4922,7 +5795,6 @@ em_object_mapping_list[] = Xsand_stoneout_2, FALSE, FALSE, EL_ROCK, ACTION_EMPTYING, -1 }, -#if 1 { Xsand_sandstone_1, FALSE, FALSE, EL_QUICKSAND_FILLING, -1, -1 @@ -4939,24 +5811,6 @@ em_object_mapping_list[] = Xsand_sandstone_4, FALSE, FALSE, EL_QUICKSAND_FILLING, -1, -1 }, -#else - { - Xsand_sandstone_1, FALSE, FALSE, - EL_QUICKSAND_FULL, -1, -1 - }, - { - Xsand_sandstone_2, FALSE, FALSE, - EL_QUICKSAND_FULL, -1, -1 - }, - { - Xsand_sandstone_3, FALSE, FALSE, - EL_QUICKSAND_FULL, -1, -1 - }, - { - Xsand_sandstone_4, FALSE, FALSE, - EL_QUICKSAND_FULL, -1, -1 - }, -#endif { Xplant, TRUE, FALSE, EL_EMC_PLANT, -1, -1 @@ -5746,6 +6600,52 @@ int map_direction_EM_to_RND(int direction) MV_NONE); } +int map_element_RND_to_SP(int element_rnd) +{ + int element_sp = 0x20; /* map unknown elements to yellow "hardware" */ + + if (element_rnd >= EL_SP_START && + element_rnd <= EL_SP_END) + element_sp = element_rnd - EL_SP_START; + else if (element_rnd == EL_EMPTY_SPACE) + element_sp = 0x00; + else if (element_rnd == EL_INVISIBLE_WALL) + element_sp = 0x28; + + return element_sp; +} + +int map_element_SP_to_RND(int element_sp) +{ + int element_rnd = EL_UNKNOWN; + + if (element_sp >= 0x00 && + element_sp <= 0x27) + element_rnd = EL_SP_START + element_sp; + else if (element_sp == 0x28) + element_rnd = EL_INVISIBLE_WALL; + + return element_rnd; +} + +int map_action_SP_to_RND(int action_sp) +{ + switch (action_sp) + { + case actActive: return ACTION_ACTIVE; + case actImpact: return ACTION_IMPACT; + case actExploding: return ACTION_EXPLODING; + case actDigging: return ACTION_DIGGING; + case actSnapping: return ACTION_SNAPPING; + case actCollecting: return ACTION_COLLECTING; + case actPassing: return ACTION_PASSING; + case actPushing: return ACTION_PUSHING; + case actDropping: return ACTION_DROPPING; + + default: return ACTION_DEFAULT; + } +} + int get_next_element(int element) { switch (element) @@ -5766,19 +6666,6 @@ int get_next_element(int element) } } -#if 0 -int el_act_dir2img(int element, int action, int direction) -{ - element = GFX_ELEMENT(element); - - if (direction == MV_NONE) - return element_info[element].graphic[action]; - - direction = MV_DIR_TO_BIT(direction); - - return element_info[element].direction_graphic[action][direction]; -} -#else int el_act_dir2img(int element, int action, int direction) { element = GFX_ELEMENT(element); @@ -5787,21 +6674,7 @@ int el_act_dir2img(int element, int action, int direction) /* direction_graphic[][] == graphic[] for undefined direction graphics */ return element_info[element].direction_graphic[action][direction]; } -#endif - -#if 0 -static int el_act_dir2crm(int element, int action, int direction) -{ - element = GFX_ELEMENT(element); - - if (direction == MV_NONE) - return element_info[element].crumbled[action]; - - direction = MV_DIR_TO_BIT(direction); - return element_info[element].direction_crumbled[action][direction]; -} -#else static int el_act_dir2crm(int element, int action, int direction) { element = GFX_ELEMENT(element); @@ -5810,7 +6683,6 @@ static int el_act_dir2crm(int element, int action, int direction) /* direction_graphic[][] == graphic[] for undefined direction graphics */ return element_info[element].direction_crumbled[action][direction]; } -#endif int el_act2img(int element, int action) { @@ -5992,19 +6864,9 @@ int getBeltSwitchElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir) return getBeltSwitchElementFromBeltNrAndBeltDirNr(belt_nr, belt_dir_nr); } -int getNumActivePlayers_EM() +boolean getTeamMode_EM() { - int num_players = 0; - int i; - - if (!tape.playing) - return -1; - - for (i = 0; i < MAX_PLAYERS; i++) - if (tape.player_participates[i]) - num_players++; - - return num_players; + return game.team_mode; } int getGameFrameDelay_EM(int native_em_game_frame_delay) @@ -6022,18 +6884,18 @@ int getGameFrameDelay_EM(int native_em_game_frame_delay) return game_frame_delay_value; } -unsigned int InitRND(long seed) +unsigned int InitRND(int seed) { if (level.game_engine_type == GAME_ENGINE_TYPE_EM) return InitEngineRandom_EM(seed); + else if (level.game_engine_type == GAME_ENGINE_TYPE_SP) + return InitEngineRandom_SP(seed); else return InitEngineRandom_RND(seed); } -#if 1 static struct Mapping_EM_to_RND_object object_mapping[TILE_MAX]; static struct Mapping_EM_to_RND_player player_mapping[MAX_PLAYERS][SPR_MAX]; -#endif inline static int get_effective_element_EM(int tile, int frame_em) { @@ -6129,6 +6991,9 @@ inline static boolean check_linear_animation_EM(int tile) case Ytank_s_e: case Ytank_w_s: case Ytank_n_w: + case Yacid_splash_eB: + case Yacid_splash_wB: + case Yemerald_stone: return TRUE; } @@ -6181,7 +7046,6 @@ void SetGfxAnimation_EM(struct GraphicInfo_EM *g_em, int tile, int frame_em, int x, int y) { int action = object_mapping[tile].action; -#if 1 int direction = object_mapping[tile].direction; int effective_element = get_effective_element_EM(tile, frame_em); int graphic = (direction == MV_NONE ? @@ -6189,7 +7053,6 @@ void SetGfxAnimation_EM(struct GraphicInfo_EM *g_em, el_act_dir2img(effective_element, action, direction)); struct GraphicInfo *g = &graphic_info[graphic]; int sync_frame; -#endif boolean action_removing = (action == ACTION_DIGGING || action == ACTION_SNAPPING || action == ACTION_COLLECTING); @@ -6203,29 +7066,23 @@ void SetGfxAnimation_EM(struct GraphicInfo_EM *g_em, action == ACTION_FILLING || action == ACTION_EMPTYING); -#if 0 - if (tile == Xsand_stonesand_1 || - tile == Xsand_stonesand_2 || - tile == Xsand_stonesand_3 || - tile == Xsand_stonesand_4) - printf("::: 1: quicksand frame %d [%d]\n", GfxFrame[x][y], tile); -#endif - -#if 1 - if ((action_removing || check_linear_animation_EM(tile)) && frame_em == 0) + /* special case: graphic uses "2nd movement tile" and has defined + 7 frames for movement animation (or less) => use default graphic + for last (8th) frame which ends the movement animation */ + if (g->double_movement && g->anim_frames < 8 && frame_em == 7) { - GfxFrame[x][y] = 0; + action = ACTION_DEFAULT; /* (keep action_* unchanged for now) */ + graphic = (direction == MV_NONE ? + el_act2img(effective_element, action) : + el_act_dir2img(effective_element, action, direction)); - // printf("::: resetting... [%d]\n", tile); + g = &graphic_info[graphic]; } -#else - if (action_removing || check_linear_animation_EM(tile)) - { - GfxFrame[x][y] = frame_em; - // printf("::: resetting... [%d]\n", tile); + if ((action_removing || check_linear_animation_EM(tile)) && frame_em == 0) + { + GfxFrame[x][y] = 0; } -#endif else if (action_moving) { boolean is_backside = object_mapping[tile].is_backside; @@ -6237,6 +7094,12 @@ void SetGfxAnimation_EM(struct GraphicInfo_EM *g_em, GfxFrame[x][y]++; +#if 1 + /* !!! TEST !!! NEW !!! DOES NOT WORK RIGHT YET !!! */ + if (g->double_movement && frame_em == 0) + GfxFrame[x][y] = 0; +#endif + if (move_dir == MV_LEFT) GfxFrame[x - 1][y] = GfxFrame[x][y]; else if (move_dir == MV_RIGHT) @@ -6257,15 +7120,6 @@ void SetGfxAnimation_EM(struct GraphicInfo_EM *g_em, GfxFrame[x][y]++; } -#if 0 - if (tile == Xsand_stonesand_1 || - tile == Xsand_stonesand_2 || - tile == Xsand_stonesand_3 || - tile == Xsand_stonesand_4) - printf("::: 2: quicksand frame %d [%d]\n", GfxFrame[x][y], tile); -#endif - -#if 1 if (graphic_info[graphic].anim_global_sync) sync_frame = FrameCounter; else if (IN_FIELD(x, y, MAX_LEV_FIELDX, MAX_LEV_FIELDY)) @@ -6283,7 +7137,6 @@ void SetGfxAnimation_EM(struct GraphicInfo_EM *g_em, g_em->unique_identifier = (graphic << 16) | ((frame % 8) << 12) | (g_em->width << 6) | g_em->height; -#endif } void getGraphicSourceObjectExt_EM(struct GraphicInfo_EM *g_em, @@ -6291,29 +7144,40 @@ void getGraphicSourceObjectExt_EM(struct GraphicInfo_EM *g_em, { int action = object_mapping[tile].action; int direction = object_mapping[tile].direction; + boolean is_backside = object_mapping[tile].is_backside; int effective_element = get_effective_element_EM(tile, frame_em); + int effective_action = action; int graphic = (direction == MV_NONE ? - el_act2img(effective_element, action) : - el_act_dir2img(effective_element, action, direction)); + el_act2img(effective_element, effective_action) : + el_act_dir2img(effective_element, effective_action, + direction)); int crumbled = (direction == MV_NONE ? - el_act2crm(effective_element, action) : - el_act_dir2crm(effective_element, action, direction)); + el_act2crm(effective_element, effective_action) : + el_act_dir2crm(effective_element, effective_action, + direction)); int base_graphic = el_act2img(effective_element, ACTION_DEFAULT); int base_crumbled = el_act2crm(effective_element, ACTION_DEFAULT); boolean has_crumbled_graphics = (base_crumbled != base_graphic); struct GraphicInfo *g = &graphic_info[graphic]; -#if 0 - struct GraphicInfo *g_crumbled = &graphic_info[crumbled]; -#endif int sync_frame; -#if 0 - if (frame_em == 0) /* reset animation frame for certain elements */ - { - if (check_linear_animation_EM(tile)) - GfxFrame[x][y] = 0; + /* special case: graphic uses "2nd movement tile" and has defined + 7 frames for movement animation (or less) => use default graphic + for last (8th) frame which ends the movement animation */ + if (g->double_movement && g->anim_frames < 8 && frame_em == 7) + { + effective_action = ACTION_DEFAULT; + graphic = (direction == MV_NONE ? + el_act2img(effective_element, effective_action) : + el_act_dir2img(effective_element, effective_action, + direction)); + crumbled = (direction == MV_NONE ? + el_act2crm(effective_element, effective_action) : + el_act_dir2crm(effective_element, effective_action, + direction)); + + g = &graphic_info[graphic]; } -#endif if (graphic_info[graphic].anim_global_sync) sync_frame = FrameCounter; @@ -6330,37 +7194,13 @@ void getGraphicSourceObjectExt_EM(struct GraphicInfo_EM *g_em, g->anim_start_frame, sync_frame); - getGraphicSourceExt(graphic, frame, &g_em->bitmap, - &g_em->src_x, &g_em->src_y, FALSE); + getGraphicSourceExt(graphic, frame, &g_em->bitmap, &g_em->src_x, &g_em->src_y, + g->double_movement && is_backside); /* (updating the "crumbled" graphic definitions is probably not really needed, as animations for crumbled graphics can't be longer than one EMC cycle) */ -#if 1 set_crumbled_graphics_EM(g_em, has_crumbled_graphics, crumbled, sync_frame); - -#else - - g_em->crumbled_bitmap = NULL; - g_em->crumbled_src_x = 0; - g_em->crumbled_src_y = 0; - - g_em->has_crumbled_graphics = FALSE; - - if (has_crumbled_graphics && crumbled != IMG_EMPTY_SPACE) - { - int frame_crumbled = getAnimationFrame(g_crumbled->anim_frames, - g_crumbled->anim_delay, - g_crumbled->anim_mode, - g_crumbled->anim_start_frame, - sync_frame); - - getGraphicSource(crumbled, frame_crumbled, &g_em->crumbled_bitmap, - &g_em->crumbled_src_x, &g_em->crumbled_src_y); - - g_em->has_crumbled_graphics = TRUE; - } -#endif } void getGraphicSourcePlayerExt_EM(struct GraphicInfo_EM *g_em, @@ -6389,22 +7229,10 @@ void getGraphicSourcePlayerExt_EM(struct GraphicInfo_EM *g_em, getGraphicSourceExt(graphic, frame, &g_em->bitmap, &g_em->src_x, &g_em->src_y, FALSE); - -#if 0 - printf("::: %d: %d, %d [%d]\n", - player_nr, - stored_player[player_nr].Frame, - stored_player[player_nr].StepFrame, - FrameCounter); -#endif } void InitGraphicInfo_EM(void) { -#if 0 - struct Mapping_EM_to_RND_object object_mapping[TILE_MAX]; - struct Mapping_EM_to_RND_player player_mapping[MAX_PLAYERS][SPR_MAX]; -#endif int i, j, p; #if DEBUG_EM_GFX @@ -6476,11 +7304,6 @@ void InitGraphicInfo_EM(void) int action = object_mapping[i].action; int direction = object_mapping[i].direction; boolean is_backside = object_mapping[i].is_backside; -#if 0 - boolean action_removing = (action == ACTION_DIGGING || - action == ACTION_SNAPPING || - action == ACTION_COLLECTING); -#endif boolean action_exploding = ((action == ACTION_EXPLODING || action == ACTION_SMASHED_BY_ROCK || action == ACTION_SMASHED_BY_SPRING) && @@ -6490,42 +7313,7 @@ void InitGraphicInfo_EM(void) for (j = 0; j < 8; j++) { -#if 1 int effective_element = get_effective_element_EM(i, j); -#else - int effective_element = (j > 5 && i == Yacid_splash_eB ? EL_EMPTY : - j > 5 && i == Yacid_splash_wB ? EL_EMPTY : - j < 7 ? element : - i == Xdrip_stretch ? element : - i == Xdrip_stretchB ? element : - i == Ydrip_s1 ? element : - i == Ydrip_s1B ? element : - i == Xball_1B ? element : - i == Xball_2 ? element : - i == Xball_2B ? element : - i == Yball_eat ? element : - i == Ykey_1_eat ? element : - i == Ykey_2_eat ? element : - i == Ykey_3_eat ? element : - i == Ykey_4_eat ? element : - i == Ykey_5_eat ? element : - i == Ykey_6_eat ? element : - i == Ykey_7_eat ? element : - i == Ykey_8_eat ? element : - i == Ylenses_eat ? element : - i == Ymagnify_eat ? element : - i == Ygrass_eat ? element : - i == Ydirt_eat ? element : - i == Yemerald_stone ? EL_EMERALD : - i == Ydiamond_stone ? EL_ROCK : - i == Xsand_stonein_1 ? element : - i == Xsand_stonein_2 ? element : - i == Xsand_stonein_3 ? element : - i == Xsand_stonein_4 ? element : - is_backside ? EL_EMPTY : - action_removing ? EL_EMPTY : - element); -#endif int effective_action = (j < 7 ? action : i == Xdrip_stretch ? action : i == Xdrip_stretchB ? action : @@ -6567,9 +7355,6 @@ void InitGraphicInfo_EM(void) boolean has_action_graphics = (graphic != base_graphic); boolean has_crumbled_graphics = (base_crumbled != base_graphic); struct GraphicInfo *g = &graphic_info[graphic]; -#if 0 - struct GraphicInfo *g_crumbled = &graphic_info[crumbled]; -#endif struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][7 - j]; Bitmap *src_bitmap; int src_x, src_y; @@ -6708,75 +7493,9 @@ void InitGraphicInfo_EM(void) g_em->preserve_background = FALSE; -#if 1 set_crumbled_graphics_EM(g_em, has_crumbled_graphics, crumbled, sync_frame); -#else - - g_em->crumbled_bitmap = NULL; - g_em->crumbled_src_x = 0; - g_em->crumbled_src_y = 0; - g_em->crumbled_border_size = 0; - - g_em->has_crumbled_graphics = FALSE; - -#if 0 - if (has_crumbled_graphics && crumbled == IMG_EMPTY_SPACE) - printf("::: empty crumbled: %d [%s], %d, %d\n", - effective_element, element_info[effective_element].token_name, - effective_action, direction); -#endif - - /* if element can be crumbled, but certain action graphics are just empty - space (like instantly snapping sand to empty space in 1 frame), do not - treat these empty space graphics as crumbled graphics in EMC engine */ - if (has_crumbled_graphics && crumbled != IMG_EMPTY_SPACE) - { - int frame_crumbled = getAnimationFrame(g_crumbled->anim_frames, - g_crumbled->anim_delay, - g_crumbled->anim_mode, - g_crumbled->anim_start_frame, - sync_frame); - - getGraphicSource(crumbled, frame_crumbled, &src_bitmap, &src_x, &src_y); - - g_em->has_crumbled_graphics = TRUE; - g_em->crumbled_bitmap = src_bitmap; - g_em->crumbled_src_x = src_x; - g_em->crumbled_src_y = src_y; - g_em->crumbled_border_size = graphic_info[crumbled].border_size; - - -#if 0 - if (g_em == &graphic_info_em_object[207][0]) - printf("... %d, %d [%d, %d, %d, %d] [%d, %d, %d, %d, %d, %d => %d]\n", - graphic_info_em_object[207][0].crumbled_src_x, - graphic_info_em_object[207][0].crumbled_src_y, - - crumbled, frame, src_x, src_y, - - g->anim_frames, - g->anim_delay, - g->anim_mode, - g->anim_start_frame, - sync_frame, - gfx.anim_random_frame, - frame); -#endif - -#if 0 - printf("::: EMC tile %d is crumbled\n", i); -#endif - } -#endif - -#if 0 - if (element == EL_ROCK && - effective_action == ACTION_FILLING) - printf("::: has_action_graphics == %d\n", has_action_graphics); -#endif - if ((!g->double_movement && (effective_action == ACTION_FALLING || effective_action == ACTION_MOVING || effective_action == ACTION_PUSHING || @@ -7067,6 +7786,41 @@ void InitGraphicInfo_EM(void) #endif } +void CheckSingleStepMode_EM(byte action[MAX_PLAYERS], int frame, + boolean any_player_moving, + boolean player_is_dropping) +{ + if (tape.single_step && tape.recording && !tape.pausing) + if (frame == 0 && !player_is_dropping) + TapeTogglePause(TAPE_TOGGLE_AUTOMATIC); +} + +void CheckSingleStepMode_SP(boolean murphy_is_waiting, + boolean murphy_is_dropping) +{ + if (tape.single_step && tape.recording && !tape.pausing) + if (murphy_is_waiting) + TapeTogglePause(TAPE_TOGGLE_AUTOMATIC); +} + +void getGraphicSource_SP(struct GraphicInfo_SP *g_sp, + int graphic, int sync_frame, int x, int y) +{ + int frame = getGraphicAnimationFrame(graphic, sync_frame); + + getGraphicSource(graphic, frame, &g_sp->bitmap, &g_sp->src_x, &g_sp->src_y); +} + +boolean isNextAnimationFrame_SP(int graphic, int sync_frame) +{ + return (IS_NEXT_FRAME(sync_frame, graphic)); +} + +int getGraphicInfo_Delay(int graphic) +{ + return graphic_info[graphic].anim_delay; +} + void PlayMenuSoundExt(int sound) { if (sound == SND_UNDEFINED) @@ -7150,47 +7904,66 @@ void PlaySoundSelecting() #endif } -void ToggleFullscreenIfNeeded() +void ToggleFullscreenOrChangeWindowScalingIfNeeded() { boolean change_fullscreen = (setup.fullscreen != video.fullscreen_enabled); boolean change_fullscreen_mode = (video.fullscreen_enabled && !strEqual(setup.fullscreen_mode, video.fullscreen_mode_current)); + boolean change_window_scaling_percent = (!video.fullscreen_enabled && + setup.window_scaling_percent != + video.window_scaling_percent); - if (!video.fullscreen_available) + if (change_window_scaling_percent && video.fullscreen_enabled) return; -#if 1 - if (change_fullscreen || change_fullscreen_mode) -#else - if (setup.fullscreen != video.fullscreen_enabled || - setup.fullscreen_mode != video.fullscreen_mode_current) + if (!change_window_scaling_percent && !video.fullscreen_available) + return; + +#if defined(TARGET_SDL2) + if (change_window_scaling_percent) + { + SDLSetWindowScaling(setup.window_scaling_percent); + + return; + } + else if (change_fullscreen) + { + SDLSetWindowFullscreen(setup.fullscreen); + + /* set setup value according to successfully changed fullscreen mode */ + setup.fullscreen = video.fullscreen_enabled; + + return; + } #endif + + if (change_fullscreen || + change_fullscreen_mode || + change_window_scaling_percent) { Bitmap *tmp_backbuffer = CreateBitmap(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH); /* save backbuffer content which gets lost when toggling fullscreen mode */ BlitBitmap(backbuffer, tmp_backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); -#if 1 if (change_fullscreen_mode) -#else - if (setup.fullscreen && video.fullscreen_enabled) -#endif { /* keep fullscreen, but change fullscreen mode (screen resolution) */ -#if 1 - /* (this is now set in sdl.c) */ -#else - video.fullscreen_mode_current = setup.fullscreen_mode; -#endif video.fullscreen_enabled = FALSE; /* force new fullscreen mode */ } + if (change_window_scaling_percent) + { + /* keep window mode, but change window scaling */ + video.fullscreen_enabled = TRUE; /* force new window scaling */ + } + /* toggle fullscreen */ ChangeVideoModeIfNeeded(setup.fullscreen); + /* set setup value according to successfully changed fullscreen mode */ setup.fullscreen = video.fullscreen_enabled; /* restore backbuffer content from temporary backbuffer backup bitmap */ @@ -7198,11 +7971,174 @@ void ToggleFullscreenIfNeeded() FreeBitmap(tmp_backbuffer); -#if 1 /* update visible window/screen */ BlitBitmap(backbuffer, window, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); -#else - redraw_mask = REDRAW_ALL; -#endif + } +} + +void ChangeViewportPropertiesIfNeeded() +{ + int gfx_game_mode = game_status; + int gfx_game_mode2 = (game_status == GAME_MODE_EDITOR ? GAME_MODE_DEFAULT : + game_status); + struct RectWithBorder *vp_playfield = &viewport.playfield[gfx_game_mode]; + struct RectWithBorder *vp_door_1 = &viewport.door_1[gfx_game_mode]; + struct RectWithBorder *vp_door_2 = &viewport.door_2[gfx_game_mode2]; + struct RectWithBorder *vp_door_3 = &viewport.door_2[GAME_MODE_EDITOR]; + int border_size = vp_playfield->border_size; + int new_sx = vp_playfield->x + border_size; + int new_sy = vp_playfield->y + border_size; + int new_sxsize = vp_playfield->width - 2 * border_size; + int new_sysize = vp_playfield->height - 2 * border_size; + int new_real_sx = vp_playfield->x; + int new_real_sy = vp_playfield->y; + int new_full_sxsize = vp_playfield->width; + int new_full_sysize = vp_playfield->height; + int new_dx = vp_door_1->x; + int new_dy = vp_door_1->y; + int new_dxsize = vp_door_1->width; + int new_dysize = vp_door_1->height; + int new_vx = vp_door_2->x; + int new_vy = vp_door_2->y; + int new_vxsize = vp_door_2->width; + int new_vysize = vp_door_2->height; + int new_ex = vp_door_3->x; + int new_ey = vp_door_3->y; + int new_exsize = vp_door_3->width; + int new_eysize = vp_door_3->height; + int new_tilesize_var = + (setup.small_game_graphics ? MINI_TILESIZE : game.tile_size); + + int tilesize = (gfx_game_mode == GAME_MODE_PLAYING ? new_tilesize_var : + gfx_game_mode == GAME_MODE_EDITOR ? MINI_TILESIZE : TILESIZE); + int new_scr_fieldx = new_sxsize / tilesize; + int new_scr_fieldy = new_sysize / tilesize; + int new_scr_fieldx_buffers = new_sxsize / new_tilesize_var; + int new_scr_fieldy_buffers = new_sysize / new_tilesize_var; + boolean init_gfx_buffers = FALSE; + boolean init_video_buffer = FALSE; + boolean init_gadgets_and_toons = FALSE; + boolean init_em_graphics = FALSE; + + if (viewport.window.width != WIN_XSIZE || + viewport.window.height != WIN_YSIZE) + { + WIN_XSIZE = viewport.window.width; + WIN_YSIZE = viewport.window.height; + + init_video_buffer = TRUE; + init_gfx_buffers = TRUE; + + // printf("::: video: init_video_buffer, init_gfx_buffers\n"); + } + + if (new_scr_fieldx != SCR_FIELDX || + new_scr_fieldy != SCR_FIELDY) + { + /* this always toggles between MAIN and GAME when using small tile size */ + + SCR_FIELDX = new_scr_fieldx; + SCR_FIELDY = new_scr_fieldy; + + // printf("::: new_scr_fieldx != SCR_FIELDX ...\n"); + } + + if (new_sx != SX || + new_sy != SY || + new_dx != DX || + new_dy != DY || + new_vx != VX || + new_vy != VY || + new_ex != EX || + new_ey != EY || + new_sxsize != SXSIZE || + new_sysize != SYSIZE || + new_dxsize != DXSIZE || + new_dysize != DYSIZE || + new_vxsize != VXSIZE || + new_vysize != VYSIZE || + new_exsize != EXSIZE || + new_eysize != EYSIZE || + new_real_sx != REAL_SX || + new_real_sy != REAL_SY || + new_full_sxsize != FULL_SXSIZE || + new_full_sysize != FULL_SYSIZE || + new_tilesize_var != TILESIZE_VAR + ) + { + if (new_tilesize_var != TILESIZE_VAR) + { + // printf("::: new_tilesize_var != TILESIZE_VAR\n"); + + // changing tile size invalidates scroll values of engine snapshots + FreeEngineSnapshot(); + + // changing tile size requires update of graphic mapping for EM engine + init_em_graphics = TRUE; + } + + SX = new_sx; + SY = new_sy; + DX = new_dx; + DY = new_dy; + VX = new_vx; + VY = new_vy; + EX = new_ex; + EY = new_ey; + SXSIZE = new_sxsize; + SYSIZE = new_sysize; + DXSIZE = new_dxsize; + DYSIZE = new_dysize; + VXSIZE = new_vxsize; + VYSIZE = new_vysize; + EXSIZE = new_exsize; + EYSIZE = new_eysize; + REAL_SX = new_real_sx; + REAL_SY = new_real_sy; + FULL_SXSIZE = new_full_sxsize; + FULL_SYSIZE = new_full_sysize; + TILESIZE_VAR = new_tilesize_var; + + init_gfx_buffers = TRUE; + init_gadgets_and_toons = TRUE; + + // printf("::: viewports: init_gfx_buffers\n"); + // printf("::: viewports: init_gadgets_and_toons\n"); + } + + if (init_gfx_buffers) + { + // printf("::: init_gfx_buffers\n"); + + SCR_FIELDX = new_scr_fieldx_buffers; + SCR_FIELDY = new_scr_fieldy_buffers; + + InitGfxBuffers(); + + SCR_FIELDX = new_scr_fieldx; + SCR_FIELDY = new_scr_fieldy; + } + + if (init_video_buffer) + { + // printf("::: init_video_buffer\n"); + + InitVideoBuffer(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH, setup.fullscreen); + + SetDrawDeactivationMask(REDRAW_NONE); + SetDrawBackgroundMask(REDRAW_FIELD); + } + + if (init_gadgets_and_toons) + { + // printf("::: init_gadgets_and_toons\n"); + + InitGadgets(); + InitToons(); + } + + if (init_em_graphics) + { + InitGraphicInfo_EM(); } }