X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=979eead935e254fe9a62febb76a90bb2a6290194;hb=0d0e1a63d6b14109b64805bcb1a45ddf469ba35d;hp=7330f9f9c2e11bce490501dc316342efb56c787b;hpb=f4b305df0ae775ef48daee86020904abb79ebef8;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index 7330f9f9..979eead9 100644 --- a/src/tools.c +++ b/src/tools.c @@ -243,19 +243,18 @@ void BackToFront() VX+VIDEO_CONTROL_XPOS,VY+VIDEO_CONTROL_YPOS); } } + if (redraw_mask & REDRAW_DOOR_3) BlitBitmap(backbuffer, window, EX, EY, EXSIZE, EYSIZE, EX, EY); + redraw_mask &= ~REDRAW_DOORS; } if (redraw_mask & REDRAW_MICROLEVEL) { - BlitBitmap(backbuffer, window, - MICROLEV_XPOS, MICROLEV_YPOS, MICROLEV_XSIZE, MICROLEV_YSIZE, - MICROLEV_XPOS, MICROLEV_YPOS); - BlitBitmap(backbuffer, window, - SX, MICROLABEL_YPOS, SXSIZE, getFontHeight(FONT_SPECIAL_GAME), - SX, MICROLABEL_YPOS); + BlitBitmap(backbuffer, window, SX, SY + 10 * TILEY, SXSIZE, 7 * TILEY, + SX, SY + 10 * TILEY); + redraw_mask &= ~REDRAW_MICROLEVEL; } @@ -279,7 +278,7 @@ void BackToFront() info1[0] = '\0'; sprintf(text, "%.1f fps%s", global.frames_per_second, info1); - DrawTextExt(window, SX, SY, text, FONT_DEFAULT_SMALL, FONT_OPAQUE); + DrawTextExt(window, SX, SY, text, FONT_TEXT_2, FONT_OPAQUE); } FlushDisplay(); @@ -543,6 +542,7 @@ void DrawPlayer(struct PlayerInfo *player) int graphic; int frame = 0; boolean player_is_moving = (last_jx != jx || last_jy != jy ? TRUE : FALSE); + int current_action = ACTION_DEFAULT; if (!player->active || !IN_SCR_FIELD(SCREENX(last_jx), SCREENY(last_jy))) return; @@ -560,6 +560,13 @@ void DrawPlayer(struct PlayerInfo *player) if (element == EL_EXPLOSION) return; + current_action = (player->Pushing ? ACTION_PUSHING : + player->is_digging ? ACTION_DIGGING : + player->is_moving ? ACTION_MOVING : + player->snapped ? ACTION_SNAPPING : ACTION_DEFAULT); + + InitPlayerGfxAnimation(player, current_action, player->MovDir); + /* ----------------------------------------------------------------------- */ /* draw things in the field the player is leaving, if needed */ /* ----------------------------------------------------------------------- */ @@ -570,12 +577,14 @@ void DrawPlayer(struct PlayerInfo *player) { DrawLevelElement(last_jx, last_jy, Store[last_jx][last_jy]); - if (last_element == EL_DYNAMITE_ACTIVE) + if (last_element == EL_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) + else if (last_element == EL_DYNAMITE_ACTIVE || + last_element == EL_SP_DISK_RED_ACTIVE) DrawDynamite(last_jx, last_jy); else DrawLevelField(last_jx, last_jy); @@ -606,20 +615,71 @@ void DrawPlayer(struct PlayerInfo *player) if (Store[jx][jy]) DrawLevelElement(jx, jy, Store[jx][jy]); - else if (!IS_ACTIVE_BOMB(element)) - DrawLevelField(jx, jy); - else + else if (IS_ACTIVE_BOMB(element)) DrawLevelElement(jx, jy, EL_EMPTY); + else + { + if (player_is_moving && GfxElement[jx][jy] != EL_UNDEFINED) + { + int old_element = GfxElement[jx][jy]; + int old_graphic = + el_act_dir2img(old_element, ACTION_DIGGING, player->MovDir); + int frame = getGraphicAnimationFrame(old_graphic, player->StepFrame); + +#if 0 + Bitmap *src_bitmap; + int src_x, src_y; + int width = TILEX, height = TILEY; + int cx = 0, cy = 0; + + if (player->MovDir == MV_UP) + { + cy = player->GfxPos; + height -= cy; + } + else if (player->MovDir == MV_DOWN) + { + cy = 0; + height = TILEY - player->GfxPos; + } + else if (player->MovDir == MV_LEFT) + { + cx = player->GfxPos; + width -= cx; + } + else if (player->MovDir == MV_RIGHT) + { + cx = 0; + width = TILEX - player->GfxPos; + } + + getGraphicSource(old_graphic, frame, &src_bitmap, &src_x, &src_y); + + BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, + width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy); +#else +#if 0 + printf("::: %d, %d, %d, %d => %d, %d [%d, %d, %d]\n", + old_element, ACTION_DIGGING, player->MovDir, player->Frame, + old_graphic, frame, + player->MovPos, player->GfxPos, player->StepFrame); +#endif + + DrawGraphic(sx, sy, old_graphic, frame); +#endif + } + else + { + GfxElement[jx][jy] = EL_UNDEFINED; + + DrawLevelField(jx, jy); + } + } /* ----------------------------------------------------------------------- */ /* draw player himself */ /* ----------------------------------------------------------------------- */ - player->GfxAction = (player->Pushing ? ACTION_PUSHING : - player->is_digging ? ACTION_DIGGING : - player->is_moving ? ACTION_MOVING : - player->snapped ? ACTION_SNAPPING : ACTION_DEFAULT); - if (player->use_murphy_graphic) { static int last_horizontal_dir = MV_LEFT; @@ -1044,7 +1104,7 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element, frame = getGraphicAnimationFrame(graphic, -1); } - if (element == EL_WALL_GROWING) + if (element == EL_EXPANDABLE_WALL) { boolean left_stopped = FALSE, right_stopped = FALSE; @@ -1057,17 +1117,17 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element, graphic = IMG_WALL; else if (left_stopped) { - graphic = IMG_WALL_GROWING_ACTIVE_RIGHT; + graphic = IMG_EXPANDABLE_WALL_GROWING_RIGHT; frame = graphic_info[graphic].anim_frames - 1; } else if (right_stopped) { - graphic = IMG_WALL_GROWING_ACTIVE_LEFT; + graphic = IMG_EXPANDABLE_WALL_GROWING_LEFT; frame = graphic_info[graphic].anim_frames - 1; } } #if 0 - else if (IS_AMOEBOID(element) || element == EL_AMOEBA_DRIPPING) + else if (IS_AMOEBOID(element) || element == EL_AMOEBA_DROPPING) { graphic = (element == EL_BD_AMOEBA ? IMG_BD_AMOEBA_PART1 : element == EL_AMOEBA_WET ? IMG_AMOEBA_WET_PART1 : @@ -1080,9 +1140,9 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element, #endif #if 0 - if (IS_AMOEBOID(element) || element == EL_AMOEBA_DRIPPING) + if (IS_AMOEBOID(element) || element == EL_AMOEBA_DROPPING) { - if (Feld[lx][ly] == EL_AMOEBA_DRIPPING) + if (Feld[lx][ly] == EL_AMOEBA_DROPPING) printf("---> %d -> %d / %d [%d]\n", element, graphic, frame, GfxRandom[lx][ly]); } @@ -1160,6 +1220,9 @@ void DrawCrumbledSand(int x, int y) element = Feld[lx][ly]; if (element == EL_SAND || +#if 1 + (element == EL_EMPTY_SPACE && GfxElement[lx][ly] == EL_SAND) || +#endif element == EL_LANDMINE || element == EL_TRAP || element == EL_TRAP_ACTIVE) @@ -1185,6 +1248,9 @@ void DrawCrumbledSand(int x, int y) element = Feld[lxx][lyy]; if (element == EL_SAND || +#if 1 + (element == EL_EMPTY_SPACE && GfxElement[lxx][lyy] == EL_SAND) || +#endif element == EL_LANDMINE || element == EL_TRAP || element == EL_TRAP_ACTIVE) @@ -1230,6 +1296,9 @@ void DrawCrumbledSand(int x, int y) if (!IN_LEV_FIELD(lxx, lyy) || (Feld[lxx][lyy] != EL_SAND && +#if 1 + !(Feld[lxx][lyy] == EL_EMPTY_SPACE && GfxElement[lxx][lyy] == EL_SAND) && +#endif Feld[lxx][lyy] != EL_LANDMINE && Feld[lxx][lyy] != EL_TRAP && Feld[lxx][lyy] != EL_TRAP_ACTIVE) || @@ -1321,7 +1390,7 @@ void DrawScreenField(int x, int y) if (element == EL_QUICKSAND_EMPTYING || element == EL_MAGIC_WALL_EMPTYING || element == EL_BD_MAGIC_WALL_EMPTYING || - element == EL_AMOEBA_DRIPPING) + element == EL_AMOEBA_DROPPING) cut_mode = CUT_ABOVE; else if (element == EL_QUICKSAND_FILLING || element == EL_MAGIC_WALL_FILLING || @@ -1363,7 +1432,7 @@ void DrawScreenField(int x, int y) if (element_old == EL_QUICKSAND_EMPTYING || element_old == EL_MAGIC_WALL_EMPTYING || element_old == EL_BD_MAGIC_WALL_EMPTYING || - element_old == EL_AMOEBA_DRIPPING) + element_old == EL_AMOEBA_DROPPING) cut_mode = CUT_ABOVE; DrawScreenElement(x, y, EL_EMPTY); @@ -1529,9 +1598,15 @@ static void DrawMicroLevelExt(int xpos, int ypos, int from_x, int from_y) static void DrawMicroLevelLabelExt(int mode) { char label_text[MAX_OUTPUT_LINESIZE + 1]; - int max_len_label_text = SXSIZE / getFontWidth(FONT_SPECIAL_GAME); + int max_len_label_text; + int font_nr = FONT_TEXT_2; + + if (mode == MICROLABEL_CREATED_BY || mode == MICROLABEL_IMPORTED_FROM) + font_nr = FONT_TEXT_3; + + max_len_label_text = SXSIZE / getFontWidth(font_nr); - DrawBackground(SX, MICROLABEL_YPOS, SXSIZE,getFontHeight(FONT_SPECIAL_GAME)); + DrawBackground(SX, MICROLABEL_YPOS, SXSIZE, getFontHeight(font_nr)); strncpy(label_text, (mode == MICROLABEL_LEVEL_NAME ? level.name : mode == MICROLABEL_CREATED_BY ? "created by" : @@ -1544,11 +1619,11 @@ static void DrawMicroLevelLabelExt(int mode) if (strlen(label_text) > 0) { - int text_width = strlen(label_text) * getFontWidth(FONT_SPECIAL_GAME); + int text_width = strlen(label_text) * getFontWidth(font_nr); int lxpos = SX + (SXSIZE - text_width) / 2; int lypos = MICROLABEL_YPOS; - DrawText(lxpos, lypos, label_text, FONT_SPECIAL_GAME); + DrawText(lxpos, lypos, label_text, font_nr); } redraw_mask |= REDRAW_MICROLEVEL; @@ -1560,6 +1635,9 @@ void DrawMicroLevel(int xpos, int ypos, boolean restart) 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 */ + + game_status = PSEUDO_PREVIEW; /* force PREVIEW font on preview level */ if (restart) { @@ -1575,6 +1653,17 @@ void DrawMicroLevel(int xpos, int ypos, boolean restart) DelayReached(&scroll_delay, 0); DelayReached(&label_delay, 0); + if (leveldir_current->name) + { + int len = strlen(leveldir_current->name); + int lxpos = SX + (SXSIZE - len * getFontWidth(FONT_TEXT_1)) / 2; + int lypos = SY + 352; + + DrawText(lxpos, lypos, leveldir_current->name, FONT_TEXT_1); + } + + game_status = last_game_status; /* restore current game status */ + return; } @@ -1643,6 +1732,8 @@ void DrawMicroLevel(int xpos, int ypos, boolean restart) MICROLABEL_LEVEL_IMPORT_INFO : MICROLABEL_EMPTY); DrawMicroLevelLabelExt(label_state); } + + game_status = last_game_status; /* restore current game status */ } int REQ_in_range(int x, int y) @@ -1664,6 +1755,7 @@ boolean Request(char *text, unsigned int req_state) { int mx, my, ty, result = -1; unsigned int old_door_state; + int last_game_status = game_status; /* save current game status */ #if defined(PLATFORM_UNIX) /* pause network game while waiting for request to answer */ @@ -1689,6 +1781,8 @@ boolean Request(char *text, unsigned int req_state) /* clear door drawing field */ DrawBackground(DX, DY, DXSIZE, DYSIZE); + game_status = PSEUDO_DOOR; /* force DOOR font on preview level */ + /* write text for request */ for(ty=0; ty < MAX_REQUEST_LINES; ty++) { @@ -1715,12 +1809,15 @@ boolean Request(char *text, unsigned int req_state) strncpy(text_line, text, tl); text_line[tl] = 0; - DrawText(DX + 50 - (tl * 14)/2, DY + 8 + ty * 16, - text_line, FONT_DEFAULT_SMALL); + DrawText(DX + (DXSIZE - tl * getFontWidth(FONT_TEXT_2)) / 2, + DY + 8 + ty * (getFontHeight(FONT_TEXT_2) + 2), + text_line, FONT_TEXT_2); text += tl + (tc == ' ' ? 1 : 0); } + game_status = last_game_status; /* restore current game status */ + if (req_state & REQ_ASK) { MapGadget(tool_gadget[TOOL_CTRL_ID_YES]); @@ -2284,7 +2381,7 @@ void CreateToolButtons() { int player_nr = id - TOOL_CTRL_ID_PLAYER_1; - getMiniGraphicSource(PLAYER_NR_GFX(IMG_PLAYER1, player_nr), + getMiniGraphicSource(PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), &deco_bitmap, &deco_x, &deco_y); deco_xpos = (toolbutton_info[i].width - MINI_TILEX) / 2; deco_ypos = (toolbutton_info[i].height - MINI_TILEY) / 2; @@ -2346,7 +2443,7 @@ int get_next_element(int element) 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_AMOEBA_DRIPPING: return EL_AMOEBA_WET; + case EL_AMOEBA_DROPPING: return EL_AMOEBA_WET; default: return element; }