X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.c;h=7de35d14cf77d78cd7d51d80add15c9dae05835f;hp=95f12fc1d5ca157f11fbfea1a3f9ee002e725fc0;hb=3ff2e8a0b5c27b99a9920bdf5ed82bc41bf40181;hpb=bdc7198372648cdde60eb28495569700b63592d5 diff --git a/src/tools.c b/src/tools.c index 95f12fc1..7de35d14 100644 --- a/src/tools.c +++ b/src/tools.c @@ -1,15 +1,15 @@ -/*********************************************************** -* 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" @@ -37,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 *); @@ -108,8 +235,6 @@ void SetDrawtoField(int mode) { if (mode == DRAW_BUFFERED && setup.soft_scrolling) { -#if NEW_TILESIZE -#if NEW_SCROLL FX = 2 * TILEX_VAR; FY = 2 * TILEY_VAR; BX1 = -2; @@ -118,37 +243,6 @@ void SetDrawtoField(int mode) BY2 = SCR_FIELDY + 1; redraw_x1 = 2; redraw_y1 = 2; -#else - FX = TILEX_VAR; - FY = TILEY_VAR; - BX1 = -1; - BY1 = -1; - BX2 = SCR_FIELDX; - BY2 = SCR_FIELDY; - redraw_x1 = 1; - redraw_y1 = 1; -#endif -#else -#if NEW_SCROLL - FX = 2 * TILEX; - FY = 2 * TILEY; - BX1 = -2; - BY1 = -2; - BX2 = SCR_FIELDX + 1; - BY2 = SCR_FIELDY + 1; - redraw_x1 = 2; - redraw_y1 = 2; -#else - FX = TILEX; - FY = TILEY; - BX1 = -1; - BY1 = -1; - BX2 = SCR_FIELDX; - BY2 = SCR_FIELDY; - redraw_x1 = 1; - redraw_y1 = 1; -#endif -#endif drawto_field = fieldbuffer; } @@ -167,70 +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 && - level.game_engine_type == GAME_ENGINE_TYPE_SP) - { - /* currently there is no partial redraw -- always redraw whole playfield */ - RedrawPlayfield_SP(TRUE); - - /* blit playfield from scroll buffer to normal back buffer for fading in */ - BlitScreenToBitmap_SP(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) @@ -304,25 +359,19 @@ void DrawMaskedBorder(int redraw_mask) } } -void BlitScreenToBitmap(Bitmap *target_bitmap) +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); -#if NEW_TILESIZE 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; - // fx += dx * TILESIZE_VAR / TILESIZE; - // fy += dy * TILESIZE_VAR / TILESIZE; -#else - fx += (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0); - fy += (ScreenMovDir & (MV_UP | MV_DOWN) ? ScreenGfxPos : 0); -#endif - ffx = (scroll_x - SBX_Left) * TILEX_VAR + dx_var; ffy = (scroll_y - SBY_Upper) * TILEY_VAR + dy_var; @@ -350,13 +399,21 @@ void BlitScreenToBitmap(Bitmap *target_bitmap) fy += dy_var; } -#if 0 - printf("::: (%d, %d) [(%d / %d, %d / %d)] => %d, %d\n", - scroll_x, scroll_y, - SBX_Left, SBX_Right, - SBY_Upper, SBY_Lower, - fx, fy); -#endif + 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]) { @@ -377,21 +434,21 @@ void BlitScreenToBitmap(Bitmap *target_bitmap) } } +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 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)])); -#endif - if (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD) redraw_mask |= REDRAW_FIELD; @@ -493,10 +550,6 @@ void BackToFront() if (redraw_mask & REDRAW_FIELD) { -#if 0 - printf("::: REDRAW_FIELD\n"); -#endif - if (game_status != GAME_MODE_PLAYING || redraw_mask & REDRAW_FROM_BACKBUFFER) { @@ -505,88 +558,7 @@ void BackToFront() } else { -#if 1 - BlitScreenToBitmap(window); -#else - int fx = FX, fy = FY; - -#if NEW_TILESIZE - 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; - - // fx += dx * TILESIZE_VAR / TILESIZE; - // fy += dy * TILESIZE_VAR / TILESIZE; -#else - fx += (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0); - fy += (ScreenMovDir & (MV_UP | MV_DOWN) ? ScreenGfxPos : 0); -#endif - - /* !!! THIS WORKS !!! */ - - printf("::: %d, %d\n", scroll_x, scroll_y); - - 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 > 0 ? TILEX_VAR : 0); - } - else - { - fx += dx; - } - - 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 > 0 ? TILEY_VAR : 0); - } - else - { - fy += dy; - } - - 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); - } -#endif - -#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; @@ -616,97 +588,66 @@ void BackToFront() if (redraw_mask & REDRAW_TILES) { -#if 0 - printf("::: REDRAW_TILES\n"); -#endif - -#if NEW_TILESIZE - -#if 1 - InitGfxClipRegion(TRUE, SX, SY, SXSIZE, SYSIZE); + int sx = SX; + int sy = SY; - { - int sx = SX; // - (EVEN(SCR_FIELDX) ? TILEX_VAR / 2 : 0); - int sy = SY; // + (EVEN(SCR_FIELDY) ? TILEY_VAR / 2 : 0); + 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 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); - 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; + ffx = (scroll_x - SBX_Left) * TILEX_VAR + dx_var; + ffy = (scroll_y - SBY_Upper) * TILEY_VAR + dy_var; - if (EVEN(SCR_FIELDX)) + if (EVEN(SCR_FIELDX)) + { + if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2 + TILEX_VAR) { - if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2 + TILEX_VAR) - { - fx += dx_var - MIN(ffx, 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; - } + if (fx % TILEX_VAR) + sx -= TILEX_VAR / 2; else - { - fx += (dx_var > 0 ? TILEX_VAR : 0); - } + sx -= TILEX_VAR; + } + else + { + fx += (dx_var > 0 ? TILEX_VAR : 0); } + } - if (EVEN(SCR_FIELDY)) + if (EVEN(SCR_FIELDY)) + { + if (ffy < SBY_Lower * TILEY_VAR + TILEY_VAR / 2 + TILEY_VAR) { - if (ffy < SBY_Lower * TILEY_VAR + TILEY_VAR / 2 + TILEY_VAR) - { - fy += dy_var - MIN(ffy, 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; - } + if (fy % TILEY_VAR) + sy -= TILEY_VAR / 2; else - { - fy += (dy_var > 0 ? TILEY_VAR : 0); - } + sy -= TILEY_VAR; + } + else + { + fy += (dy_var > 0 ? TILEY_VAR : 0); } - -#if 0 - printf("::: %d, %d, %d, %d\n", sx, sy, SCR_FIELDX, SCR_FIELDY); -#endif - - 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_VAR, FY + y * TILEY_VAR, - TILEX_VAR, TILEY_VAR, - sx + x * TILEX_VAR, sy + y * TILEY_VAR); } - InitGfxClipRegion(FALSE, -1, -1, -1, -1); -#else - for (x = 0; x < SCR_FIELDX; x++) - for (y = 0 ; y < SCR_FIELDY; y++) + 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_VAR, FY + y * TILEY_VAR, TILEX_VAR, TILEY_VAR, - SX + x * TILEX_VAR, SY + y * TILEY_VAR); -#endif + sx + x * TILEX_VAR, sy + y * TILEY_VAR); -#else - 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); -#endif + InitGfxClipRegion(FALSE, -1, -1, -1, -1); } if (redraw_mask & REDRAW_FPS) /* display frames per second */ @@ -719,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(); @@ -752,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; @@ -775,72 +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; } -#if 0 - printf("::: !!! FADING %d ... [%d] [%d]\n", fade_mode, fade_type, - fade_type_skip); -#endif - -#if 1 fade_delay = fading.fade_delay; post_delay = (fade_mode == FADE_MODE_FADE_OUT ? fading.post_delay : 0); -#endif 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; -#if 1 fade_delay = 0; -#else - return; -#endif } -#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 about 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; @@ -848,11 +738,6 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type) width = FULL_SXSIZE; height = FULL_SYSIZE; -#if 0 - fade_delay = fading.fade_delay; - post_delay = (fade_mode == FADE_MODE_FADE_OUT ? fading.post_delay : 0); -#endif - if (border.draw_masked_when_fading) draw_border_function = DrawMaskedBorder_FIELD; /* update when fading */ else @@ -864,36 +749,18 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type) y = 0; width = WIN_XSIZE; height = WIN_YSIZE; - -#if 0 - fade_delay = fading.fade_delay; - post_delay = (fade_mode == FADE_MODE_FADE_OUT ? fading.post_delay : 0); -#endif } -#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; } @@ -936,10 +803,6 @@ void FadeSetEnterMenu() { fading = menu.enter_menu; -#if 0 - printf("::: storing enter_menu\n"); -#endif - FadeSetLeaveNext(fading, TRUE); /* (keep same fade mode) */ } @@ -947,10 +810,6 @@ void FadeSetLeaveMenu() { fading = menu.leave_menu; -#if 0 - printf("::: storing leave_menu\n"); -#endif - FadeSetLeaveNext(fading, TRUE); /* (keep same fade mode) */ } @@ -958,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 */ } @@ -969,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 */ } @@ -1057,48 +904,27 @@ void SetDoorBackgroundImage(int graphic) void SetPanelBackground() { -#if 1 struct GraphicInfo *gfx = &graphic_info[IMG_BACKGROUND_PANEL]; -#if 1 BlitBitmapTiled(gfx->bitmap, bitmap_db_panel, gfx->src_x, gfx->src_y, gfx->width, gfx->height, 0, 0, DXSIZE, DYSIZE); -#else - /* (ClearRectangle() only needed if panel bitmap is smaller than panel) */ - ClearRectangle(bitmap_db_panel, DX, DY, DXSIZE, DYSIZE); - BlitBitmap(gfx->bitmap, bitmap_db_panel, gfx->src_x, gfx->src_y, - MIN(gfx->width, DXSIZE), MIN(gfx->height, DYSIZE), 0, 0); -#endif -#else - BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, bitmap_db_panel, - DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, 0, 0); -#endif 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 -#if 1 - /* (this only works for the current arrangement of playfield and panels) */ - if (x < gfx.dx) + if (IN_GFX_FIELD_FULL(x, y)) redraw_mask |= REDRAW_FIELD; - else if (y < gfx.vy) + else if (IN_GFX_DOOR_1(x, y)) redraw_mask |= REDRAW_DOOR_1; - else + else if (IN_GFX_DOOR_2(x, y)) redraw_mask |= REDRAW_DOOR_2; -#else - /* (this is just wrong (when drawing to one of the two door panel areas)) */ - redraw_mask |= REDRAW_FIELD; -#endif + 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) @@ -1241,25 +1067,46 @@ void getSizedGraphicSourceExt(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; -#if NEW_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 / TILESIZE; + tilesize_raw / TILESIZE; int src_y = (g->src_y + (get_backside ? g->offset2_y : 0)) * - tilesize / TILESIZE; -#else - int src_x = g->src_x * tilesize / TILESIZE; - int src_y = g->src_y * tilesize / TILESIZE; -#endif - 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; + 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 (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 */ { @@ -1309,17 +1156,7 @@ void getFixedGraphicSource(int graphic, int frame, 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, @@ -1329,11 +1166,9 @@ 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 NEW_TILESIZE if (TILESIZE_VAR != TILESIZE) return getSizedGraphicSourceExt(graphic, frame, TILESIZE_VAR, bitmap, x, y, get_backside); -#endif *bitmap = g->bitmap; @@ -1376,12 +1211,9 @@ void DrawGraphic(int x, int y, int graphic, int frame) } #endif -#if NEW_TILESIZE DrawGraphicExt(drawto_field, FX + x * TILEX_VAR, FY + y * TILEY_VAR, graphic, frame); -#else - DrawGraphicExt(drawto_field, FX + x * TILEX, FY + y * TILEY, graphic, frame); -#endif + MarkTileDirty(x, y); } @@ -1408,11 +1240,8 @@ 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); -#if NEW_TILESIZE + BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX_VAR, TILEY_VAR, x, y); -#else - BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX, TILEY, x, y); -#endif } void DrawFixedGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic, @@ -1436,13 +1265,9 @@ void DrawGraphicThruMask(int x, int y, int graphic, int frame) } #endif -#if NEW_TILESIZE DrawGraphicThruMaskExt(drawto_field, FX + x * TILEX_VAR, FY + y * TILEY_VAR, graphic, frame); -#else - DrawGraphicThruMaskExt(drawto_field, FX + x * TILEX, FY + y * TILEY, graphic, - frame); -#endif + MarkTileDirty(x, y); } @@ -1472,12 +1297,9 @@ void DrawGraphicThruMaskExt(DrawBuffer *d, int dst_x, int dst_y, int graphic, SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc, dst_x - src_x, dst_y - src_y); -#if NEW_TILESIZE + BlitBitmapMasked(src_bitmap, d, src_x, src_y, TILEX_VAR, TILEY_VAR, dst_x, dst_y); -#else - BlitBitmapMasked(src_bitmap, d, src_x, src_y, TILEX, TILEY, dst_x, dst_y); -#endif } void DrawFixedGraphicThruMaskExt(DrawBuffer *d, int dst_x, int dst_y, @@ -1608,14 +1430,12 @@ inline static void DrawGraphicShiftedNormal(int x, int y, int dx, int dy, } #endif -#if NEW_TILESIZE 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; -#endif if (width > 0 && height > 0) { @@ -1624,13 +1444,8 @@ inline static void DrawGraphicShiftedNormal(int x, int y, int dx, int dy, src_x += cx; src_y += cy; -#if NEW_TILESIZE dst_x = FX + x * TILEX_VAR + dx; dst_y = FY + y * TILEY_VAR + dy; -#else - dst_x = FX + x * TILEX + dx; - dst_y = FY + y * TILEY + dy; -#endif if (mask_mode == USE_MASKING) { @@ -1654,64 +1469,34 @@ 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; -#if NEW_TILESIZE int width = TILEX_VAR, height = TILEY_VAR; -#else - int width = TILEX, height = TILEY; -#endif int x1 = x; int y1 = y; int x2 = x + SIGN(dx); int y2 = y + SIGN(dy); -#if 0 - /* !!! DOES NOT WORK FOR SLOW MOVEMENT !!! */ - int sync_frame = GfxFrame[LEVELX(x)][LEVELY(y)]; -#else + /* 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; -#if 1 + /* (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; -#else - int sync_frame = anim_pos * anim_frames / TILESIZE; -#endif -#endif + boolean draw_start_tile = (cut_mode != CUT_ABOVE); /* only for falling! */ boolean draw_end_tile = (cut_mode != CUT_BELOW); /* only for falling! */ /* re-calculate animation frame for two-tile movement animation */ frame = getGraphicAnimationFrame(graphic, sync_frame); -#if 0 -#if 0 - printf("::: %d, %d, %d => %d [%d]\n", - anim_pos, anim_frames, anim_delay, sync_frame, graphic); -#else - printf("::: %d, %d => %d\n", - anim_pos, anim_frames, sync_frame); -#endif -#endif - -#if 0 - printf("::: %d [%d, %d] [%d] [%d]\n", frame, sync_frame, dy, - GfxFrame[LEVELX(x)][LEVELY(y)], mask_mode); -#endif - /* check if movement start graphic inside screen area and should be drawn */ if (draw_start_tile && IN_SCR_FIELD(x1, y1)) { getGraphicSourceExt(graphic, frame, &src_bitmap, &src_x, &src_y, TRUE); -#if NEW_TILESIZE dst_x = FX + x1 * TILEX_VAR; dst_y = FY + y1 * TILEY_VAR; -#else - dst_x = FX + x1 * TILEX; - dst_y = FY + y1 * TILEY; -#endif if (mask_mode == USE_MASKING) { @@ -1732,13 +1517,8 @@ inline static void DrawGraphicShiftedDouble(int x, int y, int dx, int dy, { getGraphicSourceExt(graphic, frame, &src_bitmap, &src_x, &src_y, FALSE); -#if NEW_TILESIZE dst_x = FX + x2 * TILEX_VAR; dst_y = FY + y2 * TILEY_VAR; -#else - dst_x = FX + x2 * TILEX; - dst_y = FY + y2 * TILEY; -#endif if (mask_mode == USE_MASKING) { @@ -1908,23 +1688,13 @@ static void DrawLevelFieldCrumbledInnerCorners(int x, int y, int dx, int dy, getGraphicSource(graphic, 1, &src_bitmap, &src_x, &src_y); -#if NEW_TILESIZE width = crumbled_border_size * TILESIZE_VAR / TILESIZE; height = crumbled_border_size * TILESIZE_VAR / TILESIZE; - cx = (dx > 0 ? TILEX - crumbled_border_size : 0) * TILESIZE_VAR / TILESIZE; - cy = (dy > 0 ? TILEY - crumbled_border_size : 0) * 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); -#else - width = crumbled_border_size; - height = crumbled_border_size; - cx = (dx > 0 ? TILEX - crumbled_border_size : 0); - cy = (dy > 0 ? TILEY - crumbled_border_size : 0); - - BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, - width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy); -#endif } static void DrawLevelFieldCrumbledBorders(int x, int y, int graphic, int frame, @@ -1935,46 +1705,22 @@ static void DrawLevelFieldCrumbledBorders(int x, int y, int graphic, int frame, int width, height, bx, by, cx, cy; int sx = SCREENX(x), sy = SCREENY(y); 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 */ -#if 1 - width = (dir == 1 || dir == 2 ? crumbled_border_size : TILEX); - height = (dir == 0 || dir == 3 ? crumbled_border_size : TILEY); - cx = (dir == 2 ? TILEX - crumbled_border_size : 0); - cy = (dir == 3 ? TILEY - crumbled_border_size : 0); -#else - if (dir == 1 || dir == 2) /* left or right crumbled border */ - { - width = crumbled_border_size; - height = TILEY; - cx = (dir == 2 ? TILEX - crumbled_border_size : 0); - cy = 0; - } - else /* top or bottom crumbled border */ - { - width = TILEX; - height = crumbled_border_size; - cx = 0; - cy = (dir == 3 ? TILEY - crumbled_border_size : 0); - } -#endif + 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); -#if NEW_TILESIZE - BlitBitmap(src_bitmap, drawto_field, - src_x + cx * TILESIZE_VAR / TILESIZE, - src_y + cy * TILESIZE_VAR / TILESIZE, - width * TILESIZE_VAR / TILESIZE, - height * TILESIZE_VAR / TILESIZE, - FX + sx * TILEX_VAR + cx * TILESIZE_VAR / TILESIZE, - FY + sy * TILEY_VAR + cy * TILESIZE_VAR / TILESIZE); -#else - BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, - width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy); -#endif + 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) || @@ -1983,8 +1729,7 @@ static void DrawLevelFieldCrumbledBorders(int x, int y, int graphic, int frame, /* correct corners of crumbled border, if needed */ -#if 1 - for (i = -1; i <= 1; i+=2) + 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); @@ -1998,13 +1743,13 @@ static void DrawLevelFieldCrumbledBorders(int x, int y, int graphic, int frame, { /* no crumbled corner, but continued crumbled border */ - int c1 = (dir == 2 || dir == 3 ? TILESIZE - crumbled_border_size : 0); - int c2 = (i == 1 ? TILESIZE - crumbled_border_size : 0); - int b1 = (i == 1 ? crumbled_border_size : - TILESIZE - 2 * crumbled_border_size); + 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; - height = crumbled_border_size; + width = crumbled_border_size_var; + height = crumbled_border_size_var; if (dir == 1 || dir == 2) { @@ -2021,80 +1766,12 @@ static void DrawLevelFieldCrumbledBorders(int x, int y, int graphic, int frame, by = cy; } -#if NEW_TILESIZE - BlitBitmap(src_bitmap, drawto_field, - src_x + bx * TILESIZE_VAR / TILESIZE, - src_y + by * TILESIZE_VAR / TILESIZE, - width * TILESIZE_VAR / TILESIZE, - height * TILESIZE_VAR / TILESIZE, - FX + sx * TILEX_VAR + cx * TILESIZE_VAR / TILESIZE, - FY + sy * TILEY_VAR + cy * TILESIZE_VAR / TILESIZE); -#else BlitBitmap(src_bitmap, drawto_field, src_x + bx, src_y + by, - width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy); -#endif - } - } -#else - if (dir == 1 || dir == 2) /* left or right crumbled border */ - { - for (i = -1; i <= 1; i+=2) - { - int xx = x; - int yy = y + i; - 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 */ - - width = crumbled_border_size; - height = crumbled_border_size; - cx = (dir == 2 ? TILEX - crumbled_border_size : 0); - cy = (i == 1 ? TILEY - crumbled_border_size : 0); - bx = cx; - by = (i == 1 ? crumbled_border_size : - TILEY - 2 * crumbled_border_size); - - BlitBitmap(src_bitmap, drawto_field, src_x + bx, src_y + by, - width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy); - } - } - } - else /* top or bottom crumbled border */ - { - for (i = -1; i <= 1; i+=2) - { - int xx = x + i; - int yy = y; - 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 */ - - width = crumbled_border_size; - height = crumbled_border_size; - cx = (i == 1 ? TILEX - crumbled_border_size : 0); - cy = (dir == 3 ? TILEY - crumbled_border_size : 0); - bx = (i == 1 ? crumbled_border_size : - TILEX - 2 * crumbled_border_size); - by = cy; - - BlitBitmap(src_bitmap, drawto_field, src_x + bx, src_y + by, - width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy); - } + width, height, + FX + sx * TILEX_VAR + cx, + FY + sy * TILEY_VAR + cy); } } -#endif } static void DrawLevelFieldCrumbledExt(int x, int y, int graphic, int frame) @@ -2130,15 +1807,10 @@ static void DrawLevelFieldCrumbledExt(int x, int y, int graphic, int frame) BorderElement); /* check if neighbour field is of same crumble type */ -#if 1 if (IS_CRUMBLED_TILE(xx, yy, element) && graphic_info[graphic].class == graphic_info[el_act2crm(element, ACTION_DEFAULT)].class) continue; -#else - if (IS_CRUMBLED_TILE(xx, yy, element)) - continue; -#endif DrawLevelFieldCrumbledBorders(x, y, graphic, frame, i); } @@ -2194,14 +1866,6 @@ void DrawLevelFieldCrumbled(int x, int y) 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])) @@ -2210,13 +1874,8 @@ void DrawLevelFieldCrumbled(int x, int 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 DrawLevelFieldCrumbledExt(x, y, graphic, 0); } @@ -2337,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); @@ -2364,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) @@ -2475,9 +2118,11 @@ void DrawEnvelopeBackgroundTiles(int graphic, int startx, int starty, 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 * tile_width, tile_width); - int inner_height = MAX(height - 2 * tile_height, tile_height); - int inner_sx = (width >= 3 * tile_width ? tile_width : 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; @@ -2549,11 +2194,7 @@ void AnimateEnvelope(int envelope_nr, int anim_mode, int action) SetDrawtoField(DRAW_BUFFERED); -#if 1 BlitScreenToBitmap(backbuffer); -#else - BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY); -#endif SetDrawtoField(DRAW_BACKBUFFER); @@ -2561,17 +2202,11 @@ void AnimateEnvelope(int envelope_nr, int anim_mode, int action) for (xx = 0; xx < xsize; xx++) DrawEnvelopeBackground(graphic, sx, sy, xx, yy, xsize, ysize, font_nr); -#if 1 DrawTextBuffer(sx + font_width, sy + font_height, level.envelope[envelope_nr].text, font_nr, max_xsize, xsize - 2, ysize - 2, 0, mask_mode, level.envelope[envelope_nr].autowrap, level.envelope[envelope_nr].centered, FALSE); -#else - DrawTextToTextArea(sx + font_width, 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(); @@ -2644,6 +2279,8 @@ static void setRequestPosition(int *x, int *y, boolean add_border_size) void DrawEnvelopeRequest(char *text) { + 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); @@ -2657,8 +2294,6 @@ void DrawEnvelopeRequest(char *text) int text_height = request.height - 2 * border_size; int line_length = text_width / font_width; int max_lines = text_height / line_height; - boolean autowrap = FALSE; - boolean centered = TRUE; int width = request.width; int height = request.height; int tile_size = request.step_offset; @@ -2667,6 +2302,33 @@ void DrawEnvelopeRequest(char *text) 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 (*src_text_ptr != ' ') + *dst_text_ptr++ = *src_text_ptr; + + src_text_ptr++; + } + + *dst_text_ptr = '\0'; + + text_final = text_door_style; + } + setRequestPosition(&sx, &sy, FALSE); ClearRectangle(backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE); @@ -2677,9 +2339,9 @@ void DrawEnvelopeRequest(char *text) x, y, x_steps, y_steps, tile_size, tile_size); - DrawTextBuffer(sx + border_size, sy + border_size, text, font_nr, + DrawTextBuffer(sx + border_size, sy + border_size, text_final, font_nr, line_length, -1, max_lines, line_spacing, mask_mode, - autowrap, centered, FALSE); + request.autowrap, request.centered, FALSE); for (i = 0; i < NUM_TOOL_BUTTONS; i++) RedrawGadget(tool_gadget[i]); @@ -2687,38 +2349,16 @@ void DrawEnvelopeRequest(char *text) // store readily prepared envelope request for later use when animating BlitBitmap(backbuffer, bitmap_db_cross, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); -#if 0 - // !!! TEST !!! - BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); - BlitBitmap(bitmap_db_cross, backbuffer, sx, sy, width, height, sx, sy); - - redraw_mask = REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; - BackToFront(); - - Delay(3000); - - BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); - - redraw_mask = REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; - BackToFront(); - - Delay(1000); -#endif + if (text_door_style) + free(text_door_style); } -#if 1 - -void AnimateEnvelopeRequest(char *text, int anim_mode, int action) +void AnimateEnvelopeRequest(int anim_mode, int action) { int graphic = IMG_BACKGROUND_REQUEST; boolean draw_masked = graphic_info[graphic].draw_masked; -#if 1 int delay_value_normal = request.step_delay; int delay_value_fast = delay_value_normal / 2; -#else - int delay_value_normal = GameFrameDelay; - int delay_value_fast = FfwdFrameDelay; -#endif 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); @@ -2759,7 +2399,6 @@ void AnimateEnvelopeRequest(char *text, int anim_mode, int action) BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); -#if 1 for (yy = 0; yy < 2; yy++) { for (xx = 0; xx < 2; xx++) @@ -2779,321 +2418,56 @@ void AnimateEnvelopeRequest(char *text, int anim_mode, int action) src_xx, src_yy, xx_size, yy_size, dst_xx, dst_yy); } } -#else - BlitBitmap(bitmap_db_cross, backbuffer, - src_x, src_y, - xsize_size_left, ysize_size_top, - dst_x, dst_y); - BlitBitmap(bitmap_db_cross, backbuffer, - src_x + max_xsize_pos, src_y, - tile_size, ysize_size_top, - dst_x + xsize_size_left, dst_y); - BlitBitmap(bitmap_db_cross, backbuffer, - src_x, src_y + max_ysize_pos, - xsize_size_left, tile_size, - dst_x, dst_y + ysize_size_top); - BlitBitmap(bitmap_db_cross, backbuffer, - src_x + max_xsize_pos, src_y + max_ysize_pos, - tile_size, tile_size, - dst_x + xsize_size_left, dst_y + ysize_size_top); -#endif -#if 1 - redraw_mask = REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; - // redraw_mask |= REDRAW_ALL | REDRAW_FROM_BACKBUFFER; -#else redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; -#endif -#if 1 DoAnimation(); BackToFront(); -#else - BackToFront(); -#endif WaitUntilDelayReached(&anim_delay, anim_delay_value / 2); } } -#else -void AnimateEnvelopeRequest(char *text, int anim_mode, int action) +void ShowEnvelopeRequest(char *text, unsigned int req_state, int action) { -#if 0 - int envelope_nr = 0; -#endif -#if 1 + int last_game_status = game_status; /* save current game status */ int graphic = IMG_BACKGROUND_REQUEST; -#else - int graphic = IMG_BACKGROUND_ENVELOPE_1 + envelope_nr; -#endif - Bitmap *src_bitmap = graphic_info[graphic].bitmap; - 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 int anim_delay = 0; - int frame_delay_value = (ffwd_delay ? FfwdFrameDelay : GameFrameDelay); - int anim_delay_value = (no_delay ? 0 : frame_delay_value + 500 * 0); -#if 1 - int max_word_len = maxWordLengthInString(text); - int font_nr = (max_word_len > 7 ? FONT_TEXT_1 : FONT_TEXT_2); -#else - int font_nr = FONT_ENVELOPE_1 + envelope_nr; -#endif - int font_width = getFontWidth(font_nr); - int font_height = getFontHeight(font_nr); - int line_spacing = 2 * 1; -#if 1 + 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 1 - int max_xsize = DXSIZE / font_width; - // int max_ysize = DYSIZE / font_height; - int max_ysize = DYSIZE / (font_height + line_spacing); -#else - int max_xsize = 7; /* tools.c: MAX_REQUEST_LINE_FONT1_LEN == 7 */ - int max_ysize = 13; /* tools.c: MAX_REQUEST_LINES == 13 */ -#endif + if (game_status == GAME_MODE_PLAYING) + BlitScreenToBitmap(backbuffer); -#else - int max_xsize = level.envelope[envelope_nr].xsize; - int max_ysize = level.envelope[envelope_nr].ysize; -#endif - int xstart = (anim_mode & ANIM_VERTICAL ? max_xsize : 0); - int ystart = (anim_mode & ANIM_HORIZONTAL ? max_ysize : 0); - int xend = max_xsize; - int yend = (anim_mode != ANIM_DEFAULT ? max_ysize : 0); - int xstep = (xstart < xend ? 1 : 0); - int ystep = (ystart < yend || xstep == 0 ? 1 : 0); - int x, y; + SetDrawtoField(DRAW_BACKBUFFER); -#if 1 - char *text_ptr; - char *text_copy = getStringCopy(text); -#else -#if 1 - font_nr = FONT_TEXT_2; + // SetDrawBackgroundMask(REDRAW_NONE); - if (maxWordLengthInString(text) > 7) /* MAX_REQUEST_LINE_FONT1_LEN == 7 */ + if (action == ACTION_OPENING) { - max_xsize = 10; /* tools.c: MAX_REQUEST_LINE_FONT2_LEN == 10 */ - font_nr = FONT_TEXT_1; - } -#else - int max_word_len = 0; - char *text_ptr; - char *text_copy = getStringCopy(text); - - font_nr = FONT_TEXT_2; + BlitBitmap(backbuffer, bitmap_db_store, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); - for (text_ptr = text; *text_ptr; text_ptr++) - { - max_word_len = (*text_ptr != ' ' ? max_word_len + 1 : 0); - - if (max_word_len > 7) /* tools.c: MAX_REQUEST_LINE_FONT1_LEN == 7 */ + if (req_state & REQ_ASK) { - max_xsize = 10; /* tools.c: MAX_REQUEST_LINE_FONT2_LEN == 10 */ - font_nr = FONT_TEXT_1; - - break; + MapGadget(tool_gadget[TOOL_CTRL_ID_YES]); + MapGadget(tool_gadget[TOOL_CTRL_ID_NO]); } - } -#endif -#endif - -#if 1 - for (text_ptr = text_copy; *text_ptr; text_ptr++) - if (*text_ptr == ' ') - *text_ptr = '\n'; -#endif - -#if 1 - dDX = SX + (SXSIZE - DXSIZE) / 2 - DX; - dDY = SY + (SYSIZE - DYSIZE) / 2 - DY; -#else - dDX = SX + SXSIZE / 2 - max_xsize * font_width / 2 - DX; - dDY = SY + SYSIZE / 2 - max_ysize * font_height / 2 - DY; -#endif - - 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 = SX + (SXSIZE - xsize * font_width) / 2; - // int sy = SX + (SYSIZE - ysize * font_height) / 2; - int sy = SY + (SYSIZE - ysize * (font_height + line_spacing)) / 2; - int xx, yy; - -#if 1 - BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); -#else - SetDrawtoField(DRAW_BUFFERED); - -#if 1 - BlitScreenToBitmap(backbuffer); -#else - BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY); -#endif - - SetDrawtoField(DRAW_BACKBUFFER); -#endif - - for (yy = 0; yy < ysize; yy++) - for (xx = 0; xx < xsize; xx++) - DrawEnvelopeBackgroundTiles(graphic, sx, sy, xx, yy, xsize, ysize, - getFontWidth(font_nr), - getFontHeight(font_nr) + line_spacing); - -#if 1 - -#if 1 - DrawTextBuffer(sx + font_width, sy + font_height + 8, - text_copy, font_nr, max_xsize, - xsize - 2, ysize - 2, line_spacing, mask_mode, - FALSE, TRUE, FALSE); -#else - DrawTextBuffer(sx + font_width, sy + font_height, - level.envelope[envelope_nr].text, font_nr, max_xsize, - xsize - 2, ysize - 2, 0, mask_mode, - level.envelope[envelope_nr].autowrap, - level.envelope[envelope_nr].centered, FALSE); -#endif - -#else - DrawTextToTextArea(sx + font_width, sy + font_height, - level.envelope[envelope_nr].text, font_nr, max_xsize, - xsize - 2, ysize - 2, mask_mode); -#endif - - /* copy request gadgets to door backbuffer */ -#if 1 - /* - if ((ysize - 2) > 13) - BlitBitmap(bitmap_db_door, drawto, - DOOR_GFX_PAGEX1 + (DXSIZE - (xsize - 2) * font_width) / 2, - DOOR_GFX_PAGEY1 + 13 * font_height, - (xsize - 2) * font_width, - (ysize - 2 - 13) * font_height, - sx + font_width, - sy + font_height * (1 + 13)); - */ - if ((ysize - 2) > 13) - BlitBitmap(bitmap_db_door, drawto, - DOOR_GFX_PAGEX1 + (DXSIZE - (xsize - 2) * font_width) / 2, - DOOR_GFX_PAGEY1 + 11 * (font_height + line_spacing * 0), - (xsize - 2) * font_width, - (ysize - 2 - 13) * (font_height + line_spacing), - sx + font_width, - sy + (font_height + line_spacing) * (1 + 13)); -#else - if ((ysize - 2) > 13) - BlitBitmap(bitmap_db_door, drawto, - DOOR_GFX_PAGEX1 + (DXSIZE - (xsize - 2) * font_width) / 2, - DOOR_GFX_PAGEY1 + 13 * font_height, - (xsize - 2) * font_width, - (ysize - 2 - 13) * font_height, - sx + font_width, - sy + font_height * (1 + 13)); -#endif - -#if 1 - redraw_mask = REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; - // redraw_mask |= REDRAW_ALL | REDRAW_FROM_BACKBUFFER; -#else - redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; -#endif - -#if 1 - DoAnimation(); - BackToFront(); -#else - BackToFront(); -#endif - - WaitUntilDelayReached(&anim_delay, anim_delay_value / 2); - } - -#if 1 - free(text_copy); -#endif -} - -#endif - -void ShowEnvelopeRequest(char *text, unsigned int req_state, int action) -{ -#if 1 - int last_game_status = game_status; /* save current game status */ - // int last_draw_background_mask = gfx.draw_background_mask; -#endif -#if 1 - int graphic = IMG_BACKGROUND_REQUEST; - int sound_opening = SND_REQUEST_OPENING; - int sound_closing = SND_REQUEST_CLOSING; -#else - int envelope_nr = 0; - int element = EL_ENVELOPE_1 + envelope_nr; - int graphic = IMG_BACKGROUND_ENVELOPE_1 + envelope_nr; - int sound_opening = element_info[element].sound[ACTION_OPENING]; - int sound_closing = element_info[element].sound[ACTION_CLOSING]; -#endif -#if 0 - boolean ffwd_delay = (tape.playing && tape.fast_forward); - boolean no_delay = (tape.warp_forward); - int normal_delay_value = ONE_SECOND_DELAY / (ffwd_delay ? 2 : 1); - int wait_delay_value = (no_delay ? 0 : normal_delay_value); -#endif - 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); - char *text_copy = getStringCopy(text); - char *text_ptr; - - for (text_ptr = text_copy; *text_ptr; text_ptr++) - if (*text_ptr == ' ') - *text_ptr = '\n'; - -#if 1 - if (game_status == GAME_MODE_PLAYING) - { - if (level.game_engine_type == GAME_ENGINE_TYPE_EM) - BlitScreenToBitmap_EM(backbuffer); - else if (level.game_engine_type == GAME_ENGINE_TYPE_SP) - BlitScreenToBitmap_SP(backbuffer); - else + else if (req_state & REQ_CONFIRM) { - BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY); + 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]); } - } - - SetDrawtoField(DRAW_BACKBUFFER); - - // SetDrawBackgroundMask(REDRAW_NONE); - - if (action == ACTION_OPENING) - { - BlitBitmap(backbuffer, bitmap_db_store, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); - -#if 1 - 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]); - } -#endif - DrawEnvelopeRequest(text_copy); + DrawEnvelopeRequest(text); if (game_status != GAME_MODE_MAIN) InitAnimation(); @@ -3101,7 +2475,6 @@ void ShowEnvelopeRequest(char *text, unsigned int req_state, int action) /* force DOOR font inside door area */ game_status = GAME_MODE_PSEUDO_DOOR; -#endif game.envelope_active = TRUE; /* needed for RedrawPlayfield() events */ @@ -3110,32 +2483,25 @@ void ShowEnvelopeRequest(char *text, unsigned int req_state, int action) PlayMenuSoundStereo(sound_opening, SOUND_MIDDLE); if (anim_mode == ANIM_DEFAULT) - AnimateEnvelopeRequest(text, ANIM_DEFAULT, ACTION_OPENING); + AnimateEnvelopeRequest(ANIM_DEFAULT, ACTION_OPENING); - AnimateEnvelopeRequest(text, main_anim_mode, ACTION_OPENING); + AnimateEnvelopeRequest(main_anim_mode, ACTION_OPENING); -#if 0 - if (tape.playing) - Delay(wait_delay_value); - else - WaitForEventToContinue(); -#endif } else { PlayMenuSoundStereo(sound_closing, SOUND_MIDDLE); if (anim_mode != ANIM_NONE) - AnimateEnvelopeRequest(text, main_anim_mode, ACTION_CLOSING); + AnimateEnvelopeRequest(main_anim_mode, ACTION_CLOSING); if (anim_mode == ANIM_DEFAULT) - AnimateEnvelopeRequest(text, ANIM_DEFAULT, ACTION_CLOSING); + AnimateEnvelopeRequest(ANIM_DEFAULT, ACTION_CLOSING); } game.envelope_active = FALSE; -#if 1 - // game_status = last_game_status; /* restore current game status */ + game_status = last_game_status; /* restore current game status */ if (action == ACTION_CLOSING) { @@ -3144,44 +2510,20 @@ void ShowEnvelopeRequest(char *text, unsigned int req_state, int action) BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); } -#else - SetDrawtoField(DRAW_BUFFERED); -#endif // SetDrawBackgroundMask(last_draw_background_mask); -#if 1 - redraw_mask = REDRAW_FIELD; - // redraw_mask |= REDRAW_ALL; -#else redraw_mask |= REDRAW_FIELD; -#endif -#if 1 if (game_status == GAME_MODE_MAIN) DoAnimation(); BackToFront(); - /* (important: after "BackToFront()", but before "SetDrawtoField()") */ - game_status = last_game_status; /* restore current game status */ - -#if 1 if (action == ACTION_CLOSING && game_status == GAME_MODE_PLAYING && level.game_engine_type == GAME_ENGINE_TYPE_RND) SetDrawtoField(DRAW_BUFFERED); -#else - if (game_status == GAME_MODE_PLAYING && - level.game_engine_type == GAME_ENGINE_TYPE_RND) - SetDrawtoField(DRAW_BUFFERED); -#endif - -#else - BackToFront(); -#endif - - free(text_copy); } void DrawPreviewElement(int dst_x, int dst_y, int element, int tilesize) @@ -3194,16 +2536,12 @@ void DrawPreviewElement(int dst_x, int dst_y, int element, int tilesize) BlitBitmap(src_bitmap, drawto, src_x, src_y, tilesize, tilesize, dst_x,dst_y); } -void DrawLevel() +void DrawLevel(int draw_background_mask) { int x,y; -#if 1 SetMainBackgroundImage(IMG_BACKGROUND_PLAYING); - SetDrawBackgroundMask(REDRAW_FIELD); -#else - SetDrawBackgroundMask(REDRAW_NONE); -#endif + SetDrawBackgroundMask(draw_background_mask); ClearField(); @@ -3235,14 +2573,19 @@ static void DrawPreviewLevelPlayfieldExt(int from_x, int from_y) 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_xsize * tile_size) / 2; - dst_y += (preview_height - real_preview_ysize * tile_size) / 2; + dst_x += (preview_width - real_preview_width) / 2; + dst_y += (preview_height - real_preview_height) / 2; for (x = 0; x < real_preview_xsize; x++) { @@ -3290,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 : @@ -3347,16 +2668,7 @@ 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; } @@ -3373,11 +2685,6 @@ static void DrawPreviewLevelExt(boolean restart) 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; @@ -3409,37 +2716,17 @@ static void DrawPreviewLevelExt(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 */ @@ -3587,13 +2874,9 @@ inline void DrawGraphicAnimation(int x, int y, int graphic) if (!IN_SCR_FIELD(x, y)) return; -#if NEW_TILESIZE DrawGraphicAnimationExt(drawto_field, FX + x * TILEX_VAR, FY + y * TILEY_VAR, graphic, GfxFrame[lx][ly], NO_MASKING); -#else - DrawGraphicAnimationExt(drawto_field, FX + x * TILEX, FY + y * TILEY, - graphic, GfxFrame[lx][ly], NO_MASKING); -#endif + MarkTileDirty(x, y); } @@ -3842,15 +3125,10 @@ 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); } @@ -3910,13 +3188,6 @@ void DrawPlayer(struct PlayerInfo *player) /* 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); @@ -3936,15 +3207,10 @@ 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 1 if (game.use_masked_pushing && IS_MOVING(jx, jy)) { /* this allows transparent pushing animation over non-black background */ @@ -3961,20 +3227,6 @@ void DrawPlayer(struct PlayerInfo *player) } else if (Back[next_jx][next_jy]) DrawLevelElement(next_jx, next_jy, Back[next_jx][next_jy]); -#else - if (Back[next_jx][next_jy]) - DrawLevelElement(next_jx, next_jy, Back[next_jx][next_jy]); -#endif - -#if 0 - printf("::: %d, %d, %d, %d [%d] [%d, %d, %d] [%d] [%d, %d] [%d, %d]\n", - jx, px, player->GfxPos, player->StepFrame, - player->is_pushing, - dx, sxx, pxx, - IS_MOVING(jx, jy), - graphic, frame, - GfxFrame[jx][jy], GfxFrame[next_jx][next_jy]); -#endif #if 1 /* do not draw (EM style) pushing animation when pushing is finished */ @@ -3989,7 +3241,6 @@ void DrawPlayer(struct PlayerInfo *player) DrawGraphicShiftedThruMask(px, py, pxx, pyy, graphic, frame, NO_CUTTING); #endif } -#endif #if DRAW_PLAYER_OVER_PUSHED_ELEMENT /* ----------------------------------------------------------------------- */ @@ -4097,9 +3348,7 @@ void WaitForEventToContinue() button_status = MB_RELEASED; -#if 1 ClearEventQueue(); -#endif while (still_wait) { @@ -4141,8 +3390,6 @@ void WaitForEventToContinue() #define MAX_REQUEST_LINE_FONT1_LEN 7 #define MAX_REQUEST_LINE_FONT2_LEN 10 -#if 1 - static int RequestHandleEvents(unsigned int req_state) { int last_game_status = game_status; /* save current game status */ @@ -4235,6 +3482,9 @@ static int RequestHandleEvents(unsigned int req_state) break; case KSYM_Return: +#if defined(TARGET_SDL2) + case KSYM_Menu: +#endif result = 1; break; @@ -4272,8 +3522,6 @@ static int RequestHandleEvents(unsigned int req_state) result = 0; } -#if 1 - if (game_status == GAME_MODE_PLAYING && local_player->LevelSolved_GameEnd) { HandleGameActions(); @@ -4286,33 +3534,15 @@ static int RequestHandleEvents(unsigned int req_state) Delay(10); } -#if 1 game_status = GAME_MODE_PSEUDO_DOOR; -#endif BackToFront(); -#if 1 game_status = last_game_status; /* restore current game status */ -#endif - -#else + } - DoAnimation(); - -#if 1 - if (!PendingEvent()) /* delay only if no pending events */ - Delay(10); -#else - /* don't eat all CPU time */ - Delay(10); -#endif - -#endif - } - - return result; -} + return result; +} static boolean RequestDoor(char *text, unsigned int req_state) { @@ -4331,12 +3561,7 @@ static boolean RequestDoor(char *text, unsigned int req_state) } if (game_status == GAME_MODE_PLAYING) - { - if (level.game_engine_type == GAME_ENGINE_TYPE_EM) - BlitScreenToBitmap_EM(backbuffer); - else if (level.game_engine_type == GAME_ENGINE_TYPE_SP) - BlitScreenToBitmap_SP(backbuffer); - } + BlitScreenToBitmap(backbuffer); /* disable deactivated drawing when quick-loading level tape recording */ if (tape.playing && tape.deactivate_display) @@ -4368,9 +3593,8 @@ static boolean RequestDoor(char *text, unsigned int req_state) 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); + BlitBitmap(bitmap_db_door_1, bitmap_db_door_1, + 0 * DXSIZE, 0, DXSIZE, DYSIZE, 1 * DXSIZE, 0); } SetDoorBackgroundImage(IMG_BACKGROUND_DOOR); @@ -4394,10 +3618,14 @@ static boolean RequestDoor(char *text, unsigned int req_state) for (tl = 0, tx = 0; tx < max_request_line_len; tl++, tx++) { tc = *(text_ptr + tx); - if (!tc || tc == ' ') + // if (!tc || tc == ' ') + if (!tc || tc == ' ' || tc == '?' || tc == '!') break; } + if ((tc == '?' || tc == '!') && tl == 0) + tl = 1; + if (!tl) { text_ptr++; @@ -4413,6 +3641,7 @@ static boolean RequestDoor(char *text, unsigned int req_state) 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 */ @@ -4435,9 +3664,7 @@ static boolean RequestDoor(char *text, unsigned int req_state) } /* copy request gadgets to door backbuffer */ - BlitBitmap(drawto, bitmap_db_door, - DX, DY, DXSIZE, DYSIZE, - DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1); + BlitBitmap(drawto, bitmap_db_door_1, DX, DY, DXSIZE, DYSIZE, 0, 0); OpenDoor(DOOR_OPEN_1); @@ -4508,17 +3735,9 @@ static boolean RequestDoor(char *text, unsigned int req_state) static boolean RequestEnvelope(char *text, unsigned int req_state) { int result; -#if 0 - int i; -#endif if (game_status == GAME_MODE_PLAYING) - { - if (level.game_engine_type == GAME_ENGINE_TYPE_EM) - BlitScreenToBitmap_EM(backbuffer); - else if (level.game_engine_type == GAME_ENGINE_TYPE_SP) - BlitScreenToBitmap_SP(backbuffer); - } + BlitScreenToBitmap(backbuffer); /* disable deactivated drawing when quick-loading level tape recording */ if (tape.playing && tape.deactivate_display) @@ -4547,74 +3766,8 @@ static boolean RequestEnvelope(char *text, unsigned int req_state) /* clear door drawing field */ // DrawBackground(DX, DY, DXSIZE, DYSIZE); -#if 0 - if (global.use_envelope_request) - { - /* !!! TMP !!! */ - FreeToolButtons(); - CreateToolButtons(); - } -#endif - -#if 0 -#if 0 - if (req_state & REQ_ASK) - { - MapGadgetExt(tool_gadget[TOOL_CTRL_ID_YES], FALSE); - MapGadgetExt(tool_gadget[TOOL_CTRL_ID_NO], FALSE); - } - else if (req_state & REQ_CONFIRM) - { - MapGadgetExt(tool_gadget[TOOL_CTRL_ID_CONFIRM], FALSE); - } - else if (req_state & REQ_PLAYER) - { - MapGadgetExt(tool_gadget[TOOL_CTRL_ID_PLAYER_1], FALSE); - MapGadgetExt(tool_gadget[TOOL_CTRL_ID_PLAYER_2], FALSE); - MapGadgetExt(tool_gadget[TOOL_CTRL_ID_PLAYER_3], FALSE); - MapGadgetExt(tool_gadget[TOOL_CTRL_ID_PLAYER_4], FALSE); - } -#else - 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]); - } -#endif -#endif - ShowEnvelopeRequest(text, req_state, ACTION_OPENING); -#if 0 - for (i = 0; i < NUM_TOOL_BUTTONS; i++) - { - if ((req_state & REQ_ASK && (i == TOOL_CTRL_ID_YES || - i == TOOL_CTRL_ID_NO)) || - (req_state & REQ_CONFIRM && i == TOOL_CTRL_ID_CONFIRM) || - (req_state & REQ_PLAYER && (i == TOOL_CTRL_ID_PLAYER_1 && - i == TOOL_CTRL_ID_PLAYER_2 && - i == TOOL_CTRL_ID_PLAYER_3 && - i == TOOL_CTRL_ID_PLAYER_4))) - { - int x = tool_gadget[i]->x + dDX; - int y = tool_gadget[i]->y + dDY; - - ModifyGadget(tool_gadget[i], GDI_X, x, GDI_Y, y, GDI_END); - } - } -#endif - if (!(req_state & REQUEST_WAIT_FOR_INPUT)) { if (game_status == GAME_MODE_PLAYING) @@ -4630,11 +3783,6 @@ static boolean RequestEnvelope(char *text, unsigned int req_state) return FALSE; } -#if 0 - if (game_status != GAME_MODE_MAIN) - InitAnimation(); -#endif - SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1); // ---------- handle request buttons ---------- @@ -4682,465 +3830,216 @@ boolean Request(char *text, unsigned int req_state) return RequestDoor(text, req_state); } -#else // ===================================================================== - -boolean Request(char *text, unsigned int req_state) +static int compareDoorPartOrderInfo(const void *object1, const void *object2) { - 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; -#if 0 - int max_word_len = 0; -#endif - char *text_ptr; - int i; + const struct DoorPartOrderInfo *dpo1 = (struct DoorPartOrderInfo *)object1; + const struct DoorPartOrderInfo *dpo2 = (struct DoorPartOrderInfo *)object2; + int compare_result; -#if 0 - global.use_envelope_request = 1; -#endif + if (dpo1->sort_priority != dpo2->sort_priority) + compare_result = dpo1->sort_priority - dpo2->sort_priority; + else + compare_result = dpo1->nr - dpo2->nr; -#if 1 - if (maxWordLengthInString(text) > MAX_REQUEST_LINE_FONT1_LEN) + return compare_result; +} + +void InitGraphicCompatibilityInfo_Doors() +{ + struct { - max_request_line_len = MAX_REQUEST_LINE_FONT2_LEN; - font_nr = FONT_TEXT_1; + int door_token; + int part_1, part_8; + struct DoorInfo *door; } -#else - for (text_ptr = text; *text_ptr; text_ptr++) + doors[] = { - 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; - } - } -#endif + { 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 }, - if (game_status == GAME_MODE_PLAYING) + { -1, -1, -1, NULL } + }; + struct Rect door_rect_list[] = { - if (level.game_engine_type == GAME_ENGINE_TYPE_EM) - BlitScreenToBitmap_EM(backbuffer); - else if (level.game_engine_type == GAME_ENGINE_TYPE_SP) - BlitScreenToBitmap_SP(backbuffer); - } + { DX, DY, DXSIZE, DYSIZE }, + { VX, VY, VXSIZE, VYSIZE } + }; + int i, j; - /* disable deactivated drawing when quick-loading level tape recording */ - if (tape.playing && tape.deactivate_display) - TapeDeactivateDisplayOff(TRUE); + 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; - SetMouseCursor(CURSOR_DEFAULT); + /* check if any door part graphic definitions have been redefined */ -#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 + for (j = 0; door_part_controls[j].door_token != -1; j++) + { + struct DoorPartControlInfo *dpc = &door_part_controls[j]; + struct FileInfo *fi = getImageListEntryFromImageID(dpc->graphic); - old_door_state = GetDoorState(); + if (dpc->door_token == door_token && fi->redefined) + door_gfx_redefined = TRUE; + } - /* simulate releasing mouse button over last gadget, if still pressed */ - if (button_status) - HandleGadgets(-1, -1, 0); + /* check for old-style door graphic/animation modifications */ - UnmapAllGadgets(); + if (!door_gfx_redefined) + { + if (door->anim_mode & ANIM_STATIC_PANEL) + { + door->panel.step_xoffset = 0; + door->panel.step_yoffset = 0; + } - /* draw released gadget before proceeding */ - // BackToFront(); + 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; -#if 0 - if (old_door_state & DOOR_OPEN_1 && !global.use_envelope_request) -#else - if (old_door_state & DOOR_OPEN_1) -#endif - { -#if 1 - if (!global.use_envelope_request) - CloseDoor(DOOR_CLOSE_1); -#else - CloseDoor(DOOR_CLOSE_1); -#endif + /* remove door part graphics other than the two default wings */ - /* 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); - } + 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 1 - SetDoorBackgroundImage(IMG_BACKGROUND_DOOR); -#endif + if (dpc->graphic >= part_3 && + dpc->graphic <= part_8) + g->bitmap = NULL; + } - SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1); + /* set graphics and screen positions of the default wings */ - /* clear door drawing field */ - DrawBackground(DX, DY, DXSIZE, DYSIZE); + 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; - /* force DOOR font inside door area */ - game_status = GAME_MODE_PSEUDO_DOOR; + door->part_2.x = door->part_1.x; + door->part_2.y = door->part_1.y; - /* 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 (door->width != -1) + { + g_part_1->width = door->width; + g_part_2->width = door->width; - if (!*text_ptr) - break; + // 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; + } - for (tl = 0, tx = 0; tx < max_request_line_len; tl++, tx++) - { - tc = *(text_ptr + tx); - if (!tc || tc == ' ') - break; - } + if (door->height != -1) + { + g_part_1->height = door->height; + g_part_2->height = door->height; - if (!tl) - { - text_ptr++; - ty--; - continue; - } + // 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; + } - strncpy(text_line, text_ptr, tl); - text_line[tl] = 0; + /* set animation delays for the default wings and panels */ - DrawText(DX + (DXSIZE - tl * getFontWidth(font_nr)) / 2, - DY + 8 + ty * (getFontHeight(font_nr) + 2), - text_line, font_nr); + door->part_1.step_delay = door->step_delay; + door->part_2.step_delay = door->step_delay; + door->panel.step_delay = door->step_delay; - text_ptr += tl + (tc == ' ' ? 1 : 0); - } + /* set animation draw order for the default wings */ - game_status = last_game_status; /* restore current game status */ + door->part_1.sort_priority = 2; /* draw left wing over ... */ + door->part_2.sort_priority = 1; /* ... right wing */ -#if 1 - if (global.use_envelope_request) - { - /* !!! TMP !!! */ - FreeToolButtons(); - CreateToolButtons(); - } -#endif + /* set animation draw offset for the default wings */ - 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]); - } + 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; - /* copy request gadgets to door backbuffer */ - BlitBitmap(drawto, bitmap_db_door, - DX, DY, DXSIZE, DYSIZE, - DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1); + 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; -#if 1 - if (global.use_envelope_request) - { - ShowEnvelopeRequest(text, ACTION_OPENING); + num_door_steps = g_part_1->height / door->step_offset; + } - for (i = 0; i < NUM_TOOL_BUTTONS; i++) - { - if ((req_state & REQ_ASK && (i == TOOL_CTRL_ID_YES || - i == TOOL_CTRL_ID_NO)) || - (req_state & REQ_CONFIRM && i == TOOL_CTRL_ID_CONFIRM) || - (req_state & REQ_PLAYER && (i == TOOL_CTRL_ID_PLAYER_1 && - i == TOOL_CTRL_ID_PLAYER_2 && - i == TOOL_CTRL_ID_PLAYER_3 && - i == TOOL_CTRL_ID_PLAYER_4))) - { - int x = tool_gadget[i]->x + dDX; - int y = tool_gadget[i]->y + dDY; + /* set animation draw offset for the default panels */ - ModifyGadget(tool_gadget[i], GDI_X, x, GDI_Y, y, GDI_END); + 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; + } } } } -#endif +} -#if 1 - if (!global.use_envelope_request) - OpenDoor(DOOR_OPEN_1); -#else - OpenDoor(DOOR_OPEN_1); -#endif +void InitDoors() +{ + int i; - if (!(req_state & REQUEST_WAIT_FOR_INPUT)) + for (i = 0; door_part_controls[i].door_token != -1; i++) { - if (game_status == GAME_MODE_PLAYING) - { - SetPanelBackground(); - SetDrawBackgroundMask(REDRAW_DOOR_1); - } - else + 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) { - SetDrawBackgroundMask(REDRAW_FIELD); + // dpc->pos->start_step_opening = dpc->pos->start_step; + dpc->pos->start_step_closing = dpc->pos->start_step; } - return FALSE; + /* fill structure for door part draw order (sorted below) */ + dpo->nr = i; + dpo->sort_priority = dpc->pos->sort_priority; } -#if 1 - if (game_status != GAME_MODE_MAIN && !global.use_envelope_request) - InitAnimation(); -#else - if (game_status != GAME_MODE_MAIN) - InitAnimation(); -#endif + /* sort door part controls according to sort_priority and graphic number */ + qsort(door_part_order, MAX_DOOR_PARTS, + sizeof(struct DoorPartOrderInfo), compareDoorPartOrderInfo); +} - button_status = MB_RELEASED; +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); - request_gadget_id = -1; + if (door_state & DOOR_OPEN_2) + BlitBitmap(bitmap_db_door_2, bitmap_db_door_2, + 1 * VXSIZE, 0, VXSIZE, VYSIZE, 0 * VXSIZE, 0); - SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1); - - while (result < 0) - { - if (PendingEvent()) - { - Event event; - - NextEvent(&event); - - switch (event.type) - { - case EVENT_BUTTONPRESS: - case EVENT_BUTTONRELEASE: - case EVENT_MOTIONNOTIFY: - { - if (event.type == EVENT_MOTIONNOTIFY) - { - if (!PointerInWindow(window)) - continue; /* window and pointer are on different screens */ - - if (!button_status) - continue; - - motion_status = TRUE; - mx = ((MotionEvent *) &event)->x; - my = ((MotionEvent *) &event)->y; - } - else - { - motion_status = FALSE; - mx = ((ButtonEvent *) &event)->x; - my = ((ButtonEvent *) &event)->y; - if (event.type == EVENT_BUTTONPRESS) - button_status = ((ButtonEvent *) &event)->button; - else - button_status = MB_RELEASED; - } - - /* this sets 'request_gadget_id' */ - HandleGadgets(mx, my, button_status); - - switch (request_gadget_id) - { - case TOOL_CTRL_ID_YES: - result = TRUE; - break; - case TOOL_CTRL_ID_NO: - result = FALSE; - break; - case TOOL_CTRL_ID_CONFIRM: - result = TRUE | FALSE; - break; - - case TOOL_CTRL_ID_PLAYER_1: - result = 1; - break; - case TOOL_CTRL_ID_PLAYER_2: - result = 2; - break; - case TOOL_CTRL_ID_PLAYER_3: - result = 3; - break; - case TOOL_CTRL_ID_PLAYER_4: - result = 4; - break; - - default: - break; - } - - break; - } - - case EVENT_KEYPRESS: - switch (GetEventKey((KeyEvent *)&event, TRUE)) - { - case KSYM_space: - if (req_state & REQ_CONFIRM) - result = 1; - break; - - case KSYM_Return: - result = 1; - break; - - case KSYM_Escape: -#if defined(TARGET_SDL2) - case KSYM_Back: -#endif - result = 0; - break; - - default: - break; - } - - if (req_state & REQ_PLAYER) - result = 0; - break; - - case EVENT_KEYRELEASE: - ClearPlayerAction(); - break; - - default: - HandleOtherEvents(&event); - break; - } - } - else if (AnyJoystickButton() == JOY_BUTTON_NEW_PRESSED) - { - int joy = AnyJoystick(); - - if (joy & JOY_BUTTON_1) - result = 1; - else if (joy & JOY_BUTTON_2) - result = 0; - } - -#if 1 - - if (game_status == GAME_MODE_PLAYING && local_player->LevelSolved_GameEnd) - { - HandleGameActions(); - } - else - { - DoAnimation(); - - if (!PendingEvent()) /* delay only if no pending events */ - Delay(10); - } - -#if 1 - game_status = GAME_MODE_PSEUDO_DOOR; -#endif - - BackToFront(); - -#if 1 - game_status = last_game_status; /* restore current game status */ -#endif - -#else - - DoAnimation(); - -#if 1 - if (!PendingEvent()) /* delay only if no pending events */ - Delay(10); -#else - /* don't eat all CPU time */ - Delay(10); -#endif - -#endif - } - - if (game_status != GAME_MODE_MAIN) - StopAnimation(); - - UnmapToolButtons(); - -#if 1 - if (global.use_envelope_request) - ShowEnvelopeRequest(text, ACTION_CLOSING); -#endif - -#if 1 - if (!(req_state & REQ_STAY_OPEN) && !global.use_envelope_request) -#else - if (!(req_state & REQ_STAY_OPEN)) -#endif - { - 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; -} - -#endif - -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); - - 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); - - door_state &= ~DOOR_COPY_BACK; - } + door_state &= ~DOOR_COPY_BACK; + } return MoveDoor(door_state); } @@ -5152,12 +4051,12 @@ unsigned int CloseDoor(unsigned int door_state) 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); + 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; } @@ -5175,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 int door_delay = 0; unsigned int door_delay_value; - int stepsize = 1; + int i; if (door_1.width < 0 || door_1.width > DXSIZE) door_1.width = DXSIZE; @@ -5217,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++) { - /* 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); + 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 (k = start; k <= end && !(door_1_done && door_2_done); k += stepsize) + for (i = 0; i < MAX_DOOR_PARTS; i++) { - int x = k; - Bitmap *bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap; - GC gc = bitmap->stored_clip_gc; + 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 (door_state & DOOR_ACTION_1) - { - int a = MIN(x * door_1.step_offset, end); - int p = (door_state & DOOR_OPEN_1 ? end - a : a); - int i = p + door_skip; + if (!is_panel) + panel_has_doors[door_index] = TRUE; - 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); + 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; + } - ClearRectangle(drawto, DX, DY + DYSIZE - p / 2, DXSIZE, p / 2); - } + num_move_steps = max_move_delay / max_step_delay; - if (door_1.anim_mode & ANIM_HORIZONTAL && x <= DXSIZE) - { - 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); - } - else if (door_1.anim_mode & ANIM_VERTICAL && x <= DYSIZE) - { - 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); - } - else if (x <= DXSIZE) /* ANIM_DEFAULT */ - { - 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); - } + door_delay_value = max_step_delay; - redraw_mask |= REDRAW_DOOR_1; - door_1_done = (a == end); - } + for (k = 0; k < num_move_steps; k++) + { + door_part_done_all = TRUE; + + for (i = 0; i < NUM_DOORS; i++) + door_panel_drawn[i] = FALSE; - if (door_state & DOOR_ACTION_2) + for (i = 0; i < MAX_DOOR_PARTS; i++) { - 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; + 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_2.anim_mode & ANIM_STATIC_PANEL) - { - BlitBitmap(bitmap_db_door, drawto, - DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2, - VXSIZE, VYSIZE, VX, VY); - } - else if (x <= VYSIZE) + if (!(door_state & door_token)) + continue; + + if (!g->bitmap) + continue; + + // draw door panel + + if (!door_panel_drawn[door_index]) { - BlitBitmap(bitmap_db_door, drawto, - DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2 + p / 2, - VXSIZE, VYSIZE - p / 2, VX, VY); + ClearRectangle(drawto, door_rect->x, door_rect->y, + door_rect->width, door_rect->height); - ClearRectangle(drawto, VX, VY + VYSIZE - p / 2, VXSIZE, p / 2); + door_panel_drawn[door_index] = TRUE; } - if (door_2.anim_mode & ANIM_HORIZONTAL && x <= VXSIZE) + // draw opening or closing door parts + + if (pos->step_xoffset < 0) // door part on right side { - 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_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 (door_2.anim_mode & ANIM_VERTICAL && x <= VYSIZE) + else // door part on left side { - 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_xx = 0; + dst_xx = pos->x - kk * pos->step_xoffset; + + if (dst_xx < 0) + { + src_xx = ABS(dst_xx); + dst_xx = 0; + } + + width = g->width - src_xx; + + // printf("::: k == %d [%d] \n", k, start_step); + } + + if (pos->step_yoffset < 0) // door part on bottom side + { + 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 // door part on top side + { + src_yy = 0; + dst_yy = pos->y - kk * pos->step_yoffset; + + if (dst_yy < 0) + { + src_yy = ABS(dst_yy); + dst_yy = 0; + } + + height = g->height - src_yy; + } + + if (is_panel) + { + src_x = src_xx; + src_y = src_yy; + } + else + { + 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)) @@ -5452,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; } } @@ -5466,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; } @@ -5490,8 +4429,6 @@ void UndrawSpecialEditorDoor() /* ---------- new tool button stuff ---------------------------------------- */ -#if 1 - static struct { int graphic; @@ -5565,8 +4502,8 @@ void CreateToolButtons() gi = CreateGadget(GDI_CUSTOM_ID, id, GDI_INFO_TEXT, toolbutton_info[i].infotext, - GDI_X, dx + pos->x, - GDI_Y, dy + pos->y, + 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, @@ -5589,168 +4526,6 @@ void CreateToolButtons() } } -#else - -/* 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 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" - }, - { - 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" - }, - { - 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" - }, - { - 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" - }, - { - 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" - }, - { - 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" - }, - { - 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" - } -}; - -void CreateToolButtons() -{ - int i; - - for (i = 0; i < NUM_TOOL_BUTTONS; i++) - { - Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap; - Bitmap *deco_bitmap = None; - int deco_x = 0, deco_y = 0, deco_xpos = 0, deco_ypos = 0; - struct GadgetInfo *gi; - unsigned int event_mask; - int gd_xoffset, gd_yoffset; - int gd_x1, gd_x2, gd_y; - 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 (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; - } - - 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_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_DECORATION_DESIGN, deco_bitmap, deco_x, deco_y, - GDI_DECORATION_POSITION, deco_xpos, deco_ypos, - GDI_DECORATION_SIZE, MINI_TILEX, MINI_TILEY, - GDI_DECORATION_SHIFTING, 1, 1, - GDI_DIRECT_DRAW, FALSE, - GDI_EVENT_MASK, event_mask, - GDI_CALLBACK_ACTION, HandleToolButtons, - GDI_END); - - if (gi == NULL) - Error(ERR_EXIT, "cannot create gadget"); - - tool_gadget[id] = gi; - } -} - -#endif - void FreeToolButtons() { int i; @@ -6988,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 @@ -7013,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 @@ -7039,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 @@ -7056,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 @@ -7929,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); @@ -7950,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); @@ -7973,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) { @@ -8155,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) @@ -8195,10 +6894,8 @@ unsigned int InitRND(int seed) 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) { @@ -8217,13 +6914,6 @@ inline static int get_effective_element_EM(int tile, int frame_em) case Yacid_splash_wB: return (frame_em > 5 ? EL_EMPTY : element); -#if 0 - /* !!! FIX !!! */ - case Ydiamond_stone: - // if (!game.use_native_emc_graphics_engine) - return EL_ROCK; -#endif - default: return element; } @@ -8301,11 +6991,9 @@ inline static boolean check_linear_animation_EM(int tile) case Ytank_s_e: case Ytank_w_s: case Ytank_n_w: -#if 1 case Yacid_splash_eB: case Yacid_splash_wB: case Yemerald_stone: -#endif return TRUE; } @@ -8358,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 ? @@ -8366,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); @@ -8393,29 +7079,10 @@ void SetGfxAnimation_EM(struct GraphicInfo_EM *g_em, g = &graphic_info[graphic]; } -#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) { GfxFrame[x][y] = 0; - - // printf("::: resetting... [%d]\n", tile); - } -#else - if (action_removing || check_linear_animation_EM(tile)) - { - GfxFrame[x][y] = frame_em; - - // printf("::: resetting... [%d]\n", tile); } -#endif else if (action_moving) { boolean is_backside = object_mapping[tile].is_backside; @@ -8430,11 +7097,7 @@ void SetGfxAnimation_EM(struct GraphicInfo_EM *g_em, #if 1 /* !!! TEST !!! NEW !!! DOES NOT WORK RIGHT YET !!! */ if (g->double_movement && frame_em == 0) - { GfxFrame[x][y] = 0; - - // printf("::: resetting... [%d]\n", tile); - } #endif if (move_dir == MV_LEFT) @@ -8457,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)) @@ -8483,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, @@ -8493,11 +7146,7 @@ void getGraphicSourceObjectExt_EM(struct GraphicInfo_EM *g_em, int direction = object_mapping[tile].direction; boolean is_backside = object_mapping[tile].is_backside; int effective_element = get_effective_element_EM(tile, frame_em); -#if 1 int effective_action = action; -#else - int effective_action = (frame_em < 7 ? action : ACTION_DEFAULT); -#endif int graphic = (direction == MV_NONE ? el_act2img(effective_element, effective_action) : el_act_dir2img(effective_element, effective_action, @@ -8510,9 +7159,6 @@ void getGraphicSourceObjectExt_EM(struct GraphicInfo_EM *g_em, 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; /* special case: graphic uses "2nd movement tile" and has defined @@ -8523,366 +7169,24 @@ void getGraphicSourceObjectExt_EM(struct GraphicInfo_EM *g_em, 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]; - } - -#if 0 - if (frame_em == 7) - return; -#endif - - -#if 0 - if (frame_em == 0) /* reset animation frame for certain elements */ - { - if (check_linear_animation_EM(tile)) - GfxFrame[x][y] = 0; - } -#endif - - if (graphic_info[graphic].anim_global_sync) - sync_frame = FrameCounter; - else if (IN_FIELD(x, y, MAX_LEV_FIELDX, MAX_LEV_FIELDY)) - sync_frame = GfxFrame[x][y]; - else - sync_frame = 0; /* playfield border (pseudo steel) */ - - SetRandomAnimationValue(x, y); - -#if 0 - int i = tile; - int j = frame_em; - int xxx_sync_frame = (i == Xdrip_stretch ? 7 : - i == Xdrip_stretchB ? 7 : - i == Ydrip_s2 ? j + 8 : - i == Ydrip_s2B ? j + 8 : - i == Xacid_1 ? 0 : - i == Xacid_2 ? 10 : - i == Xacid_3 ? 20 : - i == Xacid_4 ? 30 : - i == Xacid_5 ? 40 : - i == Xacid_6 ? 50 : - i == Xacid_7 ? 60 : - i == Xacid_8 ? 70 : - i == Xfake_acid_1 ? 0 : - i == Xfake_acid_2 ? 10 : - i == Xfake_acid_3 ? 20 : - i == Xfake_acid_4 ? 30 : - i == Xfake_acid_5 ? 40 : - i == Xfake_acid_6 ? 50 : - i == Xfake_acid_7 ? 60 : - i == Xfake_acid_8 ? 70 : - i == Xball_2 ? 7 : - i == Xball_2B ? j + 8 : - i == Yball_eat ? j + 1 : - i == Ykey_1_eat ? j + 1 : - i == Ykey_2_eat ? j + 1 : - i == Ykey_3_eat ? j + 1 : - i == Ykey_4_eat ? j + 1 : - i == Ykey_5_eat ? j + 1 : - i == Ykey_6_eat ? j + 1 : - i == Ykey_7_eat ? j + 1 : - i == Ykey_8_eat ? j + 1 : - i == Ylenses_eat ? j + 1 : - i == Ymagnify_eat ? j + 1 : - i == Ygrass_eat ? j + 1 : - i == Ydirt_eat ? j + 1 : - i == Xamoeba_1 ? 0 : - i == Xamoeba_2 ? 1 : - i == Xamoeba_3 ? 2 : - i == Xamoeba_4 ? 3 : - i == Xamoeba_5 ? 0 : - i == Xamoeba_6 ? 1 : - i == Xamoeba_7 ? 2 : - i == Xamoeba_8 ? 3 : - i == Xexit_2 ? j + 8 : - i == Xexit_3 ? j + 16 : - i == Xdynamite_1 ? 0 : - i == Xdynamite_2 ? 8 : - i == Xdynamite_3 ? 16 : - i == Xdynamite_4 ? 24 : - i == Xsand_stonein_1 ? j + 1 : - i == Xsand_stonein_2 ? j + 9 : - i == Xsand_stonein_3 ? j + 17 : - i == Xsand_stonein_4 ? j + 25 : - i == Xsand_stoneout_1 && j == 0 ? 0 : - i == Xsand_stoneout_1 && j == 1 ? 0 : - i == Xsand_stoneout_1 && j == 2 ? 1 : - i == Xsand_stoneout_1 && j == 3 ? 2 : - i == Xsand_stoneout_1 && j == 4 ? 2 : - i == Xsand_stoneout_1 && j == 5 ? 3 : - i == Xsand_stoneout_1 && j == 6 ? 4 : - i == Xsand_stoneout_1 && j == 7 ? 4 : - i == Xsand_stoneout_2 && j == 0 ? 5 : - i == Xsand_stoneout_2 && j == 1 ? 6 : - i == Xsand_stoneout_2 && j == 2 ? 7 : - i == Xsand_stoneout_2 && j == 3 ? 8 : - i == Xsand_stoneout_2 && j == 4 ? 9 : - i == Xsand_stoneout_2 && j == 5 ? 11 : - i == Xsand_stoneout_2 && j == 6 ? 13 : - i == Xsand_stoneout_2 && j == 7 ? 15 : - i == Xboom_bug && j == 1 ? 2 : - i == Xboom_bug && j == 2 ? 2 : - i == Xboom_bug && j == 3 ? 4 : - i == Xboom_bug && j == 4 ? 4 : - i == Xboom_bug && j == 5 ? 2 : - i == Xboom_bug && j == 6 ? 2 : - i == Xboom_bug && j == 7 ? 0 : - i == Xboom_bomb && j == 1 ? 2 : - i == Xboom_bomb && j == 2 ? 2 : - i == Xboom_bomb && j == 3 ? 4 : - i == Xboom_bomb && j == 4 ? 4 : - i == Xboom_bomb && j == 5 ? 2 : - i == Xboom_bomb && j == 6 ? 2 : - i == Xboom_bomb && j == 7 ? 0 : - i == Xboom_android && j == 7 ? 6 : - i == Xboom_1 && j == 1 ? 2 : - i == Xboom_1 && j == 2 ? 2 : - i == Xboom_1 && j == 3 ? 4 : - i == Xboom_1 && j == 4 ? 4 : - i == Xboom_1 && j == 5 ? 6 : - i == Xboom_1 && j == 6 ? 6 : - i == Xboom_1 && j == 7 ? 8 : - i == Xboom_2 && j == 0 ? 8 : - i == Xboom_2 && j == 1 ? 8 : - i == Xboom_2 && j == 2 ? 10 : - i == Xboom_2 && j == 3 ? 10 : - i == Xboom_2 && j == 4 ? 10 : - i == Xboom_2 && j == 5 ? 12 : - i == Xboom_2 && j == 6 ? 12 : - i == Xboom_2 && j == 7 ? 12 : -#if 0 - special_animation && j == 4 ? 3 : - effective_action != action ? 0 : -#endif - j); -#endif - -#if 0 - int xxx_effective_action; - int xxx_has_action_graphics; - - { - int element = object_mapping[i].element_rnd; - 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) && - element != EL_DIAMOND); - boolean action_active = (action == ACTION_ACTIVE); - boolean action_other = (action == ACTION_OTHER); - - { -#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 : - i == Ydrip_s1 ? action : - i == Ydrip_s1B ? action : - i == Xball_1B ? action : - i == Xball_2 ? action : - i == Xball_2B ? action : - i == Yball_eat ? action : - i == Ykey_1_eat ? action : - i == Ykey_2_eat ? action : - i == Ykey_3_eat ? action : - i == Ykey_4_eat ? action : - i == Ykey_5_eat ? action : - i == Ykey_6_eat ? action : - i == Ykey_7_eat ? action : - i == Ykey_8_eat ? action : - i == Ylenses_eat ? action : - i == Ymagnify_eat ? action : - i == Ygrass_eat ? action : - i == Ydirt_eat ? action : - i == Xsand_stonein_1 ? action : - i == Xsand_stonein_2 ? action : - i == Xsand_stonein_3 ? action : - i == Xsand_stonein_4 ? action : - i == Xsand_stoneout_1 ? action : - i == Xsand_stoneout_2 ? action : - i == Xboom_android ? ACTION_EXPLODING : - action_exploding ? ACTION_EXPLODING : - action_active ? action : - action_other ? action : - ACTION_DEFAULT); - int graphic = (el_act_dir2img(effective_element, effective_action, - direction)); - int crumbled = (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_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; - /* ensure to get symmetric 3-frame, 2-delay animations as used in EM */ - boolean special_animation = (action != ACTION_DEFAULT && - g->anim_frames == 3 && - g->anim_delay == 2 && - g->anim_mode & ANIM_LINEAR); - xxx_sync_frame = (i == Xdrip_stretch ? 7 : - i == Xdrip_stretchB ? 7 : - i == Ydrip_s2 ? j + 8 : - i == Ydrip_s2B ? j + 8 : - i == Xacid_1 ? 0 : - i == Xacid_2 ? 10 : - i == Xacid_3 ? 20 : - i == Xacid_4 ? 30 : - i == Xacid_5 ? 40 : - i == Xacid_6 ? 50 : - i == Xacid_7 ? 60 : - i == Xacid_8 ? 70 : - i == Xfake_acid_1 ? 0 : - i == Xfake_acid_2 ? 10 : - i == Xfake_acid_3 ? 20 : - i == Xfake_acid_4 ? 30 : - i == Xfake_acid_5 ? 40 : - i == Xfake_acid_6 ? 50 : - i == Xfake_acid_7 ? 60 : - i == Xfake_acid_8 ? 70 : - i == Xball_2 ? 7 : - i == Xball_2B ? j + 8 : - i == Yball_eat ? j + 1 : - i == Ykey_1_eat ? j + 1 : - i == Ykey_2_eat ? j + 1 : - i == Ykey_3_eat ? j + 1 : - i == Ykey_4_eat ? j + 1 : - i == Ykey_5_eat ? j + 1 : - i == Ykey_6_eat ? j + 1 : - i == Ykey_7_eat ? j + 1 : - i == Ykey_8_eat ? j + 1 : - i == Ylenses_eat ? j + 1 : - i == Ymagnify_eat ? j + 1 : - i == Ygrass_eat ? j + 1 : - i == Ydirt_eat ? j + 1 : - i == Xamoeba_1 ? 0 : - i == Xamoeba_2 ? 1 : - i == Xamoeba_3 ? 2 : - i == Xamoeba_4 ? 3 : - i == Xamoeba_5 ? 0 : - i == Xamoeba_6 ? 1 : - i == Xamoeba_7 ? 2 : - i == Xamoeba_8 ? 3 : - i == Xexit_2 ? j + 8 : - i == Xexit_3 ? j + 16 : - i == Xdynamite_1 ? 0 : - i == Xdynamite_2 ? 8 : - i == Xdynamite_3 ? 16 : - i == Xdynamite_4 ? 24 : - i == Xsand_stonein_1 ? j + 1 : - i == Xsand_stonein_2 ? j + 9 : - i == Xsand_stonein_3 ? j + 17 : - i == Xsand_stonein_4 ? j + 25 : - i == Xsand_stoneout_1 && j == 0 ? 0 : - i == Xsand_stoneout_1 && j == 1 ? 0 : - i == Xsand_stoneout_1 && j == 2 ? 1 : - i == Xsand_stoneout_1 && j == 3 ? 2 : - i == Xsand_stoneout_1 && j == 4 ? 2 : - i == Xsand_stoneout_1 && j == 5 ? 3 : - i == Xsand_stoneout_1 && j == 6 ? 4 : - i == Xsand_stoneout_1 && j == 7 ? 4 : - i == Xsand_stoneout_2 && j == 0 ? 5 : - i == Xsand_stoneout_2 && j == 1 ? 6 : - i == Xsand_stoneout_2 && j == 2 ? 7 : - i == Xsand_stoneout_2 && j == 3 ? 8 : - i == Xsand_stoneout_2 && j == 4 ? 9 : - i == Xsand_stoneout_2 && j == 5 ? 11 : - i == Xsand_stoneout_2 && j == 6 ? 13 : - i == Xsand_stoneout_2 && j == 7 ? 15 : - i == Xboom_bug && j == 1 ? 2 : - i == Xboom_bug && j == 2 ? 2 : - i == Xboom_bug && j == 3 ? 4 : - i == Xboom_bug && j == 4 ? 4 : - i == Xboom_bug && j == 5 ? 2 : - i == Xboom_bug && j == 6 ? 2 : - i == Xboom_bug && j == 7 ? 0 : - i == Xboom_bomb && j == 1 ? 2 : - i == Xboom_bomb && j == 2 ? 2 : - i == Xboom_bomb && j == 3 ? 4 : - i == Xboom_bomb && j == 4 ? 4 : - i == Xboom_bomb && j == 5 ? 2 : - i == Xboom_bomb && j == 6 ? 2 : - i == Xboom_bomb && j == 7 ? 0 : - i == Xboom_android && j == 7 ? 6 : - i == Xboom_1 && j == 1 ? 2 : - i == Xboom_1 && j == 2 ? 2 : - i == Xboom_1 && j == 3 ? 4 : - i == Xboom_1 && j == 4 ? 4 : - i == Xboom_1 && j == 5 ? 6 : - i == Xboom_1 && j == 6 ? 6 : - i == Xboom_1 && j == 7 ? 8 : - i == Xboom_2 && j == 0 ? 8 : - i == Xboom_2 && j == 1 ? 8 : - i == Xboom_2 && j == 2 ? 10 : - i == Xboom_2 && j == 3 ? 10 : - i == Xboom_2 && j == 4 ? 10 : - i == Xboom_2 && j == 5 ? 12 : - i == Xboom_2 && j == 6 ? 12 : - i == Xboom_2 && j == 7 ? 12 : - special_animation && j == 4 ? 3 : - effective_action != action ? 0 : - j); + 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)); - xxx_effective_action = effective_action; - xxx_has_action_graphics = has_action_graphics; - } + g = &graphic_info[graphic]; } -#endif + + if (graphic_info[graphic].anim_global_sync) + sync_frame = FrameCounter; + else if (IN_FIELD(x, y, MAX_LEV_FIELDX, MAX_LEV_FIELDY)) + sync_frame = GfxFrame[x][y]; + else + sync_frame = 0; /* playfield border (pseudo steel) */ + + SetRandomAnimationValue(x, y); int frame = getAnimationFrame(g->anim_frames, g->anim_delay, @@ -8890,183 +7194,13 @@ void getGraphicSourceObjectExt_EM(struct GraphicInfo_EM *g_em, g->anim_start_frame, sync_frame); - -#if 0 - return; -#endif - -#if 0 - if (frame_em == 7) - return; -#endif - -#if 0 - int old_src_x = g_em->src_x; - int old_src_y = g_em->src_y; -#endif - -#if 1 getGraphicSourceExt(graphic, frame, &g_em->bitmap, &g_em->src_x, &g_em->src_y, g->double_movement && is_backside); -#else - getGraphicSourceExt(graphic, frame, &g_em->bitmap, - &g_em->src_x, &g_em->src_y, FALSE); -#endif - - -#if 0 - if (tile == Ydiamond_stone) - printf("::: stone smashing diamond... %d: %d, %d, %d, %d, %d -> %d [%d, %d, %d, %d, %d, %d] [%d]\n", - frame_em, - g->anim_frames, - g->anim_delay, - g->anim_mode, - g->anim_start_frame, - sync_frame, - frame, - g_em->src_x, g_em->src_y, - g_em->src_offset_x, g_em->src_offset_y, - g_em->dst_offset_x, g_em->dst_offset_y, - graphic); -#endif - - -#if 0 - return; -#endif - -#if 0 - if (frame_em == 7) - { - if (graphic == IMG_BUG_MOVING_RIGHT) - printf("::: %d, %d, %d: %d, %d [%d, %d -> %d, %d]\n", graphic, x, y, - g->double_movement, is_backside, - old_src_x, old_src_y, g_em->src_x, g_em->src_y); - - return; - } -#endif - - -#if 0 - g_em->src_offset_x = 0; - g_em->src_offset_y = 0; - g_em->dst_offset_x = 0; - g_em->dst_offset_y = 0; - g_em->width = TILEX; - g_em->height = TILEY; - - g_em->preserve_background = FALSE; -#endif /* (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 - -#if 0 - { - int effective_action = xxx_effective_action; - int has_action_graphics = xxx_has_action_graphics; - - if ((!g->double_movement && (effective_action == ACTION_FALLING || - effective_action == ACTION_MOVING || - effective_action == ACTION_PUSHING || - effective_action == ACTION_EATING)) || - (!has_action_graphics && (effective_action == ACTION_FILLING || - effective_action == ACTION_EMPTYING))) - { - int move_dir = - (effective_action == ACTION_FALLING || - effective_action == ACTION_FILLING || - effective_action == ACTION_EMPTYING ? MV_DOWN : direction); - int dx = (move_dir == MV_LEFT ? -1 : move_dir == MV_RIGHT ? 1 : 0); - int dy = (move_dir == MV_UP ? -1 : move_dir == MV_DOWN ? 1 : 0); - int num_steps = (i == Ydrip_s1 ? 16 : - i == Ydrip_s1B ? 16 : - i == Ydrip_s2 ? 16 : - i == Ydrip_s2B ? 16 : - i == Xsand_stonein_1 ? 32 : - i == Xsand_stonein_2 ? 32 : - i == Xsand_stonein_3 ? 32 : - i == Xsand_stonein_4 ? 32 : - i == Xsand_stoneout_1 ? 16 : - i == Xsand_stoneout_2 ? 16 : 8); - int cx = ABS(dx) * (TILEX / num_steps); - int cy = ABS(dy) * (TILEY / num_steps); - int step_frame = (i == Ydrip_s2 ? j + 8 : - i == Ydrip_s2B ? j + 8 : - i == Xsand_stonein_2 ? j + 8 : - i == Xsand_stonein_3 ? j + 16 : - i == Xsand_stonein_4 ? j + 24 : - i == Xsand_stoneout_2 ? j + 8 : j) + 1; - int step = (is_backside ? step_frame : num_steps - step_frame); - - if (is_backside) /* tile where movement starts */ - { - if (dx < 0 || dy < 0) - { - g_em->src_offset_x = cx * step; - g_em->src_offset_y = cy * step; - } - else - { - g_em->dst_offset_x = cx * step; - g_em->dst_offset_y = cy * step; - } - } - else /* tile where movement ends */ - { - if (dx < 0 || dy < 0) - { - g_em->dst_offset_x = cx * step; - g_em->dst_offset_y = cy * step; - } - else - { - g_em->src_offset_x = cx * step; - g_em->src_offset_y = cy * step; - } - } - - g_em->width = TILEX - cx * step; - g_em->height = TILEY - cy * step; - } - - /* create unique graphic identifier to decide if tile must be redrawn */ - /* bit 31 - 16 (16 bit): EM style graphic - bit 15 - 12 ( 4 bit): EM style frame - bit 11 - 6 ( 6 bit): graphic width - bit 5 - 0 ( 6 bit): graphic height */ - g_em->unique_identifier = - (graphic << 16) | (frame << 12) | (g_em->width << 6) | g_em->height; - } -#endif - } void getGraphicSourcePlayerExt_EM(struct GraphicInfo_EM *g_em, @@ -9095,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 @@ -9182,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) && @@ -9196,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 : @@ -9273,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; @@ -9414,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 || @@ -9778,42 +7791,16 @@ void CheckSingleStepMode_EM(byte action[MAX_PLAYERS], int frame, boolean player_is_dropping) { if (tape.single_step && tape.recording && !tape.pausing) - { -#if 0 - boolean active_players = FALSE; - int i; - - for (i = 0; i < MAX_PLAYERS; i++) - if (action[i] != JOY_NO_ACTION) - active_players = TRUE; -#endif - - // if (frame == 0) if (frame == 0 && !player_is_dropping) TapeTogglePause(TAPE_TOGGLE_AUTOMATIC); - } } void CheckSingleStepMode_SP(boolean murphy_is_waiting, boolean murphy_is_dropping) { -#if 0 - printf("::: waiting: %d, dropping: %d\n", - murphy_is_waiting, murphy_is_dropping); -#endif - if (tape.single_step && tape.recording && !tape.pausing) - { - // if (murphy_is_waiting || murphy_is_dropping) if (murphy_is_waiting) - { -#if 0 - printf("::: murphy is waiting -> pause mode\n"); -#endif - TapeTogglePause(TAPE_TOGGLE_AUTOMATIC); - } - } } void getGraphicSource_SP(struct GraphicInfo_SP *g_sp, @@ -9984,57 +7971,54 @@ void ToggleFullscreenOrChangeWindowScalingIfNeeded() 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 *door_1_x = &DX; - int *door_1_y = &DY; - int *door_2_x = (game_status == GAME_MODE_EDITOR ? &EX : &VX); - int *door_2_y = (game_status == GAME_MODE_EDITOR ? &EY : &VY); - int gfx_game_mode = (game_status == GAME_MODE_PLAYING || - game_status == GAME_MODE_EDITOR ? game_status : - GAME_MODE_MAIN); + 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_mode]; - 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; -#if NEW_TILESIZE - int new_tilesize_var = TILESIZE / (setup.small_game_graphics ? 2 : 1); + 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; -#else - int new_scr_fieldx = (vp_playfield->width - 2 * border_size) / TILESIZE; - int new_scr_fieldy = (vp_playfield->height - 2 * border_size) / TILESIZE; -#endif boolean init_gfx_buffers = FALSE; boolean init_video_buffer = FALSE; boolean init_gadgets_and_toons = FALSE; - -#if 0 - /* !!! TEST ONLY !!! */ - // InitGfxBuffers(); - return; -#endif + boolean init_em_graphics = FALSE; if (viewport.window.width != WIN_XSIZE || viewport.window.height != WIN_YSIZE) @@ -10042,20 +8026,8 @@ void ChangeViewportPropertiesIfNeeded() WIN_XSIZE = viewport.window.width; WIN_YSIZE = viewport.window.height; -#if 1 init_video_buffer = TRUE; init_gfx_buffers = TRUE; -#else - InitVideoBuffer(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH, setup.fullscreen); - InitGfxBuffers(); - -#if 1 - SetDrawDeactivationMask(REDRAW_NONE); - SetDrawBackgroundMask(REDRAW_FIELD); - - // RedrawBackground(); -#endif -#endif // printf("::: video: init_video_buffer, init_gfx_buffers\n"); } @@ -10071,74 +8043,67 @@ void ChangeViewportPropertiesIfNeeded() // printf("::: new_scr_fieldx != SCR_FIELDX ...\n"); } -#if 0 - if (new_tilesize_var != TILESIZE_VAR && - gfx_game_mode == GAME_MODE_PLAYING) - { - /* doing this outside GAME_MODE_PLAYING would give wrong playfield size */ - - TILESIZE_VAR = new_tilesize_var; - - init_gfx_buffers = TRUE; - - // printf("::: tilesize: init_gfx_buffers\n"); - } -#endif - 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 || - vp_door_1->x != *door_1_x || - vp_door_1->y != *door_1_y || - vp_door_2->x != *door_2_x || - vp_door_2->y != *door_2_y) + 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; -#if 0 - printf("::: %d, %d, %d [%d]\n", - SCR_FIELDX, SCR_FIELDY, TILESIZE_VAR, - setup.small_game_graphics); -#endif - - *door_1_x = vp_door_1->x; - *door_1_y = vp_door_1->y; - *door_2_x = vp_door_2->x; - *door_2_y = vp_door_2->y; - -#if 1 init_gfx_buffers = TRUE; + init_gadgets_and_toons = TRUE; // printf("::: viewports: init_gfx_buffers\n"); -#else - InitGfxBuffers(); -#endif - - if (gfx_game_mode == GAME_MODE_MAIN) - { -#if 1 - init_gadgets_and_toons = TRUE; - - // printf("::: viewports: init_gadgets_and_toons\n"); -#else - InitGadgets(); - InitToons(); -#endif - } + // printf("::: viewports: init_gadgets_and_toons\n"); } if (init_gfx_buffers) @@ -10172,7 +8137,8 @@ void ChangeViewportPropertiesIfNeeded() InitToons(); } -#if 0 - printf("::: %d, %d / %d, %d [%d]\n", VX, VY, EX, EY, game_status); -#endif + if (init_em_graphics) + { + InitGraphicInfo_EM(); + } }