X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=63c29e6262030ae4f67591cc084c47970f711aeb;hb=56356dc9e2d4a856879a3c91aa7212d0a80afdfd;hp=9530644e204d1787fbe18e240867c44b5923b7e9;hpb=585994e9f3f77300b730f790062010518f35a739;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index 9530644e..63c29e62 100644 --- a/src/tools.c +++ b/src/tools.c @@ -205,16 +205,16 @@ void DrawMaskedBorder_Rect(int x, int y, int width, int height) void DrawMaskedBorder_FIELD() { - if (game_status >= GAME_MODE_TITLE && - game_status <= GAME_MODE_PLAYING && - border.draw_masked[game_status]) + if (global.border_status >= GAME_MODE_TITLE && + global.border_status <= GAME_MODE_PLAYING && + border.draw_masked[global.border_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 || + (global.border_status != GAME_MODE_EDITOR || border.draw_masked[GFX_SPECIAL_ARG_EDITOR])) DrawMaskedBorder_Rect(DX, DY, DXSIZE, DYSIZE); } @@ -222,7 +222,7 @@ void DrawMaskedBorder_DOOR_1() void DrawMaskedBorder_DOOR_2() { if (border.draw_masked[GFX_SPECIAL_ARG_DOOR] && - game_status != GAME_MODE_EDITOR) + global.border_status != GAME_MODE_EDITOR) DrawMaskedBorder_Rect(VX, VY, VXSIZE, VYSIZE); } @@ -448,123 +448,88 @@ void BackToFront() redraw_mask = REDRAW_NONE; } -void FadeToFront() +static void FadeCrossSaveBackbuffer() { -#if 0 - long fading_delay = 300; + BlitBitmap(backbuffer, bitmap_db_cross, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); +} + +static void FadeExt(int fade_mask, int fade_mode, int fade_type) +{ + static int fade_type_skip = FADE_TYPE_NONE; + void (*draw_border_function)(void) = NULL; + Bitmap *bitmap = (fade_mode & FADE_TYPE_TRANSFORM ? bitmap_db_cross : NULL); + int x, y, width, height; + int fade_delay, post_delay; - if (setup.fading && (redraw_mask & REDRAW_FIELD)) + if (fade_type == FADE_TYPE_FADE_OUT) { + if (fade_type_skip != FADE_TYPE_NONE) + { +#if 1 + printf("::: skipping %d ... [%d] (X)\n", fade_mode, fade_type_skip); #endif -#if 0 - int x,y; - - ClearRectangle(window, REAL_SX,REAL_SY,FULL_SXSIZE,FULL_SYSIZE); - FlushDisplay(); + /* skip all fade operations until specified fade operation */ + if (fade_type & fade_type_skip) + fade_type_skip = FADE_TYPE_NONE; - for (i = 0; i < 2 * FULL_SYSIZE; i++) - { - for (y = 0; y < FULL_SYSIZE; y++) - { - BlitBitmap(backbuffer, window, - REAL_SX,REAL_SY+i, FULL_SXSIZE,1, REAL_SX,REAL_SY+i); - } - FlushDisplay(); - Delay(10); + return; } -#endif - -#if 0 - for (i = 1; i < FULL_SYSIZE; i+=2) - BlitBitmap(backbuffer, window, - REAL_SX,REAL_SY+i, FULL_SXSIZE,1, REAL_SX,REAL_SY+i); - FlushDisplay(); - Delay(fading_delay); -#endif -#if 0 - SetClipOrigin(clip_gc[PIX_FADEMASK], 0, 0); - BlitBitmapMasked(backbuffer, window, - REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE, - REAL_SX,REAL_SY); - FlushDisplay(); - Delay(fading_delay); - - SetClipOrigin(clip_gc[PIX_FADEMASK], -1, -1); - BlitBitmapMasked(backbuffer, window, - REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE, - REAL_SX,REAL_SY); - FlushDisplay(); - Delay(fading_delay); - - SetClipOrigin(clip_gc[PIX_FADEMASK], 0, -1); - BlitBitmapMasked(backbuffer, window, - REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE, - REAL_SX,REAL_SY); - FlushDisplay(); - Delay(fading_delay); - - SetClipOrigin(clip_gc[PIX_FADEMASK], -1, 0); - BlitBitmapMasked(backbuffer, window, - REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE, - REAL_SX,REAL_SY); - FlushDisplay(); - Delay(fading_delay); + if (fading.fade_mode & FADE_TYPE_TRANSFORM) + FadeCrossSaveBackbuffer(); - redraw_mask &= ~REDRAW_MAIN; + return; } -#endif - - BackToFront(); -} - -void FadeExt(int fade_mask, int fade_mode) -{ - static int fade_mode_skip = FADE_MODE_NONE; - void (*draw_border_function)(void) = NULL; -#if 0 - Bitmap *bitmap = (fade_mode != FADE_MODE_FADE_IN ? bitmap_db_cross : NULL); -#else - Bitmap *bitmap = (fade_mode & FADE_TYPE_TRANSFORM ? bitmap_db_cross : NULL); -#endif - int x, y, width, height; - int fade_delay, post_delay; redraw_mask |= fade_mask; - if (fade_mode & FADE_TYPE_SKIP) + if (fade_type == FADE_TYPE_SKIP) { -#if 0 - printf("::: will skip %d ... [%d]\n", fade_mode, fade_mode_skip); +#if 1 + printf("::: will skip %d ... [%d]\n", fade_mode, fade_type_skip); #endif - fade_mode_skip = fade_mode; + fade_type_skip = fade_mode; return; } - if (fade_mode_skip & FADE_TYPE_SKIP) + if (fade_type_skip != FADE_TYPE_NONE) { -#if 0 - printf("::: skipping %d ... [%d]\n", fade_mode, fade_mode_skip); +#if 1 + printf("::: skipping %d ... [%d]\n", fade_mode, fade_type_skip); #endif /* skip all fade operations until specified fade operation */ - if (fade_mode & fade_mode_skip) - fade_mode_skip = FADE_MODE_NONE; + if (fade_type & fade_type_skip) + fade_type_skip = FADE_TYPE_NONE; return; } #if 1 if (global.autoplay_leveldir) - fading.fade_mode = FADE_MODE_NONE; + { + // fading.fade_mode = FADE_MODE_NONE; + + return; + } #endif #if 1 if (fading.fade_mode == FADE_MODE_NONE) + { + BackToFront(); + return; + } +#endif + + /* !!! what abount fade_mask == REDRAW_FIELD | REDRAW_ALL ??? !!! */ + +#if 1 + printf("::: NOW FADING %d ... [%d]\n", fade_mode, fade_type); #endif if (fade_mask & REDRAW_FIELD) @@ -577,7 +542,10 @@ void FadeExt(int fade_mask, int fade_mode) fade_delay = fading.fade_delay; post_delay = (fade_mode == FADE_MODE_FADE_OUT ? fading.post_delay : 0); - draw_border_function = DrawMaskedBorder_FIELD; + if (border.draw_masked_when_fading) + draw_border_function = DrawMaskedBorder_FIELD; /* update when fading */ + else + DrawMaskedBorder_FIELD(); /* draw once */ } else /* REDRAW_ALL */ { @@ -612,13 +580,17 @@ void FadeExt(int fade_mask, int fade_mode) void FadeIn(int fade_mask) { +#if 0 + global.border_status = game_status; +#endif + #if 1 // printf("::: now fading in...\n"); if (fading.fade_mode & FADE_TYPE_TRANSFORM) - FadeExt(fade_mask, fading.fade_mode); + FadeExt(fade_mask, fading.fade_mode, FADE_TYPE_FADE_IN); else - FadeExt(fade_mask, FADE_MODE_FADE_IN); + FadeExt(fade_mask, FADE_MODE_FADE_IN, FADE_TYPE_FADE_IN); #else #if 1 if (fading.fade_mode == FADE_MODE_CROSSFADE) @@ -636,10 +608,18 @@ void FadeOut(int fade_mask) #if 1 // printf("::: fading.fade_mode == %d\n", fading.fade_mode); +#if 1 + if (fading.fade_mode & FADE_TYPE_TRANSFORM) + FadeExt(fade_mask, fading.fade_mode, FADE_TYPE_FADE_OUT); + else + FadeExt(fade_mask, FADE_MODE_FADE_OUT, FADE_TYPE_FADE_OUT); +#else if (fading.fade_mode & FADE_TYPE_TRANSFORM) FadeCrossSaveBackbuffer(); else - FadeExt(fade_mask, FADE_MODE_FADE_OUT); + FadeExt(fade_mask, FADE_MODE_FADE_OUT, FADE_TYPE_FADE_OUT); +#endif + #else #if 1 if (fading.fade_mode == FADE_MODE_CROSSFADE) @@ -650,17 +630,18 @@ void FadeOut(int fade_mask) FadeExt(fade_mask, FADE_MODE_FADE_OUT); #endif #endif + +#if 1 + global.border_status = game_status; +#endif } +#if 0 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); -} +#endif static void FadeSetLeaveNext(struct TitleFadingInfo fading_leave, boolean set) { @@ -676,6 +657,10 @@ void FadeSetEnterMenu() { fading = menu.enter_menu; +#if 0 + printf("::: storing enter_menu\n"); +#endif + FadeSetLeaveNext(fading, TRUE); /* (keep same fade mode) */ } @@ -683,6 +668,10 @@ void FadeSetLeaveMenu() { fading = menu.leave_menu; +#if 0 + printf("::: storing leave_menu\n"); +#endif + FadeSetLeaveNext(fading, TRUE); /* (keep same fade mode) */ } @@ -690,11 +679,31 @@ 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 */ } +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 */ } @@ -717,12 +726,12 @@ void FadeSetDisabled() void FadeSkipNextFadeIn() { - FadeExt(0, FADE_MODE_SKIP_FADE_IN); + FadeExt(0, FADE_MODE_SKIP_FADE_IN, FADE_TYPE_SKIP); } void FadeSkipNextFadeOut() { - FadeExt(0, FADE_MODE_SKIP_FADE_OUT); + FadeExt(0, FADE_MODE_SKIP_FADE_OUT, FADE_TYPE_SKIP); } void SetWindowBackgroundImageIfDefined(int graphic) @@ -912,6 +921,82 @@ inline int getGraphicAnimationFrame(int graphic, int sync_frame) sync_frame); } +void getSizedGraphicSource(int graphic, int frame, int tilesize_raw, + Bitmap **bitmap, int *x, int *y) +{ + struct + { + int width_mult, width_div; + int height_mult, height_div; + } + offset_calc[6] = + { + { 15, 16, 2, 3 }, /* 1 x 1 */ + { 7, 8, 2, 3 }, /* 2 x 2 */ + { 3, 4, 2, 3 }, /* 4 x 4 */ + { 1, 2, 2, 3 }, /* 8 x 8 */ + { 0, 1, 2, 3 }, /* 16 x 16 */ + { 0, 1, 0, 1 }, /* 32 x 32 */ + }; + struct GraphicInfo *g = &graphic_info[graphic]; + Bitmap *src_bitmap = g->bitmap; + int tilesize = MIN(MAX(1, tilesize_raw), TILESIZE); + int offset_calc_pos = log_2(tilesize); + int width_mult = offset_calc[offset_calc_pos].width_mult; + int width_div = offset_calc[offset_calc_pos].width_div; + int height_mult = offset_calc[offset_calc_pos].height_mult; + int height_div = offset_calc[offset_calc_pos].height_div; + int startx = src_bitmap->width * width_mult / width_div; + int starty = src_bitmap->height * height_mult / height_div; + int src_x = g->src_x * tilesize / TILESIZE; + int src_y = g->src_y * tilesize / TILESIZE; + int width = g->width * tilesize / TILESIZE; + int height = g->height * tilesize / TILESIZE; + int offset_x = g->offset_x * tilesize / TILESIZE; + int offset_y = g->offset_y * tilesize / TILESIZE; + + if (g->offset_y == 0) /* frames are ordered horizontally */ + { + int max_width = g->anim_frames_per_line * width; + int pos = (src_y / height) * max_width + src_x + frame * offset_x; + + src_x = pos % max_width; + src_y = src_y % height + pos / max_width * height; + } + else if (g->offset_x == 0) /* frames are ordered vertically */ + { + int max_height = g->anim_frames_per_line * height; + int pos = (src_x / width) * max_height + src_y + frame * offset_y; + + src_x = src_x % width + pos / max_height * width; + src_y = pos % max_height; + } + else /* frames are ordered diagonally */ + { + src_x = src_x + frame * offset_x; + src_y = src_y + frame * offset_y; + } + + *bitmap = src_bitmap; + *x = startx + src_x; + *y = starty + src_y; +} + +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, int *x, int *y, boolean get_backside) { @@ -1003,21 +1088,27 @@ void DrawGraphicThruMaskExt(DrawBuffer *d, int dst_x, int dst_y, int graphic, BlitBitmapMasked(src_bitmap, d, src_x, src_y, TILEX, TILEY, dst_x, dst_y); } -void DrawMiniGraphic(int x, int y, int graphic) +void DrawSizedGraphic(int x, int y, int graphic, int frame, int tilesize) { - DrawMiniGraphicExt(drawto, SX + x * MINI_TILEX,SY + y * MINI_TILEY, graphic); - MarkTileDirty(x / 2, y / 2); + DrawSizedGraphicExt(drawto, SX + x * tilesize, SY + y * tilesize, graphic, + frame, tilesize); + MarkTileDirty(x / tilesize, y / tilesize); } -void getMiniGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y) +void DrawSizedGraphicExt(DrawBuffer *d, int x, int y, int graphic, int frame, + int tilesize) { - struct GraphicInfo *g = &graphic_info[graphic]; - int mini_startx = 0; - int mini_starty = g->bitmap->height * 2 / 3; + Bitmap *src_bitmap; + int src_x, src_y; - *bitmap = g->bitmap; - *x = mini_startx + g->src_x / 2; - *y = mini_starty + g->src_y / 2; + getSizedGraphicSource(graphic, frame, tilesize, &src_bitmap, &src_x, &src_y); + BlitBitmap(src_bitmap, d, src_x, src_y, tilesize, tilesize, x, y); +} + +void DrawMiniGraphic(int x, int y, int graphic) +{ + DrawMiniGraphicExt(drawto, SX + x * MINI_TILEX,SY + y * MINI_TILEY, graphic); + MarkTileDirty(x / 2, y / 2); } void DrawMiniGraphicExt(DrawBuffer *d, int x, int y, int graphic) @@ -1826,58 +1917,13 @@ void ShowEnvelope(int envelope_nr) BackToFront(); } -void getPreviewGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y, - int tilesize) -{ - struct - { - int width_mult, width_div; - int height_mult, height_div; -#if 1 - } - offset_calc[6] = -#else - offset_calc[4] = -#endif - { - { 0, 1, 0, 1 }, - { 0, 1, 2, 3 }, - { 1, 2, 2, 3 }, - { 3, 4, 2, 3 }, -#if 1 - { 7, 8, 2, 3 }, - { 15, 16, 2, 3 }, -#endif - }; -#if 1 - int offset_calc_pos = (tilesize < MICRO_TILESIZE / 4 || - tilesize > TILESIZE ? 5 : 5 - log_2(tilesize)); -#else - int offset_calc_pos = (tilesize < MICRO_TILESIZE || tilesize > TILESIZE ? 3 : - 5 - log_2(tilesize)); -#endif - Bitmap *src_bitmap = graphic_info[graphic].bitmap; - 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 DrawPreviewElement(int dst_x, int dst_y, int element, int tilesize) { Bitmap *src_bitmap; int src_x, src_y; int graphic = el2preimg(element); - getPreviewGraphicSource(graphic, &src_bitmap, &src_x, &src_y, tilesize); + getSizedGraphicSource(graphic, 0, tilesize, &src_bitmap, &src_x, &src_y); BlitBitmap(src_bitmap, drawto, src_x, src_y, tilesize, tilesize, dst_x,dst_y); } @@ -1996,8 +2042,8 @@ static void DrawPreviewLevelLabelExt(int mode) #endif #if 1 - if (pos->chars != -1) - max_len_label_text = pos->chars; + if (pos->size != -1) + max_len_label_text = pos->size; #endif for (i = 0; i < max_len_label_text; i++) @@ -2106,8 +2152,8 @@ void DrawPreviewLevel(boolean restart) #endif #if 1 - if (pos->chars != -1) - max_len_label_text = pos->chars; + if (pos->size != -1) + max_len_label_text = pos->size; #endif strncpy(label_text, leveldir_current->name, max_len_label_text); @@ -2938,6 +2984,11 @@ boolean Request(char *text, unsigned int req_state) 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; @@ -2949,6 +3000,7 @@ boolean Request(char *text, unsigned int req_state) default: break; } + if (req_state & REQ_PLAYER) result = 0; break; @@ -2977,7 +3029,6 @@ boolean Request(char *text, unsigned int req_state) if (game_status == GAME_MODE_PLAYING && local_player->LevelSolved_GameEnd) { HandleGameActions(); - BackToFront(); } else { @@ -2987,6 +3038,8 @@ boolean Request(char *text, unsigned int req_state) Delay(10); } + BackToFront(); + #else DoAnimation(); @@ -5740,6 +5793,13 @@ int el2preimg(int element) return element_info[element].special_graphic[GFX_SPECIAL_ARG_PREVIEW]; } +int el2panelimg(int element) +{ + element = GFX_ELEMENT(element); + + return element_info[element].special_graphic[GFX_SPECIAL_ARG_PANEL]; +} + int font2baseimg(int font_nr) { return font_info[font_nr].special_graphic[GFX_SPECIAL_ARG_DEFAULT]; @@ -5826,7 +5886,7 @@ int getBeltDirFromBeltSwitchElement(int element) return belt_move_dir[belt_dir_nr]; } -int getBeltElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir) +int getBeltElementFromBeltNrAndBeltDirNr(int belt_nr, int belt_dir_nr) { static int belt_base_element[4] = { @@ -5835,12 +5895,18 @@ int getBeltElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir) 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) +int getBeltElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir) +{ + int belt_dir_nr = (belt_dir == MV_LEFT ? 0 : belt_dir == MV_RIGHT ? 2 : 1); + + return getBeltElementFromBeltNrAndBeltDirNr(belt_nr, belt_dir_nr); +} + +int getBeltSwitchElementFromBeltNrAndBeltDirNr(int belt_nr, int belt_dir_nr) { static int belt_base_element[4] = { @@ -5849,11 +5915,17 @@ int getBeltSwitchElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir) 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 getBeltSwitchElementFromBeltNrAndBeltDir(int belt_nr, int belt_dir) +{ + int belt_dir_nr = (belt_dir == MV_LEFT ? 0 : belt_dir == MV_RIGHT ? 2 : 1); + + return getBeltSwitchElementFromBeltNrAndBeltDirNr(belt_nr, belt_dir_nr); +} + int getNumActivePlayers_EM() { int num_players = 0; @@ -5902,6 +5974,69 @@ void ResetGfxAnimation_EM(int x, int y, int tile) GfxFrame[x][y] = 0; } +void SetGfxAnimation_EM(int tile, int frame_em, int x, int y) +{ +#if 0 + int element = object_mapping[tile].element_rnd; +#endif + 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); + +#if 0 + printf("::: SET: %d, %d: '%s'\n", x, y, EL_NAME(element)); +#endif + +#if 1 + if (action_removing) + { +#if 0 + printf("::: %d, %d: action_removing [%s]\n", x, y, EL_NAME(element)); +#endif + + GfxFrame[x][y] = 7 - frame_em; + } + else if (action == ACTION_FALLING || + action == ACTION_MOVING || + action == ACTION_PUSHING || + action == ACTION_EATING || + action == ACTION_FILLING || + action == ACTION_EMPTYING) + { + int move_dir = + (action == ACTION_FALLING || + action == ACTION_FILLING || + action == ACTION_EMPTYING ? MV_DOWN : direction); + + if (is_backside) + { + GfxFrame[x][y]++; + + if (move_dir == MV_LEFT) + GfxFrame[x - 1][y] = GfxFrame[x][y]; + else if (move_dir == MV_RIGHT) + GfxFrame[x + 1][y] = GfxFrame[x][y]; + else if (move_dir == MV_UP) + GfxFrame[x][y - 1] = GfxFrame[x][y]; + else if (move_dir == MV_DOWN) + GfxFrame[x][y + 1] = GfxFrame[x][y]; + } + +#if 0 + printf("::: %d, %d: %s, %d, %d [%d]\n", x, y, EL_NAME(element), is_backside, + move_dir, GfxFrame[x][y]); +#endif + } + else + GfxFrame[x][y]++; +#else + GfxFrame[x][y] = 7 - frame_em; +#endif +} + void getGraphicSourceObjectExt_EM(int tile, int frame_em, Bitmap **src_bitmap, int *src_x, int *src_y, int x, int y) @@ -5923,10 +6058,28 @@ void getGraphicSourceObjectExt_EM(int tile, int frame_em, struct GraphicInfo *g = &graphic_info[graphic]; int sync_frame; +#if 0 + printf("::: GET: %d, %d: '%s'\n", x, y, EL_NAME(element)); +#endif + +#if 0 + if (GfxFrame[x][y] < 8) + printf("::: %d, %d: %d [%s]\n", x, y, GfxFrame[x][y], EL_NAME(element)); +#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)) + sync_frame = GfxFrame[x][y]; + else + sync_frame = 0; /* steel border */ +#else if (graphic_info[graphic].anim_global_sync) sync_frame = FrameCounter; else sync_frame = 7 - frame_em; +#endif SetRandomAnimationValue(x, y);