rnd-19980927

[rocksndiamonds.git] / src / cartoons.c

diff --git a/src/cartoons.c b/src/cartoons.c
index b1b31921c03f0f1cc01131a9160a9fe4a77f447d..4857e06fcc8a59cbb7e78499e5a8b0a76c3b2910 100644 (file)
--- a/src/cartoons.c
+++ b/src/cartoons.c
@@ -131,10 +131,10 @@ void HandleAnimation(int mode)
 
        SetDrawtoField(DRAW_BACKBUFFER);
 
-       for(xx=0;xx<SCR_FIELDX;xx++)
-         for(yy=0;yy<SCR_FIELDY;yy++)
+       for(xx=0; xx<SCR_FIELDX; xx++)
+         for(yy=0; yy<SCR_FIELDY; yy++)
            DrawScreenField(xx,yy);
-       DrawPlayerField();
+       DrawAllPlayers();
 
        SetDrawtoField(DRAW_DIRECT);
       }
@@ -143,8 +143,8 @@ void HandleAnimation(int mode)
       {
        int fx = FX, fy = FY;
 
-        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,fieldbuffer,backbuffer,gc,
                  fx,fy, SXSIZE,SYSIZE,
@@ -181,7 +181,7 @@ void HandleAnimation(int mode)
 
   if (anim_restart)
   {
-    if (!DelayReached(&animstart_delay,animstart_delay_value))
+    if (!DelayReached(&animstart_delay, animstart_delay_value))
       return;
 
     toon_nr = SimpleRND(NUM_TOONS);
@@ -232,7 +232,7 @@ BOOL AnimateToon(int toon_nr, BOOL restart)
       JUMPER_FPS,
       JUMPER_STEPSIZE,
       ANIM_NORMAL,
-      ANIMDIR_LEFT,
+      ANIMDIR_RIGHT,
       ANIMPOS_DOWN
     },
     {
@@ -267,8 +267,8 @@ BOOL AnimateToon(int toon_nr, BOOL restart)
     },
     {
       GAMETOON_XSIZE, GAMETOON_YSIZE,
-      ((GFX_SPIELER_LEFT - GFX_START_ROCKSHEROES) % HEROES_PER_LINE)*TILEX,
-      ((GFX_SPIELER_LEFT - GFX_START_ROCKSHEROES) / HEROES_PER_LINE)*TILEY,
+      ((GFX_SPIELER1_LEFT - GFX_START_ROCKSHEROES) % HEROES_PER_LINE)*TILEX,
+      ((GFX_SPIELER1_LEFT - GFX_START_ROCKSHEROES) / HEROES_PER_LINE)*TILEY,
       GAMETOON_FRAMES_4,
       GAMETOON_FPS,
       GAMETOON_STEPSIZE,
@@ -278,8 +278,8 @@ BOOL AnimateToon(int toon_nr, BOOL restart)
     },
     {
       GAMETOON_XSIZE, GAMETOON_YSIZE,
-      ((GFX_SPIELER_RIGHT - GFX_START_ROCKSHEROES) % HEROES_PER_LINE)*TILEX,
-      ((GFX_SPIELER_RIGHT - GFX_START_ROCKSHEROES) / HEROES_PER_LINE)*TILEY,
+      ((GFX_SPIELER1_RIGHT - GFX_START_ROCKSHEROES) % HEROES_PER_LINE)*TILEX,
+      ((GFX_SPIELER1_RIGHT - GFX_START_ROCKSHEROES) / HEROES_PER_LINE)*TILEY,
       GAMETOON_FRAMES_4,
       GAMETOON_FPS,
       GAMETOON_STEPSIZE,
@@ -461,7 +461,7 @@ BOOL AnimateToon(int toon_nr, BOOL restart)
       pos_y >=  FULL_SYSIZE  + anim->stepsize)
     return(TRUE);
 
-  if (!DelayReached(&anim_delay,anim_delay_value))
+  if (!DelayReached(&anim_delay, anim_delay_value))
   {
     if (game_status==HELPSCREEN && !restart)
       DrawAnim(anim_pixmap,anim_clip_gc,