X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=74e4c8d8dbee2eab499ad784424dd6655ebb8684;hb=c4dd9e14b72b528e82bc018fe2fa76b784221584;hp=b5e022f620c79b6521d50adbd9278c8b95d7ccc7;hpb=5261391294502f3d757f9ac7a244dbb6d6a177c9;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index b5e022f6..74e4c8d8 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -1825,6 +1825,7 @@ void DrawPlayer(struct PlayerInfo *player)
   int next_jx = jx + dx;
   int next_jy = jy + dy;
   boolean player_is_moving = (player->MovPos ? TRUE : FALSE);
+  boolean player_is_opaque = FALSE;
   int sx = SCREENX(jx), sy = SCREENY(jy);
   int sxx = 0, syy = 0;
   int element = Feld[jx][jy], last_element = Feld[last_jx][last_jy];
@@ -1865,6 +1866,11 @@ void DrawPlayer(struct PlayerInfo *player)
 	    player->is_dropping   ? ACTION_DROPPING        :
 	    player->is_waiting    ? player->action_waiting : ACTION_DEFAULT);
 
+#if 1
+  if (player->is_waiting)
+    move_dir = player->dir_waiting;
+#endif
+
   InitPlayerGfxAnimation(player, action, move_dir);
 
   /* ----------------------------------------------------------------------- */
@@ -1913,16 +1919,17 @@ void DrawPlayer(struct PlayerInfo *player)
   {
     if (player_is_moving && GfxElement[jx][jy] != EL_UNDEFINED)
     {
-      if (GFX_CRUMBLED(GfxElement[jx][jy]))
+      int old_element = GfxElement[jx][jy];
+      int old_graphic = el_act_dir2img(old_element, action, move_dir);
+      int frame = getGraphicAnimationFrame(old_graphic, player->StepFrame);
+
+      if (GFX_CRUMBLED(old_element))
 	DrawLevelFieldCrumbledSandDigging(jx, jy, move_dir, player->StepFrame);
       else
-      {
-	int old_element = GfxElement[jx][jy];
-	int old_graphic = el_act_dir2img(old_element, action, move_dir);
-	int frame = getGraphicAnimationFrame(old_graphic, player->StepFrame);
-
 	DrawGraphic(sx, sy, old_graphic, frame);
-      }
+
+      if (graphic_info[old_graphic].anim_mode & ANIM_OPAQUE_PLAYER)
+	player_is_opaque = TRUE;
     }
     else
     {
@@ -1960,7 +1967,10 @@ void DrawPlayer(struct PlayerInfo *player)
   if (!setup.soft_scrolling && ScreenMovPos)
     sxx = syy = 0;
 
-  DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING);
+  if (player_is_opaque)
+    DrawGraphicShifted(sx, sy, sxx, syy, graphic, frame,NO_CUTTING,NO_MASKING);
+  else
+    DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING);
 
   if (SHIELD_ON(player))
   {
@@ -3474,19 +3484,19 @@ em_object_mapping_list[] =
   },
   {
     Xeater_n,				TRUE,	FALSE,
-    EL_YAMYAM,				-1, -1
+    EL_YAMYAM_UP,			-1, -1
   },
   {
-    Xeater_e,				FALSE,	FALSE,
-    EL_YAMYAM,				-1, -1
+    Xeater_e,				TRUE,	FALSE,
+    EL_YAMYAM_RIGHT,			-1, -1
   },
   {
-    Xeater_w,				FALSE,	FALSE,
-    EL_YAMYAM,				-1, -1
+    Xeater_w,				TRUE,	FALSE,
+    EL_YAMYAM_LEFT,			-1, -1
   },
   {
-    Xeater_s,				FALSE,	FALSE,
-    EL_YAMYAM,				-1, -1
+    Xeater_s,				TRUE,	FALSE,
+    EL_YAMYAM_DOWN,			-1, -1
   },
   {
     Yeater_n,				FALSE,	FALSE,
@@ -4596,10 +4606,6 @@ em_object_mapping_list[] =
     Xalpha_copyr,			TRUE,	FALSE,
     EL_CHAR('©'),			-1, -1
   },
-  {
-    Xalpha_copyr,			TRUE,	FALSE,
-    EL_CHAR('©'),			-1, -1
-  },
 
   {
     Xboom_bug,				FALSE,	FALSE,
@@ -5119,26 +5125,19 @@ int font2baseimg(int font_nr)
   return font_info[font_nr].special_graphic[GFX_SPECIAL_ARG_DEFAULT];
 }
 
-int getGameFrameDelay_EM(int native_em_game_frame_delay)
+#if 0
+void setCenteredPlayerNr_EM(int centered_player_nr)
 {
-  int game_frame_delay_value;
-
-  game_frame_delay_value =
-    (tape.playing && tape.fast_forward ? FfwdFrameDelay :
-     GameFrameDelay == GAME_FRAME_DELAY ? native_em_game_frame_delay :
-     GameFrameDelay);
-
-  if (tape.playing && tape.warp_forward && !tape.pausing)
-    game_frame_delay_value = 0;
-
-  return game_frame_delay_value;
+  game.centered_player_nr = game.centered_player_nr_next = centered_player_nr;
 }
 
 int getCenteredPlayerNr_EM()
 {
+#if 0
   if (game.centered_player_nr_next >= 0 &&
       !native_em_level.ply[game.centered_player_nr_next]->alive)
     game.centered_player_nr_next = game.centered_player_nr;
+#endif
 
   if (game.centered_player_nr != game.centered_player_nr_next)
     game.centered_player_nr = game.centered_player_nr_next;
@@ -5146,7 +5145,18 @@ int getCenteredPlayerNr_EM()
   return game.centered_player_nr;
 }
 
-int getActivePlayers_EM()
+void setSetCenteredPlayer_EM(boolean set_centered_player)
+{
+  game.set_centered_player = set_centered_player;
+}
+
+boolean getSetCenteredPlayer_EM()
+{
+  return game.set_centered_player;
+}
+#endif
+
+int getNumActivePlayers_EM()
 {
   int num_players = 0;
   int i;
@@ -5161,6 +5171,21 @@ int getActivePlayers_EM()
   return num_players;
 }
 
+int getGameFrameDelay_EM(int native_em_game_frame_delay)
+{
+  int game_frame_delay_value;
+
+  game_frame_delay_value =
+    (tape.playing && tape.fast_forward ? FfwdFrameDelay :
+     GameFrameDelay == GAME_FRAME_DELAY ? native_em_game_frame_delay :
+     GameFrameDelay);
+
+  if (tape.playing && tape.warp_forward && !tape.pausing)
+    game_frame_delay_value = 0;
+
+  return game_frame_delay_value;
+}
+
 unsigned int InitRND(long seed)
 {
   if (level.game_engine_type == GAME_ENGINE_TYPE_EM)