int element = Feld[x][y];
int graphic, phase;
- BOOL draw_thru_mask = FALSE;
if (PlayerGone)
return;
if (direct_draw_on)
SetDrawtoField(DRAW_BUFFERED);
- /* draw things behind the player (EL_PFORTE* || mole/penguin/pig/dragon) */
-
-
+ /* draw things in the field the player is leaving, if needed */
+ if (lastJX != JX || lastJY != JY)
+ {
+ if (Store[lastJX][lastJY])
+ {
+ DrawLevelElement(lastJX,lastJY, Store[lastJX][lastJY]);
+ DrawLevelElementThruMask(lastJX,lastJY, Feld[lastJX][lastJY]);
+ }
+ else if (Feld[lastJX][lastJY] == EL_DYNAMIT)
+ DrawDynamite(lastJX,lastJY);
+ else
+ DrawLevelField(lastJX,lastJY);
- DrawLevelField(x,y);
+ if (PlayerPushing)
+ {
+ int nextJX = JX + (JX - lastJX);
+ int nextJY = JY + (JY - lastJY);
+ if (PlayerGfxPos)
+ {
+ if (Feld[nextJX][nextJY] == EL_SOKOBAN_FELD_VOLL)
+ DrawLevelElement(nextJX,nextJY, EL_SOKOBAN_FELD_LEER);
+ else
+ DrawLevelElement(nextJX,nextJY, EL_LEERRAUM);
+ }
+ else
+ DrawLevelField(nextJX,nextJY);
+ }
+ }
+ /* draw things behind the player, if needed */
if (Store[x][y])
- {
- DrawGraphic(sx,sy, el2gfx(Store[x][y]));
- draw_thru_mask = TRUE;
- }
- else if (element!=EL_DYNAMIT && element!=EL_DYNABOMB)
- {
- DrawLevelField(x,y);
- draw_thru_mask = TRUE;
- }
-
- /*
- else if (element!=EL_LEERRAUM && element!=EL_DYNAMIT && element!=EL_DYNABOMB)
- {
+ DrawLevelElement(x,y, Store[x][y]);
+ else if (element != EL_DYNAMIT && element != EL_DYNABOMB)
DrawLevelField(x,y);
- draw_thru_mask = TRUE;
- }
- */
-
-
- draw_thru_mask = TRUE;
-
-
-
/* draw player himself */
graphic += PlayerFrame;
-
if (PlayerGfxPos)
{
if (PlayerMovDir == MV_LEFT || PlayerMovDir == MV_RIGHT)
syy = PlayerGfxPos;
}
-
if (!soft_scrolling_on && ScreenMovPos)
sxx = syy = 0;
-
-
-
-
-
- if (draw_thru_mask)
- DrawGraphicShiftedThruMask(sx,sy,sxx,syy,graphic,CUT_NO_CUTTING);
- /*
- DrawGraphicThruMask(sx, sy, graphic);
- */
- else
- DrawGraphicShifted(sx,sy,sxx,syy,graphic,CUT_NO_CUTTING);
- /*
- DrawGraphic(sx, sy, graphic);
- */
-
-
-
- MarkTileDirty(sx,sy);
-
-
+ DrawGraphicShiftedThruMask(sx,sy, sxx,syy, graphic, NO_CUTTING);
if (PlayerPushing && PlayerGfxPos)
{
if (Feld[JX][JY] == EL_SOKOBAN_FELD_LEER ||
Feld[nextJX][nextJY] == EL_SOKOBAN_FELD_VOLL)
- DrawGraphicShiftedThruMask(px,py,sxx,syy,
- GFX_SOKOBAN_OBJEKT,
- CUT_NO_CUTTING);
+ DrawGraphicShiftedThruMask(px,py,sxx,syy, GFX_SOKOBAN_OBJEKT,NO_CUTTING);
else
{
int element = Feld[nextJX][nextJY];
graphic += phase;
else
graphic += (phase+4)%4;
-
-
- /*
- printf("----> (%d, %d, %d)\n",
- PlayerGfxPos, phase, graphic);
- */
-
}
- DrawGraphicShifted(px,py, sxx,syy, graphic, CUT_NO_CUTTING);
+ 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)
dest_x,dest_y, x_size,y_size, dest_x,dest_y);
SetDrawtoField(DRAW_DIRECT);
}
+
+ MarkTileDirty(sx,sy);
}
static int getGraphicAnimationPhase(int frames, int delay, int mode)
MarkTileDirty(x,y);
}
-void DrawElementThruMask(int x, int y, int element)
+void DrawScreenElementThruMask(int x, int y, int element)
{
DrawGraphicThruMask(x,y,el2gfx(element));
}
+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);
+}
+
void DrawMiniGraphic(int x, int y, int graphic)
{
DrawMiniGraphicExt(drawto, gc, x, y, graphic);
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;
if (graphic < 0)
{
if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
{
graphic -= GFX_START_ROCKSSCREEN;
- 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+dx,FY+y*TILEY+dy);
+ 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)
{
graphic -= GFX_START_ROCKSHEROES;
- XCopyArea(display,pix[PIX_HEROES],drawto_field,gc,
- (graphic % HEROES_PER_LINE)*TILEX+cx,
- (graphic / HEROES_PER_LINE)*TILEY+cy,
- width,height, FX+x*TILEX+dx,FY+y*TILEY+dy);
+ 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);
}
#if DEBUG
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)
+{
+ 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)
{
int ux = UNSCROLLX(x), uy = UNSCROLLY(y);
int graphic = el2gfx(element);
}
if (dx || dy)
- DrawGraphicShifted(x,y, dx,dy, graphic, cut_mode);
+ DrawGraphicShifted(x,y, dx,dy, graphic, cut_mode, NO_MASKING);
else
DrawGraphic(x,y, graphic);
}
-void DrawGraphicShiftedThruMask(int x,int y, int dx,int dy, int graphic,
- int cut_mode)
+void DrawLevelElementShifted(int x, int y, int dx, int dy, int element,
+ int cut_mode)
{
- int width = TILEX, height = TILEY;
- int cx = 0, cy = 0;
- int src_x,src_y, dest_x,dest_y;
-
- if (graphic < 0)
- {
- DrawGraphic(x,y,graphic);
- return;
- }
-
- if (dx || dy) /* Verschiebung der Grafik? */
- {
- if (x < BX1) /* Element kommt von links ins Bild */
- {
- x = BX1;
- width = dx;
- cx = TILEX - dx;
- dx = 0;
- }
- else if (x > BX2) /* Element kommt von rechts ins Bild */
- {
- x = BX2;
- width = -dx;
- dx = TILEX + dx;
- }
- 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 */
- width -= dx;
- else if (dx) /* allg. Bewegung in x-Richtung */
- MarkTileDirty(x + SIGN(dx), y);
-
- if (y < BY1) /* Element kommt von oben ins Bild */
- {
- if (cut_mode==CUT_BELOW) /* Element oberhalb des Bildes */
- return;
-
- y = BY1;
- height = dy;
- cy = TILEY - dy;
- dy = 0;
- }
- else if (y > BY2) /* Element kommt von unten ins Bild */
- {
- y = BY2;
- height = -dy;
- dy = TILEY + dy;
- }
- 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)
- {
- if (y == BY2) /* Element unterhalb des Bildes */
- return;
-
- height = 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))
- height -= dy;
- else if (dy) /* allg. Bewegung in y-Richtung */
- MarkTileDirty(x, y + SIGN(dy));
- }
-
- if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
- {
- 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;
-
- 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 if (graphic >= GFX_START_ROCKSHEROES && graphic <= GFX_END_ROCKSHEROES)
- {
- 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;
-
- 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);
- }
-
-#if DEBUG
- if (!IN_SCR_FIELD(x,y))
- {
- printf("DrawGraphicShiftedThruMask(): x = %d, y = %d, graphic = %d\n",
- x,y,graphic);
- printf("DrawGraphicShifted(): This should never happen!\n");
- return;
- }
-#endif
-
- MarkTileDirty(x,y);
+ if (IN_LEV_FIELD(x,y) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
+ DrawScreenElementShifted(SCROLLX(x),SCROLLY(y), dx,dy, element, cut_mode);
}
void ErdreichAnbroeckeln(int x, int y)
else
element = Feld[uxx][uyy];
-/*
- if (element==EL_ERDREICH || IS_SOLID(element))
- continue;
-*/
if (element==EL_ERDREICH)
continue;
yy = y+xy[i][1];
uxx = ux+xy[i][0];
uyy = uy+xy[i][1];
-/*
- if (!IN_LEV_FIELD(uxx,uyy) || Feld[uxx][uyy]!=EL_ERDREICH ||
- !IN_SCR_FIELD(xx,yy) || IS_SOLID(element))
- continue;
-*/
if (!IN_LEV_FIELD(uxx,uyy) || Feld[uxx][uyy]!=EL_ERDREICH ||
!IN_SCR_FIELD(xx,yy))
void DrawScreenElement(int x, int y, int element)
{
- DrawElementShifted(x,y,0,0,element,CUT_NO_CUTTING);
+ DrawScreenElementShifted(x,y, 0,0, element, NO_CUTTING);
ErdreichAnbroeckeln(x,y);
}
if (IS_MOVING(ux,uy))
{
int horiz_move = (MovDir[ux][uy]==MV_LEFT || MovDir[ux][uy]==MV_RIGHT);
- BOOL cut_mode = CUT_NO_CUTTING;
+ BOOL cut_mode = NO_CUTTING;
if (Store[ux][uy]==EL_MORAST_LEER ||
Store[ux][uy]==EL_SIEB_LEER ||
cut_mode = CUT_BELOW;
if (cut_mode==CUT_ABOVE)
- DrawElementShifted(x,y,0,0,Store[ux][uy],CUT_NO_CUTTING);
+ DrawScreenElementShifted(x,y, 0,0, Store[ux][uy], NO_CUTTING);
else
DrawScreenElement(x,y,EL_LEERRAUM);
if (horiz_move)
- DrawElementShifted(x,y,MovPos[ux][uy],0,element,CUT_NO_CUTTING);
+ DrawScreenElementShifted(x,y, MovPos[ux][uy],0, element, NO_CUTTING);
else
- DrawElementShifted(x,y,0,MovPos[ux][uy],element,cut_mode);
+ DrawScreenElementShifted(x,y, 0,MovPos[ux][uy], element, cut_mode);
}
else if (IS_BLOCKED(ux,uy))
{
int oldx,oldy;
int sx, sy;
int horiz_move;
- BOOL cut_mode = CUT_NO_CUTTING;
+ BOOL cut_mode = NO_CUTTING;
Blocked2Moving(ux,uy,&oldx,&oldy);
sx = SCROLLX(oldx);
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);
BackToFront();
- if (game_status==MAINMENU)
+ if (game_status == MAINMENU)
DoAnimation();
}
}
projects / rocksndiamonds.git / blobdiff