X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.c;h=3f9b7f26bdc436ee1e899dd8020eb7b3e67f5b62;hp=4711961d04144b313957294b5e84ec4d215b90d7;hb=db0cf963a41d958dc11ee1d3cfb2b1f88cba7f76;hpb=88c9b68c44a16e7df62557b63cc7e86731e028c9 diff --git a/src/tools.c b/src/tools.c index 4711961d..3f9b7f26 100644 --- a/src/tools.c +++ b/src/tools.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -19,6 +19,11 @@ #include "cartoons.h" #include "network.h" #include "tape.h" +#include "screens.h" + + +/* select level set with EMC X11 graphics before activating EM GFX debugging */ +#define DEBUG_EM_GFX 0 /* tool button identifiers */ #define TOOL_CTRL_ID_YES 0 @@ -63,6 +68,12 @@ void DumpTile(int x, int y) int sx = SCREENX(x); int sy = SCREENY(y); + if (level.game_engine_type == GAME_ENGINE_TYPE_EM) + { + x--; + y--; + } + printf_line("-", 79); printf("Field Info: SCREEN(%d, %d), LEVEL(%d, %d)\n", sx, sy, x, y); printf_line("-", 79); @@ -127,6 +138,10 @@ void RedrawPlayfield(boolean force_redraw, int x, int y, int width, int height) if (game_status == GAME_MODE_PLAYING && level.game_engine_type == GAME_ENGINE_TYPE_EM) { + /* currently there is no partial redraw -- always redraw whole playfield */ + RedrawPlayfield_EM(TRUE); + + /* blit playfield from scroll buffer to normal back buffer for fading in */ BlitScreenToBitmap_EM(backbuffer); } else if (game_status == GAME_MODE_PLAYING && !game.envelope_active) @@ -169,9 +184,83 @@ void RedrawPlayfield(boolean force_redraw, int x, int y, int width, int height) } } + if (force_redraw) + { + x = gfx.sx; + y = gfx.sy; + width = gfx.sxsize; + height = gfx.sysize; + } + BlitBitmap(drawto, window, x, y, width, height, x, y); } +void DrawMaskedBorder_Rect(int x, int y, int width, int height) +{ + Bitmap *bitmap = graphic_info[IMG_GLOBAL_BORDER].bitmap; + + SetClipOrigin(bitmap, bitmap->stored_clip_gc, 0, 0); + BlitBitmapMasked(bitmap, backbuffer, x, y, width, height, x, y); +} + +void DrawMaskedBorder_FIELD() +{ + if (game_status >= GAME_MODE_TITLE && + game_status <= GAME_MODE_PLAYING && + border.draw_masked[game_status]) + DrawMaskedBorder_Rect(REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE); +} + +void DrawMaskedBorder_DOOR_1() +{ + if (border.draw_masked[GFX_SPECIAL_ARG_DOOR] && + (game_status != GAME_MODE_EDITOR || + border.draw_masked[GFX_SPECIAL_ARG_EDITOR])) + DrawMaskedBorder_Rect(DX, DY, DXSIZE, DYSIZE); +} + +void DrawMaskedBorder_DOOR_2() +{ + if (border.draw_masked[GFX_SPECIAL_ARG_DOOR] && + game_status != GAME_MODE_EDITOR) + DrawMaskedBorder_Rect(VX, VY, VXSIZE, VYSIZE); +} + +void DrawMaskedBorder_DOOR_3() +{ + /* currently not available */ +} + +void DrawMaskedBorder_ALL() +{ + DrawMaskedBorder_FIELD(); + DrawMaskedBorder_DOOR_1(); + DrawMaskedBorder_DOOR_2(); + DrawMaskedBorder_DOOR_3(); +} + +void DrawMaskedBorder(int redraw_mask) +{ + /* do not draw masked screen borders when displaying title screens */ + if (effectiveGameStatus() == GAME_MODE_TITLE || + effectiveGameStatus() == GAME_MODE_MESSAGE) + return; + + if (redraw_mask & REDRAW_ALL) + DrawMaskedBorder_ALL(); + else + { + if (redraw_mask & REDRAW_FIELD) + DrawMaskedBorder_FIELD(); + if (redraw_mask & REDRAW_DOOR_1) + DrawMaskedBorder_DOOR_1(); + if (redraw_mask & REDRAW_DOOR_2) + DrawMaskedBorder_DOOR_2(); + if (redraw_mask & REDRAW_DOOR_3) + DrawMaskedBorder_DOOR_3(); + } +} + void BackToFront() { int x,y; @@ -189,6 +278,11 @@ void BackToFront() if (redraw_mask == REDRAW_NONE) return; + if (redraw_mask & REDRAW_TILES && + game_status == GAME_MODE_PLAYING && + border.draw_masked[GAME_MODE_PLAYING]) + redraw_mask |= REDRAW_FIELD; + if (global.fps_slowdown && game_status == GAME_MODE_PLAYING) { static boolean last_frame_skipped = FALSE; @@ -226,10 +320,19 @@ void BackToFront() SyncDisplay(); + /* prevent drawing masked border to backbuffer when using playfield buffer */ + if (game_status != GAME_MODE_PLAYING || + redraw_mask & REDRAW_FROM_BACKBUFFER || + buffer == backbuffer) + DrawMaskedBorder(redraw_mask); + else + DrawMaskedBorder(redraw_mask & REDRAW_DOORS); + if (redraw_mask & REDRAW_ALL) { BlitBitmap(backbuffer, window, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); - redraw_mask = 0; + + redraw_mask = REDRAW_NONE; } if (redraw_mask & REDRAW_FIELD) @@ -255,7 +358,23 @@ void BackToFront() ABS(ScreenMovPos) == ScrollStepSize || redraw_tiles > REDRAWTILES_THRESHOLD) { - BlitBitmap(buffer, window, fx, fy, SXSIZE, SYSIZE, SX, SY); + if (border.draw_masked[GAME_MODE_PLAYING]) + { + if (buffer != backbuffer) + { + /* copy playfield buffer to backbuffer to add masked border */ + BlitBitmap(buffer, backbuffer, fx, fy, SXSIZE, SYSIZE, SX, SY); + DrawMaskedBorder(REDRAW_FIELD); + } + + BlitBitmap(backbuffer, window, + REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE, + REAL_SX, REAL_SY); + } + else + { + BlitBitmap(buffer, window, fx, fy, SXSIZE, SYSIZE, SX, SY); + } #if 0 #ifdef DEBUG @@ -401,10 +520,98 @@ void FadeToFront() BackToFront(); } +void FadeExt(int fade_mask, int fade_mode) +{ + void (*draw_border_function)(void) = NULL; + Bitmap *bitmap = (fade_mode == FADE_MODE_CROSSFADE ? bitmap_db_cross : NULL); + int x, y, width, height; + int fade_delay, post_delay; + + if (fade_mask & REDRAW_FIELD) + { + x = REAL_SX; + y = REAL_SY; + width = FULL_SXSIZE; + height = FULL_SYSIZE; + + fade_delay = menu.fade_delay; + post_delay = (fade_mode == FADE_MODE_FADE_OUT ? menu.post_delay : 0); + + draw_border_function = DrawMaskedBorder_FIELD; + } + else /* REDRAW_ALL */ + { + x = 0; + y = 0; + width = WIN_XSIZE; + height = WIN_YSIZE; + + fade_delay = title.fade_delay_final; + post_delay = (fade_mode == FADE_MODE_FADE_OUT ? title.post_delay_final : 0); + } + + redraw_mask |= fade_mask; + + if (!setup.fade_screens || fade_delay == 0) + { + if (fade_mode == FADE_MODE_FADE_OUT) + ClearRectangle(backbuffer, x, y, width, height); + + BackToFront(); + + return; + } + + FadeRectangle(bitmap, x, y, width, height, fade_mode, fade_delay, post_delay, + draw_border_function); + + redraw_mask &= ~fade_mask; +} + +void FadeIn(int fade_mask) +{ + FadeExt(fade_mask, FADE_MODE_FADE_IN); +} + +void FadeOut(int fade_mask) +{ + FadeExt(fade_mask, FADE_MODE_FADE_OUT); +} + +void FadeCross(int fade_mask) +{ + FadeExt(fade_mask, FADE_MODE_CROSSFADE); +} + +void FadeCrossSaveBackbuffer() +{ + BlitBitmap(backbuffer, bitmap_db_cross, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); +} + +void SetWindowBackgroundImageIfDefined(int graphic) +{ + if (graphic_info[graphic].bitmap) + SetWindowBackgroundBitmap(graphic_info[graphic].bitmap); +} + void SetMainBackgroundImageIfDefined(int graphic) { if (graphic_info[graphic].bitmap) - SetMainBackgroundImage(graphic); + SetMainBackgroundBitmap(graphic_info[graphic].bitmap); +} + +void SetDoorBackgroundImageIfDefined(int graphic) +{ + if (graphic_info[graphic].bitmap) + SetDoorBackgroundBitmap(graphic_info[graphic].bitmap); +} + +void SetWindowBackgroundImage(int graphic) +{ + SetWindowBackgroundBitmap(graphic == IMG_UNDEFINED ? NULL : + graphic_info[graphic].bitmap ? + graphic_info[graphic].bitmap : + graphic_info[IMG_BACKGROUND].bitmap); } void SetMainBackgroundImage(int graphic) @@ -423,17 +630,54 @@ void SetDoorBackgroundImage(int graphic) graphic_info[IMG_BACKGROUND].bitmap); } -void DrawBackground(int dst_x, int dst_y, int width, int height) +void SetPanelBackground() +{ + BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, bitmap_db_panel, + DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, 0, 0); + + SetDoorBackgroundBitmap(bitmap_db_panel); +} + +void DrawBackground(int x, int y, int width, int height) { - ClearRectangleOnBackground(backbuffer, dst_x, dst_y, width, 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 + ClearRectangleOnBackground(backbuffer, x, y, width, height); +#endif redraw_mask |= REDRAW_FIELD; } +void DrawBackgroundForFont(int x, int y, int width, int height, int font_nr) +{ + struct FontBitmapInfo *font = getFontBitmapInfo(font_nr); + + if (font->bitmap == NULL) + return; + + DrawBackground(x, y, width, height); +} + +void DrawBackgroundForGraphic(int x, int y, int width, int height, int graphic) +{ + struct GraphicInfo *g = &graphic_info[graphic]; + + if (g->bitmap == NULL) + return; + + DrawBackground(x, y, width, height); +} + void ClearWindow() { + /* !!! "drawto" might still point to playfield buffer here (see above) !!! */ + /* (when entering hall of fame after playing) */ DrawBackground(REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE); + /* !!! maybe this should be done before clearing the background !!! */ if (setup.soft_scrolling && game_status == GAME_MODE_PLAYING) { ClearRectangle(fieldbuffer, 0, 0, FXSIZE, FYSIZE); @@ -480,6 +724,39 @@ void SetBorderElement() } } +void FloodFillLevel(int from_x, int from_y, int fill_element, + short field[MAX_LEV_FIELDX][MAX_LEV_FIELDY], + int max_fieldx, int max_fieldy) +{ + int i,x,y; + int old_element; + static int check[4][2] = { { -1, 0 }, { 0, -1 }, { 1, 0 }, { 0, 1 } }; + static int safety = 0; + + /* check if starting field still has the desired content */ + if (field[from_x][from_y] == fill_element) + return; + + safety++; + + if (safety > max_fieldx * max_fieldy) + Error(ERR_EXIT, "Something went wrong in 'FloodFill()'. Please debug."); + + old_element = field[from_x][from_y]; + field[from_x][from_y] = fill_element; + + for (i = 0; i < 4; i++) + { + x = from_x + check[i][0]; + y = from_y + check[i][1]; + + if (IN_FIELD(x, y, max_fieldx, max_fieldy) && field[x][y] == old_element) + FloodFillLevel(x, y, fill_element, field, max_fieldx, max_fieldy); + } + + safety--; +} + void SetRandomAnimationValue(int x, int y) { gfx.anim_random_frame = GfxRandom[x][y]; @@ -737,11 +1014,14 @@ inline static void DrawGraphicShiftedDouble(int x, int y, int dx, int dy, int y2 = y + SIGN(dy); int anim_frames = graphic_info[graphic].anim_frames; int sync_frame = (dx ? ABS(dx) : ABS(dy)) * anim_frames / TILESIZE; + 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 (IN_SCR_FIELD(x1, y1)) /* movement start graphic inside screen area */ + /* 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); @@ -762,7 +1042,8 @@ inline static void DrawGraphicShiftedDouble(int x, int y, int dx, int dy, MarkTileDirty(x1, y1); } - if (IN_SCR_FIELD(x2, y2)) /* movement end graphic inside screen area */ + /* check if movement end graphic inside screen area and should be drawn */ + if (draw_end_tile && IN_SCR_FIELD(x2, y2)) { getGraphicSourceExt(graphic, frame, &src_bitmap, &src_x, &src_y, FALSE); @@ -895,10 +1176,6 @@ void DrawLevelFieldThruMask(int x, int y) DrawLevelElementExt(x, y, 0, 0, Feld[x][y], NO_CUTTING, USE_MASKING); } -#define TILE_GFX_ELEMENT(x, y) \ - (GfxElement[x][y] != EL_UNDEFINED && Feld[x][y] != EL_EXPLOSION ? \ - GfxElement[x][y] : Feld[x][y]) - static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) { Bitmap *src_bitmap; @@ -970,34 +1247,20 @@ static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) int sxx = sx + xy[i][0]; int syy = sy + xy[i][1]; -#if 1 if (!IN_LEV_FIELD(xx, yy) || !IN_SCR_FIELD(sxx, syy) || IS_MOVING(xx, yy)) continue; -#if 1 if (Feld[xx][yy] == EL_ELEMENT_SNAPPING) continue; -#endif element = TILE_GFX_ELEMENT(xx, yy); if (!GFX_CRUMBLED(element)) continue; -#else - if (!IN_LEV_FIELD(xx, yy) || - !IN_SCR_FIELD(sxx, syy) || - !GFX_CRUMBLED(Feld[xx][yy]) || - IS_MOVING(xx, yy)) - continue; -#endif -#if 1 graphic = el_act2crm(element, ACTION_DEFAULT); -#else - graphic = el_act2crm(Feld[xx][yy], ACTION_DEFAULT); -#endif crumbled_border_size = graphic_info[graphic].border_size; getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); @@ -1033,10 +1296,19 @@ void DrawLevelFieldCrumbledSand(int x, int y) return; #if 1 + /* !!! CHECK THIS !!! */ + + /* if (Feld[x][y] == EL_ELEMENT_SNAPPING && GFX_CRUMBLED(GfxElement[x][y])) + */ + + if (Feld[x][y] == EL_ELEMENT_SNAPPING && + GfxElement[x][y] != EL_UNDEFINED && + GFX_CRUMBLED(GfxElement[x][y])) { DrawLevelFieldCrumbledSandDigging(x, y, GfxDir[x][y], GfxFrame[x][y]); + return; } #endif @@ -1152,13 +1424,17 @@ void DrawScreenField(int x, int y) boolean cut_mode = NO_CUTTING; if (element == EL_QUICKSAND_EMPTYING || + element == EL_QUICKSAND_FAST_EMPTYING || element == EL_MAGIC_WALL_EMPTYING || element == EL_BD_MAGIC_WALL_EMPTYING || + element == EL_DC_MAGIC_WALL_EMPTYING || element == EL_AMOEBA_DROPPING) cut_mode = CUT_ABOVE; else if (element == EL_QUICKSAND_FILLING || + element == EL_QUICKSAND_FAST_FILLING || element == EL_MAGIC_WALL_FILLING || - element == EL_BD_MAGIC_WALL_FILLING) + element == EL_BD_MAGIC_WALL_FILLING || + element == EL_DC_MAGIC_WALL_FILLING) cut_mode = CUT_BELOW; if (cut_mode == CUT_ABOVE) @@ -1200,8 +1476,10 @@ void DrawScreenField(int x, int y) content_old = Store[oldx][oldy]; if (element_old == EL_QUICKSAND_EMPTYING || + element_old == EL_QUICKSAND_FAST_EMPTYING || element_old == EL_MAGIC_WALL_EMPTYING || element_old == EL_BD_MAGIC_WALL_EMPTYING || + element_old == EL_DC_MAGIC_WALL_EMPTYING || element_old == EL_AMOEBA_DROPPING) cut_mode = CUT_ABOVE; @@ -1321,8 +1599,8 @@ void AnimateEnvelope(int envelope_nr, int anim_mode, int action) int font_nr = FONT_ENVELOPE_1 + envelope_nr; int font_width = getFontWidth(font_nr); int font_height = getFontHeight(font_nr); - int max_xsize = level.envelope_xsize[envelope_nr]; - int max_ysize = level.envelope_ysize[envelope_nr]; + int max_xsize = level.envelope[envelope_nr].xsize; + int max_ysize = level.envelope[envelope_nr].ysize; int xstart = (anim_mode & ANIM_VERTICAL ? max_xsize : 0); int ystart = (anim_mode & ANIM_HORIZONTAL ? max_ysize : 0); int xend = max_xsize; @@ -1348,9 +1626,17 @@ void AnimateEnvelope(int envelope_nr, int anim_mode, int action) for (yy = 0; yy < ysize; yy++) for (xx = 0; xx < xsize; xx++) DrawEnvelopeBackground(envelope_nr, sx,sy, xx,yy, xsize, ysize, font_nr); +#if 1 + DrawTextBuffer(SX + sx + font_width, SY + sy + font_height, + level.envelope[envelope_nr].text, font_nr, max_xsize, + xsize - 2, ysize - 2, mask_mode, + level.envelope[envelope_nr].autowrap, + level.envelope[envelope_nr].centered, FALSE); +#else DrawTextToTextArea(SX + sx + font_width, SY + sy + font_height, - level.envelope_text[envelope_nr], font_nr, max_xsize, + level.envelope[envelope_nr].text, font_nr, max_xsize, xsize - 2, ysize - 2, mask_mode); +#endif redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; BackToFront(); @@ -1375,7 +1661,7 @@ void ShowEnvelope(int envelope_nr) game.envelope_active = TRUE; /* needed for RedrawPlayfield() events */ - PlaySoundStereo(sound_opening, SOUND_MIDDLE); + PlayMenuSoundStereo(sound_opening, SOUND_MIDDLE); if (anim_mode == ANIM_DEFAULT) AnimateEnvelope(envelope_nr, ANIM_DEFAULT, ACTION_OPENING); @@ -1387,7 +1673,7 @@ void ShowEnvelope(int envelope_nr) else WaitForEventToContinue(); - PlaySoundStereo(sound_closing, SOUND_MIDDLE); + PlayMenuSoundStereo(sound_closing, SOUND_MIDDLE); if (anim_mode != ANIM_NONE) AnimateEnvelope(envelope_nr, main_anim_mode, ACTION_CLOSING); @@ -1403,28 +1689,45 @@ void ShowEnvelope(int envelope_nr) BackToFront(); } -void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y) +void getPreviewGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y, + int tilesize) { + struct + { + int width_mult, width_div; + int height_mult, height_div; + } offset_calc[4] = + { + { 0, 1, 0, 1 }, + { 0, 1, 2, 3 }, + { 1, 2, 2, 3 }, + { 3, 4, 2, 3 }, + }; + int offset_calc_pos = (tilesize < MICRO_TILESIZE || tilesize > TILESIZE ? 3 : + 5 - log_2(tilesize)); Bitmap *src_bitmap = graphic_info[graphic].bitmap; - int mini_startx = src_bitmap->width * 3 / 4; - int mini_starty = src_bitmap->height * 2 / 3; - int src_x = mini_startx + graphic_info[graphic].src_x / 8; - int src_y = mini_starty + graphic_info[graphic].src_y / 8; + 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 mini_startx = src_bitmap->width * width_mult / width_div; + int mini_starty = src_bitmap->height * height_mult / height_div; + int src_x = mini_startx + graphic_info[graphic].src_x * tilesize / TILESIZE; + int src_y = mini_starty + graphic_info[graphic].src_y * tilesize / TILESIZE; *bitmap = src_bitmap; *x = src_x; *y = src_y; } -void DrawMicroElement(int xpos, int ypos, int element) +void DrawPreviewElement(int dst_x, int dst_y, int element, int tilesize) { Bitmap *src_bitmap; int src_x, src_y; int graphic = el2preimg(element); - getMicroGraphicSource(graphic, &src_bitmap, &src_x, &src_y); - BlitBitmap(src_bitmap, drawto, src_x, src_y, MICRO_TILEX, MICRO_TILEY, - xpos, ypos); + getPreviewGraphicSource(graphic, &src_bitmap, &src_x, &src_y, tilesize); + BlitBitmap(src_bitmap, drawto, src_x, src_y, tilesize, tilesize, dst_x,dst_y); } void DrawLevel() @@ -1452,33 +1755,36 @@ void DrawMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y) redraw_mask |= REDRAW_FIELD; } -static void DrawMicroLevelExt(int xpos, int ypos, int from_x, int from_y) +static void DrawPreviewLevelExt(int from_x, int from_y) { + boolean show_level_border = (BorderElement != EL_EMPTY); + int level_xsize = lev_fieldx + (show_level_border ? 2 : 0); + int level_ysize = lev_fieldy + (show_level_border ? 2 : 0); + int tile_size = preview.tile_size; + int preview_width = preview.xsize * tile_size; + int preview_height = preview.ysize * tile_size; + int real_preview_xsize = MIN(level_xsize, preview.xsize); + int real_preview_ysize = MIN(level_ysize, preview.ysize); + int dst_x = SX + ALIGNED_XPOS(preview.x, preview_width, preview.align); + int dst_y = SY + preview.y; int x, y; - DrawBackground(xpos, ypos, MICROLEVEL_XSIZE, MICROLEVEL_YSIZE); - - if (lev_fieldx < STD_LEV_FIELDX) - xpos += (STD_LEV_FIELDX - lev_fieldx) / 2 * MICRO_TILEX; - if (lev_fieldy < STD_LEV_FIELDY) - ypos += (STD_LEV_FIELDY - lev_fieldy) / 2 * MICRO_TILEY; + DrawBackground(dst_x, dst_y, preview_width, preview_height); - xpos += MICRO_TILEX; - ypos += MICRO_TILEY; + dst_x += (preview_width - real_preview_xsize * tile_size) / 2; + dst_y += (preview_height - real_preview_ysize * tile_size) / 2; - for (x = -1; x <= STD_LEV_FIELDX; x++) + for (x = 0; x < real_preview_xsize; x++) { - for (y = -1; y <= STD_LEV_FIELDY; y++) + for (y = 0; y < real_preview_ysize; y++) { - int lx = from_x + x, ly = from_y + y; - - if (lx >= 0 && lx < lev_fieldx && ly >= 0 && ly < lev_fieldy) - DrawMicroElement(xpos + x * MICRO_TILEX, ypos + y * MICRO_TILEY, - level.field[lx][ly]); - else if (lx >= -1 && lx < lev_fieldx+1 && ly >= -1 && ly < lev_fieldy+1 - && BorderElement != EL_EMPTY) - DrawMicroElement(xpos + x * MICRO_TILEX, ypos + y * MICRO_TILEY, - getBorderElement(lx, ly)); + int lx = from_x + x + (show_level_border ? -1 : 0); + int ly = from_y + y + (show_level_border ? -1 : 0); + int element = (IN_LEV_FIELD(lx, ly) ? level.field[lx][ly] : + getBorderElement(lx, ly)); + + DrawPreviewElement(dst_x + x * tile_size, dst_y + y * tile_size, + element, tile_size); } } @@ -1494,8 +1800,24 @@ static void DrawMicroLevelExt(int xpos, int ypos, int from_x, int from_y) #define MICROLABEL_IMPORTED_BY_HEAD 6 #define MICROLABEL_IMPORTED_BY 7 -static void DrawMicroLevelLabelExt(int mode) +static int getMaxTextLength(struct TextPosInfo *pos, int font_nr) +{ + int max_text_width = SXSIZE; + int font_width = getFontWidth(font_nr); + + if (pos->align == ALIGN_CENTER) + max_text_width = (pos->x < SXSIZE / 2 ? pos->x * 2 : (SXSIZE - pos->x) * 2); + else if (pos->align == ALIGN_RIGHT) + max_text_width = pos->x; + else + max_text_width = SXSIZE - pos->x; + + return max_text_width / font_width; +} + +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; int font_nr = FONT_TEXT_2; @@ -1506,7 +1828,16 @@ static void DrawMicroLevelLabelExt(int mode) mode == MICROLABEL_IMPORTED_BY_HEAD) font_nr = FONT_TEXT_3; +#if 1 + max_len_label_text = getMaxTextLength(pos, font_nr); +#else max_len_label_text = SXSIZE / getFontWidth(font_nr); +#endif + +#if 1 + if (pos->chars != -1) + max_len_label_text = pos->chars; +#endif for (i = 0; i < max_len_label_text; i++) label_text[i] = ' '; @@ -1514,10 +1845,14 @@ static void DrawMicroLevelLabelExt(int mode) 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, @@ -1533,35 +1868,56 @@ static void DrawMicroLevelLabelExt(int mode) if (strlen(label_text) > 0) { +#if 1 + DrawTextSAligned(pos->x, pos->y, label_text, font_nr, pos->align); +#else int lxpos = SX + (SXSIZE - getTextWidth(label_text, font_nr)) / 2; int lypos = MICROLABEL2_YPOS; DrawText(lxpos, lypos, label_text, font_nr); +#endif } redraw_mask |= REDRAW_MICROLEVEL; } -void DrawMicroLevel(int xpos, int ypos, boolean restart) +void DrawPreviewLevel(boolean restart) { static unsigned long scroll_delay = 0; static unsigned long label_delay = 0; static int from_x, from_y, scroll_direction; static int label_state, label_counter; - int last_game_status = game_status; /* save current game status */ + unsigned long scroll_delay_value = preview.step_delay; + boolean show_level_border = (BorderElement != EL_EMPTY); + int level_xsize = lev_fieldx + (show_level_border ? 2 : 0); + int level_ysize = lev_fieldy + (show_level_border ? 2 : 0); + int last_game_status = game_status; /* save current game status */ /* force PREVIEW font on preview level */ game_status = GAME_MODE_PSEUDO_PREVIEW; if (restart) { - from_x = from_y = 0; + from_x = 0; + from_y = 0; + + if (preview.anim_mode == ANIM_CENTERED) + { + if (level_xsize > preview.xsize) + from_x = (level_xsize - preview.xsize) / 2; + if (level_ysize > preview.ysize) + from_y = (level_ysize - preview.ysize) / 2; + } + + from_x += preview.xoffset; + from_y += preview.yoffset; + scroll_direction = MV_RIGHT; label_state = 1; label_counter = 0; - DrawMicroLevelExt(xpos, ypos, from_x, from_y); - DrawMicroLevelLabelExt(label_state); + DrawPreviewLevelExt(from_x, from_y); + DrawPreviewLevelLabelExt(label_state); /* initialize delay counters */ DelayReached(&scroll_delay, 0); @@ -1569,18 +1925,35 @@ void DrawMicroLevel(int xpos, int ypos, boolean restart) if (leveldir_current->name) { + struct TextPosInfo *pos = &menu.main.text.level_info_1; char label_text[MAX_OUTPUT_LINESIZE + 1]; int font_nr = FONT_TEXT_1; +#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->chars != -1) + max_len_label_text = pos->chars; +#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 } game_status = last_game_status; /* restore current game status */ @@ -1588,36 +1961,51 @@ void DrawMicroLevel(int xpos, int ypos, boolean restart) return; } - /* scroll micro level, if needed */ - if ((lev_fieldx > STD_LEV_FIELDX || lev_fieldy > STD_LEV_FIELDY) && - DelayReached(&scroll_delay, MICROLEVEL_SCROLL_DELAY)) + /* scroll preview level, if needed */ + if (preview.anim_mode != ANIM_NONE && + (level_xsize > preview.xsize || level_ysize > preview.ysize) && + DelayReached(&scroll_delay, scroll_delay_value)) { switch (scroll_direction) { case MV_LEFT: if (from_x > 0) - from_x--; + { + from_x -= preview.step_offset; + from_x = (from_x < 0 ? 0 : from_x); + } else scroll_direction = MV_UP; break; case MV_RIGHT: - if (from_x < lev_fieldx - STD_LEV_FIELDX) - from_x++; + if (from_x < level_xsize - preview.xsize) + { + from_x += preview.step_offset; + from_x = (from_x > level_xsize - preview.xsize ? + level_xsize - preview.xsize : from_x); + } else scroll_direction = MV_DOWN; break; case MV_UP: if (from_y > 0) - from_y--; + { + from_y -= preview.step_offset; + from_y = (from_y < 0 ? 0 : from_y); + } else scroll_direction = MV_RIGHT; break; case MV_DOWN: - if (from_y < lev_fieldy - STD_LEV_FIELDY) - from_y++; + if (from_y < level_ysize - preview.ysize) + { + from_y += preview.step_offset; + from_y = (from_y > level_ysize - preview.ysize ? + level_ysize - preview.ysize : from_y); + } else scroll_direction = MV_LEFT; break; @@ -1626,14 +2014,14 @@ void DrawMicroLevel(int xpos, int ypos, boolean restart) break; } - DrawMicroLevelExt(xpos, ypos, from_x, from_y); + DrawPreviewLevelExt(from_x, from_y); } /* !!! THIS ALL SUCKS -- SHOULD BE CLEANLY REWRITTEN !!! */ /* redraw micro level label, if needed */ - if (strcmp(level.name, NAMELESS_LEVEL_NAME) != 0 && - strcmp(level.author, ANONYMOUS_NAME) != 0 && - strcmp(level.author, leveldir_current->name) != 0 && + if (!strEqual(level.name, NAMELESS_LEVEL_NAME) && + !strEqual(level.author, ANONYMOUS_NAME) && + !strEqual(level.author, leveldir_current->name) && DelayReached(&label_delay, MICROLEVEL_LABEL_DELAY)) { int max_label_counter = 23; @@ -1667,7 +2055,7 @@ void DrawMicroLevel(int xpos, int ypos, boolean restart) label_state = (label_state == MICROLABEL_IMPORTED_FROM_HEAD ? MICROLABEL_IMPORTED_BY_HEAD : MICROLABEL_IMPORTED_BY); - DrawMicroLevelLabelExt(label_state); + DrawPreviewLevelLabelExt(label_state); } game_status = last_game_status; /* restore current game status */ @@ -1814,6 +2202,7 @@ void DrawPlayer(struct PlayerInfo *player) int next_jx = jx + dx; int next_jy = jy + dy; boolean player_is_moving = (player->MovPos ? TRUE : FALSE); + boolean player_is_opaque = FALSE; int sx = SCREENX(jx), sy = SCREENY(jy); int sxx = 0, syy = 0; int element = Feld[jx][jy], last_element = Feld[last_jx][last_jy]; @@ -1823,6 +2212,11 @@ void DrawPlayer(struct PlayerInfo *player) int last_player_frame = player->Frame; int frame = 0; + /* GfxElement[][] is set to the element the player is digging or collecting; + remove also for off-screen player if the player is not moving anymore */ + if (IN_LEV_FIELD(jx, jy) && !player_is_moving) + GfxElement[jx][jy] = EL_UNDEFINED; + if (!player->active || !IN_SCR_FIELD(SCREENX(last_jx), SCREENY(last_jy))) return; @@ -1847,6 +2241,9 @@ void DrawPlayer(struct PlayerInfo *player) player->is_dropping ? ACTION_DROPPING : player->is_waiting ? player->action_waiting : ACTION_DEFAULT); + if (player->is_waiting) + move_dir = player->dir_waiting; + InitPlayerGfxAnimation(player, action, move_dir); /* ----------------------------------------------------------------------- */ @@ -1860,16 +2257,27 @@ void DrawPlayer(struct PlayerInfo *player) DrawLevelElement(last_jx, last_jy, Back[last_jx][last_jy]); if (last_element == EL_DYNAMITE_ACTIVE || + last_element == EL_EM_DYNAMITE_ACTIVE || last_element == EL_SP_DISK_RED_ACTIVE) DrawDynamite(last_jx, last_jy); else DrawLevelFieldThruMask(last_jx, last_jy); } else if (last_element == EL_DYNAMITE_ACTIVE || + last_element == EL_EM_DYNAMITE_ACTIVE || last_element == EL_SP_DISK_RED_ACTIVE) DrawDynamite(last_jx, last_jy); +#if 0 + /* !!! this is not enough to prevent flickering of players which are + moving next to each others without a free tile between them -- this + can only be solved by drawing all players layer by layer (first the + background, then the foreground etc.) !!! => TODO */ + else if (!IS_PLAYER(last_jx, last_jy)) + DrawLevelField(last_jx, last_jy); +#else else DrawLevelField(last_jx, last_jy); +#endif if (player->is_pushing && IN_SCR_FIELD(SCREENX(next_jx), SCREENY(next_jy))) DrawLevelElement(next_jx, next_jy, EL_EMPTY); @@ -1893,24 +2301,32 @@ void DrawPlayer(struct PlayerInfo *player) { if (player_is_moving && GfxElement[jx][jy] != EL_UNDEFINED) { - if (GFX_CRUMBLED(GfxElement[jx][jy])) + int old_element = GfxElement[jx][jy]; + int old_graphic = el_act_dir2img(old_element, action, move_dir); + int frame = getGraphicAnimationFrame(old_graphic, player->StepFrame); + + if (GFX_CRUMBLED(old_element)) DrawLevelFieldCrumbledSandDigging(jx, jy, move_dir, player->StepFrame); else - { - int old_element = GfxElement[jx][jy]; - int old_graphic = el_act_dir2img(old_element, action, move_dir); - int frame = getGraphicAnimationFrame(old_graphic, player->StepFrame); - DrawGraphic(sx, sy, old_graphic, frame); - } + + if (graphic_info[old_graphic].anim_mode & ANIM_OPAQUE_PLAYER) + player_is_opaque = TRUE; } else { 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); } @@ -1940,7 +2356,10 @@ void DrawPlayer(struct PlayerInfo *player) if (!setup.soft_scrolling && ScreenMovPos) sxx = syy = 0; - DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING); + if (player_is_opaque) + DrawGraphicShifted(sx, sy, sxx, syy, graphic, frame,NO_CUTTING,NO_MASKING); + else + DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING); if (SHIELD_ON(player)) { @@ -1967,15 +2386,26 @@ void DrawPlayer(struct PlayerInfo *player) int px = SCREENX(jx), py = SCREENY(jy); int pxx = (TILEX - ABS(sxx)) * dx; int pyy = (TILEY - ABS(syy)) * dy; + int gfx_frame = GfxFrame[jx][jy]; int graphic; + int sync_frame; int frame; if (!IS_MOVING(jx, jy)) /* push movement already finished */ + { element = Feld[next_jx][next_jy]; + gfx_frame = GfxFrame[next_jx][next_jy]; + } graphic = el_act_dir2img(element, ACTION_PUSHING, move_dir); + +#if 1 + sync_frame = (IS_ANIM_MODE_CE(graphic) ? gfx_frame : player->StepFrame); + frame = getGraphicAnimationFrame(graphic, sync_frame); +#else frame = getGraphicAnimationFrame(graphic, player->StepFrame); +#endif /* draw background element under pushed element (like the Sokoban field) */ if (Back[next_jx][next_jy]) @@ -2003,7 +2433,9 @@ void DrawPlayer(struct PlayerInfo *player) if (player_is_moving && last_element == EL_EXPLOSION) { - int graphic = el_act2img(GfxElement[last_jx][last_jy], ACTION_EXPLODING); + int element = (GfxElement[last_jx][last_jy] != EL_UNDEFINED ? + GfxElement[last_jx][last_jy] : EL_EMPTY); + int graphic = el_act2img(element, ACTION_EXPLODING); int delay = (game.emulation == EMU_SUPAPLEX ? 3 : 2); int phase = ExplodePhase[last_jx][last_jy] - 1; int frame = getGraphicAnimationFrame(graphic, phase - delay); @@ -2062,6 +2494,10 @@ void WaitForEventToContinue() button_status = MB_RELEASED; +#if 1 + ClearEventQueue(); +#endif + while (still_wait) { if (PendingEvent()) @@ -2119,7 +2555,11 @@ boolean Request(char *text, unsigned int req_state) 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; } @@ -2161,6 +2601,10 @@ boolean Request(char *text, unsigned int req_state) DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1); } +#if 1 + SetDoorBackgroundImage(IMG_BACKGROUND_DOOR); +#endif + SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1); /* clear door drawing field */ @@ -2230,7 +2674,15 @@ boolean Request(char *text, unsigned int req_state) if (!(req_state & REQUEST_WAIT_FOR_INPUT)) { - SetDrawBackgroundMask(REDRAW_FIELD); + if (game_status == GAME_MODE_PLAYING) + { + SetPanelBackground(); + SetDrawBackgroundMask(REDRAW_DOOR_1); + } + else + { + SetDrawBackgroundMask(REDRAW_FIELD); + } return FALSE; } @@ -2252,7 +2704,7 @@ boolean Request(char *text, unsigned int req_state) NextEvent(&event); - switch(event.type) + switch (event.type) { case EVENT_BUTTONPRESS: case EVENT_BUTTONRELEASE: @@ -2284,7 +2736,7 @@ boolean Request(char *text, unsigned int req_state) /* this sets 'request_gadget_id' */ HandleGadgets(mx, my, button_status); - switch(request_gadget_id) + switch (request_gadget_id) { case TOOL_CTRL_ID_YES: result = TRUE; @@ -2317,7 +2769,7 @@ boolean Request(char *text, unsigned int req_state) } case EVENT_KEYPRESS: - switch(GetEventKey((KeyEvent *)&event, TRUE)) + switch (GetEventKey((KeyEvent *)&event, TRUE)) { case KSYM_Return: result = 1; @@ -2353,13 +2805,37 @@ boolean Request(char *text, unsigned int req_state) result = 0; } - DoAnimation(); +#if 1 - /* don't eat all CPU time */ - Delay(10); - } + if (game_status == GAME_MODE_PLAYING && local_player->LevelSolved_GameEnd) + { + HandleGameActions(); + BackToFront(); + } + else + { + DoAnimation(); - if (game_status != GAME_MODE_MAIN) + if (!PendingEvent()) /* delay only if no pending events */ + Delay(10); + } + +#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(); @@ -2375,7 +2851,15 @@ boolean Request(char *text, unsigned int req_state) RemapAllGadgets(); - SetDrawBackgroundMask(REDRAW_FIELD); + if (game_status == GAME_MODE_PLAYING) + { + SetPanelBackground(); + SetDrawBackgroundMask(REDRAW_DOOR_1); + } + else + { + SetDrawBackgroundMask(REDRAW_FIELD); + } #if defined(NETWORK_AVALIABLE) /* continue network game after request */ @@ -2460,7 +2944,7 @@ unsigned int MoveDoor(unsigned int door_state) door_2.height = VYSIZE; if (door_state == DOOR_GET_STATE) - return(door1 | door2); + return (door1 | door2); if (door_state & DOOR_SET_STATE) { @@ -2469,17 +2953,20 @@ unsigned int MoveDoor(unsigned int door_state) if (door_state & DOOR_ACTION_2) door2 = door_state & DOOR_ACTION_2; - return(door1 | door2); + return (door1 | door2); } - if (door1 == DOOR_OPEN_1 && door_state & DOOR_OPEN_1) - door_state &= ~DOOR_OPEN_1; - else if (door1 == DOOR_CLOSE_1 && door_state & DOOR_CLOSE_1) - door_state &= ~DOOR_CLOSE_1; - if (door2 == DOOR_OPEN_2 && door_state & DOOR_OPEN_2) - door_state &= ~DOOR_OPEN_2; - else if (door2 == DOOR_CLOSE_2 && door_state & DOOR_CLOSE_2) - door_state &= ~DOOR_CLOSE_2; + if (!(door_state & DOOR_FORCE_REDRAW)) + { + if (door1 == DOOR_OPEN_1 && door_state & DOOR_OPEN_1) + door_state &= ~DOOR_OPEN_1; + else if (door1 == DOOR_CLOSE_1 && door_state & DOOR_CLOSE_1) + door_state &= ~DOOR_CLOSE_1; + if (door2 == DOOR_OPEN_2 && door_state & DOOR_OPEN_2) + door_state &= ~DOOR_OPEN_2; + else if (door2 == DOOR_CLOSE_2 && door_state & DOOR_CLOSE_2) + door_state &= ~DOOR_CLOSE_2; + } door_delay_value = (door_state & DOOR_ACTION_1 ? door_1.step_delay : door_2.step_delay); @@ -2511,26 +2998,17 @@ unsigned int MoveDoor(unsigned int door_state) 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; -#if 1 int end = door_size; -#else - int end = (door_state & DOOR_ACTION_1 && - door_1.anim_mode & ANIM_VERTICAL ? DYSIZE : DXSIZE); -#endif -#if 1 int start = ((door_state & DOOR_NO_DELAY) ? end : 0); -#else - int start = ((door_state & DOOR_NO_DELAY) ? end : offset_skip); -#endif int k; if (!(door_state & DOOR_NO_DELAY) && !setup.quick_doors) { /* opening door sound has priority over simultaneously closing door */ if (door_state & (DOOR_OPEN_1 | DOOR_OPEN_2)) - PlaySoundStereo(SND_DOOR_OPENING, SOUND_MIDDLE); + PlayMenuSoundStereo(SND_DOOR_OPENING, SOUND_MIDDLE); else if (door_state & (DOOR_CLOSE_1 | DOOR_CLOSE_2)) - PlaySoundStereo(SND_DOOR_CLOSING, SOUND_MIDDLE); + PlayMenuSoundStereo(SND_DOOR_CLOSING, SOUND_MIDDLE); } for (k = start; k <= end && !(door_1_done && door_2_done); k += stepsize) @@ -2633,8 +3111,8 @@ unsigned int MoveDoor(unsigned int door_state) if (door_state & DOOR_ACTION_2) { - int a = MIN(x * door_2.step_offset, door_size_2); - int p = (door_state & DOOR_OPEN_2 ? door_size_2 - a : a); + 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; if (door_2.anim_mode & ANIM_STATIC_PANEL) @@ -2712,13 +3190,15 @@ unsigned int MoveDoor(unsigned int door_state) door_2_done = (a == VXSIZE); } - BackToFront(); + if (!(door_state & DOOR_NO_DELAY)) + { + BackToFront(); - if (game_status == GAME_MODE_MAIN) - DoAnimation(); + if (game_status == GAME_MODE_MAIN) + DoAnimation(); - if (!(door_state & DOOR_NO_DELAY)) WaitUntilDelayReached(&door_delay, door_delay_value); + } } } @@ -2902,6 +3382,7 @@ void CreateToolButtons() 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); @@ -3436,35 +3917,35 @@ em_object_mapping_list[] = }, { Yspring_kill_e, FALSE, FALSE, - EL_ROBOT, ACTION_SLURPED_BY_SPRING, MV_BIT_RIGHT + EL_SPRING, ACTION_EATING, MV_BIT_RIGHT }, { Yspring_kill_eB, FALSE, TRUE, - EL_ROBOT, ACTION_SLURPED_BY_SPRING, MV_BIT_RIGHT + EL_SPRING, ACTION_EATING, MV_BIT_RIGHT }, { Yspring_kill_w, FALSE, FALSE, - EL_ROBOT, ACTION_SLURPED_BY_SPRING, MV_BIT_LEFT + EL_SPRING, ACTION_EATING, MV_BIT_LEFT }, { Yspring_kill_wB, FALSE, TRUE, - EL_ROBOT, ACTION_SLURPED_BY_SPRING, MV_BIT_LEFT + EL_SPRING, ACTION_EATING, MV_BIT_LEFT }, { Xeater_n, TRUE, FALSE, - EL_YAMYAM, -1, -1 + EL_YAMYAM_UP, -1, -1 }, { - Xeater_e, FALSE, FALSE, - EL_YAMYAM, -1, -1 + Xeater_e, TRUE, FALSE, + EL_YAMYAM_RIGHT, -1, -1 }, { - Xeater_w, FALSE, FALSE, - EL_YAMYAM, -1, -1 + Xeater_w, TRUE, FALSE, + EL_YAMYAM_LEFT, -1, -1 }, { - Xeater_s, FALSE, FALSE, - EL_YAMYAM, -1, -1 + Xeater_s, TRUE, FALSE, + EL_YAMYAM_DOWN, -1, -1 }, { Yeater_n, FALSE, FALSE, @@ -4064,43 +4545,43 @@ em_object_mapping_list[] = }, { Xexit, TRUE, FALSE, - EL_EXIT_CLOSED, -1, -1 + EL_EM_EXIT_CLOSED, -1, -1 }, { Xexit_1, TRUE, FALSE, - EL_EXIT_OPEN, -1, -1 + EL_EM_EXIT_OPEN, -1, -1 }, { Xexit_2, FALSE, FALSE, - EL_EXIT_OPEN, -1, -1 + EL_EM_EXIT_OPEN, -1, -1 }, { Xexit_3, FALSE, FALSE, - EL_EXIT_OPEN, -1, -1 + EL_EM_EXIT_OPEN, -1, -1 }, { Xdynamite, TRUE, FALSE, - EL_DYNAMITE, -1, -1 + EL_EM_DYNAMITE, -1, -1 }, { Ydynamite_eat, FALSE, FALSE, - EL_DYNAMITE, ACTION_COLLECTING, -1 + EL_EM_DYNAMITE, ACTION_COLLECTING, -1 }, { Xdynamite_1, TRUE, FALSE, - EL_DYNAMITE_ACTIVE, -1, -1 + EL_EM_DYNAMITE_ACTIVE, -1, -1 }, { Xdynamite_2, FALSE, FALSE, - EL_DYNAMITE_ACTIVE, -1, -1 + EL_EM_DYNAMITE_ACTIVE, -1, -1 }, { Xdynamite_3, FALSE, FALSE, - EL_DYNAMITE_ACTIVE, -1, -1 + EL_EM_DYNAMITE_ACTIVE, -1, -1 }, { Xdynamite_4, FALSE, FALSE, - EL_DYNAMITE_ACTIVE, -1, -1 + EL_EM_DYNAMITE_ACTIVE, -1, -1 }, { Xbumper, TRUE, FALSE, @@ -4135,19 +4616,19 @@ em_object_mapping_list[] = EL_QUICKSAND_FULL, -1, -1 }, { - Xsand_stonein_1, FALSE, FALSE, + Xsand_stonein_1, FALSE, TRUE, EL_ROCK, ACTION_FILLING, -1 }, { - Xsand_stonein_2, FALSE, FALSE, + Xsand_stonein_2, FALSE, TRUE, EL_ROCK, ACTION_FILLING, -1 }, { - Xsand_stonein_3, FALSE, FALSE, + Xsand_stonein_3, FALSE, TRUE, EL_ROCK, ACTION_FILLING, -1 }, { - Xsand_stonein_4, FALSE, FALSE, + Xsand_stonein_4, FALSE, TRUE, EL_ROCK, ACTION_FILLING, -1 }, { @@ -4574,10 +5055,6 @@ em_object_mapping_list[] = Xalpha_copyr, TRUE, FALSE, EL_CHAR('©'), -1, -1 }, - { - Xalpha_copyr, TRUE, FALSE, - EL_CHAR('©'), -1, -1 - }, { Xboom_bug, FALSE, FALSE, @@ -4965,640 +5442,6 @@ void map_android_clone_elements_EM_to_RND(struct LevelInfo *level) } } -#if 0 - -int map_element_RND_to_EM(int element_rnd) -{ - static unsigned short mapping_RND_to_EM[NUM_FILE_ELEMENTS]; - static boolean mapping_initialized = FALSE; - - struct - { - int element_em; - int element_rnd; - } - mapping_RND_to_EM_list[] = - { - { Xblank, EL_EMPTY }, - { Xstone, EL_ROCK }, - { Xnut, EL_NUT }, - { Xbug_n, EL_BUG_UP }, - { Xbug_e, EL_BUG_RIGHT }, - { Xbug_s, EL_BUG_DOWN }, - { Xbug_w, EL_BUG_LEFT }, - { Xtank_n, EL_SPACESHIP_UP }, - { Xtank_e, EL_SPACESHIP_RIGHT }, - { Xtank_s, EL_SPACESHIP_DOWN }, - { Xtank_w, EL_SPACESHIP_LEFT }, - { Xandroid, EL_EMC_ANDROID }, - { Xandroid_1_n, EL_EMC_ANDROID_UP }, - { Xandroid_1_e, EL_EMC_ANDROID_RIGHT }, - { Xandroid_1_w, EL_EMC_ANDROID_LEFT }, - { Xandroid_1_s, EL_EMC_ANDROID_DOWN }, - { Xspring, EL_SPRING }, - { Xeater_n, EL_YAMYAM }, - { Xalien, EL_ROBOT }, - { Xemerald, EL_EMERALD }, - { Xdiamond, EL_DIAMOND }, - { Xdrip_fall, EL_AMOEBA_DROP }, - { Xbomb, EL_BOMB }, - { Xballoon, EL_BALLOON }, - { Xgrass, EL_EMC_GRASS }, - { Xdirt, EL_SAND }, - { Xacid_ne, EL_ACID_POOL_TOPRIGHT }, - { Xacid_se, EL_ACID_POOL_BOTTOMRIGHT }, - { Xacid_s, EL_ACID_POOL_BOTTOM }, - { Xacid_sw, EL_ACID_POOL_BOTTOMLEFT }, - { Xacid_nw, EL_ACID_POOL_TOPLEFT }, - { Xacid_1, EL_ACID }, - { Xball_1, EL_EMC_MAGIC_BALL }, - { Xgrow_ns, EL_EMC_GROW }, - { Xwonderwall, EL_MAGIC_WALL }, - { Xamoeba_1, EL_AMOEBA_WET }, - { Xdoor_1, EL_EM_GATE_1 }, - { Xdoor_2, EL_EM_GATE_2 }, - { Xdoor_3, EL_EM_GATE_3 }, - { Xdoor_4, EL_EM_GATE_4 }, - { Xdoor_5, EL_EMC_GATE_5 }, - { Xdoor_6, EL_EMC_GATE_6 }, - { Xdoor_7, EL_EMC_GATE_7 }, - { Xdoor_8, EL_EMC_GATE_8 }, - { Xkey_1, EL_EM_KEY_1 }, - { Xkey_2, EL_EM_KEY_2 }, - { Xkey_3, EL_EM_KEY_3 }, - { Xkey_4, EL_EM_KEY_4 }, - { Xkey_5, EL_EMC_KEY_5 }, - { Xkey_6, EL_EMC_KEY_6 }, - { Xkey_7, EL_EMC_KEY_7 }, - { Xkey_8, EL_EMC_KEY_8 }, - { Xwind_n, EL_BALLOON_SWITCH_UP }, - { Xwind_e, EL_BALLOON_SWITCH_RIGHT }, - { Xwind_s, EL_BALLOON_SWITCH_DOWN }, - { Xwind_w, EL_BALLOON_SWITCH_LEFT }, - { Xwind_nesw, EL_BALLOON_SWITCH_ANY }, - { Xwind_stop, EL_BALLOON_SWITCH_NONE }, - { Xexit, EL_EXIT_CLOSED }, - { Xexit_1, EL_EXIT_OPEN }, - { Xdynamite, EL_DYNAMITE }, - { Xdynamite_1, EL_DYNAMITE_ACTIVE }, - { Xbumper, EL_EMC_BUMPER }, - { Xwheel, EL_ROBOT_WHEEL }, - { Xswitch, EL_UNKNOWN }, - { Xsand, EL_QUICKSAND_EMPTY }, - { Xsand_stone, EL_QUICKSAND_FULL }, - { Xplant, EL_EMC_PLANT }, - { Xlenses, EL_EMC_LENSES }, - { Xmagnify, EL_EMC_MAGNIFIER }, - { Xdripper, EL_UNKNOWN }, - { Xfake_blank, EL_INVISIBLE_WALL }, - { Xfake_grass, EL_INVISIBLE_SAND }, - { Xfake_door_1, EL_EM_GATE_1_GRAY }, - { Xfake_door_2, EL_EM_GATE_2_GRAY }, - { Xfake_door_3, EL_EM_GATE_3_GRAY }, - { Xfake_door_4, EL_EM_GATE_4_GRAY }, - { Xfake_door_5, EL_EMC_GATE_5_GRAY }, - { Xfake_door_6, EL_EMC_GATE_6_GRAY }, - { Xfake_door_7, EL_EMC_GATE_7_GRAY }, - { Xfake_door_8, EL_EMC_GATE_8_GRAY }, - { Xsteel_1, EL_STEELWALL }, - { Xsteel_2, EL_UNKNOWN }, - { Xsteel_3, EL_EMC_STEELWALL_1 }, - { Xsteel_4, EL_UNKNOWN }, - { Xwall_1, EL_WALL }, - { Xwall_2, EL_UNKNOWN }, - { Xwall_3, EL_UNKNOWN }, - { Xwall_4, EL_UNKNOWN }, - { Xround_wall_1, EL_WALL_SLIPPERY }, - { Xround_wall_2, EL_UNKNOWN }, - { Xround_wall_3, EL_UNKNOWN }, - { Xround_wall_4, EL_UNKNOWN }, - { Xdecor_1, EL_UNKNOWN }, - { Xdecor_2, EL_EMC_WALL_6 }, - { Xdecor_3, EL_EMC_WALL_4 }, - { Xdecor_4, EL_EMC_WALL_5 }, - { Xdecor_5, EL_EMC_WALL_7 }, - { Xdecor_6, EL_EMC_WALL_8 }, - { Xdecor_7, EL_UNKNOWN }, - { Xdecor_8, EL_EMC_WALL_1 }, - { Xdecor_9, EL_EMC_WALL_2 }, - { Xdecor_10, EL_EMC_WALL_3 }, - { Xdecor_11, EL_UNKNOWN }, - { Xdecor_12, EL_UNKNOWN }, - { Xalpha_0, EL_CHAR('0') }, - { Xalpha_1, EL_CHAR('1') }, - { Xalpha_2, EL_CHAR('2') }, - { Xalpha_3, EL_CHAR('3') }, - { Xalpha_4, EL_CHAR('4') }, - { Xalpha_5, EL_CHAR('5') }, - { Xalpha_6, EL_CHAR('6') }, - { Xalpha_7, EL_CHAR('7') }, - { Xalpha_8, EL_CHAR('8') }, - { Xalpha_9, EL_CHAR('9') }, - { Xalpha_excla, EL_CHAR('!') }, - { Xalpha_quote, EL_CHAR('"') }, - { Xalpha_comma, EL_CHAR(',') }, - { Xalpha_minus, EL_CHAR('-') }, - { Xalpha_perio, EL_CHAR('.') }, - { Xalpha_colon, EL_CHAR(':') }, - { Xalpha_quest, EL_CHAR('?') }, - { Xalpha_a, EL_CHAR('A') }, - { Xalpha_b, EL_CHAR('B') }, - { Xalpha_c, EL_CHAR('C') }, - { Xalpha_d, EL_CHAR('D') }, - { Xalpha_e, EL_CHAR('E') }, - { Xalpha_f, EL_CHAR('F') }, - { Xalpha_g, EL_CHAR('G') }, - { Xalpha_h, EL_CHAR('H') }, - { Xalpha_i, EL_CHAR('I') }, - { Xalpha_j, EL_CHAR('J') }, - { Xalpha_k, EL_CHAR('K') }, - { Xalpha_l, EL_CHAR('L') }, - { Xalpha_m, EL_CHAR('M') }, - { Xalpha_n, EL_CHAR('N') }, - { Xalpha_o, EL_CHAR('O') }, - { Xalpha_p, EL_CHAR('P') }, - { Xalpha_q, EL_CHAR('Q') }, - { Xalpha_r, EL_CHAR('R') }, - { Xalpha_s, EL_CHAR('S') }, - { Xalpha_t, EL_CHAR('T') }, - { Xalpha_u, EL_CHAR('U') }, - { Xalpha_v, EL_CHAR('V') }, - { Xalpha_w, EL_CHAR('W') }, - { Xalpha_x, EL_CHAR('X') }, - { Xalpha_y, EL_CHAR('Y') }, - { Xalpha_z, EL_CHAR('Z') }, - { Xalpha_arrow_e, EL_CHAR('>') }, - { Xalpha_arrow_w, EL_CHAR('<') }, - { Xalpha_copyr, EL_CHAR('©') }, - - { Zplayer, EL_PLAYER_1 }, - { Zplayer, EL_PLAYER_2 }, - { Zplayer, EL_PLAYER_3 }, - { Zplayer, EL_PLAYER_4 }, - - { ZBORDER, EL_EMC_LEVEL_BORDER }, - - { -1, -1 } - }; - - if (!mapping_initialized) - { - int i; - - /* return "Xalpha_quest" for all undefined elements in mapping array */ - for (i = 0; i < NUM_FILE_ELEMENTS; i++) - mapping_RND_to_EM[i] = Xalpha_quest; - - for (i = 0; mapping_RND_to_EM_list[i].element_rnd != -1; i++) - mapping_RND_to_EM[mapping_RND_to_EM_list[i].element_rnd] = - mapping_RND_to_EM_list[i].element_em; - - mapping_initialized = TRUE; - } - - if (element_rnd >= 0 && element_rnd < NUM_FILE_ELEMENTS) - return mapping_RND_to_EM[element_rnd]; - - Error(ERR_WARN, "invalid RND level element %d", element_rnd); - - return EL_UNKNOWN; -} - -int map_element_EM_to_RND(int element_em) -{ - static unsigned short mapping_EM_to_RND[TILE_MAX]; - static boolean mapping_initialized = FALSE; - - struct - { - int element_em; - int element_rnd; - } - em_object_mapping_list[] = - { - { Xblank, EL_EMPTY }, - { Yacid_splash_eB, EL_EMPTY }, - { Yacid_splash_wB, EL_EMPTY }, - -#ifdef EM_ENGINE_BAD_ROLL - { Xstone_force_e, EL_ROCK }, - { Xstone_force_w, EL_ROCK }, - { Xnut_force_e, EL_NUT }, - { Xnut_force_w, EL_NUT }, - { Xspring_force_e, EL_SPRING }, - { Xspring_force_w, EL_SPRING }, - { Xemerald_force_e, EL_EMERALD }, - { Xemerald_force_w, EL_EMERALD }, - { Xdiamond_force_e, EL_DIAMOND }, - { Xdiamond_force_w, EL_DIAMOND }, - { Xbomb_force_e, EL_BOMB }, - { Xbomb_force_w, EL_BOMB }, -#endif - - { Xstone, EL_ROCK }, - { Xstone_pause, EL_ROCK }, - { Xstone_fall, EL_ROCK }, - { Ystone_s, EL_ROCK }, - { Ystone_sB, EL_ROCK }, - { Ystone_e, EL_ROCK }, - { Ystone_eB, EL_ROCK }, - { Ystone_w, EL_ROCK }, - { Ystone_wB, EL_ROCK }, - { Xnut, EL_NUT }, - { Xnut_pause, EL_NUT }, - { Xnut_fall, EL_NUT }, - { Ynut_s, EL_NUT }, - { Ynut_sB, EL_NUT }, - { Ynut_e, EL_NUT }, - { Ynut_eB, EL_NUT }, - { Ynut_w, EL_NUT }, - { Ynut_wB, EL_NUT }, - { Xbug_n, EL_BUG_UP }, - { Xbug_e, EL_BUG_RIGHT }, - { Xbug_s, EL_BUG_DOWN }, - { Xbug_w, EL_BUG_LEFT }, - { Xbug_gon, EL_BUG_UP }, - { Xbug_goe, EL_BUG_RIGHT }, - { Xbug_gos, EL_BUG_DOWN }, - { Xbug_gow, EL_BUG_LEFT }, - { Ybug_n, EL_BUG_UP }, - { Ybug_nB, EL_BUG_UP }, - { Ybug_e, EL_BUG_RIGHT }, - { Ybug_eB, EL_BUG_RIGHT }, - { Ybug_s, EL_BUG_DOWN }, - { Ybug_sB, EL_BUG_DOWN }, - { Ybug_w, EL_BUG_LEFT }, - { Ybug_wB, EL_BUG_LEFT }, - { Ybug_w_n, EL_BUG_UP }, - { Ybug_n_e, EL_BUG_RIGHT }, - { Ybug_e_s, EL_BUG_DOWN }, - { Ybug_s_w, EL_BUG_LEFT }, - { Ybug_e_n, EL_BUG_UP }, - { Ybug_s_e, EL_BUG_RIGHT }, - { Ybug_w_s, EL_BUG_DOWN }, - { Ybug_n_w, EL_BUG_LEFT }, - { Ybug_stone, EL_ROCK }, - { Ybug_spring, EL_SPRING }, - { Xtank_n, EL_SPACESHIP_UP }, - { Xtank_e, EL_SPACESHIP_RIGHT }, - { Xtank_s, EL_SPACESHIP_DOWN }, - { Xtank_w, EL_SPACESHIP_LEFT }, - { Xtank_gon, EL_SPACESHIP_UP }, - { Xtank_goe, EL_SPACESHIP_RIGHT }, - { Xtank_gos, EL_SPACESHIP_DOWN }, - { Xtank_gow, EL_SPACESHIP_LEFT }, - { Ytank_n, EL_SPACESHIP_UP }, - { Ytank_nB, EL_SPACESHIP_UP }, - { Ytank_e, EL_SPACESHIP_RIGHT }, - { Ytank_eB, EL_SPACESHIP_RIGHT }, - { Ytank_s, EL_SPACESHIP_DOWN }, - { Ytank_sB, EL_SPACESHIP_DOWN }, - { Ytank_w, EL_SPACESHIP_LEFT }, - { Ytank_wB, EL_SPACESHIP_LEFT }, - { Ytank_w_n, EL_SPACESHIP_UP }, - { Ytank_n_e, EL_SPACESHIP_RIGHT }, - { Ytank_e_s, EL_SPACESHIP_DOWN }, - { Ytank_s_w, EL_SPACESHIP_LEFT }, - { Ytank_e_n, EL_SPACESHIP_UP }, - { Ytank_s_e, EL_SPACESHIP_RIGHT }, - { Ytank_w_s, EL_SPACESHIP_DOWN }, - { Ytank_n_w, EL_SPACESHIP_LEFT }, - { Ytank_stone, EL_ROCK }, - { Ytank_spring, EL_SPRING }, - { Xandroid, EL_EMC_ANDROID }, - { Xandroid_1_n, EL_EMC_ANDROID_UP }, - { Xandroid_2_n, EL_EMC_ANDROID_UP }, - { Xandroid_1_e, EL_EMC_ANDROID_RIGHT }, - { Xandroid_2_e, EL_EMC_ANDROID_RIGHT }, - { Xandroid_1_w, EL_EMC_ANDROID_LEFT }, - { Xandroid_2_w, EL_EMC_ANDROID_LEFT }, - { Xandroid_1_s, EL_EMC_ANDROID_DOWN }, - { Xandroid_2_s, EL_EMC_ANDROID_DOWN }, - { Yandroid_n, EL_EMC_ANDROID_UP }, - { Yandroid_nB, EL_EMC_ANDROID_UP }, - { Yandroid_ne, EL_EMC_ANDROID_RIGHT_UP }, - { Yandroid_neB, EL_EMC_ANDROID_RIGHT_UP }, - { Yandroid_e, EL_EMC_ANDROID_RIGHT }, - { Yandroid_eB, EL_EMC_ANDROID_RIGHT }, - { Yandroid_se, EL_EMC_ANDROID_RIGHT_DOWN }, - { Yandroid_seB, EL_EMC_ANDROID_RIGHT_DOWN }, - { Yandroid_s, EL_EMC_ANDROID_DOWN }, - { Yandroid_sB, EL_EMC_ANDROID_DOWN }, - { Yandroid_sw, EL_EMC_ANDROID_LEFT_DOWN }, - { Yandroid_swB, EL_EMC_ANDROID_LEFT_DOWN }, - { Yandroid_w, EL_EMC_ANDROID_LEFT }, - { Yandroid_wB, EL_EMC_ANDROID_LEFT }, - { Yandroid_nw, EL_EMC_ANDROID_LEFT_UP }, - { Yandroid_nwB, EL_EMC_ANDROID_LEFT_UP }, - { Xspring, EL_SPRING }, - { Xspring_pause, EL_SPRING }, - { Xspring_e, EL_SPRING }, - { Xspring_w, EL_SPRING }, - { Xspring_fall, EL_SPRING }, - { Yspring_s, EL_SPRING }, - { Yspring_sB, EL_SPRING }, - { Yspring_e, EL_SPRING }, - { Yspring_eB, EL_SPRING }, - { Yspring_w, EL_SPRING }, - { Yspring_wB, EL_SPRING }, - { Yspring_kill_e, EL_SPRING }, - { Yspring_kill_eB, EL_SPRING }, - { Yspring_kill_w, EL_SPRING }, - { Yspring_kill_wB, EL_SPRING }, - { Xeater_n, EL_YAMYAM }, - { Xeater_e, EL_YAMYAM }, - { Xeater_w, EL_YAMYAM }, - { Xeater_s, EL_YAMYAM }, - { Yeater_n, EL_YAMYAM }, - { Yeater_nB, EL_YAMYAM }, - { Yeater_e, EL_YAMYAM }, - { Yeater_eB, EL_YAMYAM }, - { Yeater_s, EL_YAMYAM }, - { Yeater_sB, EL_YAMYAM }, - { Yeater_w, EL_YAMYAM }, - { Yeater_wB, EL_YAMYAM }, - { Yeater_stone, EL_ROCK }, - { Yeater_spring, EL_SPRING }, - { Xalien, EL_ROBOT }, - { Xalien_pause, EL_ROBOT }, - { Yalien_n, EL_ROBOT }, - { Yalien_nB, EL_ROBOT }, - { Yalien_e, EL_ROBOT }, - { Yalien_eB, EL_ROBOT }, - { Yalien_s, EL_ROBOT }, - { Yalien_sB, EL_ROBOT }, - { Yalien_w, EL_ROBOT }, - { Yalien_wB, EL_ROBOT }, - { Yalien_stone, EL_ROCK }, - { Yalien_spring, EL_SPRING }, - { Xemerald, EL_EMERALD }, - { Xemerald_pause, EL_EMERALD }, - { Xemerald_fall, EL_EMERALD }, - { Xemerald_shine, EL_EMERALD }, - { Yemerald_s, EL_EMERALD }, - { Yemerald_sB, EL_EMERALD }, - { Yemerald_e, EL_EMERALD }, - { Yemerald_eB, EL_EMERALD }, - { Yemerald_w, EL_EMERALD }, - { Yemerald_wB, EL_EMERALD }, - { Yemerald_eat, EL_EMERALD }, - { Yemerald_stone, EL_ROCK }, - { Xdiamond, EL_DIAMOND }, - { Xdiamond_pause, EL_DIAMOND }, - { Xdiamond_fall, EL_DIAMOND }, - { Xdiamond_shine, EL_DIAMOND }, - { Ydiamond_s, EL_DIAMOND }, - { Ydiamond_sB, EL_DIAMOND }, - { Ydiamond_e, EL_DIAMOND }, - { Ydiamond_eB, EL_DIAMOND }, - { Ydiamond_w, EL_DIAMOND }, - { Ydiamond_wB, EL_DIAMOND }, - { Ydiamond_eat, EL_DIAMOND }, - { Ydiamond_stone, EL_ROCK }, - { Xdrip_fall, EL_AMOEBA_DROP }, - { Xdrip_stretch, EL_AMOEBA_DROP }, - { Xdrip_stretchB, EL_AMOEBA_DROP }, - { Xdrip_eat, EL_AMOEBA_DROP }, - { Ydrip_s1, EL_AMOEBA_DROP }, - { Ydrip_s1B, EL_AMOEBA_DROP }, - { Ydrip_s2, EL_AMOEBA_DROP }, - { Ydrip_s2B, EL_AMOEBA_DROP }, - { Xbomb, EL_BOMB }, - { Xbomb_pause, EL_BOMB }, - { Xbomb_fall, EL_BOMB }, - { Ybomb_s, EL_BOMB }, - { Ybomb_sB, EL_BOMB }, - { Ybomb_e, EL_BOMB }, - { Ybomb_eB, EL_BOMB }, - { Ybomb_w, EL_BOMB }, - { Ybomb_wB, EL_BOMB }, - { Ybomb_eat, EL_BOMB }, - { Xballoon, EL_BALLOON }, - { Yballoon_n, EL_BALLOON }, - { Yballoon_nB, EL_BALLOON }, - { Yballoon_e, EL_BALLOON }, - { Yballoon_eB, EL_BALLOON }, - { Yballoon_s, EL_BALLOON }, - { Yballoon_sB, EL_BALLOON }, - { Yballoon_w, EL_BALLOON }, - { Yballoon_wB, EL_BALLOON }, - { Xgrass, EL_SAND }, - { Ygrass_nB, EL_SAND }, - { Ygrass_eB, EL_SAND }, - { Ygrass_sB, EL_SAND }, - { Ygrass_wB, EL_SAND }, - { Xdirt, EL_SAND }, - { Ydirt_nB, EL_SAND }, - { Ydirt_eB, EL_SAND }, - { Ydirt_sB, EL_SAND }, - { Ydirt_wB, EL_SAND }, - { Xacid_ne, EL_ACID_POOL_TOPRIGHT }, - { Xacid_se, EL_ACID_POOL_BOTTOMRIGHT }, - { Xacid_s, EL_ACID_POOL_BOTTOM }, - { Xacid_sw, EL_ACID_POOL_BOTTOMLEFT }, - { Xacid_nw, EL_ACID_POOL_TOPLEFT }, - { Xacid_1, EL_ACID }, - { Xacid_2, EL_ACID }, - { Xacid_3, EL_ACID }, - { Xacid_4, EL_ACID }, - { Xacid_5, EL_ACID }, - { Xacid_6, EL_ACID }, - { Xacid_7, EL_ACID }, - { Xacid_8, EL_ACID }, - { Xball_1, EL_EMC_MAGIC_BALL }, - { Xball_1B, EL_EMC_MAGIC_BALL }, - { Xball_2, EL_EMC_MAGIC_BALL }, - { Xball_2B, EL_EMC_MAGIC_BALL }, - { Yball_eat, EL_EMC_MAGIC_BALL }, - { Xgrow_ns, EL_EMC_GROW }, - { Ygrow_ns_eat, EL_EMC_GROW }, - { Xgrow_ew, EL_EMC_GROW }, - { Ygrow_ew_eat, EL_EMC_GROW }, - { Xwonderwall, EL_MAGIC_WALL }, - { XwonderwallB, EL_MAGIC_WALL }, - { Xamoeba_1, EL_AMOEBA_WET }, - { Xamoeba_2, EL_AMOEBA_WET }, - { Xamoeba_3, EL_AMOEBA_WET }, - { Xamoeba_4, EL_AMOEBA_WET }, - { Xamoeba_5, EL_AMOEBA_WET }, - { Xamoeba_6, EL_AMOEBA_WET }, - { Xamoeba_7, EL_AMOEBA_WET }, - { Xamoeba_8, EL_AMOEBA_WET }, - { Xdoor_1, EL_EM_GATE_1 }, - { Xdoor_2, EL_EM_GATE_2 }, - { Xdoor_3, EL_EM_GATE_3 }, - { Xdoor_4, EL_EM_GATE_4 }, - { Xdoor_5, EL_EMC_GATE_5 }, - { Xdoor_6, EL_EMC_GATE_6 }, - { Xdoor_7, EL_EMC_GATE_7 }, - { Xdoor_8, EL_EMC_GATE_8 }, - { Xkey_1, EL_EM_KEY_1 }, - { Xkey_2, EL_EM_KEY_2 }, - { Xkey_3, EL_EM_KEY_3 }, - { Xkey_4, EL_EM_KEY_4 }, - { Xkey_5, EL_EMC_KEY_5 }, - { Xkey_6, EL_EMC_KEY_6 }, - { Xkey_7, EL_EMC_KEY_7 }, - { Xkey_8, EL_EMC_KEY_8 }, - { Xwind_n, EL_BALLOON_SWITCH_UP }, - { Xwind_e, EL_BALLOON_SWITCH_RIGHT }, - { Xwind_s, EL_BALLOON_SWITCH_DOWN }, - { Xwind_w, EL_BALLOON_SWITCH_LEFT }, - { Xwind_nesw, EL_BALLOON_SWITCH_ANY }, - { Xwind_stop, EL_BALLOON_SWITCH_NONE }, - { Xexit, EL_EXIT_CLOSED }, - { Xexit_1, EL_EXIT_OPEN }, - { Xexit_2, EL_EXIT_OPEN }, - { Xexit_3, EL_EXIT_OPEN }, - { Xdynamite, EL_DYNAMITE }, - { Ydynamite_eat, EL_DYNAMITE }, - { Xdynamite_1, EL_DYNAMITE_ACTIVE }, - { Xdynamite_2, EL_DYNAMITE_ACTIVE }, - { Xdynamite_3, EL_DYNAMITE_ACTIVE }, - { Xdynamite_4, EL_DYNAMITE_ACTIVE }, - { Xbumper, EL_EMC_BUMPER }, - { XbumperB, EL_EMC_BUMPER }, - { Xwheel, EL_ROBOT_WHEEL }, - { XwheelB, EL_ROBOT_WHEEL }, - { Xswitch, EL_UNKNOWN }, - { XswitchB, EL_UNKNOWN }, - { Xsand, EL_QUICKSAND_EMPTY }, - { Xsand_stone, EL_QUICKSAND_FULL }, - { Xsand_stonein_1, EL_QUICKSAND_FULL }, - { Xsand_stonein_2, EL_QUICKSAND_FULL }, - { Xsand_stonein_3, EL_QUICKSAND_FULL }, - { Xsand_stonein_4, EL_QUICKSAND_FULL }, - { Xsand_stonesand_1, EL_QUICKSAND_FULL }, - { Xsand_stonesand_2, EL_QUICKSAND_FULL }, - { Xsand_stonesand_3, EL_QUICKSAND_FULL }, - { Xsand_stonesand_4, EL_QUICKSAND_FULL }, - { Xsand_stoneout_1, EL_QUICKSAND_FULL }, - { Xsand_stoneout_2, EL_QUICKSAND_FULL }, - { Xsand_sandstone_1, EL_QUICKSAND_FULL }, - { Xsand_sandstone_2, EL_QUICKSAND_FULL }, - { Xsand_sandstone_3, EL_QUICKSAND_FULL }, - { Xsand_sandstone_4, EL_QUICKSAND_FULL }, - { Xplant, EL_EMC_PLANT }, - { Yplant, EL_EMC_PLANT }, - { Xlenses, EL_EMC_LENSES }, - { Xmagnify, EL_EMC_MAGNIFIER }, - { Xdripper, EL_UNKNOWN }, - { XdripperB, EL_UNKNOWN }, - { Xfake_blank, EL_INVISIBLE_WALL }, - { Xfake_blankB, EL_INVISIBLE_WALL }, - { Xfake_grass, EL_INVISIBLE_SAND }, - { Xfake_grassB, EL_INVISIBLE_SAND }, - { Xfake_door_1, EL_EM_GATE_1_GRAY }, - { Xfake_door_2, EL_EM_GATE_2_GRAY }, - { Xfake_door_3, EL_EM_GATE_3_GRAY }, - { Xfake_door_4, EL_EM_GATE_4_GRAY }, - { Xfake_door_5, EL_EMC_GATE_5_GRAY }, - { Xfake_door_6, EL_EMC_GATE_6_GRAY }, - { Xfake_door_7, EL_EMC_GATE_7_GRAY }, - { Xfake_door_8, EL_EMC_GATE_8_GRAY }, - { Xsteel_1, EL_STEELWALL }, - { Xsteel_2, EL_UNKNOWN }, - { Xsteel_3, EL_EMC_STEELWALL_1 }, - { Xsteel_4, EL_UNKNOWN }, - { Xwall_1, EL_WALL }, - { Xwall_2, EL_UNKNOWN }, - { Xwall_3, EL_UNKNOWN }, - { Xwall_4, EL_UNKNOWN }, - { Xround_wall_1, EL_WALL_SLIPPERY }, - { Xround_wall_2, EL_UNKNOWN }, - { Xround_wall_3, EL_UNKNOWN }, - { Xround_wall_4, EL_UNKNOWN }, - { Xdecor_1, EL_UNKNOWN }, - { Xdecor_2, EL_EMC_WALL_6 }, - { Xdecor_3, EL_EMC_WALL_4 }, - { Xdecor_4, EL_EMC_WALL_5 }, - { Xdecor_5, EL_EMC_WALL_7 }, - { Xdecor_6, EL_EMC_WALL_8 }, - { Xdecor_7, EL_UNKNOWN }, - { Xdecor_8, EL_EMC_WALL_1 }, - { Xdecor_9, EL_EMC_WALL_2 }, - { Xdecor_10, EL_EMC_WALL_3 }, - { Xdecor_11, EL_UNKNOWN }, - { Xdecor_12, EL_UNKNOWN }, - { Xalpha_0, EL_CHAR('0') }, - { Xalpha_1, EL_CHAR('1') }, - { Xalpha_2, EL_CHAR('2') }, - { Xalpha_3, EL_CHAR('3') }, - { Xalpha_4, EL_CHAR('4') }, - { Xalpha_5, EL_CHAR('5') }, - { Xalpha_6, EL_CHAR('6') }, - { Xalpha_7, EL_CHAR('7') }, - { Xalpha_8, EL_CHAR('8') }, - { Xalpha_9, EL_CHAR('9') }, - { Xalpha_excla, EL_CHAR('!') }, - { Xalpha_quote, EL_CHAR('"') }, - { Xalpha_comma, EL_CHAR(',') }, - { Xalpha_minus, EL_CHAR('-') }, - { Xalpha_perio, EL_CHAR('.') }, - { Xalpha_colon, EL_CHAR(':') }, - { Xalpha_quest, EL_CHAR('?') }, - { Xalpha_a, EL_CHAR('A') }, - { Xalpha_b, EL_CHAR('B') }, - { Xalpha_c, EL_CHAR('C') }, - { Xalpha_d, EL_CHAR('D') }, - { Xalpha_e, EL_CHAR('E') }, - { Xalpha_f, EL_CHAR('F') }, - { Xalpha_g, EL_CHAR('G') }, - { Xalpha_h, EL_CHAR('H') }, - { Xalpha_i, EL_CHAR('I') }, - { Xalpha_j, EL_CHAR('J') }, - { Xalpha_k, EL_CHAR('K') }, - { Xalpha_l, EL_CHAR('L') }, - { Xalpha_m, EL_CHAR('M') }, - { Xalpha_n, EL_CHAR('N') }, - { Xalpha_o, EL_CHAR('O') }, - { Xalpha_p, EL_CHAR('P') }, - { Xalpha_q, EL_CHAR('Q') }, - { Xalpha_r, EL_CHAR('R') }, - { Xalpha_s, EL_CHAR('S') }, - { Xalpha_t, EL_CHAR('T') }, - { Xalpha_u, EL_CHAR('U') }, - { Xalpha_v, EL_CHAR('V') }, - { Xalpha_w, EL_CHAR('W') }, - { Xalpha_x, EL_CHAR('X') }, - { Xalpha_y, EL_CHAR('Y') }, - { Xalpha_z, EL_CHAR('Z') }, - { Xalpha_arrow_e, EL_CHAR('>') }, - { Xalpha_arrow_w, EL_CHAR('<') }, - { Xalpha_copyr, EL_CHAR('©') }, - - { Zplayer, EL_PLAYER_1 }, - - { ZBORDER, EL_EMC_LEVEL_BORDER }, - - { -1, -1 } - }; - - if (!mapping_initialized) - { - int i; - - /* return "EL_UNKNOWN" for all undefined elements in mapping array */ - for (i = 0; i < TILE_MAX; i++) - mapping_EM_to_RND[i] = EL_UNKNOWN; - - for (i = 0; em_object_mapping_list[i].element_em != -1; i++) - mapping_EM_to_RND[em_object_mapping_list[i].element_em] = - em_object_mapping_list[i].element_rnd; - - mapping_initialized = TRUE; - } - - if (element_em >= 0 && element_em < TILE_MAX) - return mapping_EM_to_RND[element_em]; - - Error(ERR_WARN, "invalid EM level element %d", element_em); - - return EL_UNKNOWN; -} - -#endif - int map_direction_RND_to_EM(int direction) { return (direction == MV_UP ? 0 : @@ -5619,14 +5462,18 @@ int map_direction_EM_to_RND(int direction) int get_next_element(int element) { - switch(element) + switch (element) { case EL_QUICKSAND_FILLING: return EL_QUICKSAND_FULL; case EL_QUICKSAND_EMPTYING: return EL_QUICKSAND_EMPTY; + case EL_QUICKSAND_FAST_FILLING: return EL_QUICKSAND_FAST_FULL; + case EL_QUICKSAND_FAST_EMPTYING: return EL_QUICKSAND_FAST_EMPTY; case EL_MAGIC_WALL_FILLING: return EL_MAGIC_WALL_FULL; case EL_MAGIC_WALL_EMPTYING: return EL_MAGIC_WALL_ACTIVE; case EL_BD_MAGIC_WALL_FILLING: return EL_BD_MAGIC_WALL_FULL; case EL_BD_MAGIC_WALL_EMPTYING: return EL_BD_MAGIC_WALL_ACTIVE; + case EL_DC_MAGIC_WALL_FILLING: return EL_DC_MAGIC_WALL_FULL; + case EL_DC_MAGIC_WALL_EMPTYING: return EL_DC_MAGIC_WALL_ACTIVE; case EL_AMOEBA_DROPPING: return EL_AMOEBA_WET; default: return element; @@ -5731,6 +5578,130 @@ int font2baseimg(int font_nr) return font_info[font_nr].special_graphic[GFX_SPECIAL_ARG_DEFAULT]; } +int getBeltNrFromBeltElement(int element) +{ + return (element < EL_CONVEYOR_BELT_2_LEFT ? 0 : + element < EL_CONVEYOR_BELT_3_LEFT ? 1 : + element < EL_CONVEYOR_BELT_4_LEFT ? 2 : 3); +} + +int getBeltNrFromBeltActiveElement(int element) +{ + return (element < EL_CONVEYOR_BELT_2_LEFT_ACTIVE ? 0 : + element < EL_CONVEYOR_BELT_3_LEFT_ACTIVE ? 1 : + element < EL_CONVEYOR_BELT_4_LEFT_ACTIVE ? 2 : 3); +} + +int getBeltNrFromBeltSwitchElement(int element) +{ + return (element < EL_CONVEYOR_BELT_2_SWITCH_LEFT ? 0 : + element < EL_CONVEYOR_BELT_3_SWITCH_LEFT ? 1 : + element < EL_CONVEYOR_BELT_4_SWITCH_LEFT ? 2 : 3); +} + +int getBeltDirNrFromBeltElement(int element) +{ + static int belt_base_element[4] = + { + EL_CONVEYOR_BELT_1_LEFT, + EL_CONVEYOR_BELT_2_LEFT, + EL_CONVEYOR_BELT_3_LEFT, + EL_CONVEYOR_BELT_4_LEFT + }; + + int belt_nr = getBeltNrFromBeltElement(element); + int belt_dir_nr = element - belt_base_element[belt_nr]; + + return (belt_dir_nr % 3); +} + +int getBeltDirNrFromBeltSwitchElement(int element) +{ + static int belt_base_element[4] = + { + EL_CONVEYOR_BELT_1_SWITCH_LEFT, + EL_CONVEYOR_BELT_2_SWITCH_LEFT, + EL_CONVEYOR_BELT_3_SWITCH_LEFT, + EL_CONVEYOR_BELT_4_SWITCH_LEFT + }; + + int belt_nr = getBeltNrFromBeltSwitchElement(element); + int belt_dir_nr = element - belt_base_element[belt_nr]; + + return (belt_dir_nr % 3); +} + +int getBeltDirFromBeltElement(int element) +{ + static int belt_move_dir[3] = + { + MV_LEFT, + MV_NONE, + MV_RIGHT + }; + + int belt_dir_nr = getBeltDirNrFromBeltElement(element); + + return belt_move_dir[belt_dir_nr]; +} + +int getBeltDirFromBeltSwitchElement(int element) +{ + static int belt_move_dir[3] = + { + MV_LEFT, + MV_NONE, + MV_RIGHT + }; + + int belt_dir_nr = getBeltDirNrFromBeltSwitchElement(element); + + return belt_move_dir[belt_dir_nr]; +} + +int getBeltElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir) +{ + static int belt_base_element[4] = + { + EL_CONVEYOR_BELT_1_LEFT, + EL_CONVEYOR_BELT_2_LEFT, + EL_CONVEYOR_BELT_3_LEFT, + EL_CONVEYOR_BELT_4_LEFT + }; + int belt_dir_nr = (belt_dir == MV_LEFT ? 0 : belt_dir == MV_RIGHT ? 2 : 1); + + return belt_base_element[belt_nr] + belt_dir_nr; +} + +int getBeltSwitchElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir) +{ + static int belt_base_element[4] = + { + EL_CONVEYOR_BELT_1_SWITCH_LEFT, + EL_CONVEYOR_BELT_2_SWITCH_LEFT, + EL_CONVEYOR_BELT_3_SWITCH_LEFT, + EL_CONVEYOR_BELT_4_SWITCH_LEFT + }; + int belt_dir_nr = (belt_dir == MV_LEFT ? 0 : belt_dir == MV_RIGHT ? 2 : 1); + + return belt_base_element[belt_nr] + belt_dir_nr; +} + +int getNumActivePlayers_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; +} + int getGameFrameDelay_EM(int native_em_game_frame_delay) { int game_frame_delay_value; @@ -5749,26 +5720,112 @@ int getGameFrameDelay_EM(int native_em_game_frame_delay) unsigned int InitRND(long seed) { if (level.game_engine_type == GAME_ENGINE_TYPE_EM) - return InitEngineRND_EM(seed); + return InitEngineRandom_EM(seed); else - return InitEngineRND(seed); + return InitEngineRandom_RND(seed); } -#define DEBUG_EM_GFX 0 +#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 + +void ResetGfxAnimation_EM(int x, int y, int tile) +{ + GfxFrame[x][y] = 0; +} + +void getGraphicSourceObjectExt_EM(int tile, int frame_em, + Bitmap **src_bitmap, int *src_x, int *src_y, + int x, int y) +{ + int element = object_mapping[tile].element_rnd; + int action = object_mapping[tile].action; + int direction = object_mapping[tile].direction; + boolean is_backside = object_mapping[tile].is_backside; + boolean action_removing = (action == ACTION_DIGGING || + action == ACTION_SNAPPING || + action == ACTION_COLLECTING); + int effective_element = (frame_em > 0 ? element : + is_backside ? EL_EMPTY : + action_removing ? EL_EMPTY : + element); + int graphic = (direction == MV_NONE ? + el_act2img(effective_element, action) : + el_act_dir2img(effective_element, action, direction)); + struct GraphicInfo *g = &graphic_info[graphic]; + int sync_frame; + + if (graphic_info[graphic].anim_global_sync) + sync_frame = FrameCounter; + else + sync_frame = 7 - frame_em; + + SetRandomAnimationValue(x, y); + + int frame = getAnimationFrame(g->anim_frames, + g->anim_delay, + g->anim_mode, + g->anim_start_frame, + sync_frame); + + getGraphicSourceExt(graphic, frame, src_bitmap, src_x, src_y, FALSE); +} + +void getGraphicSourcePlayerExt_EM(int player_nr, int anim, int frame_em, + Bitmap **src_bitmap, int *src_x, int *src_y) +{ + int element = player_mapping[player_nr][anim].element_rnd; + int action = player_mapping[player_nr][anim].action; + int direction = player_mapping[player_nr][anim].direction; + int graphic = (direction == MV_NONE ? + el_act2img(element, action) : + el_act_dir2img(element, action, direction)); + struct GraphicInfo *g = &graphic_info[graphic]; + int sync_frame; + + InitPlayerGfxAnimation(&stored_player[player_nr], action, direction); + + stored_player[player_nr].StepFrame = 7 - frame_em; + + sync_frame = stored_player[player_nr].Frame; + +#if 0 + printf("::: %d: %d, %d [%d]\n", + player_nr, + stored_player[player_nr].Frame, + stored_player[player_nr].StepFrame, + FrameCounter); +#endif + + int frame = getAnimationFrame(g->anim_frames, + g->anim_delay, + g->anim_mode, + g->anim_start_frame, + sync_frame); + + getGraphicSourceExt(graphic, frame, src_bitmap, src_x, src_y, FALSE); +} 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 + int num_em_gfx_errors = 0; + if (graphic_info_em_object[0][0].bitmap == NULL) { /* EM graphics not yet initialized in em_open_all() */ return; } + + printf("::: [4 errors can be ignored (1 x 'bomb', 3 x 'em_dynamite']\n"); #endif /* always start with reliable default values */ @@ -5862,12 +5919,12 @@ void InitGraphicInfo_EM(void) i == Ymagnify_eat ? element : i == Ygrass_eat ? element : i == Ydirt_eat ? element : - i == Yspring_kill_e ? EL_SPRING : - i == Yspring_kill_w ? EL_SPRING : i == Yemerald_stone ? EL_EMERALD : i == Ydiamond_stone ? EL_ROCK : - i == Xsand_stonein_4 ? EL_EMPTY : - i == Xsand_stoneout_2 ? 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); @@ -5909,6 +5966,7 @@ void InitGraphicInfo_EM(void) 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]; struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][7 - j]; @@ -5965,9 +6023,9 @@ void InitGraphicInfo_EM(void) i == Xexit_2 ? j + 8 : i == Xexit_3 ? j + 16 : i == Xdynamite_1 ? 0 : - i == Xdynamite_2 ? 20 : - i == Xdynamite_3 ? 40 : - i == Xdynamite_4 ? 60 : + 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 : @@ -6076,22 +6134,43 @@ void InitGraphicInfo_EM(void) g_em->crumbled_border_size = graphic_info[crumbled].border_size; } - if (!g->double_movement && (effective_action == ACTION_FALLING || - effective_action == ACTION_MOVING || - effective_action == ACTION_PUSHING)) +#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 || + effective_action == ACTION_EATING)) || + (!has_action_graphics && (effective_action == ACTION_FILLING || + effective_action == ACTION_EMPTYING))) { int move_dir = - (effective_action == ACTION_FALLING ? MV_DOWN : direction); + (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 || - i == Ydrip_s1B || - i == Ydrip_s2 || - i == Ydrip_s2B ? 16 : 8); + 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 || - i == Ydrip_s2B ? j + 8 : j) + 1; + 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 */ @@ -6125,7 +6204,6 @@ void InitGraphicInfo_EM(void) g_em->height = TILEY - cy * step; } -#if 1 /* 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 @@ -6133,29 +6211,12 @@ void InitGraphicInfo_EM(void) bit 5 - 0 ( 6 bit): graphic height */ g_em->unique_identifier = (graphic << 16) | (frame << 12) | (g_em->width << 6) | g_em->height; -#else - /* create unique graphic identifier to decide if tile must be redrawn */ - /* bit 31 - 16 (16 bit): EM style element - 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 = - (i << 16) | (j << 12) | (g_em->width << 6) | g_em->height; -#endif - -#if 0 - if (effective_element == EL_ROCK) - printf("::: EL_ROCK(%d, %d): %d, %d => %d\n", - effective_action, j, graphic, frame, g_em->unique_identifier); -#endif #if DEBUG_EM_GFX -#if 1 /* skip check for EMC elements not contained in original EMC artwork */ if (element == EL_EMC_FAKE_ACID) continue; -#endif if (g_em->bitmap != debug_bitmap || g_em->src_x != debug_src_x || @@ -6213,6 +6274,8 @@ void InitGraphicInfo_EM(void) printf(" %d (%d): size %d,%d should be %d,%d\n", j, is_backside, g_em->width, g_em->height, TILEX, TILEY); + + num_em_gfx_errors++; } #endif @@ -6225,14 +6288,25 @@ void InitGraphicInfo_EM(void) { int element = object_mapping[i].element_rnd; int action = object_mapping[i].action; - - if (action == ACTION_SMASHED_BY_ROCK && - element_info[element].graphic[action] == - element_info[element].graphic[ACTION_DEFAULT]) + int direction = object_mapping[i].direction; + boolean is_backside = object_mapping[i].is_backside; + int graphic_action = el_act_dir2img(element, action, direction); + int graphic_default = el_act_dir2img(element, ACTION_DEFAULT, direction); + + if ((action == ACTION_SMASHED_BY_ROCK || + action == ACTION_SMASHED_BY_SPRING || + action == ACTION_EATING) && + graphic_action == graphic_default) { + int e = (action == ACTION_SMASHED_BY_ROCK ? Ystone_s : + action == ACTION_SMASHED_BY_SPRING ? Yspring_s : + direction == MV_LEFT ? (is_backside? Yspring_wB: Yspring_w) : + direction == MV_RIGHT ? (is_backside? Yspring_eB: Yspring_e) : + Xspring); + /* no separate animation for "smashed by rock" -- use rock instead */ struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][7 - j]; - struct GraphicInfo_EM *g_xx = &graphic_info_em_object[Ystone_s][7 - j]; + struct GraphicInfo_EM *g_xx = &graphic_info_em_object[e][7 - j]; g_em->bitmap = g_xx->bitmap; g_em->src_x = g_xx->src_x; @@ -6243,8 +6317,10 @@ void InitGraphicInfo_EM(void) g_em->dst_offset_y = g_xx->dst_offset_y; g_em->width = g_xx->width; g_em->height = g_xx->height; + g_em->unique_identifier = g_xx->unique_identifier; - g_em->preserve_background = TRUE; + if (!is_backside) + g_em->preserve_background = TRUE; } } } @@ -6283,7 +6359,7 @@ void InitGraphicInfo_EM(void) g->anim_start_frame, sync_frame); - getGraphicSourceExt(graphic, frame, &src_bitmap, &src_x,&src_y, FALSE); + getGraphicSourceExt(graphic, frame, &src_bitmap, &src_x, &src_y, FALSE); g_em->bitmap = src_bitmap; g_em->src_x = src_x; @@ -6296,6 +6372,12 @@ void InitGraphicInfo_EM(void) g_em->height = TILEY; #if DEBUG_EM_GFX + + /* skip check for EMC elements not contained in original EMC artwork */ + if (element == EL_PLAYER_3 || + element == EL_PLAYER_4) + continue; + if (g_em->bitmap != debug_bitmap || g_em->src_x != debug_src_x || g_em->src_y != debug_src_y) @@ -6331,6 +6413,8 @@ void InitGraphicInfo_EM(void) g_em->src_x / 32, g_em->src_y / 32, debug_src_x, debug_src_y, debug_src_x / 32, debug_src_y / 32); + + num_em_gfx_errors++; } #endif @@ -6339,6 +6423,140 @@ void InitGraphicInfo_EM(void) } #if DEBUG_EM_GFX + printf("\n"); + printf("::: [%d errors found]\n", num_em_gfx_errors); + exit(0); #endif } + +void PlayMenuSound() +{ + int sound = menu.sound[game_status]; + + if (sound == SND_UNDEFINED) + return; + + if ((!setup.sound_simple && !IS_LOOP_SOUND(sound)) || + (!setup.sound_loops && IS_LOOP_SOUND(sound))) + return; + + if (IS_LOOP_SOUND(sound)) + PlaySoundLoop(sound); + else + PlaySound(sound); +} + +void PlayMenuSoundStereo(int sound, int stereo_position) +{ + if (sound == SND_UNDEFINED) + return; + + if ((!setup.sound_simple && !IS_LOOP_SOUND(sound)) || + (!setup.sound_loops && IS_LOOP_SOUND(sound))) + return; + + if (IS_LOOP_SOUND(sound)) + PlaySoundExt(sound, SOUND_MAX_VOLUME, stereo_position, SND_CTRL_PLAY_LOOP); + else + PlaySoundStereo(sound, stereo_position); +} + +void PlayMenuSoundIfLoop() +{ + int sound = menu.sound[game_status]; + + if (sound == SND_UNDEFINED) + return; + + if ((!setup.sound_simple && !IS_LOOP_SOUND(sound)) || + (!setup.sound_loops && IS_LOOP_SOUND(sound))) + return; + + if (IS_LOOP_SOUND(sound)) + PlaySoundLoop(sound); +} + +void PlayMenuMusic() +{ + int music = menu.music[game_status]; + + if (music == MUS_UNDEFINED) + return; + + if (!setup.sound_music) + return; + + PlayMusic(music); +} + +void PlaySoundActivating() +{ +#if 0 + PlaySound(SND_MENU_ITEM_ACTIVATING); +#endif +} + +void PlaySoundSelecting() +{ +#if 0 + PlaySound(SND_MENU_ITEM_SELECTING); +#endif +} + +void ToggleFullscreenIfNeeded() +{ + boolean change_fullscreen = (setup.fullscreen != + video.fullscreen_enabled); + boolean change_fullscreen_mode = (video.fullscreen_enabled && + !strEqual(setup.fullscreen_mode, + video.fullscreen_mode_current)); + + if (!video.fullscreen_available) + return; + +#if 1 + if (change_fullscreen || change_fullscreen_mode) +#else + if (setup.fullscreen != video.fullscreen_enabled || + setup.fullscreen_mode != video.fullscreen_mode_current) +#endif + { + Bitmap *tmp_backbuffer = CreateBitmap(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH); + + /* save backbuffer content which gets lost when toggling fullscreen mode */ + BlitBitmap(backbuffer, tmp_backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); + +#if 1 + if (change_fullscreen_mode) +#else + if (setup.fullscreen && video.fullscreen_enabled) +#endif + { + /* keep fullscreen, but change fullscreen mode (screen resolution) */ +#if 1 + /* (this is now set in sdl.c) */ +#else + video.fullscreen_mode_current = setup.fullscreen_mode; +#endif + video.fullscreen_enabled = FALSE; /* force new fullscreen mode */ + } + + /* toggle fullscreen */ + ChangeVideoModeIfNeeded(setup.fullscreen); + + setup.fullscreen = video.fullscreen_enabled; + + /* restore backbuffer content from temporary backbuffer backup bitmap */ + BlitBitmap(tmp_backbuffer, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); + + 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 + } +}