X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Finit.c;h=4181eb00cb58737be9d121288400b7d6c5d4d0c3;hb=f45528c08776cd2c87a83bf3ec7e1f7fe7b18765;hp=9092f382813787b83c942fd1d9403c5ea5ff6b77;hpb=34b9fd6b89ffe8fa0637840118b43e4d36bb1798;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 9092f382..4181eb00 100644
--- a/src/init.c
+++ b/src/init.c
@@ -432,17 +432,36 @@ void InitGfx()
   }
   tile_needs_clipping[] =
   {
-    { GFX_SPIELER_UP, 4 },
-    { GFX_SPIELER_DOWN, 4 },
-    { GFX_SPIELER_LEFT, 4 },
-    { GFX_SPIELER_RIGHT, 4 },
-    { GFX_SPIELER_PUSH_LEFT, 4 },
-    { GFX_SPIELER_PUSH_RIGHT, 4 },
+    { GFX_SPIELER1_UP, 4 },
+    { GFX_SPIELER1_DOWN, 4 },
+    { GFX_SPIELER1_LEFT, 4 },
+    { GFX_SPIELER1_RIGHT, 4 },
+    { GFX_SPIELER1_PUSH_LEFT, 4 },
+    { GFX_SPIELER1_PUSH_RIGHT, 4 },
+    { GFX_SPIELER2_UP, 4 },
+    { GFX_SPIELER2_DOWN, 4 },
+    { GFX_SPIELER2_LEFT, 4 },
+    { GFX_SPIELER2_RIGHT, 4 },
+    { GFX_SPIELER2_PUSH_LEFT, 4 },
+    { GFX_SPIELER2_PUSH_RIGHT, 4 },
+    { GFX_SPIELER3_UP, 4 },
+    { GFX_SPIELER3_DOWN, 4 },
+    { GFX_SPIELER3_LEFT, 4 },
+    { GFX_SPIELER3_RIGHT, 4 },
+    { GFX_SPIELER3_PUSH_LEFT, 4 },
+    { GFX_SPIELER3_PUSH_RIGHT, 4 },
+    { GFX_SPIELER4_UP, 4 },
+    { GFX_SPIELER4_DOWN, 4 },
+    { GFX_SPIELER4_LEFT, 4 },
+    { GFX_SPIELER4_RIGHT, 4 },
+    { GFX_SPIELER4_PUSH_LEFT, 4 },
+    { GFX_SPIELER4_PUSH_RIGHT, 4 },
     { GFX_GEBLUBBER, 4 },
     { GFX_DYNAMIT, 7 },
     { GFX_DYNABOMB, 4 },
     { GFX_SOKOBAN_OBJEKT, 1 },
-    { GFX_MASK_SPARKLING, 3 },
+    { GFX_FUNKELN_BLAU, 3 },
+    { GFX_FUNKELN_WEISS, 3 },
     { -1, 0 }
   };
 
@@ -504,15 +523,8 @@ void InitGfx()
       int src_x, src_y;
       Pixmap src_pixmap;
 
-      if (tile_needs_clipping[i].start == GFX_MASK_SPARKLING)
-      {
-	/* special case -- should be cleaned up sometimes... */
-	src_pixmap = clipmask[PIX_BACK];
-	src_x  = SX + GFX_PER_LINE*TILEX;
-	src_y  = SY + j*TILEY;
-      }
-      else if (graphic >= GFX_START_ROCKSSCREEN &&
-	       graphic <= GFX_END_ROCKSSCREEN)
+      if (graphic >= GFX_START_ROCKSSCREEN &&
+	  graphic <= GFX_END_ROCKSSCREEN)
       {
 	src_pixmap = clipmask[PIX_BACK];
 	graphic -= GFX_START_ROCKSSCREEN;
@@ -1203,6 +1215,16 @@ void InitElementProperties()
   };
   static int ep_pushable_num = sizeof(ep_pushable)/sizeof(int);
 
+  static int ep_player[] =
+  {
+    EL_SPIELFIGUR,
+    EL_SPIELER1,
+    EL_SPIELER2,
+    EL_SPIELER3,
+    EL_SPIELER4
+  };
+  static int ep_player_num = sizeof(ep_player)/sizeof(int);
+
   static long ep_bit[] =
   {
     EP_BIT_AMOEBALIVE,
@@ -1228,7 +1250,8 @@ void InitElementProperties()
     EP_BIT_INACTIVE,
     EP_BIT_EXPLOSIVE,
     EP_BIT_MAMPF3,
-    EP_BIT_PUSHABLE
+    EP_BIT_PUSHABLE,
+    EP_BIT_PLAYER
   };
   static int *ep_array[] =
   {
@@ -1255,7 +1278,8 @@ void InitElementProperties()
     ep_inactive,
     ep_explosive,
     ep_mampf3,
-    ep_pushable
+    ep_pushable,
+    ep_player
   };
   static int *ep_num[] =
   {
@@ -1282,7 +1306,8 @@ void InitElementProperties()
     &ep_inactive_num,
     &ep_explosive_num,
     &ep_mampf3_num,
-    &ep_pushable_num
+    &ep_pushable_num,
+    &ep_player_num
   };
   static int num_properties = sizeof(ep_num)/sizeof(int *);