if (direct_draw_on && game_status == PLAYING)
redraw_mask &= ~REDRAW_MAIN;
-
-
- /*
- if (ScreenMovPos && redraw_mask & REDRAW_FIELD)
- {
- redraw_mask |= REDRAW_FIELD;
-
- printf("FULL SCREEN REDRAW FORCED by ScreenMovPos == %d\n", ScreenMovPos);
- }
- */
-
-
-
- /*
- if (ScreenMovPos && redraw_mask & REDRAW_TILES)
- {
- redraw_mask |= REDRAW_FIELD;
-
- printf("FULL SCREEN REDRAW FORCED by ScreenMovPos == %d\n", ScreenMovPos);
- }
- */
-
-
- /*
- if (ScreenMovPos && !(redraw_mask & REDRAW_FIELD))
- {
- printf("OOPS!\n");
-
- *((int *)NULL) = 0;
- }
- */
-
- /*
- if (IN_SCR_FIELD(lastJX,lastJY))
- redraw[redraw_x1 + lastJX][redraw_y1 + lastJY] = 0;
- */
-
-
if (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD)
redraw_mask |= REDRAW_FIELD;
- if (redraw_mask & REDRAW_FIELD)
+ if (redraw_mask & REDRAW_FIELD || ScreenMovPos)
redraw_mask &= ~REDRAW_TILES;
- /*
- {
- static int lastFrame = 0;
-
- printf("FrameCounter: %d\n", FrameCounter);
-
- if (FrameCounter != lastFrame + 1)
- {
- printf("SYNC LOST! <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
-
- if (FrameCounter > 100)
- *((int *)NULL) = 0;
- }
-
- lastFrame = FrameCounter;
- }
- */
-
if (!redraw_mask)
return;
if (redraw_mask & REDRAW_FIELD)
{
- int fx = FX, fy = FY;
-
- if (soft_scrolling_on)
+ 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
{
- fx += (PlayerMovDir & (MV_LEFT|MV_RIGHT) ? ScreenMovPos : 0);
- fy += (PlayerMovDir & (MV_UP|MV_DOWN) ? ScreenMovPos : 0);
- }
+ int fx = FX, fy = FY;
+
+ if (soft_scrolling_on)
+ {
+ fx += (PlayerMovDir & (MV_LEFT|MV_RIGHT) ? ScreenMovPos : 0);
+ fy += (PlayerMovDir & (MV_UP|MV_DOWN) ? ScreenMovPos : 0);
+ }
- if (game_status == PLAYING && !(redraw_mask & REDRAW_FROM_BACKBUFFER))
- {
XCopyArea(display,buffer,window,gc,
fx,fy, SXSIZE,SYSIZE,
SX,SY);
- /*
- printf("FULL SCREEN REDRAW / ScreenMovPos == %d\n", ScreenMovPos);
- */
+
+
+#if 0
+ printf("FULL SCREEN REDRAW [%d]\n", ScreenMovPos);
+#endif
+
+
}
- else
- XCopyArea(display,backbuffer,window,gc,
- REAL_SX,REAL_SY, FULL_SXSIZE,FULL_SYSIZE,
- REAL_SX,REAL_SY);
redraw_mask &= ~REDRAW_MAIN;
}
void FadeToFront()
{
-
/*
long fading_delay = 300000;
if (PlayerGone)
return;
- /*
- printf("INFO: DrawPlayerField(): x = %d, y = %d\n",x,y);
- */
-
-
#if DEBUG
if (!IN_LEV_FIELD(x,y) || !IN_SCR_FIELD(sx,sy))
{
graphic += PlayerFrame;
- if (PlayerMovPos)
+ if (PlayerGfxPos)
{
if (PlayerMovDir == MV_LEFT || PlayerMovDir == MV_RIGHT)
- sxx = PlayerMovPos;
+ sxx = PlayerGfxPos;
else
- syy = PlayerMovPos;
+ syy = PlayerGfxPos;
}
-#if 0
- if (!soft_scrolling_on)
- {
- int old_scroll_x=scroll_x, old_scroll_y=scroll_y;
- int new_scroll_x=scroll_x, new_scroll_y=scroll_y;
- int offset = (scroll_delay_on ? 3 : 0);
- if ((scroll_x < lastJX-MIDPOSX-offset || scroll_x > lastJX-MIDPOSX+offset) &&
- lastJX>=MIDPOSX-1-offset && lastJX<=lev_fieldx-(MIDPOSX-offset))
- new_scroll_x = lastJX-MIDPOSX + (scroll_x < lastJX-MIDPOSX ? -offset : offset);
- if ((scroll_y < lastJY-MIDPOSY-offset || scroll_y > lastJY-MIDPOSY+offset) &&
- JY>=MIDPOSY-1-offset && JY<=lev_fieldy-(MIDPOSY-offset))
- new_scroll_y = lastJY-MIDPOSY + (scroll_y < lastJY-MIDPOSY ? -offset : offset);
+ if (!soft_scrolling_on && ScreenMovPos)
+ sxx = syy = 0;
+
- if (new_scroll_x!=old_scroll_x || new_scroll_y!=old_scroll_y)
- /*
- ScrollLevel(old_scroll_x-scroll_x,old_scroll_y-scroll_y);
- */
- sxx = syy = 0;
- }
-#endif
- if (!soft_scrolling_on && ScreenMovPos)
- sxx = syy = 0;
if (draw_thru_mask)
- if (PlayerPushing && PlayerMovPos)
+ MarkTileDirty(sx,sy);
+
+
+
+ if (PlayerPushing && PlayerGfxPos)
{
int nextJX = JX + (JX - lastJX);
int nextJY = JY + (JY - lastJY);
GFX_SOKOBAN_OBJEKT,
CUT_NO_CUTTING);
else
- DrawGraphicShifted(px,py,sxx,syy,
- el2gfx(Feld[nextJX][nextJY]),
- CUT_NO_CUTTING);
+ {
+ int element = Feld[nextJX][nextJY];
+ int graphic = el2gfx(element);
+
+ if (element == EL_FELSBROCKEN && sxx)
+ {
+ int phase = (PlayerGfxPos / (TILEX/4));
+
+ if (PlayerMovDir == MV_LEFT)
+ graphic += phase;
+ else
+ graphic += (phase+4)%4;
+
+
+ /*
+ printf("----> (%d, %d, %d)\n",
+ PlayerGfxPos, phase, graphic);
+ */
+
+ }
+
+ DrawGraphicShifted(px,py, sxx,syy, graphic, CUT_NO_CUTTING);
+ }
}
if (element == EL_DYNAMIT)
{
- if ((phase = (48-MovDelay[x][y])/6) > 6)
+ if ((phase = (96-MovDelay[x][y])/12) > 6)
phase = 6;
}
else
{
- if ((phase = ((48-MovDelay[x][y])/3) % 8) > 3)
+ if ((phase = ((96-MovDelay[x][y])/6) % 8) > 3)
phase = 7-phase;
}
{
int dest_x = SX+SCROLLX(x)*TILEX;
int dest_y = SY+SCROLLY(y)*TILEY;
+ int x_size = TILEX;
+ int y_size = TILEY;
+
+ if (!ScreenMovPos)
+ {
+ dest_x = SX + SCROLLX(MIN(JX,lastJX))*TILEX;
+ dest_y = SY + SCROLLY(MIN(JY,lastJY))*TILEY;
+ x_size = TILEX * (1 + ABS(JX - lastJX));
+ y_size = TILEY * (1 + ABS(JY - lastJY));
+ }
XCopyArea(display,drawto_field,window,gc,
- dest_x,dest_y, TILEX,TILEY, dest_x,dest_y);
+ dest_x,dest_y, x_size,y_size, dest_x,dest_y);
SetDrawtoField(DRAW_DIRECT);
}
}
else
phase = (FrameCounter % (delay * frames)) / delay;
+ if (mode == ANIM_REVERSE)
+ phase = -phase;
+
return(phase);
}
{
int phase = getGraphicAnimationPhase(frames, delay, mode);
-/*
- int phase;
-
- if (mode == ANIM_OSCILLATE)
- {
- int max_anim_frames = frames*2 - 2;
- phase = (FrameCounter % (delay * max_anim_frames)) / delay;
- phase = (phase < frames ? phase : max_anim_frames - phase);
- }
- else
- phase = (FrameCounter % (delay * frames)) / delay;
-*/
-
if (!(FrameCounter % delay) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
DrawGraphic(SCROLLX(x),SCROLLY(y), graphic + phase);
}
#endif
DrawGraphicExt(drawto_field, gc, x, y, graphic);
- redraw_tiles++;
- redraw[redraw_x1 + x][redraw_y1 + y] = TRUE;
- redraw_mask |= REDRAW_TILES;
+ MarkTileDirty(x,y);
}
void DrawGraphicExt(Drawable d, GC gc, int x, int y, int graphic)
return;
}
- redraw_tiles++;
- redraw[redraw_x1 + x][redraw_y1 + y]=TRUE;
- redraw_mask|=REDRAW_TILES;
+ MarkTileDirty(x,y);
}
void DrawElementThruMask(int x, int y, int element)
void DrawMiniGraphic(int x, int y, int graphic)
{
DrawMiniGraphicExt(drawto, gc, x, y, graphic);
- redraw_tiles++;
- redraw[x/2][y/2]=TRUE;
- redraw_mask|=REDRAW_TILES;
+ MarkTileDirty(x/2, y/2);
}
void DrawMiniGraphicExt(Drawable d, GC gc, int x, int y, int graphic)
else if (x==BX2 && dx>0) /* Element verläßt rechts das Bild */
width -= dx;
else if (dx) /* allg. Bewegung in x-Richtung */
- redraw[redraw_x1 + x + SIGN(dx)][redraw_y1 + y] = TRUE;
+ MarkTileDirty(x + SIGN(dx), y);
if (y < BY1) /* Element kommt von oben ins Bild */
{
height = dy;
cy = TILEY-dy;
dy = TILEY;
- redraw[redraw_x1 + x][redraw_y1 + y + 1] = TRUE;
+ 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 */
- redraw[redraw_x1 + x][redraw_y1 + y + SIGN(dy)] = TRUE;
+ MarkTileDirty(x, y + SIGN(dy));
}
if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
}
#endif
- redraw_tiles++;
- redraw[redraw_x1 + x][redraw_y1 + y] = TRUE;
- redraw_mask |= REDRAW_TILES;
+ MarkTileDirty(x,y);
}
void DrawElementShifted(int x, int y, int dx, int dy, int element,int cut_mode)
else if (x==BX2 && dx>0) /* Element verläßt rechts das Bild */
width -= dx;
else if (dx) /* allg. Bewegung in x-Richtung */
- redraw[redraw_x1 + x + SIGN(dx)][redraw_y1 + y] = TRUE;
+ MarkTileDirty(x + SIGN(dx), y);
if (y < BY1) /* Element kommt von oben ins Bild */
{
height = dy;
cy = TILEY-dy;
dy = TILEY;
- redraw[redraw_x1 + x][redraw_y1 + y + 1] = TRUE;
+ 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 */
- redraw[redraw_x1 + x][redraw_y1 + y + SIGN(dy)] = TRUE;
+ MarkTileDirty(x, y + SIGN(dy));
}
if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
}
#endif
- redraw_tiles++;
- redraw[redraw_x1 + x][redraw_y1 + y] = TRUE;
- redraw_mask |= REDRAW_TILES;
+ MarkTileDirty(x,y);
}
void ErdreichAnbroeckeln(int x, int y)
width,height, FX+x*TILEX+cx,FY+y*TILEY+cy);
}
- redraw_tiles++;
- redraw[redraw_x1 + x][redraw_y1 + y] = TRUE;
+ MarkTileDirty(x,y);
}
else
{
SY+(graphic / GFX_PER_LINE)*TILEY+cy,
width,height, FX+xx*TILEX+cx,FY+yy*TILEY+cy);
- redraw_tiles++;
- redraw[redraw_x1 + xx][redraw_y1 + yy] = TRUE;
+ MarkTileDirty(xx,yy);
}
}
}
graphic = el2gfx(element);
DrawMiniGraphic(x,y,graphic);
-
- redraw_tiles++;
- redraw[x/2][y/2]=TRUE;
- redraw_mask|=REDRAW_TILES;
}
void DrawMiniElementOrWall(int x, int y, int scroll_x, int scroll_y)
projects / rocksndiamonds.git / blobdiff