X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=6b8ae64696af23dee2a8be92a643ba4a6bae91e0;hb=8f33ee4940b9c35bf4627b7ef1126d03748da646;hp=cb473ce77e96463fa140c24d7da0bf2ac276036a;hpb=2f5368f25e34c02cb5ff7a012aa96198442231cb;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index cb473ce7..6b8ae646 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -628,55 +628,12 @@ void DrawPlayer(struct PlayerInfo *player)
   if (element == EL_EXPLOSION)
     return;
 
-#if 1
-
-  action = GetPlayerAction(player, move_dir);
-
-#else
-
-  action = (player->is_pushing	  ? ACTION_PUSHING    :
-	    player->is_digging    ? ACTION_DIGGING    :
-	    player->is_collecting ? ACTION_COLLECTING :
-	    player->is_moving     ? ACTION_MOVING     :
-	    player->is_snapping   ? ACTION_SNAPPING   :
-	    player->is_sleeping   ? ACTION_SLEEPING   :
-	    player->is_bored      ? ACTION_BORING     :
-	    player->is_waiting    ? ACTION_WAITING    : ACTION_DEFAULT);
-
-  if (player->is_bored && player->num_special_action_bored > 0)
-  {
-    if (player->anim_delay_counter == 0 && player->post_delay_counter == 0)
-    {
-      int graphic_waiting;
-
-      action = ACTION_BORING_1 + SimpleRND(player->num_special_action_bored);
-      special_graphic = el_act_dir2img(EL_SP_MURPHY, action, move_dir);
-
-      player->anim_delay_counter =
-	graphic_info[special_graphic].anim_delay_fixed +
-	SimpleRND(graphic_info[special_graphic].anim_delay_random);
-      player->post_delay_counter =
-	graphic_info[special_graphic].post_delay_fixed +
-	SimpleRND(graphic_info[special_graphic].post_delay_random);
-      player->special_action_bored = action;
-    }
-
-    if (player->anim_delay_counter > 0)
-    {
-      action = player->special_action_bored;
-      player->anim_delay_counter--;
-    }
-
-    if (player->post_delay_counter > 0)
-    {
-      player->post_delay_counter--;
-    }
-  }
-#endif
-
-#if 0
-  printf("::: '%s'\n", element_action_info[action].suffix);
-#endif
+  action = (player->is_pushing    ? ACTION_PUSHING         :
+	    player->is_digging    ? ACTION_DIGGING         :
+	    player->is_collecting ? ACTION_COLLECTING      :
+	    player->is_moving     ? ACTION_MOVING          :
+	    player->is_snapping   ? ACTION_SNAPPING        :
+	    player->is_waiting    ? player->action_waiting : ACTION_DEFAULT);
 
   InitPlayerGfxAnimation(player, action, move_dir);
 
@@ -2068,7 +2025,7 @@ boolean Request(char *text, unsigned int req_state)
   for (ty = 0; ty < MAX_REQUEST_LINES; ty++)
   {
     char text_line[max_request_line_len + 1];
-    int tx, tl, tc;
+    int tx, tl, tc = 0;
 
     if (!*text)
       break;