rnd-19981204-1

[rocksndiamonds.git] / src / cartoons.c

diff --git a/src/cartoons.c b/src/cartoons.c
index 2ffb823dd7246dce890c7fb51deaea276ad6b3d3..834996b73c53ff4a49d594226fc40ee6de9f5dcb 100644 (file)
--- 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                                              *
 ***********************************************************/
@@ -18,7 +17,7 @@
 #include "tools.h"
 
 static void HandleAnimation(int);
-static BOOL AnimateToon(int, BOOL);
+static boolean AnimateToon(int, boolean);
 static void DrawAnim(Pixmap, GC, int, int, int, int, int, int, int, int);
 
 struct AnimInfo
@@ -28,7 +27,7 @@ struct AnimInfo
   int frames;
   int frames_per_second;
   int stepsize;
-  BOOL pingpong;
+  boolean pingpong;
   int direction;
   int position;
 };
@@ -108,14 +107,14 @@ void DoAnimation()
 
 void HandleAnimation(int mode)
 {
-  static long animstart_delay = -1;
-  static long animstart_delay_value = 0;
-  static BOOL anim_restart = TRUE;
-  static BOOL reset_delay = TRUE;
+  static unsigned long animstart_delay = -1;
+  static unsigned long animstart_delay_value = 0;
+  static boolean anim_restart = TRUE;
+  static boolean reset_delay = TRUE;
   static int toon_nr = 0;
   int draw_mode;
 
-  if (!toons_on)
+  if (!setup.toons)
     return;
 
   switch(mode)
@@ -125,26 +124,26 @@ void HandleAnimation(int mode)
       reset_delay = TRUE;
 
       /* Fill empty backbuffer for animation functions */
-      if (direct_draw_on && game_status == PLAYING)
+      if (setup.direct_draw && game_status == PLAYING)
       {
        int xx,yy;
 
        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(JX,JY);
+       DrawAllPlayers();
 
        SetDrawtoField(DRAW_DIRECT);
       }
 
-      if (soft_scrolling_on && game_status == PLAYING)
+      if (setup.soft_scrolling && game_status == PLAYING)
       {
        int fx = FX, fy = FY;
 
-        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,fieldbuffer,backbuffer,gc,
                  fx,fy, SXSIZE,SYSIZE,
@@ -159,12 +158,12 @@ void HandleAnimation(int mode)
       redraw_mask |= (REDRAW_FIELD | REDRAW_FROM_BACKBUFFER);
 
       /* Redraw background even when in direct drawing mode */
-      draw_mode = direct_draw_on;
-      direct_draw_on = FALSE;
+      draw_mode = setup.direct_draw;
+      setup.direct_draw = FALSE;
 
       BackToFront();
 
-      direct_draw_on = draw_mode;
+      setup.direct_draw = draw_mode;
 
       return;
       break;
@@ -190,14 +189,14 @@ void HandleAnimation(int mode)
   anim_restart = reset_delay = AnimateToon(toon_nr,anim_restart);
 }
 
-BOOL AnimateToon(int toon_nr, BOOL restart)
+boolean AnimateToon(int toon_nr, boolean restart)
 {
-  static pos_x = 0, pos_y = 0;
-  static delta_x = 0, delta_y = 0;
+  static int pos_x = 0, pos_y = 0;
+  static int delta_x = 0, delta_y = 0;
   static int frame = 0, frame_step = 1;
-  static BOOL horiz_move, vert_move;
-  static long anim_delay = 0;
-  static int anim_delay_value = 0;
+  static boolean horiz_move, vert_move;
+  static unsigned long anim_delay = 0;
+  static unsigned long anim_delay_value = 0;
   static int width,height;
   static int pad_x,pad_y;
   static int cut_x,cut_y;
@@ -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,