X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=2d35e042e0b67db6629289cf29ee25bf6725ec65;hb=074c00b42409c74e9c5856db1be03dced3a15ae9;hp=106d251ed5c7d45d01c0dcde7be7d1324f4e43b7;hpb=8c3a8e72f2bebc6a732f11cac24a4f3ca21dd730;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index 106d251e..2d35e042 100644 --- a/src/tools.c +++ b/src/tools.c @@ -40,6 +40,39 @@ static int el_act2crm(int, int); static struct GadgetInfo *tool_gadget[NUM_TOOL_BUTTONS]; static int request_gadget_id = -1; +void DumpTile(int x, int y) +{ + int sx = SCREENX(x); + int sy = SCREENX(y); + + printf_line("-", 79); + printf("Field Info: SCREEN(%d, %d), LEVEL(%d, %d)\n", sx, sy, x, y); + printf_line("-", 79); + + if (!IN_LEV_FIELD(x, y)) + { + printf("(not in level field)\n"); + printf("\n"); + + return; + } + + printf(" Feld: %d ['%s']\n", Feld[x][y], + element_info[Feld[x][y]].token_name); + printf(" Back: %d\n", Back[x][y]); + printf(" Store: %d\n", Store[x][y]); + printf(" Store2: %d\n", Store2[x][y]); + printf(" StorePlayer: %d\n", StorePlayer[x][y]); + printf(" MovPos: %d\n", MovPos[x][y]); + printf(" MovDir: %d\n", MovDir[x][y]); + printf(" MovDelay: %d\n", MovDelay[x][y]); + printf(" ChangeDelay: %d\n", ChangeDelay[x][y]); + printf(" GfxElement: %d\n", GfxElement[x][y]); + printf(" GfxAction: %d\n", GfxAction[x][y]); + printf(" GfxFrame: %d\n", GfxFrame[x][y]); + printf("\n"); +} + void SetDrawtoField(int mode) { if (mode == DRAW_BUFFERED && setup.soft_scrolling) @@ -225,26 +258,30 @@ void BackToFront() BlitBitmap(backbuffer, window, DX, DY, DXSIZE, DYSIZE, DX, DY); if (redraw_mask & REDRAW_DOOR_2) { +#if 0 if ((redraw_mask & REDRAW_DOOR_2) == REDRAW_DOOR_2) - BlitBitmap(backbuffer, window, VX,VY, VXSIZE,VYSIZE, VX,VY); +#endif + BlitBitmap(backbuffer, window, VX, VY, VXSIZE, VYSIZE, VX, VY); +#if 0 else { if (redraw_mask & REDRAW_VIDEO_1) BlitBitmap(backbuffer, window, - VX+VIDEO_DISPLAY1_XPOS,VY+VIDEO_DISPLAY1_YPOS, - VIDEO_DISPLAY_XSIZE,VIDEO_DISPLAY_YSIZE, - VX+VIDEO_DISPLAY1_XPOS,VY+VIDEO_DISPLAY1_YPOS); + VX + VIDEO_DISPLAY1_XPOS, VY + VIDEO_DISPLAY1_YPOS, + VIDEO_DISPLAY_XSIZE, VIDEO_DISPLAY_YSIZE, + VX + VIDEO_DISPLAY1_XPOS, VY + VIDEO_DISPLAY1_YPOS); if (redraw_mask & REDRAW_VIDEO_2) BlitBitmap(backbuffer, window, - VX+VIDEO_DISPLAY2_XPOS,VY+VIDEO_DISPLAY2_YPOS, - VIDEO_DISPLAY_XSIZE,VIDEO_DISPLAY_YSIZE, - VX+VIDEO_DISPLAY2_XPOS,VY+VIDEO_DISPLAY2_YPOS); + VX + VIDEO_DISPLAY2_XPOS, VY + VIDEO_DISPLAY2_YPOS, + VIDEO_DISPLAY_XSIZE, VIDEO_DISPLAY_YSIZE, + VX + VIDEO_DISPLAY2_XPOS, VY + VIDEO_DISPLAY2_YPOS); if (redraw_mask & REDRAW_VIDEO_3) BlitBitmap(backbuffer, window, - VX+VIDEO_CONTROL_XPOS,VY+VIDEO_CONTROL_YPOS, - VIDEO_CONTROL_XSIZE,VIDEO_CONTROL_YSIZE, - VX+VIDEO_CONTROL_XPOS,VY+VIDEO_CONTROL_YPOS); + VX + VIDEO_CONTROL_XPOS, VY + VIDEO_CONTROL_YPOS, + VIDEO_CONTROL_XSIZE, VIDEO_CONTROL_YSIZE, + VX + VIDEO_CONTROL_XPOS, VY + VIDEO_CONTROL_YPOS); } +#endif } if (redraw_mask & REDRAW_DOOR_3) @@ -628,55 +665,13 @@ void DrawPlayer(struct PlayerInfo *player) if (element == EL_EXPLOSION) return; -#if 1 - - action = GetPlayerAction(player, move_dir); - -#else - - action = (player->is_pushing ? ACTION_PUSHING : - player->is_digging ? ACTION_DIGGING : - player->is_collecting ? ACTION_COLLECTING : - player->is_moving ? ACTION_MOVING : - player->is_snapping ? ACTION_SNAPPING : - player->is_sleeping ? ACTION_SLEEPING : - player->is_bored ? ACTION_BORING : - player->is_waiting ? ACTION_WAITING : ACTION_DEFAULT); - - if (player->is_bored && player->num_special_action_bored > 0) - { - if (player->anim_delay_counter == 0 && player->post_delay_counter == 0) - { - int graphic_waiting; - - action = ACTION_BORING_1 + SimpleRND(player->num_special_action_bored); - special_graphic = el_act_dir2img(EL_SP_MURPHY, action, move_dir); - - player->anim_delay_counter = - graphic_info[special_graphic].anim_delay_fixed + - SimpleRND(graphic_info[special_graphic].anim_delay_random); - player->post_delay_counter = - graphic_info[special_graphic].post_delay_fixed + - SimpleRND(graphic_info[special_graphic].post_delay_random); - player->special_action_bored = action; - } - - if (player->anim_delay_counter > 0) - { - action = player->special_action_bored; - player->anim_delay_counter--; - } - - if (player->post_delay_counter > 0) - { - player->post_delay_counter--; - } - } -#endif - -#if 0 - printf("::: '%s'\n", element_action_info[action].suffix); -#endif + action = (player->is_pushing ? ACTION_PUSHING : + player->is_digging ? ACTION_DIGGING : + player->is_collecting ? ACTION_COLLECTING : + player->is_moving ? ACTION_MOVING : + player->is_snapping ? ACTION_SNAPPING : + player->is_dropping ? ACTION_DROPPING : + player->is_waiting ? player->action_waiting : ACTION_DEFAULT); InitPlayerGfxAnimation(player, action, move_dir); @@ -900,7 +895,7 @@ void DrawPlayer(struct PlayerInfo *player) SetDrawtoField(DRAW_DIRECT); } - MarkTileDirty(sx,sy); + MarkTileDirty(sx, sy); } void getGraphicSource(int graphic, int frame, Bitmap **bitmap, int *x, int *y) @@ -1024,7 +1019,7 @@ void DrawMiniGraphicExt(DrawBuffer *d, int x, int y, int graphic) BlitBitmap(src_bitmap, d, src_x, src_y, MINI_TILEX, MINI_TILEY, x, y); } -void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame, +void DrawGraphicShifted(int x, int y, int dx, int dy, int graphic, int frame, int cut_mode, int mask_mode) { Bitmap *src_bitmap; @@ -1144,13 +1139,13 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame, BlitBitmap(src_bitmap, drawto_field, src_x, src_y, width, height, dest_x, dest_y); - MarkTileDirty(x,y); + MarkTileDirty(x, y); } void DrawGraphicShiftedThruMask(int x, int y, int dx, int dy, int graphic, int frame, int cut_mode) { - DrawGraphicShifted(x,y, dx,dy, graphic, frame, cut_mode, USE_MASKING); + DrawGraphicShifted(x, y, dx, dy, graphic, frame, cut_mode, USE_MASKING); } void DrawScreenElementExt(int x, int y, int dx, int dy, int element, @@ -1234,6 +1229,10 @@ void DrawLevelFieldThruMask(int x, int y) DrawLevelElementExt(x, y, 0, 0, Feld[x][y], NO_CUTTING, USE_MASKING); } +#define TILE_GFX_ELEMENT(x, y) \ + (GfxElement[x][y] != EL_UNDEFINED && Feld[x][y] != EL_EXPLOSION ? \ + GfxElement[x][y] : Feld[x][y]) + static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) { Bitmap *src_bitmap; @@ -1263,8 +1262,7 @@ static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) if (!IN_LEV_FIELD(x, y)) return; - element = (GfxElement[x][y] != EL_UNDEFINED && Feld[x][y] != EL_EXPLOSION ? - GfxElement[x][y] : Feld[x][y]); + element = TILE_GFX_ELEMENT(x, y); /* crumble field itself */ if (GFX_CRUMBLED(element) && !IS_MOVING(x, y)) @@ -1279,7 +1277,12 @@ static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) int xx = x + xy[i][0]; int yy = y + xy[i][1]; +#if 1 + element = (IN_LEV_FIELD(xx, yy) ? TILE_GFX_ELEMENT(xx, yy) : + BorderElement); +#else element = (IN_LEV_FIELD(xx, yy) ? Feld[xx][yy] : BorderElement); +#endif /* check if neighbour field is of same type */ if (GFX_CRUMBLED(element) && !IS_MOVING(xx, yy)) @@ -1326,11 +1329,23 @@ static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) int sxx = sx + xy[i][0]; int syy = sy + xy[i][1]; +#if 1 + if (!IN_LEV_FIELD(xx, yy) || + !IN_SCR_FIELD(sxx, syy) || + IS_MOVING(xx, yy)) + continue; + + element = TILE_GFX_ELEMENT(xx, yy); + + if (!GFX_CRUMBLED(element)) + continue; +#else if (!IN_LEV_FIELD(xx, yy) || !IN_SCR_FIELD(sxx, syy) || !GFX_CRUMBLED(Feld[xx][yy]) || IS_MOVING(xx, yy)) continue; +#endif #if 1 graphic = el_act2crm(Feld[xx][yy], ACTION_DEFAULT); @@ -1507,7 +1522,13 @@ void DrawScreenField(int x, int y) DrawScreenElementShifted(x, y, 0, MovPos[lx][ly], content, cut_mode); if (content == EL_ACID) - DrawLevelElementThruMask(lx, ly + 1, EL_ACID); + { + int dir = MovDir[lx][ly]; + int newlx = lx + (dir == MV_LEFT ? -1 : dir == MV_RIGHT ? +1 : 0); + int newly = ly + (dir == MV_UP ? -1 : dir == MV_DOWN ? +1 : 0); + + DrawLevelElementThruMask(newlx, newly, EL_ACID); + } } else if (IS_BLOCKED(lx, ly)) { @@ -1641,8 +1662,10 @@ void AnimateEnvelope(int envelope_nr, int anim_mode, int action) boolean draw_masked = graphic_info[graphic].draw_masked; int mask_mode = (draw_masked ? BLIT_MASKED : BLIT_ON_BACKGROUND); boolean ffwd_delay = (tape.playing && tape.fast_forward); + boolean no_delay = (tape.warp_forward); unsigned long anim_delay = 0; - int anim_delay_value = (ffwd_delay ? FfwdFrameDelay : GameFrameDelay); + int frame_delay_value = (ffwd_delay ? FfwdFrameDelay : GameFrameDelay); + int anim_delay_value = (no_delay ? 0 : frame_delay_value); int font_nr = FONT_ENVELOPE_1 + envelope_nr; int font_width = getFontWidth(font_nr); int font_height = getFontHeight(font_nr); @@ -1691,7 +1714,9 @@ void ShowEnvelope(int envelope_nr) int sound_opening = element_info[element].sound[ACTION_OPENING]; int sound_closing = element_info[element].sound[ACTION_CLOSING]; boolean ffwd_delay = (tape.playing && tape.fast_forward); - int wait_delay_value = (ffwd_delay ? 500 : 1000); + boolean no_delay = (tape.warp_forward); + int normal_delay_value = ONE_SECOND_DELAY / (ffwd_delay ? 2 : 1); + int wait_delay_value = (no_delay ? 0 : normal_delay_value); int anim_mode = graphic_info[graphic].anim_mode; int main_anim_mode = (anim_mode == ANIM_NONE ? ANIM_VERTICAL|ANIM_HORIZONTAL: anim_mode == ANIM_DEFAULT ? ANIM_VERTICAL : anim_mode); @@ -2003,13 +2028,37 @@ void WaitForEventToContinue() } #define MAX_REQUEST_LINES 13 -#define MAX_REQUEST_LINE_LEN 7 +#define MAX_REQUEST_LINE_FONT1_LEN 7 +#define MAX_REQUEST_LINE_FONT2_LEN 10 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 */ + int max_request_line_len = MAX_REQUEST_LINE_FONT1_LEN; + int font_nr = FONT_TEXT_2; + int max_word_len = 0; + char *text_ptr; + + for (text_ptr = text; *text_ptr; text_ptr++) + { + max_word_len = (*text_ptr != ' ' ? max_word_len + 1 : 0); + + if (max_word_len > MAX_REQUEST_LINE_FONT1_LEN) + { + max_request_line_len = MAX_REQUEST_LINE_FONT2_LEN; + font_nr = FONT_LEVEL_NUMBER; + + break; + } + } + +#if 1 + /* disable deactivated drawing when quick-loading level tape recording */ + if (tape.playing && tape.deactivate_display) + TapeDeactivateDisplayOff(TRUE); +#endif #if 1 SetMouseCursor(CURSOR_DEFAULT); @@ -2049,13 +2098,13 @@ boolean Request(char *text, unsigned int req_state) /* write text for request */ for (ty = 0; ty < MAX_REQUEST_LINES; ty++) { - char text_line[MAX_REQUEST_LINE_LEN + 1]; - int tx, tl, tc; + char text_line[max_request_line_len + 1]; + int tx, tl, tc = 0; if (!*text) break; - for (tl = 0, tx = 0; tx < MAX_REQUEST_LINE_LEN; tl++, tx++) + for (tl = 0, tx = 0; tx < max_request_line_len; tl++, tx++) { tc = *(text + tx); if (!tc || tc == ' ') @@ -2072,9 +2121,9 @@ boolean Request(char *text, unsigned int req_state) strncpy(text_line, text, tl); text_line[tl] = 0; - DrawText(DX + (DXSIZE - tl * getFontWidth(FONT_TEXT_2)) / 2, - DY + 8 + ty * (getFontHeight(FONT_TEXT_2) + 2), - text_line, FONT_TEXT_2); + DrawText(DX + (DXSIZE - tl * getFontWidth(font_nr)) / 2, + DY + 8 + ty * (getFontHeight(font_nr) + 2), + text_line, font_nr); text += tl + (tc == ' ' ? 1 : 0); } @@ -2274,6 +2323,12 @@ boolean Request(char *text, unsigned int req_state) SendToServer_ContinuePlaying(); #endif +#if 1 + /* restore deactivated drawing when quick-loading level tape recording */ + if (tape.playing && tape.deactivate_display) + TapeDeactivateDisplayOn(); +#endif + return result; } @@ -2356,8 +2411,10 @@ unsigned int MoveDoor(unsigned int door_state) stepsize = 20; /* must be choosen to always draw last frame */ door_delay_value = 0; +#if 0 StopSound(SND_DOOR_OPENING); StopSound(SND_DOOR_CLOSING); +#endif } if (global.autoplay_leveldir) @@ -2375,7 +2432,7 @@ unsigned int MoveDoor(unsigned int door_state) door_1.anim_mode == ANIM_VERTICAL ? DYSIZE : DXSIZE); int x; - if (!(door_state & DOOR_NO_DELAY)) + if (!(door_state & DOOR_NO_DELAY) && !setup.quick_doors) { /* opening door sound has priority over simultaneously closing door */ if (door_state & (DOOR_OPEN_1 | DOOR_OPEN_2)) @@ -2558,11 +2615,13 @@ unsigned int MoveDoor(unsigned int door_state) } } +#if 0 if (setup.quick_doors) { StopSound(SND_DOOR_OPENING); StopSound(SND_DOOR_CLOSING); } +#endif if (door_state & DOOR_ACTION_1) door1 = door_state & DOOR_ACTION_1;