X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=3d1ec872b625d7e27fb20f3de482c78ba3205e10;hb=1478ab1f979ae33fd900e5148c5d00dcba5ad402;hp=efcba4dbc2ba57b619a2291a2ac4477977a558e5;hpb=1256664ceac31f448a0139edd3bd0dc8fa5a8697;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index efcba4db..3d1ec872 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -109,8 +109,8 @@ void BackToFront()
 
       if (soft_scrolling_on)
       {
-	fx += (PlayerMovDir & (MV_LEFT|MV_RIGHT) ? ScreenMovPos : 0);
-	fy += (PlayerMovDir & (MV_UP|MV_DOWN)    ? ScreenMovPos : 0);
+	fx += (local_player->MovDir & (MV_LEFT|MV_RIGHT) ? ScreenMovPos : 0);
+	fy += (local_player->MovDir & (MV_UP|MV_DOWN)    ? ScreenMovPos : 0);
       }
 
       XCopyArea(display,buffer,window,gc,
@@ -330,23 +330,40 @@ void DrawTextExt(Drawable d, GC gc, int x, int y,
   }
 }
 
-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;
 
-  int element = Feld[x][y];
+  DrawPlayer(PLAYERINFO(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;
@@ -361,61 +378,59 @@ void DrawPlayerField()
 
   /* 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)
@@ -423,25 +438,23 @@ void DrawPlayerField()
 
   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;
@@ -459,12 +472,12 @@ void DrawPlayerField()
 
     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;
     }
 
@@ -473,17 +486,17 @@ void DrawPlayerField()
 
   if (direct_draw_on)
   {
-    int dest_x = SX+SCROLLX(x)*TILEX;
-    int dest_y = SY+SCROLLY(y)*TILEY;
+    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,lastJX))*TILEX;
-      dest_y = SY + SCROLLY(MIN(JY,lastJY))*TILEY;
-      x_size = TILEX * (1 + ABS(JX - lastJX));
-      y_size = TILEY * (1 + ABS(JY - lastJY));
+      dest_x = SX + SCREENX(MIN(jx,last_jx))*TILEX;
+      dest_y = SY + SCREENY(MIN(jy,last_jy))*TILEY;
+      x_size = TILEX * (1 + ABS(jx - last_jx));
+      y_size = TILEY * (1 + ABS(jy - last_jy));
     }
 
     XCopyArea(display,drawto_field,window,gc,
@@ -518,12 +531,12 @@ void DrawGraphicAnimationExt(int x, int y, int graphic,
 {
   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);
   }
 }
 
@@ -822,7 +835,7 @@ void DrawGraphicShiftedThruMask(int x,int y, int dx,int dy, int graphic,
 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;
@@ -915,8 +928,8 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
 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);
 }
 
@@ -945,7 +958,7 @@ void DrawLevelElementThruMask(int x, int y, int element)
 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] =
@@ -1055,13 +1068,13 @@ void DrawScreenElement(int x, int y, int element)
 
 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))
@@ -1116,8 +1129,8 @@ void DrawScreenField(int x, int y)
     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 ||
@@ -1142,23 +1155,23 @@ void DrawScreenField(int x, int y)
 
 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));
   }
 }
 
@@ -1176,16 +1189,16 @@ void DrawMiniElement(int x, int y, int element)
   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)
@@ -1538,8 +1551,7 @@ unsigned int MoveDoor(unsigned int door_state)
 
     for(x=start; x<=DXSIZE; x+=stepsize)
     {
-      while(!DelayReached(&door_delay, door_delay_value/10))
-	Delay(1);
+      WaitUntilDelayReached(&door_delay, door_delay_value);
 
       if (door_state & DOOR_ACTION_1)
       {