X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=9b5873b5cc3a920c636bb21ec8bab50e7b76fec6;hb=76b3cb92402127cde194888bab57397eca735220;hp=e5d2985a3154f8bd972cd9c100d625831d943c38;hpb=9de8eede744c45187c7011543ef8097d1ebc879c;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index e5d2985a..9b5873b5 100644 --- a/src/tools.c +++ b/src/tools.c @@ -34,6 +34,7 @@ /* forward declaration for internal use */ static void UnmapToolButtons(); static void HandleToolButtons(struct GadgetInfo *); +static int el_act_dir2crm(int, int, int); static struct GadgetInfo *tool_gadget[NUM_TOOL_BUTTONS]; static int request_gadget_id = -1; @@ -503,6 +504,9 @@ inline void DrawLevelGraphicAnimationIfNeeded(int x, int y, int graphic) return; DrawGraphicAnimation(sx, sy, graphic); + + if (CAN_BE_CRUMBLED(Feld[x][y])) + DrawLevelFieldCrumbledSand(x, y); } void DrawLevelElementAnimationIfNeeded(int x, int y, int element) @@ -519,6 +523,9 @@ void DrawLevelElementAnimationIfNeeded(int x, int y, int element) return; DrawGraphicAnimation(sx, sy, graphic); + + if (CAN_BE_CRUMBLED(element)) + DrawLevelFieldCrumbledSand(x, y); } void DrawAllPlayers() @@ -540,6 +547,7 @@ void DrawPlayerField(int x, int y) void DrawPlayer(struct PlayerInfo *player) { +#if 0 int jx = player->jx, jy = player->jy; int last_jx = player->last_jx, last_jy = player->last_jy; int next_jx = jx + (jx - last_jx), next_jy = jy + (jy - last_jy); @@ -551,6 +559,23 @@ void DrawPlayer(struct PlayerInfo *player) boolean player_is_moving = (last_jx != jx || last_jy != jy ? TRUE : FALSE); int move_dir = player->MovDir; int action = ACTION_DEFAULT; +#else + int jx = player->jx, jy = player->jy; + int move_dir = player->MovDir; + 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 last_jx = (player->is_moving ? jx - dx : jx); + int last_jy = (player->is_moving ? jy - dy : jy); + int next_jx = jx + dx; + int next_jy = jy + dy; + int sx = SCREENX(jx), sy = SCREENY(jy); + int sxx = 0, syy = 0; + int element = Feld[jx][jy], last_element = Feld[last_jx][last_jy]; + int graphic; + int frame = 0; + boolean player_is_moving = (player->MovPos ? TRUE : FALSE); + int action = ACTION_DEFAULT; +#endif if (!player->active || !IN_SCR_FIELD(SCREENX(last_jx), SCREENY(last_jy))) return; @@ -580,7 +605,11 @@ void DrawPlayer(struct PlayerInfo *player) /* draw things in the field the player is leaving, if needed */ /* ----------------------------------------------------------------------- */ +#if 1 + if (player->is_moving) +#else if (player_is_moving) +#endif { if (Back[last_jx][last_jy] && IS_DRAWABLE(last_element)) { @@ -600,6 +629,7 @@ void DrawPlayer(struct PlayerInfo *player) if (player->Pushing && IN_SCR_FIELD(SCREENX(next_jx), SCREENY(next_jy))) { +#if 1 #if 1 DrawLevelElement(next_jx, next_jy, EL_EMPTY); #else @@ -612,6 +642,7 @@ void DrawPlayer(struct PlayerInfo *player) } else DrawLevelField(next_jx, next_jy); +#endif #endif } } @@ -634,8 +665,13 @@ void DrawPlayer(struct PlayerInfo *player) { if (player_is_moving && GfxElement[jx][jy] != EL_UNDEFINED) { +#if 1 + if (CAN_BE_CRUMBLED(GfxElement[jx][jy])) + DrawLevelFieldCrumbledSandDigging(jx, jy, move_dir, player->StepFrame); +#else if (GfxElement[jx][jy] == EL_SAND) DrawLevelFieldCrumbledSandDigging(jx, jy, move_dir, player->StepFrame); +#endif else { int old_element = GfxElement[jx][jy]; @@ -700,7 +736,17 @@ void DrawPlayer(struct PlayerInfo *player) /* draw things the player is pushing, if needed */ /* ----------------------------------------------------------------------- */ +#if 0 + printf("::: %d, %d [%d, %d] [%d]\n", + player->Pushing, player_is_moving, player->GfxAction, + player->is_moving, player_is_moving); +#endif + +#if 1 + if (player->Pushing && player->is_moving) +#else if (player->Pushing && player_is_moving) +#endif { int px = SCREENX(next_jx), py = SCREENY(next_jy); @@ -720,23 +766,35 @@ void DrawPlayer(struct PlayerInfo *player) #endif else { +#if 1 + int element = MovingOrBlocked2Element(next_jx, next_jy); +#else #if 1 int element = Feld[jx][jy]; #else int element = Feld[next_jx][next_jy]; #endif +#endif +#if 1 int graphic = el2img(element); int frame = 0; +#if 0 if ((sxx || syy) && IS_PUSHABLE(element)) +#endif { - graphic = el_act_dir2img(element, ACTION_MOVING, move_dir); + graphic = el_act_dir2img(element, ACTION_PUSHING, move_dir); frame = getGraphicAnimationFrame(graphic, player->Frame); } +#if 0 + printf("::: pushing %d: %d ...\n", sxx, frame); +#endif + DrawGraphicShifted(px, py, sxx, syy, graphic, frame, NO_CUTTING, NO_MASKING); +#endif } } @@ -1154,7 +1212,8 @@ static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) if (!IN_LEV_FIELD(x, y)) return; - element = (GfxElement[x][y] != EL_UNDEFINED ? GfxElement[x][y] : Feld[x][y]); + element = (GfxElement[x][y] != EL_UNDEFINED && Feld[x][y] != EL_EXPLOSION ? + GfxElement[x][y] : Feld[x][y]); /* crumble field itself */ if (CAN_BE_CRUMBLED(element) && !IS_MOVING(x, y)) @@ -1175,6 +1234,13 @@ static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) if (CAN_BE_CRUMBLED(element) && !IS_MOVING(xx, yy)) continue; +#if 0 + if (Feld[x][y] == EL_CUSTOM_START + 123) + printf("::: crumble [%d] THE CHAOS ENGINE (%d, %d): %d, %d\n", + i, Feld[x][y], element, + CAN_BE_CRUMBLED(element), IS_MOVING(x, y)); +#endif + if (i == 1 || i == 2) { width = snip; @@ -1244,8 +1310,13 @@ void DrawLevelFieldCrumbledSand(int x, int y) void DrawLevelFieldCrumbledSandDigging(int x, int y, int direction, int step_frame) { +#if 1 + int graphic1 = el_act_dir2img(GfxElement[x][y], ACTION_DIGGING, direction); + int graphic2 = el_act_dir2crm(GfxElement[x][y], ACTION_DIGGING, direction); +#else int graphic1 = el_act_dir2img(EL_SAND, ACTION_DIGGING, direction); int graphic2 = el_act_dir2img(EL_SAND_CRUMBLED, ACTION_DIGGING, direction); +#endif int frame1 = getGraphicAnimationFrame(graphic1, step_frame); int frame2 = getGraphicAnimationFrame(graphic2, step_frame); int sx = SCREENX(x), sy = SCREENY(y); @@ -1521,7 +1592,7 @@ static void DrawMicroLevelExt(int xpos, int ypos, int from_x, int from_y) if (lx >= 0 && lx < lev_fieldx && ly >= 0 && ly < lev_fieldy) DrawMicroElement(xpos + x * MICRO_TILEX, ypos + y * MICRO_TILEY, - Ur[lx][ly]); + 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, @@ -1563,8 +1634,7 @@ static void DrawMicroLevelLabelExt(int mode) if (strlen(label_text) > 0) { - int text_width = strlen(label_text) * getFontWidth(font_nr); - int lxpos = SX + (SXSIZE - text_width) / 2; + int lxpos = SX + (SXSIZE - getTextWidth(label_text, font_nr)) / 2; int lypos = MICROLABEL_YPOS; DrawText(lxpos, lypos, label_text, font_nr); @@ -1600,8 +1670,8 @@ void DrawMicroLevel(int xpos, int ypos, boolean restart) if (leveldir_current->name) { - int len = strlen(leveldir_current->name); - int lxpos = SX + (SXSIZE - len * getFontWidth(FONT_TEXT_1)) / 2; + int text_width = getTextWidth(leveldir_current->name, FONT_TEXT_1); + int lxpos = SX + (SXSIZE - text_width) / 2; int lypos = SY + 352; DrawText(lxpos, lypos, leveldir_current->name, FONT_TEXT_1); @@ -1712,6 +1782,10 @@ boolean Request(char *text, unsigned int req_state) old_door_state = GetDoorState(); + /* simulate releasing mouse button over last gadget, if still pressed */ + if (button_status) + HandleGadgets(-1, -1, 0); + UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_1); @@ -2388,6 +2462,14 @@ int el_act_dir2img(int element, int action, int direction) return element_info[element].direction_graphic[action][direction]; } +static int el_act_dir2crm(int element, int action, int direction) +{ + element = GFX_ELEMENT(element); + direction = MV_DIR_BIT(direction); + + return element_info[element].direction_crumbled[action][direction]; +} + int el_act2img(int element, int action) { element = GFX_ELEMENT(element);