X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fcartoons.c;h=9eef8e1e075a148b4aae99c6889af6ba0a09c61b;hp=b1b31921c03f0f1cc01131a9160a9fe4a77f447d;hb=823bddb0d9cc63ddda17a2cd20266aa3b82bde38;hpb=1256664ceac31f448a0139edd3bd0dc8fa5a8697

diff --git a/src/cartoons.c b/src/cartoons.c
index b1b31921..9eef8e1e 100644
--- a/src/cartoons.c
+++ b/src/cartoons.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  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                *
 *----------------------------------------------------------*
 *  cartoons.c                                              *
 ***********************************************************/
@@ -131,10 +130,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 +142,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 += (ScreenMovDir & (MV_LEFT|MV_RIGHT) ? ScreenGfxPos : 0);
+        fy += (ScreenMovDir & (MV_UP|MV_DOWN)    ? ScreenGfxPos : 0);
 
 	XCopyArea(display,fieldbuffer,backbuffer,gc,
 		  fx,fy, SXSIZE,SYSIZE,
@@ -181,7 +180,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 +231,7 @@ BOOL AnimateToon(int toon_nr, BOOL restart)
       JUMPER_FPS,
       JUMPER_STEPSIZE,
       ANIM_NORMAL,
-      ANIMDIR_LEFT,
+      ANIMDIR_RIGHT,
       ANIMPOS_DOWN
     },
     {
@@ -267,8 +266,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 +277,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 +460,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,