/***********************************************************
* 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 += (local_player->MovDir & (MV_LEFT|MV_RIGHT) ? ScreenMovPos : 0);
- fy += (local_player->MovDir & (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,
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 = SCROLLX(jx), sy = SCROLLY(jy);
+ int sx = SCREENX(jx), sy = SCREENY(jy);
int sxx = 0, syy = 0;
int element = Feld[jx][jy];
int graphic, phase;
if (player->Pushing && player->GfxPos)
{
- int px = SCROLLX(next_jx), py = SCROLLY(next_jy);
+ int px = SCREENX(next_jx), py = SCREENY(next_jy);
if (Feld[jx][jy] == EL_SOKOBAN_FELD_LEER ||
Feld[next_jx][next_jy] == EL_SOKOBAN_FELD_VOLL)
if (direct_draw_on)
{
- int dest_x = SX + sx*TILEX;
- int dest_y = SY + sy*TILEY;
- int x_size = TILEX;
- int y_size = TILEY;
-
- if (!ScreenMovPos)
- {
- dest_x = SX + SCROLLX(MIN(jx,last_jx))*TILEX;
- dest_y = SY + SCROLLY(MIN(jy,last_jy))*TILEY;
- x_size = TILEX * (1 + ABS(jx - last_jx));
- y_size = TILEY * (1 + ABS(jy - last_jy));
- }
+ 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);
{
int phase = getGraphicAnimationPhase(frames, delay, mode);
- if (!(FrameCounter % delay) && IN_SCR_FIELD(SCROLLX(x),SCROLLY(y)))
+ if (!(FrameCounter % delay) && IN_SCR_FIELD(SCREENX(x),SCREENY(y)))
{
if (mask_mode == USE_MASKING)
- DrawGraphicThruMask(SCROLLX(x),SCROLLY(y), graphic + phase);
+ DrawGraphicThruMask(SCREENX(x),SCREENY(y), graphic + phase);
else
- DrawGraphic(SCROLLX(x),SCROLLY(y), graphic + phase);
+ DrawGraphic(SCREENX(x),SCREENY(y), graphic + phase);
}
}
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;
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(SCROLLX(x),SCROLLY(y)))
- DrawScreenElementExt(SCROLLX(x),SCROLLY(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 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 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))
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)
projects / rocksndiamonds.git / blobdiff