X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.c;h=d2645960674a93a8112d1c9b9db28fe0bf379cbe;hp=09da1bd31e6ce2d11bdcfbc4d8482d4fe8ee13c5;hb=0918c3eb2f6219a8cc72aa85bd9c4889788dd474;hpb=046d80f9a1b3fad9d4d3d3aa92dcb3689849aebf diff --git a/src/tools.c b/src/tools.c index 09da1bd3..d2645960 100644 --- a/src/tools.c +++ b/src/tools.c @@ -1,17 +1,18 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* ©1995 Artsoft Development * -* Holger Schemel * -* 33659 Bielefeld-Senne * -* Telefon: (0521) 493245 * -* eMail: aeglos@valinor.owl.de * -* aeglos@uni-paderborn.de * -* q99492@pbhrzx.uni-paderborn.de * +* (c) 1995-98 Artsoft Entertainment * +* Holger Schemel * +* Oststrasse 11a * +* 33604 Bielefeld * +* phone: ++49 +521 290471 * +* email: aeglos@valinor.owl.de * *----------------------------------------------------------* * tools.c * ***********************************************************/ +#include + #ifdef __FreeBSD__ #include #endif @@ -22,43 +23,125 @@ #include "sound.h" #include "misc.h" #include "buttons.h" -#include +#include "joystick.h" +#include "cartoons.h" +#include "network.h" + +#ifdef MSDOS +extern boolean wait_for_vsync; +#endif + +void SetDrawtoField(int mode) +{ + if (mode == DRAW_BUFFERED && setup.soft_scrolling) + { + 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 ? backbuffer : drawto_field); - if (direct_draw_on && game_status==PLAYING) + if (setup.direct_draw && 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) + redraw_mask &= ~REDRAW_TILES; + + /* + if (redraw_mask & REDRAW_FIELD || + (ScreenGfxPos && setup.soft_scrolling && game_status == PLAYING)) + 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 (setup.soft_scrolling) + { + fx += (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0); + fy += (ScreenMovDir & (MV_UP | MV_DOWN) ? ScreenGfxPos : 0); + } + + if (setup.soft_scrolling || + ABS(ScreenGfxPos) + ScrollStepSize == TILEX || + ABS(ScreenGfxPos) == ScrollStepSize || + redraw_tiles > REDRAWTILES_THRESHOLD) + 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,31 +177,31 @@ 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;xFC_SPECIAL2) - font_color = FC_RED; - - font_width = - (font==FS_BIG ? FONT1_XSIZE : - font_color FC_SPECIAL2) + font_type = FC_RED; + + font_width = (font_size == FS_BIG ? FONT1_XSIZE : + font_type < FC_SPECIAL1 ? FONT2_XSIZE : + font_type < FC_SPECIAL2 ? FONT3_XSIZE : FONT4_XSIZE); + font_height = (font_size == FS_BIG ? FONT1_XSIZE : + font_type < FC_SPECIAL2 ? FONT2_XSIZE : FONT4_XSIZE); + font_pixmap = (font_size == FS_BIG ? PIX_BIGFONT : PIX_SMALLFONT); + font_start = (font_type * (font_size == FS_BIG ? FONT1_YSIZE : FONT2_YSIZE) * + FONT_LINES_PER_FONT); while(*text) { char c = *text++; - if (c>='a' && c<='z') + if (c >= 'a' && c <= 'z') c = 'A' + (c - 'a'); - else if (c=='ä' || c=='Ä') + else if (c == 'ä' || c == 'Ä') c = 91; - else if (c=='ö' || c=='Ö') + else if (c == 'ö' || c == 'Ö') c = 92; - else if (c=='ü' || c=='Ü') + else if (c == 'ü' || c == 'Ü') c = 93; - if (c>=32 && c<=95) - XCopyArea(display,pix[font_pixmap],d,gc, - ((c-32) % FONT_CHARS_PER_LINE)*font_width, - ((c-32) / FONT_CHARS_PER_LINE)*font_height + font_start, - font_width,font_height, x,y); + if (c >= 32 && c <= 95) + XCopyArea(display, pix[font_pixmap], d, gc, + ((c - 32) % FONT_CHARS_PER_LINE) * font_width, + ((c - 32) / FONT_CHARS_PER_LINE) * font_height + font_start, + font_width, font_height, x, y); x += font_width; } } -void DrawGraphic(int x, int y, int graphic) +void DrawAllPlayers() { - DrawGraphicExt(drawto_field, gc, x, y, graphic); - redraw_tiles++; - redraw[x][y] = TRUE; - redraw_mask |= REDRAW_TILES; + int i; + + for(i=0; ijx, 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); + int sx = SCREENX(jx), sy = SCREENY(jy); + int sxx = 0, syy = 0; + int element = Feld[jx][jy]; + int graphic, phase; + + if (!player->active || player->gone || + !IN_SCR_FIELD(SCREENX(last_jx), SCREENY(last_jy))) + return; + +#if DEBUG + if (!IN_LEV_FIELD(jx,jy)) + { + printf("DrawPlayerField(): x = %d, y = %d\n",jx,jy); + printf("DrawPlayerField(): sx = %d, sy = %d\n",sx,sy); + printf("DrawPlayerField(): This should never happen!\n"); + return; + } +#endif + + if (element == EL_EXPLODING) + return; + + /* draw things in the field the player is leaving, if needed */ + + if (last_jx != jx || last_jy != jy) { - graphic -= 256; - 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, - TILEX,TILEY, x,y); + if (Store[last_jx][last_jy]) + { + DrawLevelElement(last_jx, last_jy, Store[last_jx][last_jy]); + DrawLevelFieldThruMask(last_jx, last_jy); + } + else if (Feld[last_jx][last_jy] == EL_DYNAMIT) + DrawDynamite(last_jx, last_jy); + else + DrawLevelField(last_jx, last_jy); + + if (player->Pushing && IN_SCR_FIELD(SCREENX(next_jx), SCREENY(next_jy))) + { + if (player->GfxPos) + { + if (Feld[next_jx][next_jy] == EL_SOKOBAN_FELD_VOLL) + DrawLevelElement(next_jx, next_jy, EL_SOKOBAN_FELD_LEER); + else + DrawLevelElement(next_jx, next_jy, EL_LEERRAUM); + } + else + DrawLevelField(next_jx, next_jy); + } } + + if (!IN_SCR_FIELD(sx, sy)) + return; + + if (setup.direct_draw) + SetDrawtoField(DRAW_BUFFERED); + + /* draw things behind the player, if needed */ + + if (Store[jx][jy]) + DrawLevelElement(jx, jy, Store[jx][jy]); + else if (element != EL_DYNAMIT && element != EL_DYNABOMB) + DrawLevelField(jx, jy); + + /* draw player himself */ + + if (player->MovDir == MV_LEFT) + graphic = (player->Pushing ? GFX_SPIELER1_PUSH_LEFT : GFX_SPIELER1_LEFT); + else if (player->MovDir == MV_RIGHT) + graphic = (player->Pushing ? GFX_SPIELER1_PUSH_RIGHT : GFX_SPIELER1_RIGHT); + else if (player->MovDir == MV_UP) + graphic = GFX_SPIELER1_UP; + else /* MV_DOWN || MV_NO_MOVING */ + graphic = GFX_SPIELER1_DOWN; + + graphic += player->index_nr * 3*HEROES_PER_LINE; + graphic += player->Frame; + + if (player->GfxPos) + { + if (player->MovDir == MV_LEFT || player->MovDir == MV_RIGHT) + sxx = player->GfxPos; + else + syy = player->GfxPos; + } + + if (!setup.soft_scrolling && ScreenMovPos) + sxx = syy = 0; + + DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, NO_CUTTING); + + if (player->Pushing && player->GfxPos) + { + int px = SCREENX(next_jx), py = SCREENY(next_jy); + + if (Feld[jx][jy] == EL_SOKOBAN_FELD_LEER || + Feld[next_jx][next_jy] == EL_SOKOBAN_FELD_VOLL) + DrawGraphicShiftedThruMask(px, py, sxx, syy, GFX_SOKOBAN_OBJEKT, + NO_CUTTING); + else + { + int element = Feld[next_jx][next_jy]; + int graphic = el2gfx(element); + + if (element == EL_FELSBROCKEN && sxx) + { + int phase = (player->GfxPos / (TILEX/4)); + + if (player->MovDir == MV_LEFT) + graphic += phase; + else + graphic += (phase+4)%4; + } + + DrawGraphicShifted(px, py, sxx, syy, graphic, NO_CUTTING, NO_MASKING); + } + } + + /* draw things in front of player (EL_DYNAMIT || EL_DYNABOMB) */ + + if (element == EL_DYNAMIT || element == EL_DYNABOMB) + { + graphic = el2gfx(element); + + if (element == EL_DYNAMIT) + { + if ((phase = (96 - MovDelay[jx][jy]) / 12) > 6) + phase = 6; + } + else + { + if ((phase = ((96 - MovDelay[jx][jy]) / 6) % 8) > 3) + phase = 7 - phase; + } + + DrawGraphicThruMask(sx, sy, graphic + phase); + } + + if ((last_jx != jx || last_jy != jy) && + Feld[last_jx][last_jy] == EL_EXPLODING) + { + int phase = Frame[last_jx][last_jy]; + int delay = 2; + + if (phase > 2) + DrawGraphicThruMask(SCREENX(last_jx), SCREENY(last_jy), + GFX_EXPLOSION + ((phase - 1) / delay - 1)); + } + + if (setup.direct_draw) + { + int dest_x = SX + SCREENX(MIN(jx, last_jx)) * TILEX; + int dest_y = SY + SCREENY(MIN(jy, last_jy)) * TILEY; + int x_size = TILEX * (1 + ABS(jx - last_jx)); + int y_size = TILEY * (1 + ABS(jy - last_jy)); + + XCopyArea(display, drawto_field, window, gc, + dest_x, dest_y, x_size, y_size, dest_x, dest_y); + SetDrawtoField(DRAW_DIRECT); + } + + MarkTileDirty(sx,sy); } -void DrawGraphicThruMask(int x, int y, int graphic) +static int getGraphicAnimationPhase(int frames, int delay, int mode) { - int src_x,src_y, dest_x,dest_y; + int phase; - if (graphic<0 || graphic>255) + if (mode == ANIM_OSCILLATE) { - DrawGraphic(x,y,graphic); - return; + int max_anim_frames = 2 * frames - 2; + phase = (FrameCounter % (delay * max_anim_frames)) / delay; + phase = (phase < frames ? phase : max_anim_frames - phase); } + 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); - 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; + if (!(FrameCounter % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) + { + if (mask_mode == USE_MASKING) + DrawGraphicThruMask(SCREENX(x), SCREENY(y), graphic + phase); + else + DrawGraphic(SCREENX(x), SCREENY(y), graphic + phase); + } +} - 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); +void DrawGraphicAnimation(int x, int y, int graphic, + int frames, int delay, int mode) +{ + DrawGraphicAnimationExt(x, y, graphic, frames, delay, mode, NO_MASKING); +} - redraw_tiles++; - redraw[x][y]=TRUE; - redraw_mask|=REDRAW_TILES; +void DrawGraphicAnimationThruMask(int x, int y, int graphic, + int frames, int delay, int mode) +{ + DrawGraphicAnimationExt(x, y, graphic, frames, delay, mode, USE_MASKING); } -void DrawElementThruMask(int x, int y, int element) +void DrawGraphic(int x, int y, int graphic) { - DrawGraphicThruMask(x,y,el2gfx(element)); +#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 DrawMiniGraphic(int x, int y, int graphic) +void DrawGraphicExt(Drawable d, GC gc, int x, int y, int graphic) { - DrawMiniGraphicExt(drawto, gc, x, y, graphic); - redraw_tiles++; - redraw[x/2][y/2]=TRUE; - redraw_mask|=REDRAW_TILES; + 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, + TILEX, TILEY, x, y); + } + 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 -= GFX_START_ROCKSFONT; + XCopyArea(display, pix[PIX_BIGFONT], d, gc, + (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 DrawMiniGraphicExt(Drawable d, GC gc, int x, int y, int graphic) +void DrawGraphicThruMask(int x, int y, int graphic) { - DrawMiniGraphicExtHiRes(d,gc, SX+x*MINI_TILEX,SY+y*MINI_TILEY, graphic); +#if DEBUG + if (!IN_SCR_FIELD(x,y)) + { + printf("DrawGraphicThruMask(): x = %d,y = %d, graphic = %d\n",x,y,graphic); + printf("DrawGraphicThruMask(): This should never happen!\n"); + return; + } +#endif + + DrawGraphicThruMaskExt(drawto_field, FX + x*TILEX, FY + y*TILEY, graphic); + MarkTileDirty(x,y); } -void DrawMiniGraphicExtHiRes(Drawable d, GC gc, int x, int y, int graphic) +void DrawGraphicThruMaskExt(Drawable d, int dest_x, int dest_y, int graphic) { - if (graphic<0) - XFillRectangle(display,d,gc, x,y, MINI_TILEX,MINI_TILEY); - else if (graphic<256) - 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); + int src_x, src_y; + int tile = graphic; + Pixmap src_pixmap; + GC drawing_gc; + + 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 { - graphic -= 256; - 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); + DrawGraphicExt(d, gc, dest_x,dest_y, graphic); + return; + } + + 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 + + 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 DrawMiniGraphic(int x, int y, int graphic) +{ + 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) +{ + 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 if (graphic >= GFX_START_ROCKSFONT && graphic <= GFX_END_ROCKSFONT) + { + 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); + DrawGraphic(x, y, graphic); return; } 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)); } - 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); + 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; + } + else /* big font graphics currently not allowed (and not needed) */ + return; + + 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 - redraw_tiles++; - redraw[x][y]=TRUE; - redraw_mask|=REDRAW_TILES; + 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); + + MarkTileDirty(x,y); } -void DrawElementShifted(int x, int y, int dx, int dy, int element,int cut_mode) +void DrawGraphicShiftedThruMask(int x,int y, int dx,int dy, int graphic, + int cut_mode) { - int ux = UNSCROLLX(x), uy = UNSCROLLY(y); + DrawGraphicShifted(x,y, dx,dy, graphic, cut_mode, USE_MASKING); +} + +void DrawScreenElementExt(int x, int y, int dx, int dy, int element, + int cut_mode, int mask_mode) +{ + int ux = LEVELX(x), uy = LEVELY(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) + if (element == EL_PACMAN || element == EL_KAEFER || element == EL_FLIEGER) { - if (element==EL_PACMAN) - graphic = GFX_PACMAN + 4*!phase; - else - graphic += 4*!phase; + graphic += 4*!phase; - if (dir==MV_UP) + if (dir == MV_UP) graphic += 1; - else if (dir==MV_LEFT) + else if (dir == MV_LEFT) graphic += 2; - else if (dir==MV_DOWN) + else if (dir == MV_DOWN) graphic += 3; } - else if ((element==EL_FELSBROCKEN || - element==EL_EDELSTEIN || element==EL_EDELSTEIN2 || - element==EL_EDELSTEIN3 || element==EL_DIAMANT) - && horiz_move && phase) + else if (element == EL_MAULWURF || element == EL_PINGUIN || + element == EL_SCHWEIN || element == EL_DRACHE) { - if (element==EL_FELSBROCKEN) - graphic += 2; + 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 += 1; + 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_SIEB_LEER || element==EL_SIEB2_LEER || - element==EL_SIEB_VOLL || element==EL_SIEB2_VOLL) && SiebAktiv) + else if (element == EL_BUTTERFLY || element == EL_FIREFLY) { - graphic += 3-(SiebAktiv%8)/2; + graphic += !phase; + } + else if ((element == EL_FELSBROCKEN || IS_GEM(element)) && !cut_mode) + { + graphic += phase * (element == EL_FELSBROCKEN ? 2 : 1); + } + else if ((element == EL_SIEB_LEER || element == EL_SIEB2_LEER || + element == EL_SIEB_VOLL || element == EL_SIEB2_VOLL) && SiebAktiv) + { + graphic += 3 - (SiebAktiv % 8) / 2; } else if (IS_AMOEBOID(element)) { - graphic = (element==EL_AMOEBE_TOT ? GFX_AMOEBE_TOT : GFX_AMOEBE_LEBT); - graphic += (x+2*y) % 4; + graphic = (element == EL_AMOEBE_TOT ? GFX_AMOEBE_TOT : GFX_AMOEBE_LEBT); + graphic += (x + 2 * y + 4) % 4; } - else if (element==EL_MAUER_LEBT) + else if (element == EL_MAUER_LEBT) { - BOOL links_massiv = FALSE, rechts_massiv = FALSE; + boolean links_massiv = FALSE, rechts_massiv = FALSE; - if (!IN_LEV_FIELD(ux-1,uy) || IS_MAUER(Feld[ux-1][uy])) + if (!IN_LEV_FIELD(ux-1, uy) || IS_MAUER(Feld[ux-1][uy])) links_massiv = TRUE; - if (!IN_LEV_FIELD(ux+1,uy) || IS_MAUER(Feld[ux+1][uy])) + if (!IN_LEV_FIELD(ux+1, uy) || IS_MAUER(Feld[ux+1][uy])) rechts_massiv = TRUE; if (links_massiv && rechts_massiv) @@ -489,60 +965,93 @@ 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); + 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(SCREENX(x), SCREENY(y))) + DrawScreenElementExt(SCREENX(x), SCREENY(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 DrawLevelFieldThruMask(int x, int y) +{ + DrawLevelElementExt(x, y, 0, 0, Feld[x][y], NO_CUTTING, USE_MASKING); } void ErdreichAnbroeckeln(int x, int y) { int i, width, height, cx,cy; - int ux = UNSCROLLX(x), uy = UNSCROLLY(y); + int ux = LEVELX(x), uy = LEVELY(y); int element, graphic; int snip = 4; static int xy[4][2] = { - 0,-1, - -1,0, - +1,0, - 0,+1 + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } }; - if (!IN_LEV_FIELD(ux,uy)) + if (!IN_LEV_FIELD(ux, uy)) return; element = Feld[ux][uy]; - if (element==EL_ERDREICH) + if (element == EL_ERDREICH) { - if (!IN_SCR_FIELD(x,y)) + if (!IN_SCR_FIELD(x, y)) return; graphic = GFX_ERDENRAND; - for(i=0;i<4;i++) + for(i=0; i<4; i++) { - int uxx,uyy; + int uxx, uyy; - uxx = ux+xy[i][0]; - uyy = uy+xy[i][1]; - if (!IN_LEV_FIELD(uxx,uyy)) + uxx = ux + xy[i][0]; + uyy = uy + xy[i][1]; + if (!IN_LEV_FIELD(uxx, uyy)) element = EL_BETON; else element = Feld[uxx][uyy]; -/* - if (element==EL_ERDREICH || IS_SOLID(element)) - continue; -*/ - if (element==EL_ERDREICH) + if (element == EL_ERDREICH) continue; - if (i==1 || i==2) + if (i == 1 || i == 2) { width = snip; height = TILEY; - cx = (i==2 ? TILEX-snip : 0); + cx = (i == 2 ? TILEX - snip : 0); cy = 0; } else @@ -550,45 +1059,39 @@ void ErdreichAnbroeckeln(int x, int y) width = TILEX; height = snip; cx = 0; - cy = (i==3 ? TILEY-snip : 0); + cy = (i == 3 ? TILEY - snip : 0); } - 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); + XCopyArea(display, pix[PIX_BACK], drawto_field, gc, + SX + (graphic % GFX_PER_LINE) * TILEX + cx, + SY + (graphic / GFX_PER_LINE) * TILEY + cy, + width, height, FX + x * TILEX + cx, FY + y * TILEY + cy); } - redraw_tiles++; - redraw[x][y]=TRUE; + MarkTileDirty(x, y); } else { graphic = GFX_ERDENRAND; - for(i=0;i<4;i++) + for(i=0; i<4; i++) { - int xx,yy,uxx,uyy; + int xx, yy, uxx, uyy; - xx = x+xy[i][0]; - 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; -*/ + xx = x + xy[i][0]; + 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)) + if (!IN_LEV_FIELD(uxx, uyy) || Feld[uxx][uyy] != EL_ERDREICH || + !IN_SCR_FIELD(xx, yy)) continue; - if (i==1 || i==2) + if (i == 1 || i == 2) { width = snip; height = TILEY; - cx = (i==1 ? TILEX-snip : 0); + cx = (i == 1 ? TILEX - snip : 0); cy = 0; } else @@ -599,119 +1102,121 @@ void ErdreichAnbroeckeln(int x, int y) cy = (i==0 ? TILEY-snip : 0); } - 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); + XCopyArea(display, pix[PIX_BACK], drawto_field, gc, + SX + (graphic % GFX_PER_LINE) * TILEX + cx, + SY + (graphic / GFX_PER_LINE) * 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); - ErdreichAnbroeckeln(x,y); + DrawScreenElementExt(x, y, 0, 0, element, NO_CUTTING, NO_MASKING); + ErdreichAnbroeckeln(x, y); } void DrawLevelElement(int x, int y, int element) { - if (IN_LEV_FIELD(x,y) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y))) - DrawScreenElement(SCROLLX(x),SCROLLY(y),element); + if (IN_LEV_FIELD(x, y) && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) + DrawScreenElement(SCREENX(x), SCREENY(y), element); } void DrawScreenField(int x, int y) { - int ux = UNSCROLLX(x), uy = UNSCROLLY(y); + int ux = LEVELX(x), uy = LEVELY(y); int element; - if (!IN_LEV_FIELD(ux,uy)) + if (!IN_LEV_FIELD(ux, uy)) { - DrawScreenElement(x,y,EL_BETON); + DrawScreenElement(x, y, EL_BETON); return; } element = Feld[ux][uy]; - if (IS_MOVING(ux,uy)) + if (IS_MOVING(ux, uy)) { - int horiz_move = (MovDir[ux][uy]==MV_LEFT || MovDir[ux][uy]==MV_RIGHT); - BOOL cut_mode = CUT_NO_CUTTING; + int horiz_move = (MovDir[ux][uy] == MV_LEFT || MovDir[ux][uy] == MV_RIGHT); + boolean cut_mode = NO_CUTTING; - if (Store[ux][uy]==EL_MORAST_LEER || - Store[ux][uy]==EL_SIEB_LEER || - Store[ux][uy]==EL_SIEB2_LEER || - Store[ux][uy]==EL_AMOEBE_NASS) + if (Store[ux][uy] == EL_MORAST_LEER || + Store[ux][uy] == EL_SIEB_LEER || + Store[ux][uy] == EL_SIEB2_LEER || + Store[ux][uy] == EL_AMOEBE_NASS) cut_mode = CUT_ABOVE; - else if (Store[ux][uy]==EL_MORAST_VOLL || - Store[ux][uy]==EL_SIEB_VOLL || - Store[ux][uy]==EL_SIEB2_VOLL || - Store[ux][uy]==EL_SALZSAEURE) + else if (Store[ux][uy] == EL_MORAST_VOLL || + Store[ux][uy] == EL_SIEB_VOLL || + 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); + if (cut_mode == CUT_ABOVE) + DrawScreenElementShifted(x, y, 0, 0, Store[ux][uy], NO_CUTTING); else - DrawScreenElement(x,y,EL_LEERRAUM); + 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 (Store[ux][uy] == EL_SALZSAEURE) + DrawLevelElementThruMask(ux, uy + 1, EL_SALZSAEURE); } - else if (IS_BLOCKED(ux,uy)) + else if (IS_BLOCKED(ux, uy)) { - int oldx,oldy; + int oldx, oldy; int sx, sy; int horiz_move; - BOOL cut_mode = CUT_NO_CUTTING; - - Blocked2Moving(ux,uy,&oldx,&oldy); - sx = SCROLLX(oldx); - sy = SCROLLY(oldy); - horiz_move = (MovDir[oldx][oldy]==MV_LEFT || MovDir[oldx][oldy]==MV_RIGHT); - - if (Store[oldx][oldy]==EL_MORAST_LEER || - Store[oldx][oldy]==EL_SIEB_LEER || - Store[oldx][oldy]==EL_SIEB2_LEER || - Store[oldx][oldy]==EL_AMOEBE_NASS) + boolean cut_mode = NO_CUTTING; + + Blocked2Moving(ux, uy, &oldx, &oldy); + sx = SCREENX(oldx); + sy = SCREENY(oldy); + horiz_move = (MovDir[oldx][oldy] == MV_LEFT || + MovDir[oldx][oldy] == MV_RIGHT); + + if (Store[oldx][oldy] == EL_MORAST_LEER || + Store[oldx][oldy] == EL_SIEB_LEER || + Store[oldx][oldy] == EL_SIEB2_LEER || + Store[oldx][oldy] == EL_AMOEBE_NASS) cut_mode = CUT_ABOVE; - DrawScreenElement(x,y,EL_LEERRAUM); + DrawScreenElement(x, y, EL_LEERRAUM); 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); + DrawScreenElement(x, y, element); else - DrawScreenElement(x,y,EL_LEERRAUM); + DrawScreenElement(x, y, EL_LEERRAUM); } void DrawLevelField(int x, int y) { - if (IN_SCR_FIELD(SCROLLX(x),SCROLLY(y))) - DrawScreenField(SCROLLX(x),SCROLLY(y)); - else if (IS_MOVING(x,y)) + if (IN_SCR_FIELD(SCREENX(x), SCREENY(y))) + DrawScreenField(SCREENX(x), SCREENY(y)); + else if (IS_MOVING(x, y)) { int newx,newy; - Moving2Blocked(x,y,&newx,&newy); - if (IN_SCR_FIELD(SCROLLX(newx),SCROLLY(newy))) - DrawScreenField(SCROLLX(newx),SCROLLY(newy)); + Moving2Blocked(x, y, &newx, &newy); + if (IN_SCR_FIELD(SCREENX(newx), SCREENY(newy))) + DrawScreenField(SCREENX(newx), SCREENY(newy)); } - else if (IS_BLOCKED(x,y)) + else if (IS_BLOCKED(x, y)) { - int oldx,oldy; + int oldx, oldy; - Blocked2Moving(x,y,&oldx,&oldy); - if (IN_SCR_FIELD(SCROLLX(oldx),SCROLLY(oldy))) - DrawScreenField(SCROLLX(oldx),SCROLLY(oldy)); + Blocked2Moving(x, y, &oldx, &oldy); + if (IN_SCR_FIELD(SCREENX(oldx), SCREENY(oldy))) + DrawScreenField(SCREENX(oldx), SCREENY(oldy)); } } @@ -721,43 +1226,39 @@ void DrawMiniElement(int x, int y, int element) if (!element) { - DrawMiniGraphic(x,y,-1); + DrawMiniGraphic(x, y, -1); return; } graphic = el2gfx(element); - DrawMiniGraphic(x,y,graphic); - - redraw_tiles++; - redraw[x/2][y/2]=TRUE; - redraw_mask|=REDRAW_TILES; + DrawMiniGraphic(x, y, graphic); } -void DrawMiniElementOrWall(int x, int y, int scroll_x, int scroll_y) +void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y) { - if (x+scroll_x<-1 || x+scroll_x>lev_fieldx || - y+scroll_y<-1 || y+scroll_y>lev_fieldy) - DrawMiniElement(x,y,EL_LEERRAUM); - else if (x+scroll_x==-1 || x+scroll_x==lev_fieldx || - y+scroll_y==-1 || y+scroll_y==lev_fieldy) - DrawMiniElement(x,y,EL_BETON); + int x = sx + scroll_x, y = sy + scroll_y; + + if (x < -1 || x > lev_fieldx || y < -1 || y > lev_fieldy) + DrawMiniElement(sx, sy, EL_LEERRAUM); + else if (x == -1 || x == lev_fieldx || y == -1 || y == lev_fieldy) + DrawMiniElement(sx, sy, EL_BETON); else - DrawMiniElement(x,y,Feld[x+scroll_x][y+scroll_y]); + DrawMiniElement(sx, sy, Feld[x][y]); } void DrawMicroElement(int xpos, int ypos, int element) { int graphic; - if (element==EL_LEERRAUM) + if (element == EL_LEERRAUM) return; graphic = el2gfx(element); - XCopyArea(display,pix[PIX_BACK],drawto,gc, - MICRO_GFX_STARTX+(graphic % MICRO_GFX_PER_LINE)*MICRO_TILEX, - MICRO_GFX_STARTY+(graphic / MICRO_GFX_PER_LINE)*MICRO_TILEY, - MICRO_TILEX,MICRO_TILEY, xpos,ypos); + XCopyArea(display, pix[PIX_BACK], drawto, gc, + MICRO_GFX_STARTX + (graphic % MICRO_GFX_PER_LINE) * MICRO_TILEX, + MICRO_GFX_STARTY + (graphic / MICRO_GFX_PER_LINE) * MICRO_TILEY, + MICRO_TILEX, MICRO_TILEY, xpos, ypos); } void DrawLevel() @@ -766,11 +1267,15 @@ void DrawLevel() ClearWindow(); - for(x=0;x=0 && x=0 && y=-1 && x=-1 && y= 0 && x < lev_fieldx && y >= 0 && y < lev_fieldy) + DrawMicroElement(xpos + x * MICRO_TILEX, ypos + y * MICRO_TILEY, + Ur[x][y]); + else if (x >= -1 && x < lev_fieldx+1 && y >= -1 && y < lev_fieldy+1) + DrawMicroElement(xpos + x * MICRO_TILEX, ypos + y * MICRO_TILEY, EL_BETON); - XFillRectangle(display,drawto,gc, SX,MICROLABEL_YPOS, SXSIZE,FONT4_YSIZE); + XFillRectangle(display, drawto,gc, SX, MICROLABEL_YPOS, SXSIZE, FONT4_YSIZE); if (level.name) { int len = strlen(level.name); - int lxpos = SX+(SXSIZE-len*FONT4_XSIZE)/2; + int lxpos = SX + (SXSIZE - len * FONT4_XSIZE) / 2; int lypos = MICROLABEL_YPOS; - DrawText(lxpos,lypos,level.name,FS_SMALL,FC_SPECIAL2); + DrawText(lxpos, lypos, level.name, FS_SMALL, FC_SPECIAL2); } redraw_mask |= REDRAW_MICROLEV; } -int AYS_in_range(int x, int y) +int REQ_in_range(int x, int y) { - if (y>DY+249 && y DY+249 && y < DY+278) { - if (x>DX+1 && xDX+51 && x DX+1 && x < DX+48) + return 1; + else if (x > DX+51 && x < DX+98) + return 2; } - return(0); + return 0; } -BOOL AreYouSure(char *text, unsigned int ays_state) +boolean Request(char *text, unsigned int req_state) { - int mx,my, ty, result = -1; + int mx, my, ty, result = -1; + unsigned int old_door_state; + +#ifndef MSDOS + /* pause network game while waiting for request to answer */ + if (options.network && + game_status == PLAYING && + req_state & REQUEST_WAIT_FOR) + SendToServer_PausePlaying(); +#endif + + old_door_state = GetDoorState(); CloseDoor(DOOR_CLOSE_1); /* Alten Türinhalt sichern */ - XCopyArea(display,pix[PIX_DB_DOOR],pix[PIX_DB_DOOR],gc, - DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1, DXSIZE,DYSIZE, - DOOR_GFX_PAGEX2,DOOR_GFX_PAGEY1); + XCopyArea(display, pix[PIX_DB_DOOR], pix[PIX_DB_DOOR], gc, + DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, + DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1); /* Fragetext schreiben */ - XFillRectangle(display,pix[PIX_DB_DOOR],gc, - DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1,DXSIZE,DYSIZE); + XFillRectangle(display, pix[PIX_DB_DOOR], gc, + DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE); - for(ty=0;ty<13;ty++) + for(ty=0; ty<13; ty++) { - int tx,tl,tc; + int tx, tl, tc; char txt[256]; - if (!(*text)) + if (!*text) break; - for(tl=0,tx=0;tx<7;tl++,tx++) + + for(tl=0,tx=0; tx<7; tl++,tx++) { - tc=*(text+tx); - if (!tc || tc==32) + tc = *(text + tx); + if (!tc || tc == 32) break; } if (!tl) @@ -864,59 +1385,59 @@ BOOL AreYouSure(char *text, unsigned int ays_state) ty--; continue; } - sprintf(txt,text); - txt[tl]=0; - DrawTextExt(pix[PIX_DB_DOOR],gc, - DOOR_GFX_PAGEX1+51-(tl*14)/2,SY+ty*16,txt,FS_SMALL,FC_YELLOW); - text+=(tl+(tc==32)); - } - - if (ays_state & AYS_ASK) - XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc, - DOOR_GFX_PAGEX4,OK_BUTTON_GFX_YPOS, - DXSIZE,OK_BUTTON_YSIZE, - DOOR_GFX_PAGEX1,OK_BUTTON_YPOS); - else if (ays_state & AYS_CONFIRM) - XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc, - DOOR_GFX_PAGEX4,CONFIRM_BUTTON_GFX_YPOS, - DXSIZE,CONFIRM_BUTTON_YSIZE, - DOOR_GFX_PAGEX1,CONFIRM_BUTTON_YPOS); + sprintf(txt, text); + txt[tl] = 0; + DrawTextExt(pix[PIX_DB_DOOR], gc, + DOOR_GFX_PAGEX1 + 51 - (tl * 14)/2, SY + ty * 16, + txt, FS_SMALL, FC_YELLOW); + text += tl + (tc == 32 ? 1 : 0); + } + + if (req_state & REQ_ASK) + { + DrawYesNoButton(BUTTON_OK, DB_INIT); + DrawYesNoButton(BUTTON_NO, DB_INIT); + } + else if (req_state & REQ_CONFIRM) + { + DrawConfirmButton(BUTTON_CONFIRM, DB_INIT); + } + else if (req_state & REQ_PLAYER) + { + DrawPlayerButton(BUTTON_PLAYER_1, DB_INIT); + DrawPlayerButton(BUTTON_PLAYER_2, DB_INIT); + DrawPlayerButton(BUTTON_PLAYER_3, DB_INIT); + DrawPlayerButton(BUTTON_PLAYER_4, DB_INIT); + } OpenDoor(DOOR_OPEN_1); + ClearEventQueue(); - if (!(ays_state & AYS_ASK) && !(ays_state & AYS_CONFIRM)) + if (!(req_state & REQUEST_WAIT_FOR)) return(FALSE); - if (game_status!=MAINMENU) + if (game_status != MAINMENU) InitAnimation(); button_status = MB_RELEASED; - while(result<0) + while(result < 0) { - DoAnimation(); - Delay(10000); - if (XPending(display)) { XEvent event; XNextEvent(display, &event); + switch(event.type) { - case Expose: - HandleExposeEvent((XExposeEvent *) &event); - break; - case UnmapNotify: - SleepWhileUnmapped(); - break; case ButtonPress: case ButtonRelease: case MotionNotify: { int choice; - if (event.type==MotionNotify) + if (event.type == MotionNotify) { motion_status = TRUE; mx = ((XMotionEvent *) &event)->x; @@ -933,10 +1454,12 @@ BOOL AreYouSure(char *text, unsigned int ays_state) button_status = MB_RELEASED; } - if (ays_state & AYS_ASK) - choice = CheckChooseButtons(mx,my,button_status); - else + if (req_state & REQ_ASK) + choice = CheckYesNoButtons(mx,my,button_status); + else if (req_state & REQ_CONFIRM) choice = CheckConfirmButton(mx,my,button_status); + else + choice = CheckPlayerButtons(mx,my,button_status); switch(choice) { @@ -947,56 +1470,80 @@ BOOL AreYouSure(char *text, unsigned int ays_state) result = FALSE; break; case BUTTON_CONFIRM: - result = TRUE|FALSE; + result = TRUE | FALSE; + break; + + case BUTTON_PLAYER_1: + result = 1; + break; + case BUTTON_PLAYER_2: + result = 2; break; + case BUTTON_PLAYER_3: + result = 3; + break; + case BUTTON_PLAYER_4: + result = 4; + break; + default: break; } break; } + case KeyPress: - key_status = KEY_PRESSED; switch(XLookupKeysym((XKeyEvent *)&event, ((XKeyEvent *)&event)->state)) { case XK_Return: result = 1; break; + case XK_Escape: result = 0; break; + + default: + break; } + if (req_state & REQ_PLAYER) + result = 0; break; - case FocusIn: - HandleFocusEvent(FOCUS_IN); - break; - case FocusOut: - HandleFocusEvent(FOCUS_OUT); + + case KeyRelease: + key_joystick_mapping = 0; break; + default: + HandleOtherEvents(&event); break; } } - else if (JoystickButton()==JOY_BUTTON_NEW_PRESSED) + else if (AnyJoystickButton() == JOY_BUTTON_NEW_PRESSED) { - int joy=Joystick(); + int joy = AnyJoystick(); if (joy & JOY_BUTTON_1) result = 1; else if (joy & JOY_BUTTON_2) result = 0; } + + DoAnimation(); + + /* don't eat all CPU time */ + Delay(10); } - if (game_status!=MAINMENU) + if (game_status != MAINMENU) StopAnimation(); - if (!(ays_state & AYS_STAY_OPEN)) + if (!(req_state & REQ_STAY_OPEN)) { CloseDoor(DOOR_CLOSE_1); - if (!(ays_state & AYS_STAY_CLOSED) && - (game_status==PLAYING || game_status==LEVELED)) + if (!(req_state & REQ_STAY_CLOSED) && (old_door_state & DOOR_OPEN_1)) { XCopyArea(display,pix[PIX_DB_DOOR],pix[PIX_DB_DOOR],gc, DOOR_GFX_PAGEX2,DOOR_GFX_PAGEY1, DXSIZE,DYSIZE, @@ -1005,393 +1552,324 @@ BOOL AreYouSure(char *text, unsigned int ays_state) } } +#ifndef MSDOS + /* continue network game after request */ + if (options.network && + game_status == PLAYING && + req_state & REQUEST_WAIT_FOR) + SendToServer_ContinuePlaying(); +#endif + return(result); } -void OpenDoor(unsigned int door_state) +unsigned int OpenDoor(unsigned int door_state) { + unsigned int new_door_state; + if (door_state & DOOR_COPY_BACK) { - XCopyArea(display,pix[PIX_DB_DOOR],pix[PIX_DB_DOOR],gc, - DOOR_GFX_PAGEX2,DOOR_GFX_PAGEY1, DXSIZE,DYSIZE+VYSIZE, - DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1); + XCopyArea(display, pix[PIX_DB_DOOR], pix[PIX_DB_DOOR], gc, + DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE + VYSIZE, + DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1); door_state &= ~DOOR_COPY_BACK; } - MoveDoor(door_state); - ClearEventQueue(); + new_door_state = MoveDoor(door_state); + + return(new_door_state); } -void CloseDoor(unsigned int door_state) +unsigned int CloseDoor(unsigned int door_state) { - XCopyArea(display,backbuffer,pix[PIX_DB_DOOR],gc, - DX,DY, DXSIZE,DYSIZE, DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1); - XCopyArea(display,backbuffer,pix[PIX_DB_DOOR],gc, - VX,VY, VXSIZE,VYSIZE, DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2); + unsigned int new_door_state; - MoveDoor(door_state); - ClearEventQueue(); + XCopyArea(display, backbuffer, pix[PIX_DB_DOOR], gc, + DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1); + XCopyArea(display, backbuffer, pix[PIX_DB_DOOR], gc, + VX, VY, VXSIZE, VYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2); + + new_door_state = MoveDoor(door_state); + + return(new_door_state); +} + +unsigned int GetDoorState() +{ + return(MoveDoor(DOOR_GET_STATE)); } -void MoveDoor(unsigned int door_state) +unsigned int MoveDoor(unsigned int door_state) { static int door1 = DOOR_OPEN_1; static int door2 = DOOR_CLOSE_2; - int x, start, stepsize = 4, door_anim_delay = stepsize*5000; + static unsigned long door_delay = 0; + int x, start, stepsize = 2; + unsigned long door_delay_value = stepsize * 5; - if (door1==DOOR_OPEN_1 && door_state & DOOR_OPEN_1) + if (door_state == DOOR_GET_STATE) + return(door1 | door2); + + if (door1 == DOOR_OPEN_1 && door_state & DOOR_OPEN_1) door_state &= ~DOOR_OPEN_1; - else if (door1==DOOR_CLOSE_1 && door_state & DOOR_CLOSE_1) + else if (door1 == DOOR_CLOSE_1 && door_state & DOOR_CLOSE_1) door_state &= ~DOOR_CLOSE_1; - if (door2==DOOR_OPEN_2 && door_state & DOOR_OPEN_2) + if (door2 == DOOR_OPEN_2 && door_state & DOOR_OPEN_2) door_state &= ~DOOR_OPEN_2; - else if (door2==DOOR_CLOSE_2 && door_state & DOOR_CLOSE_2) + else if (door2 == DOOR_CLOSE_2 && door_state & DOOR_CLOSE_2) door_state &= ~DOOR_CLOSE_2; - if (quick_doors) + if (setup.quick_doors) { stepsize = 20; - door_anim_delay = 0; + door_delay_value = 0; StopSound(SND_OEFFNEN); } if (door_state & DOOR_ACTION) { if (!(door_state & DOOR_NO_DELAY)) - PlaySoundStereo(SND_OEFFNEN,PSND_MAX_RIGHT); + PlaySoundStereo(SND_OEFFNEN, PSND_MAX_RIGHT); start = ((door_state & DOOR_NO_DELAY) ? DXSIZE : 0); - for(x=start;x<=DXSIZE;x+=stepsize) + for(x=start; x<=DXSIZE; x+=stepsize) { + WaitUntilDelayReached(&door_delay, door_delay_value); + if (door_state & DOOR_ACTION_1) { int i = (door_state & DOOR_OPEN_1 ? DXSIZE-x : x); - int j = (DXSIZE - i)/3; - - XCopyArea(display,pix[PIX_DB_DOOR],drawto,gc, - DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1+i/2, - DXSIZE,DYSIZE-i/2, DX,DY); - - XFillRectangle(display,drawto,gc,DX,DY+DYSIZE-i/2,DXSIZE,i/2); - - XSetClipOrigin(display,clip_gc[PIX_DOOR], - DX-i,(DY+j)-DOOR_GFX_PAGEY1); - XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR], - DXSIZE,DOOR_GFX_PAGEY1, i,77, DX+DXSIZE-i,DY+j); - XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR], - DXSIZE,DOOR_GFX_PAGEY1+140, i,63, DX+DXSIZE-i,DY+140+j); - XSetClipOrigin(display,clip_gc[PIX_DOOR], - DX-DXSIZE+i,DY-(DOOR_GFX_PAGEY1+j)); - XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR], - DXSIZE-i,DOOR_GFX_PAGEY1+j, i,77-j, DX,DY); - XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR], - DXSIZE-i,DOOR_GFX_PAGEY1+140, i,63, DX,DY+140-j); - - XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR], - DXSIZE-i,DOOR_GFX_PAGEY1+77, i,63, - DX,DY+77-j); - XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR], - DXSIZE-i,DOOR_GFX_PAGEY1+203, i,77, - DX,DY+203-j); - XSetClipOrigin(display,clip_gc[PIX_DOOR], - DX-i,(DY+j)-DOOR_GFX_PAGEY1); - XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR], - DXSIZE,DOOR_GFX_PAGEY1+77, i,63, - DX+DXSIZE-i,DY+77+j); - XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR], - DXSIZE,DOOR_GFX_PAGEY1+203, i,77-j, - DX+DXSIZE-i,DY+203+j); + int j = (DXSIZE - i) / 3; + + XCopyArea(display, pix[PIX_DB_DOOR], drawto, gc, + DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1 + i/2, + DXSIZE,DYSIZE - i/2, DX, DY); + + XFillRectangle(display, drawto, gc, DX, DY + DYSIZE - i/2, DXSIZE,i/2); + + XSetClipOrigin(display, clip_gc[PIX_DOOR], + DX - i, (DY + j) - DOOR_GFX_PAGEY1); + XCopyArea(display, pix[PIX_DOOR], drawto,clip_gc[PIX_DOOR], + DXSIZE, DOOR_GFX_PAGEY1, i, 77, DX + DXSIZE - i, DY + j); + XCopyArea(display, pix[PIX_DOOR], drawto, clip_gc[PIX_DOOR], + DXSIZE, DOOR_GFX_PAGEY1 + 140, i, 63, DX + DXSIZE - i, + DY + 140 + j); + XSetClipOrigin(display, clip_gc[PIX_DOOR], + DX - DXSIZE + i, DY - (DOOR_GFX_PAGEY1 + j)); + XCopyArea(display, pix[PIX_DOOR], drawto, clip_gc[PIX_DOOR], + DXSIZE - i, DOOR_GFX_PAGEY1 + j, i, 77 - j, DX, DY); + XCopyArea(display, pix[PIX_DOOR], drawto, clip_gc[PIX_DOOR], + DXSIZE-i, DOOR_GFX_PAGEY1 + 140, i, 63, DX, DY + 140 - j); + + XCopyArea(display, pix[PIX_DOOR], drawto, clip_gc[PIX_DOOR], + DXSIZE - i, DOOR_GFX_PAGEY1 + 77, i, 63, + DX, DY + 77 - j); + XCopyArea(display, pix[PIX_DOOR], drawto, clip_gc[PIX_DOOR], + DXSIZE - i, DOOR_GFX_PAGEY1 + 203, i, 77, + DX, DY + 203 - j); + XSetClipOrigin(display, clip_gc[PIX_DOOR], + DX - i, (DY + j) - DOOR_GFX_PAGEY1); + XCopyArea(display, pix[PIX_DOOR], drawto, clip_gc[PIX_DOOR], + DXSIZE, DOOR_GFX_PAGEY1 + 77, i, 63, + DX + DXSIZE - i, DY + 77 + j); + XCopyArea(display, pix[PIX_DOOR], drawto, clip_gc[PIX_DOOR], + DXSIZE, DOOR_GFX_PAGEY1 + 203, i, 77 - j, + DX + DXSIZE - i, DY + 203 + j); redraw_mask |= REDRAW_DOOR_1; } if (door_state & DOOR_ACTION_2) { - int i = (door_state & DOOR_OPEN_2 ? VXSIZE-x : x); - int j = (VXSIZE - i)/3; - - XCopyArea(display,pix[PIX_DB_DOOR],drawto,gc, - DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2+i/2, - VXSIZE,VYSIZE-i/2, VX,VY); - - XFillRectangle(display,drawto,gc,VX,VY+VYSIZE-i/2,VXSIZE,i/2); - - XSetClipOrigin(display,clip_gc[PIX_DOOR], - VX-i,(VY+j)-DOOR_GFX_PAGEY2); - XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR], - VXSIZE,DOOR_GFX_PAGEY2, i,VYSIZE/2, VX+VXSIZE-i,VY+j); - XSetClipOrigin(display,clip_gc[PIX_DOOR], - VX-VXSIZE+i,VY-(DOOR_GFX_PAGEY2+j)); - XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR], - VXSIZE-i,DOOR_GFX_PAGEY2+j, i,VYSIZE/2-j, VX,VY); - - XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR], - VXSIZE-i,DOOR_GFX_PAGEY2+VYSIZE/2, i,VYSIZE/2, - VX,VY+VYSIZE/2-j); - XSetClipOrigin(display,clip_gc[PIX_DOOR], - VX-i,(VY+j)-DOOR_GFX_PAGEY2); - XCopyArea(display,pix[PIX_DOOR],drawto,clip_gc[PIX_DOOR], - VXSIZE,DOOR_GFX_PAGEY2+VYSIZE/2, i,VYSIZE/2-j, - VX+VXSIZE-i,VY+VYSIZE/2+j); + int i = (door_state & DOOR_OPEN_2 ? VXSIZE - x : x); + int j = (VXSIZE - i) / 3; + + XCopyArea(display, pix[PIX_DB_DOOR], drawto, gc, + DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2 + i/2, + VXSIZE, VYSIZE - i/2, VX, VY); + + XFillRectangle(display, drawto, gc, VX, VY + VYSIZE-i/2, VXSIZE, i/2); + + XSetClipOrigin(display, clip_gc[PIX_DOOR], + VX - i, (VY + j) - DOOR_GFX_PAGEY2); + XCopyArea(display, pix[PIX_DOOR], drawto, clip_gc[PIX_DOOR], + VXSIZE, DOOR_GFX_PAGEY2, i, VYSIZE / 2, VX + VXSIZE-i, VY+j); + XSetClipOrigin(display, clip_gc[PIX_DOOR], + VX - VXSIZE + i, VY - (DOOR_GFX_PAGEY2 + j)); + XCopyArea(display, pix[PIX_DOOR], drawto,clip_gc[PIX_DOOR], + VXSIZE - i, DOOR_GFX_PAGEY2 + j, i, VYSIZE / 2 - j, VX, VY); + + XCopyArea(display, pix[PIX_DOOR], drawto, clip_gc[PIX_DOOR], + VXSIZE - i, DOOR_GFX_PAGEY2 + VYSIZE / 2, i, VYSIZE / 2, + VX, VY + VYSIZE / 2 - j); + XSetClipOrigin(display, clip_gc[PIX_DOOR], + VX - i, (VY + j) - DOOR_GFX_PAGEY2); + XCopyArea(display, pix[PIX_DOOR], drawto, clip_gc[PIX_DOOR], + VXSIZE, DOOR_GFX_PAGEY2 + VYSIZE / 2, i, VYSIZE / 2 - j, + VX + VXSIZE - i, VY + VYSIZE / 2 + j); redraw_mask |= REDRAW_DOOR_2; } BackToFront(); - Delay(door_anim_delay); - if (game_status==MAINMENU) + if (game_status == MAINMENU) DoAnimation(); } } + if (setup.quick_doors) + StopSound(SND_OEFFNEN); + if (door_state & DOOR_ACTION_1) door1 = door_state & DOOR_ACTION_1; if (door_state & DOOR_ACTION_2) door2 = door_state & DOOR_ACTION_2; + + return(door1 | door2); } int ReadPixel(Drawable d, int x, int y) { static XImage *pixelimage; - pixelimage = XGetImage(display, d, x,y, 1,1, AllPlanes, ZPixmap); - return(XGetPixel(pixelimage,0,0)); -} - -void CheckJoystickData() -{ - int i; - int distance = 100; - - for(i=0;i<2;i++) - { - if (joystick[i].xmiddle <= distance) - joystick[i].xmiddle = distance; - if (joystick[i].ymiddle <= distance) - joystick[i].ymiddle = distance; - - if (joystick[i].xleft >= 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); + pixelimage = XGetImage(display, d, x, y, 1, 1, AllPlanes, ZPixmap); + return(XGetPixel(pixelimage, 0, 0)); } int el2gfx(int element) { switch(element) { - case EL_LEERRAUM: return(-1); - case EL_ERDREICH: return(GFX_ERDREICH); - case EL_MAUERWERK: return(GFX_MAUERWERK); - case EL_FELSBODEN: return(GFX_FELSBODEN); - case EL_FELSBROCKEN: return(GFX_FELSBROCKEN); - case EL_SCHLUESSEL: return(GFX_SCHLUESSEL); - case EL_EDELSTEIN: return(GFX_EDELSTEIN); - case EL_AUSGANG_ZU: return(GFX_AUSGANG_ZU); - case EL_AUSGANG_ACT: return(GFX_AUSGANG_ACT); - case EL_AUSGANG_AUF: return(GFX_AUSGANG_AUF); - case EL_SPIELFIGUR: return(GFX_SPIELFIGUR); - case EL_SPIELER1: return(GFX_SPIELER1); - case EL_SPIELER2: return(GFX_SPIELER2); - case EL_SPIELER3: return(GFX_SPIELER3); - case EL_SPIELER4: return(GFX_SPIELER4); - case EL_KAEFER: return(GFX_KAEFER); - case EL_KAEFER_R: return(GFX_KAEFER_R); - case EL_KAEFER_O: return(GFX_KAEFER_O); - case EL_KAEFER_L: return(GFX_KAEFER_L); - case EL_KAEFER_U: return(GFX_KAEFER_U); - case EL_FLIEGER: return(GFX_FLIEGER); - case EL_FLIEGER_R: return(GFX_FLIEGER_R); - case EL_FLIEGER_O: return(GFX_FLIEGER_O); - case EL_FLIEGER_L: return(GFX_FLIEGER_L); - case EL_FLIEGER_U: return(GFX_FLIEGER_U); - case EL_MAMPFER: return(GFX_MAMPFER); - case EL_ZOMBIE: return(GFX_ZOMBIE); - case EL_BETON: return(GFX_BETON); - case EL_DIAMANT: return(GFX_DIAMANT); - case EL_MORAST_LEER: return(GFX_MORAST_LEER); - case EL_MORAST_VOLL: return(GFX_MORAST_VOLL); - case EL_TROPFEN: return(GFX_TROPFEN); - case EL_BOMBE: return(GFX_BOMBE); - case EL_SIEB_LEER: return(GFX_SIEB_LEER); - case EL_SIEB_VOLL: return(GFX_SIEB_VOLL); - case EL_SIEB_TOT: return(GFX_SIEB_TOT); - case EL_SALZSAEURE: return(GFX_SALZSAEURE); - case EL_AMOEBE_TOT: return(GFX_AMOEBE_TOT); - case EL_AMOEBE_NASS: return(GFX_AMOEBE_NASS); - case EL_AMOEBE_NORM: return(GFX_AMOEBE_NORM); - case EL_AMOEBE_VOLL: return(GFX_AMOEBE_VOLL); - case EL_AMOEBA2DIAM: return(GFX_AMOEBA2DIAM); - case EL_KOKOSNUSS: return(GFX_KOKOSNUSS); - case EL_LIFE: return(GFX_LIFE); - case EL_LIFE_ASYNC: return(GFX_LIFE_ASYNC); - case EL_DYNAMIT: return(GFX_DYNAMIT); - case EL_BADEWANNE: return(GFX_BADEWANNE); - case EL_BADEWANNE1: return(GFX_BADEWANNE1); - case EL_BADEWANNE2: return(GFX_BADEWANNE2); - case EL_BADEWANNE3: return(GFX_BADEWANNE3); - case EL_BADEWANNE4: return(GFX_BADEWANNE4); - case EL_BADEWANNE5: return(GFX_BADEWANNE5); - case EL_ABLENK_AUS: return(GFX_ABLENK_AUS); - case EL_ABLENK_EIN: return(GFX_ABLENK_EIN); - case EL_SCHLUESSEL1: return(GFX_SCHLUESSEL1); - case EL_SCHLUESSEL2: return(GFX_SCHLUESSEL2); - case EL_SCHLUESSEL3: return(GFX_SCHLUESSEL3); - case EL_SCHLUESSEL4: return(GFX_SCHLUESSEL4); - case EL_PFORTE1: return(GFX_PFORTE1); - case EL_PFORTE2: return(GFX_PFORTE2); - case EL_PFORTE3: return(GFX_PFORTE3); - case EL_PFORTE4: return(GFX_PFORTE4); - case EL_PFORTE1X: return(GFX_PFORTE1X); - case EL_PFORTE2X: return(GFX_PFORTE2X); - case EL_PFORTE3X: return(GFX_PFORTE3X); - case EL_PFORTE4X: return(GFX_PFORTE4X); - case EL_DYNAMIT_AUS: return(GFX_DYNAMIT_AUS); - case EL_PACMAN: return(GFX_PACMAN); - case EL_PACMAN_R: return(GFX_PACMAN_R); - case EL_PACMAN_O: return(GFX_PACMAN_O); - case EL_PACMAN_L: return(GFX_PACMAN_L); - case EL_PACMAN_U: return(GFX_PACMAN_U); - case EL_UNSICHTBAR: return(GFX_UNSICHTBAR); - case EL_ERZ_EDEL: return(GFX_ERZ_EDEL); - case EL_ERZ_DIAM: return(GFX_ERZ_DIAM); - case EL_BIRNE_AUS: return(GFX_BIRNE_AUS); - case EL_BIRNE_EIN: return(GFX_BIRNE_EIN); - case EL_ZEIT_VOLL: return(GFX_ZEIT_VOLL); - case EL_ZEIT_LEER: return(GFX_ZEIT_LEER); - case EL_MAUER_LEBT: return(GFX_MAUER_LEBT); - case EL_EDELSTEIN2: return(GFX_EDELSTEIN2); - case EL_EDELSTEIN3: return(GFX_EDELSTEIN3); - case EL_ERZ_EDEL2: return(GFX_ERZ_EDEL2); - case EL_ERZ_EDEL3: return(GFX_ERZ_EDEL3); - case EL_MAMPFER2: return(GFX_MAMPFER2); - case EL_SIEB2_LEER: return(GFX_SIEB2_LEER); - case EL_SIEB2_VOLL: return(GFX_SIEB2_VOLL); - case EL_SIEB2_TOT: return(GFX_SIEB2_TOT); - case EL_DYNABOMB: return(GFX_DYNABOMB); - case EL_DYNABOMB_NR: return(GFX_DYNABOMB_NR); - case EL_DYNABOMB_SZ: return(GFX_DYNABOMB_SZ); + case EL_LEERRAUM: return -1; + case EL_ERDREICH: return GFX_ERDREICH; + case EL_MAUERWERK: return GFX_MAUERWERK; + case EL_FELSBODEN: return GFX_FELSBODEN; + case EL_FELSBROCKEN: return GFX_FELSBROCKEN; + case EL_SCHLUESSEL: return GFX_SCHLUESSEL; + case EL_EDELSTEIN: return GFX_EDELSTEIN; + case EL_AUSGANG_ZU: return GFX_AUSGANG_ZU; + case EL_AUSGANG_ACT: return GFX_AUSGANG_ACT; + case EL_AUSGANG_AUF: return GFX_AUSGANG_AUF; + case EL_SPIELFIGUR: return GFX_SPIELFIGUR; + case EL_SPIELER1: return GFX_SPIELER1; + case EL_SPIELER2: return GFX_SPIELER2; + case EL_SPIELER3: return GFX_SPIELER3; + case EL_SPIELER4: return GFX_SPIELER4; + case EL_KAEFER: return GFX_KAEFER; + case EL_KAEFER_R: return GFX_KAEFER_R; + case EL_KAEFER_O: return GFX_KAEFER_O; + case EL_KAEFER_L: return GFX_KAEFER_L; + case EL_KAEFER_U: return GFX_KAEFER_U; + case EL_FLIEGER: return GFX_FLIEGER; + case EL_FLIEGER_R: return GFX_FLIEGER_R; + case EL_FLIEGER_O: return GFX_FLIEGER_O; + case EL_FLIEGER_L: return GFX_FLIEGER_L; + case EL_FLIEGER_U: return GFX_FLIEGER_U; + case EL_BUTTERFLY: return GFX_BUTTERFLY; + case EL_BUTTERFLY_R: return GFX_BUTTERFLY_R; + case EL_BUTTERFLY_O: return GFX_BUTTERFLY_O; + case EL_BUTTERFLY_L: return GFX_BUTTERFLY_L; + case EL_BUTTERFLY_U: return GFX_BUTTERFLY_U; + case EL_FIREFLY: return GFX_FIREFLY; + case EL_FIREFLY_R: return GFX_FIREFLY_R; + case EL_FIREFLY_O: return GFX_FIREFLY_O; + case EL_FIREFLY_L: return GFX_FIREFLY_L; + case EL_FIREFLY_U: return GFX_FIREFLY_U; + case EL_MAMPFER: return GFX_MAMPFER; + 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; + case EL_MORAST_VOLL: return GFX_MORAST_VOLL; + case EL_TROPFEN: return GFX_TROPFEN; + case EL_BOMBE: return GFX_BOMBE; + case EL_SIEB_LEER: return GFX_SIEB_LEER; + case EL_SIEB_VOLL: return GFX_SIEB_VOLL; + case EL_SIEB_TOT: return GFX_SIEB_TOT; + case EL_SALZSAEURE: return GFX_SALZSAEURE; + case EL_AMOEBE_TOT: return GFX_AMOEBE_TOT; + case EL_AMOEBE_NASS: return GFX_AMOEBE_NASS; + case EL_AMOEBE_NORM: return GFX_AMOEBE_NORM; + case EL_AMOEBE_VOLL: return GFX_AMOEBE_VOLL; + case EL_AMOEBE_BD: return GFX_AMOEBE_BD; + case EL_AMOEBA2DIAM: return GFX_AMOEBA2DIAM; + case EL_KOKOSNUSS: return GFX_KOKOSNUSS; + case EL_LIFE: return GFX_LIFE; + case EL_LIFE_ASYNC: return GFX_LIFE_ASYNC; + case EL_DYNAMIT: return GFX_DYNAMIT; + case EL_BADEWANNE: return GFX_BADEWANNE; + case EL_BADEWANNE1: return GFX_BADEWANNE1; + case EL_BADEWANNE2: return GFX_BADEWANNE2; + case EL_BADEWANNE3: return GFX_BADEWANNE3; + case EL_BADEWANNE4: return GFX_BADEWANNE4; + case EL_BADEWANNE5: return GFX_BADEWANNE5; + case EL_ABLENK_AUS: return GFX_ABLENK_AUS; + case EL_ABLENK_EIN: return GFX_ABLENK_EIN; + case EL_SCHLUESSEL1: return GFX_SCHLUESSEL1; + case EL_SCHLUESSEL2: return GFX_SCHLUESSEL2; + case EL_SCHLUESSEL3: return GFX_SCHLUESSEL3; + case EL_SCHLUESSEL4: return GFX_SCHLUESSEL4; + case EL_PFORTE1: return GFX_PFORTE1; + case EL_PFORTE2: return GFX_PFORTE2; + case EL_PFORTE3: return GFX_PFORTE3; + case EL_PFORTE4: return GFX_PFORTE4; + case EL_PFORTE1X: return GFX_PFORTE1X; + case EL_PFORTE2X: return GFX_PFORTE2X; + case EL_PFORTE3X: return GFX_PFORTE3X; + case EL_PFORTE4X: return GFX_PFORTE4X; + case EL_DYNAMIT_AUS: return GFX_DYNAMIT_AUS; + case EL_PACMAN: return GFX_PACMAN; + case EL_PACMAN_R: return GFX_PACMAN_R; + case EL_PACMAN_O: return GFX_PACMAN_O; + case EL_PACMAN_L: return GFX_PACMAN_L; + case EL_PACMAN_U: return GFX_PACMAN_U; + case EL_UNSICHTBAR: return GFX_UNSICHTBAR; + case EL_ERZ_EDEL: return GFX_ERZ_EDEL; + case EL_ERZ_DIAM: return GFX_ERZ_DIAM; + case EL_BIRNE_AUS: return GFX_BIRNE_AUS; + case EL_BIRNE_EIN: return GFX_BIRNE_EIN; + case EL_ZEIT_VOLL: return GFX_ZEIT_VOLL; + case EL_ZEIT_LEER: return GFX_ZEIT_LEER; + case EL_MAUER_LEBT: return GFX_MAUER_LEBT; + case EL_MAUER_X: return GFX_MAUER_X; + case EL_MAUER_Y: return GFX_MAUER_Y; + case EL_MAUER_XY: return GFX_MAUER_XY; + case EL_EDELSTEIN_BD: return GFX_EDELSTEIN_BD; + case EL_EDELSTEIN_GELB: return GFX_EDELSTEIN_GELB; + case EL_EDELSTEIN_ROT: return GFX_EDELSTEIN_ROT; + case EL_EDELSTEIN_LILA: return GFX_EDELSTEIN_LILA; + case EL_ERZ_EDEL_BD: return GFX_ERZ_EDEL_BD; + case EL_ERZ_EDEL_GELB: return GFX_ERZ_EDEL_GELB; + case EL_ERZ_EDEL_ROT: return GFX_ERZ_EDEL_ROT; + case EL_ERZ_EDEL_LILA: return GFX_ERZ_EDEL_LILA; + case EL_MAMPFER2: return GFX_MAMPFER2; + case EL_SIEB2_LEER: return GFX_SIEB2_LEER; + case EL_SIEB2_VOLL: return GFX_SIEB2_VOLL; + case EL_SIEB2_TOT: return GFX_SIEB2_TOT; + case EL_DYNABOMB: return GFX_DYNABOMB; + case EL_DYNABOMB_NR: return GFX_DYNABOMB_NR; + case EL_DYNABOMB_SZ: return GFX_DYNABOMB_SZ; + case EL_DYNABOMB_XL: return GFX_DYNABOMB_XL; + 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)) - return(GFX_CHAR_START + (element-EL_CHAR_START)); + return GFX_CHAR_START + (element - EL_CHAR_START); else - return(-1); + return -1; } } }