X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=aa399caaa197fef426e5e570fb1bf2e298e227c1;hb=9c285b0e8e4d81c5559815c5f7142685ce865206;hp=a54b64d4e06cfe2fe4acb81a243f9f7c3d2dc5b1;hpb=8a0ac1d204ca31a92875d378138e3ec4889ef37c;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index a54b64d4..aa399caa 100644 --- a/src/tools.c +++ b/src/tools.c @@ -633,6 +633,7 @@ void DrawPlayer(struct PlayerInfo *player) 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); @@ -857,7 +858,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) @@ -981,7 +982,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; @@ -1101,13 +1102,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, @@ -2025,7 +2026,7 @@ boolean Request(char *text, unsigned int req_state) for (ty = 0; ty < MAX_REQUEST_LINES; ty++) { char text_line[max_request_line_len + 1]; - int tx, tl, tc; + int tx, tl, tc = 0; if (!*text) break;