X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=bf4e262bfc9d4fa8aad1ac12dea5d04175e06260;hb=f648fc704c75dcfb0e7721a723c7c7391e708370;hp=f730529956853b6397486378f7b5f956c80017d3;hpb=8758e1099fab693460be47636e56c779fceec08b;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index f7305299..bf4e262b 100644 --- a/src/tools.c +++ b/src/tools.c @@ -1820,6 +1820,15 @@ static void DrawPreviewLevelLabelExt(int mode) struct TextPosInfo *pos = &menu.main.text.level_info_2; char label_text[MAX_OUTPUT_LINESIZE + 1]; int max_len_label_text; +#if 1 + int font_nr = pos->font; + int i; + + if (mode == MICROLABEL_LEVEL_AUTHOR_HEAD || + mode == MICROLABEL_IMPORTED_FROM_HEAD || + mode == MICROLABEL_IMPORTED_BY_HEAD) + font_nr = pos->font_alt; +#else int font_nr = FONT_TEXT_2; int i; @@ -1827,6 +1836,11 @@ static void DrawPreviewLevelLabelExt(int mode) mode == MICROLABEL_IMPORTED_FROM_HEAD || mode == MICROLABEL_IMPORTED_BY_HEAD) font_nr = FONT_TEXT_3; +#endif + +#if 0 + printf("??? %d, %d\n", game_status, font_nr); +#endif #if 1 max_len_label_text = getMaxTextLength(pos, font_nr); @@ -1893,8 +1907,14 @@ void DrawPreviewLevel(boolean restart) int level_ysize = lev_fieldy + (show_level_border ? 2 : 0); int last_game_status = game_status; /* save current game status */ +#if 0 +#if 1 + game_status = GAME_MODE_MAIN; +#else /* force PREVIEW font on preview level */ game_status = GAME_MODE_PSEUDO_PREVIEW; +#endif +#endif if (restart) { @@ -1927,7 +1947,11 @@ void DrawPreviewLevel(boolean restart) { struct TextPosInfo *pos = &menu.main.text.level_info_1; char label_text[MAX_OUTPUT_LINESIZE + 1]; +#if 1 + int font_nr = pos->font; +#else int font_nr = FONT_TEXT_1; +#endif #if 1 int max_len_label_text = getMaxTextLength(pos, font_nr); #else @@ -5736,7 +5760,8 @@ void ResetGfxAnimation_EM(int x, int y, int tile) } void getGraphicSourceObjectExt_EM(int tile, int frame_em, - Bitmap **src_bitmap, int *src_x, int *src_y) + 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; @@ -5760,6 +5785,8 @@ void getGraphicSourceObjectExt_EM(int tile, int frame_em, else sync_frame = 7 - frame_em; + SetRandomAnimationValue(x, y); + int frame = getAnimationFrame(g->anim_frames, g->anim_delay, g->anim_mode,