X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.c;h=b37667c1f4d334223400ebbfe87ad8d65c08cbf4;hp=a2b46c8604fd3b8ac0fed0743e0a96dde455701e;hb=3dc317d10b44cc6b75db10ac194966ad8114d390;hpb=e8bffba310b8b33e441a952335273665c07eb4a5 diff --git a/src/tools.c b/src/tools.c index a2b46c86..b37667c1 100644 --- a/src/tools.c +++ b/src/tools.c @@ -260,22 +260,21 @@ void FadeToFront() void ClearWindow() { - XFillRectangle(display,backbuffer,gc, - REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE); + XFillRectangle(display, backbuffer, gc, + REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE); - if (setup.soft_scrolling && game_status==PLAYING) + if (setup.soft_scrolling && game_status == PLAYING) { - XFillRectangle(display,fieldbuffer,gc, - 0,0, FXSIZE,FYSIZE); + XFillRectangle(display, fieldbuffer, gc, 0, 0, FXSIZE, FYSIZE); SetDrawtoField(DRAW_BUFFERED); } else SetDrawtoField(DRAW_BACKBUFFER); - if (setup.direct_draw && game_status==PLAYING) + if (setup.direct_draw && game_status == PLAYING) { - XFillRectangle(display,window,gc, - REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE); + XFillRectangle(display, window, gc, + REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE); SetDrawtoField(DRAW_DIRECT); } @@ -297,40 +296,38 @@ void DrawTextExt(Drawable d, GC gc, int x, int y, int font_width, font_height, font_start; int font_pixmap; - if (font!=FS_SMALL && font!=FS_BIG) + if (font != FS_SMALL && font != FS_BIG) font = FS_SMALL; - if (font_colorFC_SPECIAL2) + if (font_color < FC_RED || font_color > FC_SPECIAL2) font_color = FC_RED; - font_width = - (font==FS_BIG ? FONT1_XSIZE : - font_color='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; } @@ -364,7 +361,7 @@ void DrawPlayer(struct PlayerInfo *player) int graphic, phase; if (!player->active || player->gone || - !IN_SCR_FIELD(SCREENX(last_jx),SCREENY(last_jy))) + !IN_SCR_FIELD(SCREENX(last_jx), SCREENY(last_jy))) return; #if DEBUG @@ -386,29 +383,29 @@ void DrawPlayer(struct PlayerInfo *player) { if (Store[last_jx][last_jy]) { - DrawLevelElement(last_jx,last_jy, Store[last_jx][last_jy]); - DrawLevelFieldThruMask(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); + DrawDynamite(last_jx, last_jy); else - DrawLevelField(last_jx,last_jy); + DrawLevelField(last_jx, last_jy); - if (player->Pushing && IN_SCR_FIELD(SCREENX(next_jx),SCREENY(next_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); + DrawLevelElement(next_jx, next_jy, EL_SOKOBAN_FELD_LEER); else - DrawLevelElement(next_jx,next_jy, EL_LEERRAUM); + DrawLevelElement(next_jx, next_jy, EL_LEERRAUM); } else - DrawLevelField(next_jx,next_jy); + DrawLevelField(next_jx, next_jy); } } - if (!IN_SCR_FIELD(sx,sy)) + if (!IN_SCR_FIELD(sx, sy)) return; if (setup.direct_draw) @@ -417,17 +414,17 @@ void DrawPlayer(struct PlayerInfo *player) /* draw things behind the player, if needed */ if (Store[jx][jy]) - DrawLevelElement(jx,jy, Store[jx][jy]); + DrawLevelElement(jx, jy, Store[jx][jy]); else if (element != EL_DYNAMIT && element != EL_DYNABOMB) - DrawLevelField(jx,jy); + DrawLevelField(jx, jy); /* draw player himself */ - if (player->MovDir==MV_LEFT) + if (player->MovDir == MV_LEFT) graphic = (player->Pushing ? GFX_SPIELER1_PUSH_LEFT : GFX_SPIELER1_LEFT); - else if (player->MovDir==MV_RIGHT) + else if (player->MovDir == MV_RIGHT) graphic = (player->Pushing ? GFX_SPIELER1_PUSH_RIGHT : GFX_SPIELER1_RIGHT); - else if (player->MovDir==MV_UP) + else if (player->MovDir == MV_UP) graphic = GFX_SPIELER1_UP; else /* MV_DOWN || MV_NO_MOVING */ graphic = GFX_SPIELER1_DOWN; @@ -446,7 +443,7 @@ void DrawPlayer(struct PlayerInfo *player) if (!setup.soft_scrolling && ScreenMovPos) sxx = syy = 0; - DrawGraphicShiftedThruMask(sx,sy, sxx,syy, graphic, NO_CUTTING); + DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, NO_CUTTING); if (player->Pushing && player->GfxPos) { @@ -454,7 +451,8 @@ void DrawPlayer(struct PlayerInfo *player) 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); + DrawGraphicShiftedThruMask(px, py, sxx, syy, GFX_SOKOBAN_OBJEKT, + NO_CUTTING); else { int element = Feld[next_jx][next_jy]; @@ -470,7 +468,7 @@ void DrawPlayer(struct PlayerInfo *player) graphic += (phase+4)%4; } - DrawGraphicShifted(px,py, sxx,syy, graphic, NO_CUTTING, NO_MASKING); + DrawGraphicShifted(px, py, sxx, syy, graphic, NO_CUTTING, NO_MASKING); } } @@ -482,37 +480,38 @@ void DrawPlayer(struct PlayerInfo *player) if (element == EL_DYNAMIT) { - if ((phase = (96-MovDelay[jx][jy])/12) > 6) + if ((phase = (96 - MovDelay[jx][jy]) / 12) > 6) phase = 6; } else { - if ((phase = ((96-MovDelay[jx][jy])/6) % 8) > 3) - phase = 7-phase; + if ((phase = ((96 - MovDelay[jx][jy]) / 6) % 8) > 3) + phase = 7 - phase; } - DrawGraphicThruMask(sx,sy, graphic + phase); + DrawGraphicThruMask(sx, sy, graphic + phase); } - if ((last_jx != jx || last_jy != jy) && Feld[last_jx][last_jy]==EL_EXPLODING) + 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)); + 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 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); + XCopyArea(display, drawto_field, window, gc, + dest_x, dest_y, x_size, y_size, dest_x, dest_y); SetDrawtoField(DRAW_DIRECT); } @@ -525,7 +524,7 @@ static int getGraphicAnimationPhase(int frames, int delay, int mode) if (mode == ANIM_OSCILLATE) { - int max_anim_frames = frames*2 - 2; + int max_anim_frames = 2 * frames - 2; phase = (FrameCounter % (delay * max_anim_frames)) / delay; phase = (phase < frames ? phase : max_anim_frames - phase); } @@ -543,25 +542,25 @@ void DrawGraphicAnimationExt(int x, int y, int graphic, { int phase = getGraphicAnimationPhase(frames, delay, mode); - if (!(FrameCounter % delay) && IN_SCR_FIELD(SCREENX(x),SCREENY(y))) + if (!(FrameCounter % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) { if (mask_mode == USE_MASKING) - DrawGraphicThruMask(SCREENX(x),SCREENY(y), graphic + phase); + DrawGraphicThruMask(SCREENX(x), SCREENY(y), graphic + phase); else - DrawGraphic(SCREENX(x),SCREENY(y), graphic + phase); + DrawGraphic(SCREENX(x), SCREENY(y), graphic + phase); } } void DrawGraphicAnimation(int x, int y, int graphic, int frames, int delay, int mode) { - DrawGraphicAnimationExt(x,y, graphic, frames,delay,mode, NO_MASKING); + DrawGraphicAnimationExt(x, y, graphic, frames, delay, mode, NO_MASKING); } void DrawGraphicAnimationThruMask(int x, int y, int graphic, int frames, int delay, int mode) { - DrawGraphicAnimationExt(x,y, graphic, frames,delay,mode, USE_MASKING); + DrawGraphicAnimationExt(x, y, graphic, frames, delay, mode, USE_MASKING); } void DrawGraphic(int x, int y, int graphic) @@ -575,7 +574,7 @@ void DrawGraphic(int x, int y, int graphic) } #endif - DrawGraphicExt(drawto_field, gc, FX+x*TILEX, FY+y*TILEY, graphic); + DrawGraphicExt(drawto_field, gc, FX + x*TILEX, FY + y*TILEY, graphic); MarkTileDirty(x,y); } @@ -584,30 +583,30 @@ 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, + XCopyArea(display, pix[PIX_BACK], d, gc, SX + (graphic % GFX_PER_LINE) * TILEX, SY + (graphic / GFX_PER_LINE) * TILEY, - TILEX,TILEY, x,y); + 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, + XCopyArea(display, pix[PIX_HEROES], d, gc, (graphic % HEROES_PER_LINE) * TILEX, (graphic / HEROES_PER_LINE) * TILEY, - TILEX,TILEY, x,y); + 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, + 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); + TILEX, TILEY, x, y); } else - XFillRectangle(display,d,gc, x,y, TILEX,TILEY); + XFillRectangle(display, d, gc, x, y, TILEX, TILEY); } void DrawGraphicThruMask(int x, int y, int graphic) @@ -621,7 +620,7 @@ void DrawGraphicThruMask(int x, int y, int graphic) } #endif - DrawGraphicThruMaskExt(drawto_field, FX+x*TILEX, FY+y*TILEY, graphic); + DrawGraphicThruMaskExt(drawto_field, FX + x*TILEX, FY + y*TILEY, graphic); MarkTileDirty(x,y); } @@ -637,16 +636,16 @@ void DrawGraphicThruMaskExt(Drawable d, int dest_x, int dest_y, int graphic) 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; + 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; + src_x = (graphic % HEROES_PER_LINE) * TILEX; + src_y = (graphic / HEROES_PER_LINE) * TILEY; } else { @@ -657,9 +656,9 @@ void DrawGraphicThruMaskExt(Drawable d, int dest_x, int dest_y, int graphic) if (tile_clipmask[tile] != None) { XSetClipMask(display, tile_clip_gc, tile_clipmask[tile]); - XSetClipOrigin(display, tile_clip_gc, dest_x,dest_y); + 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); + src_x, src_y, TILEX, TILEY, dest_x, dest_y); } else { @@ -669,13 +668,13 @@ void DrawGraphicThruMaskExt(Drawable d, int dest_x, int dest_y, int graphic) 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); + 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); + DrawMiniGraphicExt(drawto,gc, SX + x*MINI_TILEX, SY + y*MINI_TILEY, graphic); MarkTileDirty(x/2, y/2); } @@ -684,22 +683,22 @@ 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); + 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); + 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); + XFillRectangle(display, d, gc, x, y, MINI_TILEX, MINI_TILEY); } void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, @@ -707,14 +706,14 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, { int width = TILEX, height = TILEY; int cx = 0, cy = 0; - int src_x,src_y, dest_x,dest_y; + int src_x, src_y, dest_x, dest_y; int tile = graphic; Pixmap src_pixmap; GC drawing_gc; if (graphic < 0) { - DrawGraphic(x,y,graphic); + DrawGraphic(x, y, graphic); return; } @@ -733,13 +732,13 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, width = -dx; dx = TILEX + dx; } - else if (x==BX1 && 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; } - else if (x==BX2 && dx>0) /* Element verläßt rechts das Bild */ + else if (x==BX2 && dx > 0) /* Element verläßt rechts das Bild */ width -= dx; else if (dx) /* allg. Bewegung in x-Richtung */ MarkTileDirty(x + SIGN(dx), y); @@ -760,23 +759,23 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, height = -dy; dy = TILEY + dy; } - else if (y==BY1 && 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; } - else if (dy > 0 && cut_mode==CUT_ABOVE) + else if (dy > 0 && cut_mode == CUT_ABOVE) { if (y == BY2) /* Element unterhalb des Bildes */ return; height = dy; - cy = TILEY-dy; + cy = TILEY - dy; dy = TILEY; MarkTileDirty(x, y + 1); } /* Element verläßt unten das Bild */ - else if (dy > 0 && (y == BY2 || cut_mode==CUT_BELOW)) + else if (dy > 0 && (y == BY2 || cut_mode == CUT_BELOW)) height -= dy; else if (dy) /* allg. Bewegung in y-Richtung */ MarkTileDirty(x, y + SIGN(dy)); @@ -787,20 +786,20 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, 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; + 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; + 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; + dest_x = FX + x * TILEX + dx; + dest_y = FY + y * TILEY + dy; #if DEBUG if (!IN_SCR_FIELD(x,y)) @@ -816,9 +815,9 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, if (tile_clipmask[tile] != None) { XSetClipMask(display, tile_clip_gc, tile_clipmask[tile]); - XSetClipOrigin(display, tile_clip_gc, dest_x,dest_y); + 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); + src_x, src_y, TILEX, TILEY, dest_x, dest_y); } else { @@ -826,14 +825,14 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, printf("DrawGraphicShifted(): tile '%d' needs clipping!\n", tile); #endif - XSetClipOrigin(display, drawing_gc, dest_x-src_x, dest_y-src_y); + 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); + 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); + src_x, src_y, width, height, dest_x, dest_y); MarkTileDirty(x,y); } @@ -849,11 +848,11 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element, { int ux = LEVELX(x), uy = LEVELY(y); int graphic = el2gfx(element); - int phase4 = ABS(MovPos[ux][uy])/(TILEX/4); + int phase4 = ABS(MovPos[ux][uy]) / (TILEX / 4); int phase = phase4 / 2; int dir = MovDir[ux][uy]; - if (element==EL_PACMAN || element==EL_KAEFER || element==EL_FLIEGER) + if (element == EL_PACMAN || element == EL_KAEFER || element == EL_FLIEGER) { graphic += 4*!phase; @@ -864,61 +863,61 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element, else if (dir == MV_DOWN) graphic += 3; } - else if (element==EL_MAULWURF || element==EL_PINGUIN || - element==EL_SCHWEIN || element==EL_DRACHE) - { - 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 if (element == EL_MAULWURF || element == EL_PINGUIN || + element == EL_SCHWEIN || element == EL_DRACHE) + { + 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 = (element==EL_MAULWURF ? GFX_MAULWURF_DOWN : - element==EL_PINGUIN ? GFX_PINGUIN_DOWN : - element==EL_SCHWEIN ? GFX_SCHWEIN_DOWN : GFX_DRACHE_DOWN); + 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) + else if (element == EL_SONDE) { graphic = GFX_SONDE_START + getGraphicAnimationPhase(8, 2, ANIM_NORMAL); } - else if (element==EL_SALZSAEURE) + else if (element == EL_SALZSAEURE) { graphic = GFX_GEBLUBBER + getGraphicAnimationPhase(4, 10, ANIM_NORMAL); } - else if (element==EL_BUTTERFLY || element==EL_FIREFLY) + else if (element == EL_BUTTERFLY || element == EL_FIREFLY) { graphic += !phase; } - else if ((element==EL_FELSBROCKEN || IS_GEM(element)) && !cut_mode) + else if ((element == EL_FELSBROCKEN || IS_GEM(element)) && !cut_mode) { - graphic += phase * (element==EL_FELSBROCKEN ? 2 : 1); + 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) + else if ((element == EL_SIEB_LEER || element == EL_SIEB2_LEER || + element == EL_SIEB_VOLL || element == EL_SIEB2_VOLL) && SiebAktiv) { - graphic += 3-(SiebAktiv%8)/2; + 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) { 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) @@ -930,46 +929,46 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element, } if (dx || dy) - DrawGraphicShifted(x,y, dx,dy, graphic, cut_mode, mask_mode); + DrawGraphicShifted(x, y, dx, dy, graphic, cut_mode, mask_mode); else if (mask_mode == USE_MASKING) - DrawGraphicThruMask(x,y, graphic); + 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, + 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); + 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); + 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); + 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); + 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); + DrawLevelElementExt(x, y, 0, 0, Feld[x][y], NO_CUTTING, USE_MASKING); } void ErdreichAnbroeckeln(int x, int y) @@ -980,43 +979,43 @@ void ErdreichAnbroeckeln(int x, int y) 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) + 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 @@ -1024,39 +1023,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, FX+x*TILEX+cx,FY+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); } - MarkTileDirty(x,y); + 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]; + 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 @@ -1067,26 +1066,26 @@ 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, FX+xx*TILEX+cx,FY+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); - MarkTileDirty(xx,yy); + MarkTileDirty(xx, yy); } } } void DrawScreenElement(int x, int y, int element) { - DrawScreenElementExt(x,y, 0,0, element, NO_CUTTING, NO_MASKING); - 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(SCREENX(x),SCREENY(y))) - DrawScreenElement(SCREENX(x),SCREENY(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) @@ -1094,61 +1093,62 @@ void DrawScreenField(int x, int 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); + 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) + 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) - DrawScreenElementShifted(x,y, 0,0, Store[ux][uy], 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) - DrawScreenElementShifted(x,y, MovPos[ux][uy],0, element, NO_CUTTING); + DrawScreenElementShifted(x, y, MovPos[ux][uy], 0, element, NO_CUTTING); else - DrawScreenElementShifted(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); + 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; boolean cut_mode = NO_CUTTING; - Blocked2Moving(ux,uy,&oldx,&oldy); + Blocked2Moving(ux, uy, &oldx, &oldy); sx = SCREENX(oldx); sy = SCREENY(oldy); - horiz_move = (MovDir[oldx][oldy]==MV_LEFT || MovDir[oldx][oldy]==MV_RIGHT); + 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) + 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) @@ -1157,30 +1157,30 @@ void DrawScreenField(int x, int y) 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(SCREENX(x),SCREENY(y))) - DrawScreenField(SCREENX(x),SCREENY(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(SCREENX(newx),SCREENY(newy))) - DrawScreenField(SCREENX(newx),SCREENY(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(SCREENX(oldx),SCREENY(oldy))) - DrawScreenField(SCREENX(oldx),SCREENY(oldy)); + Blocked2Moving(x, y, &oldx, &oldy); + if (IN_SCR_FIELD(SCREENX(oldx), SCREENY(oldy))) + DrawScreenField(SCREENX(oldx), SCREENY(oldy)); } } @@ -1190,39 +1190,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); + DrawMiniGraphic(x, y, graphic); } void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y) { 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); + 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(sx,sy,Feld[x][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() @@ -1233,12 +1233,11 @@ void DrawLevel() for(x=BX1; x<=BX2; x++) for(y=BY1; y<=BY2; y++) - DrawScreenField(x,y); + DrawScreenField(x, y); if (setup.soft_scrolling) - XCopyArea(display,fieldbuffer,backbuffer,gc, - FX,FY, SXSIZE,SYSIZE, - SX,SY); + XCopyArea(display, fieldbuffer, backbuffer, gc, + FX, FY, SXSIZE, SYSIZE, SX, SY); redraw_mask |= (REDRAW_FIELD | REDRAW_FROM_BACKBUFFER); } @@ -1249,9 +1248,9 @@ void DrawMiniLevel(int scroll_x, int scroll_y) ClearWindow(); - for(x=0;x<2*SCR_FIELDX;x++) - for(y=0;y<2*SCR_FIELDY;y++) - DrawMiniElementOrWall(x,y,scroll_x,scroll_y); + for(x=0; x<2*SCR_FIELDX; x++) + for(y=0; y<2*SCR_FIELDY; y++) + DrawMiniElementOrWall(x, y, scroll_x, scroll_y); redraw_mask |= REDRAW_FIELD; } @@ -1260,33 +1259,33 @@ void DrawMicroLevel(int xpos, int ypos) { int x,y; - XFillRectangle(display,drawto,gc, - xpos-MICRO_TILEX,ypos-MICRO_TILEY, - MICRO_TILEX*(STD_LEV_FIELDX+2), - MICRO_TILEY*(STD_LEV_FIELDY+2)); + XFillRectangle(display, drawto, gc, + xpos - MICRO_TILEX, ypos - MICRO_TILEY, + MICRO_TILEX * (STD_LEV_FIELDX + 2), + MICRO_TILEY * (STD_LEV_FIELDY + 2)); if (lev_fieldx < STD_LEV_FIELDX) xpos += (STD_LEV_FIELDX - lev_fieldx)/2 * MICRO_TILEX; if (lev_fieldy < STD_LEV_FIELDY) ypos += (STD_LEV_FIELDY - lev_fieldy)/2 * MICRO_TILEY; - for(x=-1;x<=STD_LEV_FIELDX;x++) - for(y=-1;y<=STD_LEV_FIELDY;y++) - if (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; @@ -1294,19 +1293,19 @@ void DrawMicroLevel(int xpos, int ypos) 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; } 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; /* pause network game while waiting for request to answer */ @@ -1320,25 +1319,26 @@ boolean Request(char *text, unsigned int req_state) 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) @@ -1347,11 +1347,12 @@ boolean Request(char *text, unsigned int req_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)); + 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) @@ -1528,9 +1529,9 @@ unsigned int OpenDoor(unsigned int 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; } @@ -1543,10 +1544,10 @@ unsigned int CloseDoor(unsigned int door_state) { unsigned int new_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); + 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); @@ -1569,13 +1570,13 @@ unsigned int MoveDoor(unsigned int door_state) if (door_state == DOOR_GET_STATE) return(door1 | door2); - if (door1==DOOR_OPEN_1 && door_state & DOOR_OPEN_1) + 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 (setup.quick_doors) @@ -1588,7 +1589,7 @@ unsigned int MoveDoor(unsigned int door_state) 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); @@ -1599,73 +1600,74 @@ unsigned int MoveDoor(unsigned int door_state) 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; } @@ -1692,142 +1694,142 @@ 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)); + 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_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); + 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; } } }