/***********************************************************
* 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 *
***********************************************************/
if (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD)
redraw_mask |= REDRAW_FIELD;
- if (redraw_mask & REDRAW_FIELD || ScreenMovPos)
+ if (redraw_mask & REDRAW_FIELD || ScreenGfxPos)
redraw_mask &= ~REDRAW_TILES;
if (!redraw_mask)
if (soft_scrolling_on)
{
- fx += (PlayerMovDir & (MV_LEFT|MV_RIGHT) ? ScreenMovPos : 0);
- fy += (PlayerMovDir & (MV_UP|MV_DOWN) ? ScreenMovPos : 0);
+ fx += (ScreenMovDir & (MV_LEFT|MV_RIGHT) ? ScreenGfxPos : 0);
+ fy += (ScreenMovDir & (MV_UP|MV_DOWN) ? ScreenGfxPos : 0);
}
XCopyArea(display,buffer,window,gc,
void FadeToFront()
{
/*
- long fading_delay = 300000;
+ long fading_delay = 300;
if (fading_on && (redraw_mask & REDRAW_FIELD))
{
REAL_SX,REAL_SY+i, FULL_SXSIZE,1, REAL_SX,REAL_SY+i);
}
XFlush(display);
- Delay(10000);
+ Delay(10);
}
*/
}
}
-void DrawPlayerField()
+void DrawAllPlayers()
{
- int x = JX, y = JY;
- int sx = SCROLLX(x), sy = SCROLLY(y);
+ int i;
- int sxx = 0, syy = 0;
+ for(i=0; i<MAX_PLAYERS; i++)
+ if (stored_player[i].active)
+ DrawPlayer(&stored_player[i]);
+}
+
+void DrawPlayerField(int x, int y)
+{
+ if (!IS_PLAYER(x,y))
+ return;
+
+ DrawPlayer(PLAYERINFO(x,y));
+}
- int element = Feld[x][y];
+void DrawPlayer(struct PlayerInfo *player)
+{
+ int jx = player->jx, 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 (PlayerGone)
+ if (!player->active || player->gone || !IN_SCR_FIELD(sx,sy))
return;
#if DEBUG
- if (!IN_LEV_FIELD(x,y) || !IN_SCR_FIELD(sx,sy))
+ if (!IN_LEV_FIELD(jx,jy) || !IN_SCR_FIELD(sx,sy))
{
- printf("DrawPlayerField(): x = %d, y = %d\n",x,y);
+ 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;
/* draw things in the field the player is leaving, if needed */
- if (lastJX != JX || lastJY != JY)
+ if (last_jx != jx || last_jy != jy)
{
- if (Store[lastJX][lastJY])
+ if (Store[last_jx][last_jy])
{
- DrawLevelElement(lastJX,lastJY, Store[lastJX][lastJY]);
- DrawLevelElementThruMask(lastJX,lastJY, Feld[lastJX][lastJY]);
+ DrawLevelElement(last_jx,last_jy, Store[last_jx][last_jy]);
+ DrawLevelElementThruMask(last_jx,last_jy, Feld[last_jx][last_jy]);
}
- else if (Feld[lastJX][lastJY] == EL_DYNAMIT)
- DrawDynamite(lastJX,lastJY);
+ else if (Feld[last_jx][last_jy] == EL_DYNAMIT)
+ DrawDynamite(last_jx,last_jy);
else
- DrawLevelField(lastJX,lastJY);
+ DrawLevelField(last_jx,last_jy);
- if (PlayerPushing)
+ if (player->Pushing)
{
- int nextJX = JX + (JX - lastJX);
- int nextJY = JY + (JY - lastJY);
-
- if (PlayerGfxPos)
+ if (player->GfxPos)
{
- if (Feld[nextJX][nextJY] == EL_SOKOBAN_FELD_VOLL)
- DrawLevelElement(nextJX,nextJY, EL_SOKOBAN_FELD_LEER);
+ if (Feld[next_jx][next_jy] == EL_SOKOBAN_FELD_VOLL)
+ DrawLevelElement(next_jx,next_jy, EL_SOKOBAN_FELD_LEER);
else
- DrawLevelElement(nextJX,nextJY, EL_LEERRAUM);
+ DrawLevelElement(next_jx,next_jy, EL_LEERRAUM);
}
else
- DrawLevelField(nextJX,nextJY);
+ DrawLevelField(next_jx,next_jy);
}
}
/* draw things behind the player, if needed */
- if (Store[x][y])
- DrawLevelElement(x,y, Store[x][y]);
+ if (Store[jx][jy])
+ DrawLevelElement(jx,jy, Store[jx][jy]);
else if (element != EL_DYNAMIT && element != EL_DYNABOMB)
- DrawLevelField(x,y);
+ DrawLevelField(jx,jy);
/* draw player himself */
- if (PlayerMovDir==MV_LEFT)
- graphic = (PlayerPushing ? GFX_SPIELER_PUSH_LEFT : GFX_SPIELER_LEFT);
- else if (PlayerMovDir==MV_RIGHT)
- graphic = (PlayerPushing ? GFX_SPIELER_PUSH_RIGHT : GFX_SPIELER_RIGHT);
- else if (PlayerMovDir==MV_UP)
- graphic = GFX_SPIELER_UP;
+ 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_SPIELER_DOWN;
+ graphic = GFX_SPIELER1_DOWN;
- graphic += PlayerFrame;
+ graphic += player->nr * 3*HEROES_PER_LINE;
+ graphic += player->Frame;
- if (PlayerGfxPos)
+ if (player->GfxPos)
{
- if (PlayerMovDir == MV_LEFT || PlayerMovDir == MV_RIGHT)
- sxx = PlayerGfxPos;
+ if (player->MovDir == MV_LEFT || player->MovDir == MV_RIGHT)
+ sxx = player->GfxPos;
else
- syy = PlayerGfxPos;
+ syy = player->GfxPos;
}
if (!soft_scrolling_on && ScreenMovPos)
DrawGraphicShiftedThruMask(sx,sy, sxx,syy, graphic, NO_CUTTING);
- if (PlayerPushing && PlayerGfxPos)
+ if (player->Pushing && player->GfxPos)
{
- int nextJX = JX + (JX - lastJX);
- int nextJY = JY + (JY - lastJY);
- int px = SCROLLX(nextJX), py = SCROLLY(nextJY);
+ int px = SCREENX(next_jx), py = SCREENY(next_jy);
- if (Feld[JX][JY] == EL_SOKOBAN_FELD_LEER ||
- Feld[nextJX][nextJY] == EL_SOKOBAN_FELD_VOLL)
+ 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[nextJX][nextJY];
+ int element = Feld[next_jx][next_jy];
int graphic = el2gfx(element);
if (element == EL_FELSBROCKEN && sxx)
{
- int phase = (PlayerGfxPos / (TILEX/4));
+ int phase = (player->GfxPos / (TILEX/4));
- if (PlayerMovDir == MV_LEFT)
+ if (player->MovDir == MV_LEFT)
graphic += phase;
else
graphic += (phase+4)%4;
if (element == EL_DYNAMIT)
{
- if ((phase = (96-MovDelay[x][y])/12) > 6)
+ if ((phase = (96-MovDelay[jx][jy])/12) > 6)
phase = 6;
}
else
{
- if ((phase = ((96-MovDelay[x][y])/6) % 8) > 3)
+ if ((phase = ((96-MovDelay[jx][jy])/6) % 8) > 3)
phase = 7-phase;
}
if (direct_draw_on)
{
- int dest_x = SX+SCROLLX(x)*TILEX;
- int dest_y = SY+SCROLLY(y)*TILEY;
- int x_size = TILEX;
- int y_size = TILEY;
-
- if (!ScreenMovPos)
- {
- dest_x = SX + SCROLLX(MIN(JX,lastJX))*TILEX;
- dest_y = SY + SCROLLY(MIN(JY,lastJY))*TILEY;
- x_size = TILEX * (1 + ABS(JX - lastJX));
- y_size = TILEY * (1 + ABS(JY - lastJY));
- }
+ 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);
return(phase);
}
+void DrawGraphicAnimationExt(int x, int y, int graphic,
+ int frames, int delay, int mode, int mask_mode)
+{
+ int phase = getGraphicAnimationPhase(frames, delay, mode);
+
+ if (!(FrameCounter % delay) && IN_SCR_FIELD(SCREENX(x),SCREENY(y)))
+ {
+ if (mask_mode == USE_MASKING)
+ DrawGraphicThruMask(SCREENX(x),SCREENY(y), graphic + phase);
+ else
+ DrawGraphic(SCREENX(x),SCREENY(y), graphic + phase);
+ }
+}
+
void DrawGraphicAnimation(int x, int y, int graphic,
int frames, int delay, int mode)
{
- int phase = getGraphicAnimationPhase(frames, delay, mode);
+ DrawGraphicAnimationExt(x,y, graphic, frames,delay,mode, NO_MASKING);
+}
- if (!(FrameCounter % delay) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
- DrawGraphic(SCROLLX(x),SCROLLY(y), graphic + phase);
+void DrawGraphicAnimationThruMask(int x, int y, int graphic,
+ int frames, int delay, int mode)
+{
+ DrawGraphicAnimationExt(x,y, graphic, frames,delay,mode, USE_MASKING);
}
void DrawGraphic(int x, int y, int graphic)
}
#endif
- DrawGraphicExt(drawto_field, gc, x, y, graphic);
+ DrawGraphicExt(drawto_field, gc, FX+x*TILEX, FY+y*TILEY, graphic);
MarkTileDirty(x,y);
}
void DrawGraphicExt(Drawable d, GC gc, int x, int y, int graphic)
-{
- DrawGraphicExtHiRes(d, gc, FX+x*TILEX, FY+y*TILEY, graphic);
-}
-
-void DrawGraphicExtHiRes(Drawable d, GC gc, int x, int y, int graphic)
{
if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
{
graphic -= GFX_START_ROCKSSCREEN;
XCopyArea(display,pix[PIX_BACK],d,gc,
- SX+(graphic % GFX_PER_LINE)*TILEX,
- SY+(graphic / GFX_PER_LINE)*TILEY,
+ SX + (graphic % GFX_PER_LINE) * TILEX,
+ SY + (graphic / GFX_PER_LINE) * TILEY,
TILEX,TILEY, x,y);
}
else 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,
+ (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*TILEY*FONT_LINES_PER_FONT,
+ (graphic % FONT_CHARS_PER_LINE) * TILEX,
+ (graphic / FONT_CHARS_PER_LINE) * TILEY +
+ FC_SPECIAL1 * FONT_LINES_PER_FONT * TILEY,
TILEX,TILEY, x,y);
}
else
void DrawGraphicThruMask(int x, int y, int graphic)
{
int src_x,src_y, dest_x,dest_y;
+ int tile = graphic;
+ Pixmap src_pixmap;
+ GC drawing_gc;
#if DEBUG
if (!IN_SCR_FIELD(x,y))
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;
- dest_x = FX+x*TILEX;
- dest_y = FY+y*TILEY;
-
- XSetClipOrigin(display,clip_gc[PIX_BACK],dest_x-src_x,dest_y-src_y);
- XCopyArea(display,pix[PIX_BACK],drawto_field,clip_gc[PIX_BACK],
- src_x,src_y, TILEX,TILEY, dest_x,dest_y);
}
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;
- dest_x = FX+x*TILEX;
- dest_y = FY+y*TILEY;
-
- XSetClipOrigin(display,clip_gc[PIX_HEROES],dest_x-src_x,dest_y-src_y);
- XCopyArea(display,pix[PIX_HEROES],drawto_field,clip_gc[PIX_HEROES],
- src_x,src_y, TILEX,TILEY, dest_x,dest_y);
}
else
{
return;
}
- MarkTileDirty(x,y);
-}
+ dest_x = FX + x*TILEX;
+ dest_y = FY + y*TILEY;
-void DrawScreenElementThruMask(int x, int y, int element)
-{
- DrawGraphicThruMask(x,y,el2gfx(element));
-}
+ 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
-void DrawLevelElementThruMask(int x, int y, int element)
-{
- if (IN_LEV_FIELD(x,y) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
- DrawScreenElementThruMask(SCROLLX(x),SCROLLY(y),element);
+ 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);
+ }
+
+ MarkTileDirty(x,y);
}
void DrawMiniGraphic(int x, int y, int graphic)
{
- DrawMiniGraphicExt(drawto, gc, x, y, 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)
-{
- DrawMiniGraphicExtHiRes(d,gc, SX+x*MINI_TILEX,SY+y*MINI_TILEY, graphic);
-}
-
-void DrawMiniGraphicExtHiRes(Drawable d, GC gc, int x, int y, int graphic)
{
if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
{
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 >= 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;
- dest_x = FX+x*TILEX+dx;
- dest_y = FY+y*TILEY+dy;
-
- if (mask_mode == USE_MASKING)
- {
- 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, width,height, dest_x,dest_y);
- }
- else
- XCopyArea(display,pix[PIX_BACK],drawto_field,gc,
- src_x,src_y, width,height, dest_x,dest_y);
}
else if (graphic >= GFX_START_ROCKSHEROES && graphic <= GFX_END_ROCKSHEROES)
{
+ src_pixmap = pix[PIX_HEROES];
+ drawing_gc = clip_gc[PIX_HEROES];
graphic -= GFX_START_ROCKSHEROES;
src_x = (graphic % HEROES_PER_LINE)*TILEX+cx;
src_y = (graphic / HEROES_PER_LINE)*TILEY+cy;
- dest_x = FX+x*TILEX+dx;
- dest_y = FY+y*TILEY+dy;
-
- if (mask_mode == USE_MASKING)
- {
- XSetClipOrigin(display,clip_gc[PIX_HEROES],dest_x-src_x,dest_y-src_y);
- XCopyArea(display,pix[PIX_HEROES],drawto_field,clip_gc[PIX_HEROES],
- src_x,src_y, width,height, dest_x,dest_y);
- }
- else
- XCopyArea(display,pix[PIX_HEROES],drawto_field,gc,
- src_x,src_y, width,height, dest_x,dest_y);
}
+ dest_x = FX + x*TILEX + dx;
+ dest_y = FY + y*TILEY + dy;
+
#if DEBUG
if (!IN_SCR_FIELD(x,y))
{
}
#endif
+ if (mask_mode == USE_MASKING)
+ {
+ if (tile_clipmask[tile] != None)
+ {
+ XSetClipMask(display, tile_clip_gc, tile_clipmask[tile]);
+ XSetClipOrigin(display, tile_clip_gc, dest_x,dest_y);
+ XCopyArea(display, src_pixmap, drawto_field, tile_clip_gc,
+ src_x,src_y, TILEX,TILEY, dest_x,dest_y);
+ }
+ else
+ {
+#if DEBUG
+ printf("DrawGraphicShifted(): tile '%d' needs clipping!\n", tile);
+#endif
+
+ XSetClipOrigin(display, drawing_gc, dest_x-src_x, dest_y-src_y);
+ XCopyArea(display, src_pixmap, drawto_field, drawing_gc,
+ src_x,src_y, width,height, dest_x,dest_y);
+ }
+ }
+ else
+ XCopyArea(display, src_pixmap, drawto_field, gc,
+ src_x,src_y, width,height, dest_x,dest_y);
+
MarkTileDirty(x,y);
}
DrawGraphicShifted(x,y, dx,dy, graphic, cut_mode, USE_MASKING);
}
-void DrawScreenElementShifted(int x, int y, int dx, int dy, int element,
- int cut_mode)
+void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
+ int cut_mode, int mask_mode)
{
- int ux = UNSCROLLX(x), uy = UNSCROLLY(y);
+ int ux = LEVELX(x), uy = LEVELY(y);
int graphic = el2gfx(element);
int phase4 = ABS(MovPos[ux][uy])/(TILEX/4);
int phase = phase4 / 2;
{
graphic = GFX_SONDE_START + getGraphicAnimationPhase(8, 2, ANIM_NORMAL);
}
+ else if (element==EL_SALZSAEURE)
+ {
+ graphic = GFX_GEBLUBBER + getGraphicAnimationPhase(4, 10, ANIM_NORMAL);
+ }
else if (element==EL_BUTTERFLY || element==EL_FIREFLY)
{
graphic += !phase;
}
if (dx || dy)
- DrawGraphicShifted(x,y, dx,dy, graphic, cut_mode, NO_MASKING);
+ DrawGraphicShifted(x,y, dx,dy, graphic, cut_mode, mask_mode);
+ else if (mask_mode == USE_MASKING)
+ DrawGraphicThruMask(x,y, graphic);
else
DrawGraphic(x,y, graphic);
}
+void DrawLevelElementExt(int x, int y, int dx, int dy, int element,
+ int cut_mode, int mask_mode)
+{
+ if (IN_LEV_FIELD(x,y) && IN_SCR_FIELD(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)
{
- if (IN_LEV_FIELD(x,y) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
- DrawScreenElementShifted(SCROLLX(x),SCROLLY(y), dx,dy, element, cut_mode);
+ DrawLevelElementExt(x,y, dx,dy, element, cut_mode, NO_MASKING);
+}
+
+void DrawScreenElementThruMask(int x, int y, int element)
+{
+ DrawScreenElementExt(x,y, 0,0, element, NO_CUTTING, USE_MASKING);
+}
+
+void DrawLevelElementThruMask(int x, int y, int element)
+{
+ DrawLevelElementExt(x,y, 0,0, element, NO_CUTTING, USE_MASKING);
}
void ErdreichAnbroeckeln(int x, int y)
{
int i, width, height, cx,cy;
- 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] =
void DrawScreenElement(int x, int y, int element)
{
- DrawScreenElementShifted(x,y, 0,0, element, NO_CUTTING);
+ 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))
Store[ux][uy]==EL_AMOEBE_NASS)
cut_mode = CUT_ABOVE;
else if (Store[ux][uy]==EL_MORAST_VOLL ||
+
+#if 0
+ Store[ux][uy]==EL_SALZSAEURE ||
+#endif
+
Store[ux][uy]==EL_SIEB_VOLL ||
- Store[ux][uy]==EL_SIEB2_VOLL ||
- Store[ux][uy]==EL_SALZSAEURE)
+ Store[ux][uy]==EL_SIEB2_VOLL)
cut_mode = CUT_BELOW;
if (cut_mode==CUT_ABOVE)
DrawScreenElementShifted(x,y, MovPos[ux][uy],0, element, NO_CUTTING);
else
DrawScreenElementShifted(x,y, 0,MovPos[ux][uy], element, cut_mode);
+
+#if 1
+ if (Store[ux][uy] == EL_SALZSAEURE)
+ DrawLevelElementThruMask(ux,uy+1, EL_SALZSAEURE);
+#endif
+
}
else if (IS_BLOCKED(ux,uy))
{
BOOL cut_mode = NO_CUTTING;
Blocked2Moving(ux,uy,&oldx,&oldy);
- sx = SCROLLX(oldx);
- sy = SCROLLY(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 ||
void DrawLevelField(int x, int y)
{
- if (IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
- DrawScreenField(SCROLLX(x),SCROLLY(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));
+ if (IN_SCR_FIELD(SCREENX(newx),SCREENY(newy)))
+ DrawScreenField(SCREENX(newx),SCREENY(newy));
}
else if (IS_BLOCKED(x,y))
{
int oldx,oldy;
Blocked2Moving(x,y,&oldx,&oldy);
- if (IN_SCR_FIELD(SCROLLX(oldx),SCROLLY(oldy)))
- DrawScreenField(SCROLLX(oldx),SCROLLY(oldy));
+ if (IN_SCR_FIELD(SCREENX(oldx),SCREENY(oldy)))
+ DrawScreenField(SCREENX(oldx),SCREENY(oldy));
}
}
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)
while(result<0)
{
DoAnimation();
- Delay(10000);
+ Delay(10);
if (XPending(display))
{
static unsigned int door2 = DOOR_CLOSE_2;
static long door_delay = 0;
int x, start, stepsize = 2;
- long door_delay_value = stepsize * 5000;
+ long door_delay_value = stepsize * 5;
if (door_state == DOOR_GET_STATE)
return(door1 | door2);
for(x=start; x<=DXSIZE; x+=stepsize)
{
- while(!DelayReached(&door_delay, door_delay_value/10000))
- Delay(1000);
+ WaitUntilDelayReached(&door_delay, door_delay_value);
if (door_state & DOOR_ACTION_1)
{
projects / rocksndiamonds.git / blobdiff