X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=412363a604ef24a3f246f95beca40b15d7cb04b2;hb=41680565bf2af491be63ee8440788c4ff8b616db;hp=4f9d50fb440ed53796032cdcf2890d847ee954ba;hpb=bbe75d04a9fc20a80073e7f2c8d95ee1341a143f;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index 4f9d50fb..412363a6 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(); @@ -437,7 +436,7 @@ void SetBorderElement() void SetRandomAnimationValue(int x, int y) { - anim.random_frame = GfxRandom[x][y]; + gfx.anim_random_frame = GfxRandom[x][y]; } inline int getGraphicAnimationFrame(int graphic, int sync_frame) @@ -543,6 +542,8 @@ void DrawPlayer(struct PlayerInfo *player) int graphic; int frame = 0; boolean player_is_moving = (last_jx != jx || last_jy != jy ? TRUE : FALSE); + int move_dir = player->MovDir; + int action = ACTION_DEFAULT; if (!player->active || !IN_SCR_FIELD(SCREENX(last_jx), SCREENY(last_jy))) return; @@ -560,6 +561,14 @@ void DrawPlayer(struct PlayerInfo *player) if (element == EL_EXPLOSION) return; + action = (player->Pushing ? ACTION_PUSHING : + player->is_digging ? ACTION_DIGGING : + player->is_collecting ? ACTION_COLLECTING : + player->is_moving ? ACTION_MOVING : + player->snapped ? ACTION_SNAPPING : ACTION_DEFAULT); + + InitPlayerGfxAnimation(player, action, move_dir); + /* ----------------------------------------------------------------------- */ /* draw things in the field the player is leaving, if needed */ /* ----------------------------------------------------------------------- */ @@ -570,12 +579,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,41 +617,55 @@ 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) + { + if (GfxElement[jx][jy] == EL_SAND) + 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); + } + } + 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; int direction; - if (player->MovDir == MV_LEFT || player->MovDir == MV_RIGHT) - last_horizontal_dir = player->MovDir; + if (move_dir == MV_LEFT || move_dir == MV_RIGHT) + last_horizontal_dir = move_dir; - direction = (player->snapped ? player->MovDir : last_horizontal_dir); + direction = (player->snapped ? move_dir : last_horizontal_dir); graphic = el_act_dir2img(EL_SP_MURPHY, player->GfxAction, direction); } else - graphic = el_act_dir2img(player->element_nr, player->GfxAction, - player->MovDir); + graphic = el_act_dir2img(player->element_nr, player->GfxAction, move_dir); frame = getGraphicAnimationFrame(graphic, player->Frame); if (player->GfxPos) { - if (player->MovDir == MV_LEFT || player->MovDir == MV_RIGHT) + if (move_dir == MV_LEFT || move_dir == MV_RIGHT) sxx = player->GfxPos; else syy = player->GfxPos; @@ -681,7 +706,7 @@ void DrawPlayer(struct PlayerInfo *player) if ((sxx || syy) && IS_PUSHABLE(element)) { - graphic = el_act_dir2img(element, ACTION_MOVING, player->MovDir); + graphic = el_act_dir2img(element, ACTION_MOVING, move_dir); frame = getGraphicAnimationFrame(graphic, player->Frame); } @@ -1044,7 +1069,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 +1082,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 +1105,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]); } @@ -1138,14 +1163,14 @@ void DrawLevelFieldThruMask(int x, int y) DrawLevelElementExt(x, y, 0, 0, Feld[x][y], NO_CUTTING, USE_MASKING); } -void DrawCrumbledSand(int x, int y) +static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) { Bitmap *src_bitmap; int src_x, src_y; - int i, width, height, cx,cy; - int lx = LEVELX(x), ly = LEVELY(y); - int element, graphic; - int snip = 4; + int sx = SCREENX(x), sy = SCREENY(y); + int element; + int width, height, cx, cy, i; + int snip = TILEX / 8; /* number of border pixels from "crumbled graphic" */ static int xy[4][2] = { { 0, -1 }, @@ -1154,40 +1179,27 @@ void DrawCrumbledSand(int x, int y) { 0, +1 } }; - if (!IN_LEV_FIELD(lx, ly)) + if (!IN_LEV_FIELD(x, y)) return; - element = Feld[lx][ly]; + element = (GfxElement[x][y] != EL_UNDEFINED ? GfxElement[x][y] : Feld[x][y]); - if (element == EL_SAND || - element == EL_LANDMINE || - element == EL_TRAP || - element == EL_TRAP_ACTIVE) + /* crumble field itself */ + if (CAN_BE_CRUMBLED(element)) { - if (!IN_SCR_FIELD(x, y)) + if (!IN_SCR_FIELD(sx, sy)) return; - graphic = IMG_SAND_CRUMBLED; - - src_bitmap = graphic_info[graphic].bitmap; - src_x = graphic_info[graphic].src_x; - src_y = graphic_info[graphic].src_y; + getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); for(i=0; i<4; i++) { - int lxx, lyy; + int xx = x + xy[i][0]; + int yy = y + xy[i][1]; - lxx = lx + xy[i][0]; - lyy = ly + xy[i][1]; - if (!IN_LEV_FIELD(lxx, lyy)) - element = EL_STEELWALL; - else - element = Feld[lxx][lyy]; + element = (IN_LEV_FIELD(xx, yy) ? Feld[xx][yy] : EL_STEELWALL); - if (element == EL_SAND || - element == EL_LANDMINE || - element == EL_TRAP || - element == EL_TRAP_ACTIVE) + if (CAN_BE_CRUMBLED(element)) /* neighbour is of same type */ continue; if (i == 1 || i == 2) @@ -1206,34 +1218,25 @@ void DrawCrumbledSand(int x, int y) } BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, - width, height, FX + x * TILEX + cx, FY + y * TILEY + cy); + width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy); } - MarkTileDirty(x, y); + MarkTileDirty(sx, sy); } - else + else /* crumble neighbour fields */ { - graphic = IMG_SAND_CRUMBLED; - - src_bitmap = graphic_info[graphic].bitmap; - src_x = graphic_info[graphic].src_x; - src_y = graphic_info[graphic].src_y; + getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); for(i=0; i<4; i++) { - int xx, yy, lxx, lyy; - - xx = x + xy[i][0]; - yy = y + xy[i][1]; - lxx = lx + xy[i][0]; - lyy = ly + xy[i][1]; - - if (!IN_LEV_FIELD(lxx, lyy) || - (Feld[lxx][lyy] != EL_SAND && - Feld[lxx][lyy] != EL_LANDMINE && - Feld[lxx][lyy] != EL_TRAP && - Feld[lxx][lyy] != EL_TRAP_ACTIVE) || - !IN_SCR_FIELD(xx, yy)) + int xx = x + xy[i][0]; + int yy = y + xy[i][1]; + int sxx = sx + xy[i][0]; + int syy = sy + xy[i][1]; + + if (!IN_LEV_FIELD(xx, yy) || + !IN_SCR_FIELD(sxx, syy) || + !CAN_BE_CRUMBLED(Feld[xx][yy])) continue; if (i == 1 || i == 2) @@ -1252,13 +1255,31 @@ void DrawCrumbledSand(int x, int y) } BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, - width, height, FX + xx * TILEX + cx, FY + yy * TILEY + cy); + width, height, FX + sxx * TILEX + cx, FY + syy * TILEY + cy); - MarkTileDirty(xx, yy); + MarkTileDirty(sxx, syy); } } } +void DrawLevelFieldCrumbledSand(int x, int y) +{ + DrawLevelFieldCrumbledSandExt(x, y, IMG_SAND_CRUMBLED, 0); +} + +void DrawLevelFieldCrumbledSandDigging(int x, int y, int direction, + int step_frame) +{ + int graphic1 = el_act_dir2img(EL_SAND, ACTION_DIGGING, direction); + int graphic2 = el_act_dir2img(EL_SAND_CRUMBLED, ACTION_DIGGING, direction); + int frame1 = getGraphicAnimationFrame(graphic1, step_frame); + int frame2 = getGraphicAnimationFrame(graphic2, step_frame); + int sx = SCREENX(x), sy = SCREENY(y); + + DrawGraphic(sx, sy, graphic1, frame1); + DrawLevelFieldCrumbledSandExt(x, y, graphic2, frame2); +} + static int getBorderElement(int x, int y) { int border[7][2] = @@ -1285,7 +1306,7 @@ static int getBorderElement(int x, int y) void DrawScreenElement(int x, int y, int element) { DrawScreenElementExt(x, y, 0, 0, element, NO_CUTTING, NO_MASKING); - DrawCrumbledSand(x, y); + DrawLevelFieldCrumbledSand(LEVELX(x), LEVELY(y)); } void DrawLevelElement(int x, int y, int element) @@ -1321,7 +1342,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 +1384,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 +1550,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 +1571,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 +1587,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 +1605,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 +1684,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 +1707,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 +1733,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 +1761,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]); @@ -1959,8 +2008,8 @@ unsigned int MoveDoor(unsigned int door_state) static int door1 = DOOR_OPEN_1; static int door2 = DOOR_CLOSE_2; static unsigned long door_delay = 0; - int x, start, stepsize = 2; - unsigned long door_delay_value = stepsize * 5; + int x, start, stepsize = global.door_step_offset; + unsigned long door_delay_value = global.door_step_delay; if (door_state == DOOR_GET_STATE) return(door1 | door2); @@ -1989,8 +2038,8 @@ unsigned int MoveDoor(unsigned int door_state) stepsize = 20; door_delay_value = 0; - StopSound(SND_MENU_DOOR_OPENING); - StopSound(SND_MENU_DOOR_CLOSING); + StopSound(SND_DOOR_OPENING); + StopSound(SND_DOOR_CLOSING); } if (global.autoplay_leveldir) @@ -2005,9 +2054,9 @@ unsigned int MoveDoor(unsigned int door_state) { /* opening door sound has priority over simultaneously closing door */ if (door_state & (DOOR_OPEN_1 | DOOR_OPEN_2)) - PlaySoundStereo(SND_MENU_DOOR_OPENING, SOUND_MAX_RIGHT); + PlaySoundStereo(SND_DOOR_OPENING, SOUND_MIDDLE); else if (door_state & (DOOR_CLOSE_1 | DOOR_CLOSE_2)) - PlaySoundStereo(SND_MENU_DOOR_CLOSING, SOUND_MAX_RIGHT); + PlaySoundStereo(SND_DOOR_CLOSING, SOUND_MIDDLE); } start = ((door_state & DOOR_NO_DELAY) ? DXSIZE : 0); @@ -2105,8 +2154,8 @@ unsigned int MoveDoor(unsigned int door_state) if (setup.quick_doors) { - StopSound(SND_MENU_DOOR_OPENING); - StopSound(SND_MENU_DOOR_CLOSING); + StopSound(SND_DOOR_OPENING); + StopSound(SND_DOOR_CLOSING); } if (door_state & DOOR_ACTION_1) @@ -2284,7 +2333,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 +2395,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; } @@ -2376,10 +2425,10 @@ int el2img(int element) int el2edimg(int element) { - return element_info[element].editor_graphic; + return element_info[element].special_graphic[GFX_SPECIAL_ARG_EDITOR]; } int el2preimg(int element) { - return element_info[element].preview_graphic; + return element_info[element].special_graphic[GFX_SPECIAL_ARG_PREVIEW]; }