X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.c;h=08c6dc68d3a63e814933be8b4a285e60dbc89549;hp=63c027fa2f78858941d83e50be2361ff72bc6bb3;hb=c4baa69cc8d5e8398425e67498b49f4b77f8e477;hpb=a5a03e15b395ba1942c180d1cd0d3a4f43b87f56 diff --git a/src/tools.c b/src/tools.c index 63c027fa..08c6dc68 100644 --- a/src/tools.c +++ b/src/tools.c @@ -22,43 +22,116 @@ #include "sound.h" #include "misc.h" #include "buttons.h" +#include "joystick.h" +#include "cartoons.h" + #include +#ifdef MSDOS +extern BOOL wait_for_vsync; +#endif + +void SetDrawtoField(int mode) +{ + if (mode == DRAW_BUFFERED && soft_scrolling_on) + { + FX = TILEX; + FY = TILEY; + BX1 = -1; + BY1 = -1; + BX2 = SCR_FIELDX; + BY2 = SCR_FIELDY; + redraw_x1 = 1; + redraw_y1 = 1; + + drawto_field = fieldbuffer; + } + else /* DRAW_DIRECT, DRAW_BACKBUFFER */ + { + FX = SX; + FY = SY; + BX1 = 0; + BY1 = 0; + BX2 = SCR_FIELDX - 1; + BY2 = SCR_FIELDY - 1; + redraw_x1 = 0; + redraw_y1 = 0; + + drawto_field = (mode == DRAW_DIRECT ? window : backbuffer); + } +} + void BackToFront() { int x,y; + Drawable buffer = (drawto_field != window ? drawto_field : backbuffer); - if (direct_draw_on && game_status==PLAYING) + if (direct_draw_on && game_status == PLAYING) redraw_mask &= ~REDRAW_MAIN; + if (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD) + redraw_mask |= REDRAW_FIELD; + + if (redraw_mask & REDRAW_FIELD || ScreenMovPos) + redraw_mask &= ~REDRAW_TILES; + if (!redraw_mask) return; - if (redraw_mask & REDRAW_ALL || - (redraw_mask & REDRAW_FIELD && redraw_mask & REDRAW_DOORS)) + /* synchronize X11 graphics at this point; if we would synchronize the + display immediately after the buffer switching (after the XFlush), + this could mean that we have to wait for the graphics to complete, + although we could go on doing calculations for the next frame */ + + XSync(display,FALSE); + +#ifdef MSDOS + wait_for_vsync = TRUE; +#endif + + if (redraw_mask & REDRAW_ALL) { XCopyArea(display,backbuffer,window,gc, 0,0, WIN_XSIZE,WIN_YSIZE, 0,0); redraw_mask = 0; } - else if (redraw_mask & REDRAW_FIELD) + + if (redraw_mask & REDRAW_FIELD) { - XCopyArea(display,backbuffer,window,gc, - REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE, - REAL_SX,REAL_SY); + if (game_status != PLAYING || redraw_mask & REDRAW_FROM_BACKBUFFER) + XCopyArea(display,backbuffer,window,gc, + REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE, + REAL_SX,REAL_SY); + else + { + int fx = FX, fy = FY; + + if (soft_scrolling_on) + { + fx += (PlayerMovDir & (MV_LEFT|MV_RIGHT) ? ScreenMovPos : 0); + fy += (PlayerMovDir & (MV_UP|MV_DOWN) ? ScreenMovPos : 0); + } + + XCopyArea(display,buffer,window,gc, + fx,fy, SXSIZE,SYSIZE, + SX,SY); + } redraw_mask &= ~REDRAW_MAIN; } - else if (redraw_mask & REDRAW_DOORS) + + if (redraw_mask & REDRAW_DOORS) { if (redraw_mask & REDRAW_DOOR_1) XCopyArea(display,backbuffer,window,gc, - DX,DY, DXSIZE,DYSIZE, DX,DY); + DX,DY, DXSIZE,DYSIZE, + DX,DY); if (redraw_mask & REDRAW_DOOR_2) { if ((redraw_mask & REDRAW_DOOR_2) == REDRAW_DOOR_2) XCopyArea(display,backbuffer,window,gc, - VX,VY, VXSIZE,VYSIZE, VX,VY); + VX,VY, VXSIZE,VYSIZE, + VX,VY); else { if (redraw_mask & REDRAW_VIDEO_1) @@ -94,30 +167,27 @@ void BackToFront() if (redraw_mask & REDRAW_TILES) { - if (redraw_tiles>REDRAWTILES_TH) - XCopyArea(display,backbuffer,window,gc,SX,SY,SXSIZE,SYSIZE,SX,SY); - else - for(x=0;x 6) + phase = 6; + } + else + { + if ((phase = ((96-MovDelay[x][y])/6) % 8) > 3) + phase = 7-phase; + } + + DrawGraphicThruMask(sx,sy, graphic + phase); + } + + if (direct_draw_on) + { + int dest_x = SX+SCROLLX(x)*TILEX; + int dest_y = SY+SCROLLY(y)*TILEY; + int x_size = TILEX; + int y_size = TILEY; + + if (!ScreenMovPos) + { + dest_x = SX + SCROLLX(MIN(JX,lastJX))*TILEX; + dest_y = SY + SCROLLY(MIN(JY,lastJY))*TILEY; + x_size = TILEX * (1 + ABS(JX - lastJX)); + y_size = TILEY * (1 + ABS(JY - lastJY)); + } + + XCopyArea(display,drawto_field,window,gc, + dest_x,dest_y, x_size,y_size, dest_x,dest_y); + SetDrawtoField(DRAW_DIRECT); + } + + MarkTileDirty(sx,sy); +} + +static int getGraphicAnimationPhase(int frames, int delay, int mode) { int phase; @@ -265,111 +507,187 @@ void DrawGraphicAnimation(int x, int y, int graphic, else phase = (FrameCounter % (delay * frames)) / delay; + if (mode == ANIM_REVERSE) + phase = -phase; + + return(phase); +} + +void DrawGraphicAnimationExt(int x, int y, int graphic, + int frames, int delay, int mode, int mask_mode) +{ + int phase = getGraphicAnimationPhase(frames, delay, mode); + if (!(FrameCounter % delay) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y))) - DrawGraphic(SCROLLX(x),SCROLLY(y), graphic + phase); + { + if (mask_mode == USE_MASKING) + DrawGraphicThruMask(SCROLLX(x),SCROLLY(y), graphic + phase); + else + DrawGraphic(SCROLLX(x),SCROLLY(y), graphic + phase); + } } -void DrawGraphic(int x, int y, int graphic) +void DrawGraphicAnimation(int x, int y, int graphic, + int frames, int delay, int mode) { - DrawGraphicExt(drawto_field, gc, x, y, graphic); - redraw_tiles++; - redraw[x][y] = TRUE; - redraw_mask |= REDRAW_TILES; + DrawGraphicAnimationExt(x,y, graphic, frames,delay,mode, NO_MASKING); } -void DrawGraphicExt(Drawable d, GC gc, int x, int y, int graphic) +void DrawGraphicAnimationThruMask(int x, int y, int graphic, + int frames, int delay, int mode) { - DrawGraphicExtHiRes(d, gc, SX+x*TILEX, SY+y*TILEY, graphic); + DrawGraphicAnimationExt(x,y, graphic, frames,delay,mode, USE_MASKING); } -void DrawGraphicExtHiRes(Drawable d, GC gc, int x, int y, int graphic) +void DrawGraphic(int x, int y, int graphic) { - if (graphic<0) - XFillRectangle(display,d,gc, x,y, TILEX,TILEY); - else if (graphic<256) + +#if DEBUG + if (!IN_SCR_FIELD(x,y)) + { + printf("DrawGraphic(): x = %d, y = %d, graphic = %d\n",x,y,graphic); + printf("DrawGraphic(): This should never happen!\n"); + return; + } +#endif + + DrawGraphicExt(drawto_field, gc, FX+x*TILEX, FY+y*TILEY, graphic); + MarkTileDirty(x,y); +} + +void DrawGraphicExt(Drawable d, GC gc, int x, int y, int graphic) +{ + if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN) + { + graphic -= GFX_START_ROCKSSCREEN; XCopyArea(display,pix[PIX_BACK],d,gc, - SX+(graphic % GFX_PER_LINE)*TILEX, - SY+(graphic / GFX_PER_LINE)*TILEY, + SX + (graphic % GFX_PER_LINE) * TILEX, + SY + (graphic / GFX_PER_LINE) * TILEY, TILEX,TILEY, x,y); - else + } + else if (graphic >= GFX_START_ROCKSHEROES && graphic <= GFX_END_ROCKSHEROES) + { + graphic -= GFX_START_ROCKSHEROES; + XCopyArea(display,pix[PIX_HEROES],d,gc, + (graphic % HEROES_PER_LINE) * TILEX, + (graphic / HEROES_PER_LINE) * TILEY, + TILEX,TILEY, x,y); + } + else if (graphic >= GFX_START_ROCKSFONT && graphic <= GFX_END_ROCKSFONT) { - graphic -= 256; + graphic -= GFX_START_ROCKSFONT; XCopyArea(display,pix[PIX_BIGFONT],d,gc, - (graphic % FONT_CHARS_PER_LINE)*TILEX, - (graphic / FONT_CHARS_PER_LINE)*TILEY + - FC_SPECIAL1*TILEY*FONT_LINES_PER_FONT, + (graphic % FONT_CHARS_PER_LINE) * TILEX, + (graphic / FONT_CHARS_PER_LINE) * TILEY + + FC_SPECIAL1 * FONT_LINES_PER_FONT * TILEY, TILEX,TILEY, x,y); } + else + XFillRectangle(display,d,gc, x,y, TILEX,TILEY); } void DrawGraphicThruMask(int x, int y, int graphic) { int src_x,src_y, dest_x,dest_y; + int tile = graphic; + Pixmap src_pixmap; + GC drawing_gc; + +#if DEBUG + if (!IN_SCR_FIELD(x,y)) + { + printf("DrawGraphicThruMask(): x = %d, y = %d\n",x,y); + printf("DrawGraphicThruMask(): This should never happen!\n"); + return; + } +#endif - if (graphic<0 || graphic>255) + if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN) + { + src_pixmap = pix[PIX_BACK]; + drawing_gc = clip_gc[PIX_BACK]; + graphic -= GFX_START_ROCKSSCREEN; + src_x = SX+(graphic % GFX_PER_LINE)*TILEX; + src_y = SY+(graphic / GFX_PER_LINE)*TILEY; + } + else if (graphic >= GFX_START_ROCKSHEROES && graphic <= GFX_END_ROCKSHEROES) + { + src_pixmap = pix[PIX_HEROES]; + drawing_gc = clip_gc[PIX_HEROES]; + graphic -= GFX_START_ROCKSHEROES; + src_x = (graphic % HEROES_PER_LINE)*TILEX; + src_y = (graphic / HEROES_PER_LINE)*TILEY; + } + else { DrawGraphic(x,y,graphic); return; } - src_x = SX+(graphic % GFX_PER_LINE)*TILEX; - src_y = SY+(graphic / GFX_PER_LINE)*TILEY; - dest_x = SX+x*TILEX; - dest_y = SY+y*TILEY; + dest_x = FX + x*TILEX; + dest_y = FY + y*TILEY; - XSetClipOrigin(display,clip_gc[PIX_BACK],dest_x-src_x,dest_y-src_y); - XCopyArea(display,pix[PIX_BACK],drawto_field,clip_gc[PIX_BACK], src_x,src_y, - TILEX,TILEY, dest_x,dest_y); + if (tile_clipmask[tile] != None) + { + XSetClipMask(display, tile_clip_gc, tile_clipmask[tile]); + XSetClipOrigin(display, tile_clip_gc, dest_x,dest_y); + XCopyArea(display, src_pixmap, drawto_field, tile_clip_gc, + src_x,src_y, TILEX,TILEY, dest_x,dest_y); + } + else + { +#if DEBUG + printf("DrawGraphicThruMask(): tile '%d' needs clipping!\n", tile); +#endif - redraw_tiles++; - redraw[x][y]=TRUE; - redraw_mask|=REDRAW_TILES; -} + XSetClipOrigin(display, drawing_gc, dest_x-src_x, dest_y-src_y); + XCopyArea(display, src_pixmap, drawto_field, drawing_gc, + src_x,src_y, TILEX,TILEY, dest_x,dest_y); + } -void DrawElementThruMask(int x, int y, int element) -{ - DrawGraphicThruMask(x,y,el2gfx(element)); + MarkTileDirty(x,y); } void DrawMiniGraphic(int x, int y, int graphic) { - DrawMiniGraphicExt(drawto, gc, x, y, graphic); - redraw_tiles++; - redraw[x/2][y/2]=TRUE; - redraw_mask|=REDRAW_TILES; + DrawMiniGraphicExt(drawto,gc, SX+x*MINI_TILEX,SY+y*MINI_TILEY, graphic); + MarkTileDirty(x/2, y/2); } void DrawMiniGraphicExt(Drawable d, GC gc, int x, int y, int graphic) { - DrawMiniGraphicExtHiRes(d,gc, SX+x*MINI_TILEX,SY+y*MINI_TILEY, graphic); -} - -void DrawMiniGraphicExtHiRes(Drawable d, GC gc, int x, int y, int graphic) -{ - if (graphic<0) - XFillRectangle(display,d,gc, x,y, MINI_TILEX,MINI_TILEY); - else if (graphic<256) + if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN) + { + graphic -= GFX_START_ROCKSSCREEN; XCopyArea(display,pix[PIX_BACK],d,gc, MINI_GFX_STARTX+(graphic % MINI_GFX_PER_LINE)*MINI_TILEX, MINI_GFX_STARTY+(graphic / MINI_GFX_PER_LINE)*MINI_TILEY, MINI_TILEX,MINI_TILEY, x,y); - else + } + else if (graphic >= GFX_START_ROCKSFONT && graphic <= GFX_END_ROCKSFONT) { - graphic -= 256; + graphic -= GFX_START_ROCKSFONT; XCopyArea(display,pix[PIX_SMALLFONT],d,gc, (graphic % FONT_CHARS_PER_LINE)*FONT4_XSIZE, (graphic / FONT_CHARS_PER_LINE)*FONT4_YSIZE + FC_SPECIAL2*FONT2_YSIZE*FONT_LINES_PER_FONT, MINI_TILEX,MINI_TILEY, x,y); } + else + XFillRectangle(display,d,gc, x,y, MINI_TILEX,MINI_TILEY); } -void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int cut_mode) +void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, + int cut_mode, int mask_mode) { int width = TILEX, height = TILEY; int cx = 0, cy = 0; + int src_x,src_y, dest_x,dest_y; + int tile = graphic; + Pixmap src_pixmap; + GC drawing_gc; - if (graphic<0) + if (graphic < 0) { DrawGraphic(x,y,graphic); return; @@ -377,108 +695,183 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int cut_mode) if (dx || dy) /* Verschiebung der Grafik? */ { - if (x<0) /* Element kommt von links ins Bild */ + if (x < BX1) /* Element kommt von links ins Bild */ { - x=0; - width=dx; - cx=TILEX-dx; - dx=0; + x = BX1; + width = dx; + cx = TILEX - dx; + dx = 0; } - else if (x==SCR_FIELDX) /* Element kommt von rechts ins Bild */ + else if (x > BX2) /* Element kommt von rechts ins Bild */ { - x=SCR_FIELDX-1; - width=-dx; - dx=TILEX+dx; + x = BX2; + width = -dx; + dx = TILEX + dx; } - else if (x==0 && dx<0) /* Element verläßt links das Bild */ + else if (x==BX1 && dx<0) /* Element verläßt links das Bild */ { - width+=dx; - cx=-dx; - dx=0; + width += dx; + cx = -dx; + dx = 0; } - else if (x==SCR_FIELDX-1 && dx>0) /* El. verläßt rechts das Bild */ - width-=dx; + else if (x==BX2 && dx>0) /* Element verläßt rechts das Bild */ + width -= dx; else if (dx) /* allg. Bewegung in x-Richtung */ - redraw[x+SIGN(dx)][y]=TRUE; + MarkTileDirty(x + SIGN(dx), y); - if (y<0) /* Element kommt von oben ins Bild */ + if (y < BY1) /* Element kommt von oben ins Bild */ { if (cut_mode==CUT_BELOW) /* Element oberhalb des Bildes */ return; - y=0; - height=dy; - cy=TILEY-dy; - dy=0; + y = BY1; + height = dy; + cy = TILEY - dy; + dy = 0; } - else if (y==SCR_FIELDY) /* Element kommt von unten ins Bild */ + else if (y > BY2) /* Element kommt von unten ins Bild */ { - y=SCR_FIELDY-1; - height=-dy; - dy=TILEY+dy; + y = BY2; + height = -dy; + dy = TILEY + dy; } - else if (y==0 && dy<0) /* Element verläßt oben das Bild */ + else if (y==BY1 && dy<0) /* Element verläßt oben das Bild */ { - height+=dy; - cy=-dy; - dy=0; + height += dy; + cy = -dy; + dy = 0; } - else if (dy>0 && cut_mode==CUT_ABOVE) + else if (dy > 0 && cut_mode==CUT_ABOVE) { - if (y==SCR_FIELDY-1) /* Element unterhalb des Bildes */ + if (y == BY2) /* Element unterhalb des Bildes */ return; - height=dy; - cy=TILEY-dy; - dy=TILEY; - redraw[x][y+1]=TRUE; + height = dy; + cy = TILEY-dy; + dy = TILEY; + MarkTileDirty(x, y + 1); } /* Element verläßt unten das Bild */ - else if (dy>0 && (y==SCR_FIELDY-1 || cut_mode==CUT_BELOW)) - height-=dy; + else if (dy > 0 && (y == BY2 || cut_mode==CUT_BELOW)) + height -= dy; else if (dy) /* allg. Bewegung in y-Richtung */ - redraw[x][y+SIGN(dy)]=TRUE; + MarkTileDirty(x, y + SIGN(dy)); + } + + if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN) + { + src_pixmap = pix[PIX_BACK]; + drawing_gc = clip_gc[PIX_BACK]; + graphic -= GFX_START_ROCKSSCREEN; + src_x = SX+(graphic % GFX_PER_LINE)*TILEX+cx; + src_y = SY+(graphic / GFX_PER_LINE)*TILEY+cy; + } + else if (graphic >= GFX_START_ROCKSHEROES && graphic <= GFX_END_ROCKSHEROES) + { + src_pixmap = pix[PIX_HEROES]; + drawing_gc = clip_gc[PIX_HEROES]; + graphic -= GFX_START_ROCKSHEROES; + src_x = (graphic % HEROES_PER_LINE)*TILEX+cx; + src_y = (graphic / HEROES_PER_LINE)*TILEY+cy; + } + + dest_x = FX + x*TILEX + dx; + dest_y = FY + y*TILEY + dy; + +#if DEBUG + if (!IN_SCR_FIELD(x,y)) + { + printf("DrawGraphicShifted(): x = %d, y = %d, graphic = %d\n",x,y,graphic); + printf("DrawGraphicShifted(): This should never happen!\n"); + return; + } +#endif + + if (mask_mode == USE_MASKING) + { + if (tile_clipmask[tile] != None) + { + XSetClipMask(display, tile_clip_gc, tile_clipmask[tile]); + XSetClipOrigin(display, tile_clip_gc, dest_x,dest_y); + XCopyArea(display, src_pixmap, drawto_field, tile_clip_gc, + src_x,src_y, TILEX,TILEY, dest_x,dest_y); + } + else + { +#if DEBUG + printf("DrawGraphicShifted(): tile '%d' needs clipping!\n", tile); +#endif + + XSetClipOrigin(display, drawing_gc, dest_x-src_x, dest_y-src_y); + XCopyArea(display, src_pixmap, drawto_field, drawing_gc, + src_x,src_y, width,height, dest_x,dest_y); + } } + else + XCopyArea(display, src_pixmap, drawto_field, gc, + src_x,src_y, width,height, dest_x,dest_y); - XCopyArea(display,pix[PIX_BACK],drawto_field,gc, - SX+(graphic % GFX_PER_LINE)*TILEX+cx, - SY+(graphic / GFX_PER_LINE)*TILEY+cy, - width,height, SX+x*TILEX+dx,SY+y*TILEY+dy); + MarkTileDirty(x,y); +} - redraw_tiles++; - redraw[x][y]=TRUE; - redraw_mask|=REDRAW_TILES; +void DrawGraphicShiftedThruMask(int x,int y, int dx,int dy, int graphic, + int cut_mode) +{ + DrawGraphicShifted(x,y, dx,dy, graphic, cut_mode, USE_MASKING); } -void DrawElementShifted(int x, int y, int dx, int dy, int element,int cut_mode) +void DrawScreenElementExt(int x, int y, int dx, int dy, int element, + int cut_mode, int mask_mode) { int ux = UNSCROLLX(x), uy = UNSCROLLY(y); int graphic = el2gfx(element); - int phase = ABS(MovPos[ux][uy])/(TILEX/2); + int phase4 = ABS(MovPos[ux][uy])/(TILEX/4); + int phase = phase4 / 2; int dir = MovDir[ux][uy]; -/* - int horiz_move = (dir==MV_LEFT || dir==MV_RIGHT); -*/ - - if (element==EL_PACMAN || - element==EL_KAEFER || - element==EL_FLIEGER || - element==EL_BUTTERFLY || - element==EL_FIREFLY) + if (element==EL_PACMAN || element==EL_KAEFER || element==EL_FLIEGER) + { + graphic += 4*!phase; + + if (dir == MV_UP) + graphic += 1; + else if (dir == MV_LEFT) + graphic += 2; + else if (dir == MV_DOWN) + graphic += 3; + } + else if (element==EL_MAULWURF || element==EL_PINGUIN || + element==EL_SCHWEIN || element==EL_DRACHE) { - if (element==EL_BUTTERFLY || element==EL_FIREFLY) - graphic += !phase; + if (dir==MV_LEFT) + graphic = (element==EL_MAULWURF ? GFX_MAULWURF_LEFT : + element==EL_PINGUIN ? GFX_PINGUIN_LEFT : + element==EL_SCHWEIN ? GFX_SCHWEIN_LEFT : GFX_DRACHE_LEFT); + else if (dir==MV_RIGHT) + graphic = (element==EL_MAULWURF ? GFX_MAULWURF_RIGHT : + element==EL_PINGUIN ? GFX_PINGUIN_RIGHT : + element==EL_SCHWEIN ? GFX_SCHWEIN_RIGHT : GFX_DRACHE_RIGHT); + else if (dir==MV_UP) + graphic = (element==EL_MAULWURF ? GFX_MAULWURF_UP : + element==EL_PINGUIN ? GFX_PINGUIN_UP : + element==EL_SCHWEIN ? GFX_SCHWEIN_UP : GFX_DRACHE_UP); else - { - graphic += 4*!phase; - - if (dir==MV_UP) - graphic += 1; - else if (dir==MV_LEFT) - graphic += 2; - else if (dir==MV_DOWN) - graphic += 3; - } + graphic = (element==EL_MAULWURF ? GFX_MAULWURF_DOWN : + element==EL_PINGUIN ? GFX_PINGUIN_DOWN : + element==EL_SCHWEIN ? GFX_SCHWEIN_DOWN : GFX_DRACHE_DOWN); + + graphic += phase4; + } + else if (element==EL_SONDE) + { + graphic = GFX_SONDE_START + getGraphicAnimationPhase(8, 2, ANIM_NORMAL); + } + else if (element==EL_SALZSAEURE) + { + graphic = GFX_GEBLUBBER + getGraphicAnimationPhase(4, 10, ANIM_NORMAL); + } + else if (element==EL_BUTTERFLY || element==EL_FIREFLY) + { + graphic += !phase; } else if ((element==EL_FELSBROCKEN || IS_GEM(element)) && !cut_mode) { @@ -512,11 +905,43 @@ void DrawElementShifted(int x, int y, int dx, int dy, int element,int cut_mode) } if (dx || dy) - DrawGraphicShifted(x,y, dx,dy, graphic, cut_mode); + DrawGraphicShifted(x,y, dx,dy, graphic, cut_mode, mask_mode); + else if (mask_mode == USE_MASKING) + DrawGraphicThruMask(x,y, graphic); else DrawGraphic(x,y, graphic); } +void DrawLevelElementExt(int x, int y, int dx, int dy, int element, + int cut_mode, int mask_mode) +{ + if (IN_LEV_FIELD(x,y) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y))) + DrawScreenElementExt(SCROLLX(x),SCROLLY(y), dx,dy, element, + cut_mode, mask_mode); +} + +void DrawScreenElementShifted(int x, int y, int dx, int dy, int element, + int cut_mode) +{ + DrawScreenElementExt(x,y, dx,dy, element, cut_mode, NO_MASKING); +} + +void DrawLevelElementShifted(int x, int y, int dx, int dy, int element, + int cut_mode) +{ + DrawLevelElementExt(x,y, dx,dy, element, cut_mode, NO_MASKING); +} + +void DrawScreenElementThruMask(int x, int y, int element) +{ + DrawScreenElementExt(x,y, 0,0, element, NO_CUTTING, USE_MASKING); +} + +void DrawLevelElementThruMask(int x, int y, int element) +{ + DrawLevelElementExt(x,y, 0,0, element, NO_CUTTING, USE_MASKING); +} + void ErdreichAnbroeckeln(int x, int y) { int i, width, height, cx,cy; @@ -554,10 +979,6 @@ void ErdreichAnbroeckeln(int x, int y) else element = Feld[uxx][uyy]; -/* - if (element==EL_ERDREICH || IS_SOLID(element)) - continue; -*/ if (element==EL_ERDREICH) continue; @@ -579,11 +1000,10 @@ void ErdreichAnbroeckeln(int x, int y) XCopyArea(display,pix[PIX_BACK],drawto_field,gc, SX+(graphic % GFX_PER_LINE)*TILEX+cx, SY+(graphic / GFX_PER_LINE)*TILEY+cy, - width,height, SX+x*TILEX+cx,SY+y*TILEY+cy); + width,height, FX+x*TILEX+cx,FY+y*TILEY+cy); } - redraw_tiles++; - redraw[x][y]=TRUE; + MarkTileDirty(x,y); } else { @@ -597,11 +1017,6 @@ void ErdreichAnbroeckeln(int x, int y) yy = y+xy[i][1]; uxx = ux+xy[i][0]; uyy = uy+xy[i][1]; -/* - if (!IN_LEV_FIELD(uxx,uyy) || Feld[uxx][uyy]!=EL_ERDREICH || - !IN_SCR_FIELD(xx,yy) || IS_SOLID(element)) - continue; -*/ if (!IN_LEV_FIELD(uxx,uyy) || Feld[uxx][uyy]!=EL_ERDREICH || !IN_SCR_FIELD(xx,yy)) @@ -625,17 +1040,16 @@ void ErdreichAnbroeckeln(int x, int y) XCopyArea(display,pix[PIX_BACK],drawto_field,gc, SX+(graphic % GFX_PER_LINE)*TILEX+cx, SY+(graphic / GFX_PER_LINE)*TILEY+cy, - width,height, SX+xx*TILEX+cx,SY+yy*TILEY+cy); + width,height, FX+xx*TILEX+cx,FY+yy*TILEY+cy); - redraw_tiles++; - redraw[xx][yy]=TRUE; + MarkTileDirty(xx,yy); } } } void DrawScreenElement(int x, int y, int element) { - DrawElementShifted(x,y,0,0,element,CUT_NO_CUTTING); + DrawScreenElementExt(x,y, 0,0, element, NO_CUTTING, NO_MASKING); ErdreichAnbroeckeln(x,y); } @@ -661,7 +1075,7 @@ void DrawScreenField(int x, int y) if (IS_MOVING(ux,uy)) { int horiz_move = (MovDir[ux][uy]==MV_LEFT || MovDir[ux][uy]==MV_RIGHT); - BOOL cut_mode = CUT_NO_CUTTING; + BOOL cut_mode = NO_CUTTING; if (Store[ux][uy]==EL_MORAST_LEER || Store[ux][uy]==EL_SIEB_LEER || @@ -669,27 +1083,37 @@ void DrawScreenField(int x, int y) Store[ux][uy]==EL_AMOEBE_NASS) cut_mode = CUT_ABOVE; else if (Store[ux][uy]==EL_MORAST_VOLL || + +#if 0 + Store[ux][uy]==EL_SALZSAEURE || +#endif + Store[ux][uy]==EL_SIEB_VOLL || - Store[ux][uy]==EL_SIEB2_VOLL || - Store[ux][uy]==EL_SALZSAEURE) + Store[ux][uy]==EL_SIEB2_VOLL) cut_mode = CUT_BELOW; if (cut_mode==CUT_ABOVE) - DrawElementShifted(x,y,0,0,Store[ux][uy],CUT_NO_CUTTING); + DrawScreenElementShifted(x,y, 0,0, Store[ux][uy], NO_CUTTING); else DrawScreenElement(x,y,EL_LEERRAUM); if (horiz_move) - DrawElementShifted(x,y,MovPos[ux][uy],0,element,CUT_NO_CUTTING); + DrawScreenElementShifted(x,y, MovPos[ux][uy],0, element, NO_CUTTING); else - DrawElementShifted(x,y,0,MovPos[ux][uy],element,cut_mode); + DrawScreenElementShifted(x,y, 0,MovPos[ux][uy], element, cut_mode); + +#if 1 + if (Store[ux][uy] == EL_SALZSAEURE) + DrawLevelElementThruMask(ux,uy+1, EL_SALZSAEURE); +#endif + } else if (IS_BLOCKED(ux,uy)) { int oldx,oldy; int sx, sy; int horiz_move; - BOOL cut_mode = CUT_NO_CUTTING; + BOOL cut_mode = NO_CUTTING; Blocked2Moving(ux,uy,&oldx,&oldy); sx = SCROLLX(oldx); @@ -706,9 +1130,9 @@ void DrawScreenField(int x, int y) element = Feld[oldx][oldy]; if (horiz_move) - DrawElementShifted(sx,sy,MovPos[oldx][oldy],0,element,CUT_NO_CUTTING); + DrawScreenElementShifted(sx,sy, MovPos[oldx][oldy],0,element,NO_CUTTING); else - DrawElementShifted(sx,sy,0,MovPos[oldx][oldy],element,cut_mode); + DrawScreenElementShifted(sx,sy, 0,MovPos[oldx][oldy],element,cut_mode); } else if (IS_DRAWABLE(element)) DrawScreenElement(x,y,element); @@ -750,10 +1174,6 @@ void DrawMiniElement(int x, int y, int element) graphic = el2gfx(element); DrawMiniGraphic(x,y,graphic); - - redraw_tiles++; - redraw[x/2][y/2]=TRUE; - redraw_mask|=REDRAW_TILES; } void DrawMiniElementOrWall(int x, int y, int scroll_x, int scroll_y) @@ -789,11 +1209,16 @@ void DrawLevel() ClearWindow(); - for(x=0;x= joystick[i].xmiddle) - joystick[i].xleft = joystick[i].xmiddle-distance; - if (joystick[i].xright <= joystick[i].xmiddle) - joystick[i].xright = joystick[i].xmiddle+distance; - - if (joystick[i].yupper >= joystick[i].ymiddle) - joystick[i].yupper = joystick[i].ymiddle-distance; - if (joystick[i].ylower <= joystick[i].ymiddle) - joystick[i].ylower = joystick[i].ymiddle+distance; - } -} - -int JoystickPosition(int middle, int margin, int actual) -{ - long range, pos; - int percentage; - - if (marginmiddle) - return(0); - if (margin>middle && actual100) - percentage = 100; - - return(percentage); -} - -int Joystick() -{ -#ifdef __FreeBSD__ - struct joystick joy_ctrl; -#else - struct joystick_control - { - int buttons; - int x; - int y; - } joy_ctrl; -#endif - - int js_x,js_y, js_b1,js_b2; - int left, right, up, down; - int result=0; - - if (joystick_status==JOYSTICK_OFF) - return(0); - - if (read(joystick_device, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl)) - { - fprintf(stderr,"%s: cannot read joystick settings - no joystick support\n", - progname); - joystick_status = JOYSTICK_OFF; - return(0); - } - - js_x = joy_ctrl.x; - js_y = joy_ctrl.y; -#ifdef __FreeBSD__ - js_b1 = joy_ctrl.b1; - js_b2 = joy_ctrl.b2; -#else - js_b1 = joy_ctrl.buttons & 1; - js_b2 = joy_ctrl.buttons & 2; -#endif - - left = JoystickPosition(joystick[joystick_nr].xmiddle, - joystick[joystick_nr].xleft, js_x); - right = JoystickPosition(joystick[joystick_nr].xmiddle, - joystick[joystick_nr].xright, js_x); - up = JoystickPosition(joystick[joystick_nr].ymiddle, - joystick[joystick_nr].yupper, js_y); - down = JoystickPosition(joystick[joystick_nr].ymiddle, - joystick[joystick_nr].ylower, js_y); - - if (left>JOYSTICK_PERCENT) - result |= JOY_LEFT; - else if (right>JOYSTICK_PERCENT) - result |= JOY_RIGHT; - if (up>JOYSTICK_PERCENT) - result |= JOY_UP; - else if (down>JOYSTICK_PERCENT) - result |= JOY_DOWN; - if (js_b1) - result |= JOY_BUTTON_1; - if (js_b2) - result |= JOY_BUTTON_2; - - return(result); -} - -int JoystickButton() -{ - static int last_joy_button = 0; - int joy_button = (Joystick() & JOY_BUTTON); - int result; - - if (joy_button) - { - if (last_joy_button) - result = JOY_BUTTON_PRESSED; - else - result = JOY_BUTTON_NEW_PRESSED; - } - else - { - if (last_joy_button) - result = JOY_BUTTON_NEW_RELEASED; - else - result = JOY_BUTTON_NOT_PRESSED; - } - - last_joy_button = joy_button; - return(result); -} - int el2gfx(int element) { switch(element) @@ -1384,7 +1677,7 @@ int el2gfx(int element) case EL_FIREFLY_L: return(GFX_FIREFLY_L); case EL_FIREFLY_U: return(GFX_FIREFLY_U); case EL_MAMPFER: return(GFX_MAMPFER); - case EL_ZOMBIE: return(GFX_ZOMBIE); + case EL_ROBOT: return(GFX_ROBOT); case EL_BETON: return(GFX_BETON); case EL_DIAMANT: return(GFX_DIAMANT); case EL_MORAST_LEER: return(GFX_MORAST_LEER); @@ -1458,6 +1751,15 @@ int el2gfx(int element) case EL_SOKOBAN_OBJEKT: return(GFX_SOKOBAN_OBJEKT); case EL_SOKOBAN_FELD_LEER: return(GFX_SOKOBAN_FELD_LEER); case EL_SOKOBAN_FELD_VOLL: return(GFX_SOKOBAN_FELD_VOLL); + case EL_MAULWURF: return(GFX_MAULWURF); + case EL_PINGUIN: return(GFX_PINGUIN); + case EL_SCHWEIN: return(GFX_SCHWEIN); + case EL_DRACHE: return(GFX_DRACHE); + case EL_SONDE: return(GFX_SONDE); + case EL_PFEIL_L: return(GFX_PFEIL_L); + case EL_PFEIL_R: return(GFX_PFEIL_R); + case EL_PFEIL_O: return(GFX_PFEIL_O); + case EL_PFEIL_U: return(GFX_PFEIL_U); default: { if (IS_CHAR(element))