X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=d50b99dd3d23b79d09f4b142a573fc6ec869e852;hb=86b0ea5594dc5a9db7ac5d71fa2b7487a4fc1f9d;hp=45d37436a325dec9840a38644e2fba606f3d4208;hpb=5d25c2fc3934b3d7e6b02465361569d3a0033bae;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index 45d37436..d50b99dd 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -599,6 +599,10 @@ void DrawPlayer(struct PlayerInfo *player)
 	    player->is_moving ? ACTION_MOVING :
 	    player->snapped ? ACTION_SNAPPING : ACTION_DEFAULT);
 
+#if 0
+  printf("::: '%s'\n", element_action_info[action].suffix);
+#endif
+
   InitPlayerGfxAnimation(player, action, move_dir);
 
   /* ----------------------------------------------------------------------- */
@@ -1367,12 +1371,12 @@ static int getBorderElement(int x, int y)
     { EL_STEELWALL,			EL_INVISIBLE_STEELWALL		   }
   };
   int steel_type = (BorderElement == EL_STEELWALL ? 0 : 1);
-  int steel_position = (x == -1 && y == -1			? 0 :
-			x == lev_fieldx && y == -1		? 1 :
-			x == -1 && y == lev_fieldy		? 2 :
-			x == lev_fieldx && y == lev_fieldy	? 3 :
-			x == -1 || x == lev_fieldx		? 4 :
-			y == -1 || y == lev_fieldy		? 5 : 6);
+  int steel_position = (x == -1		&& y == -1		? 0 :
+			x == lev_fieldx	&& y == -1		? 1 :
+			x == -1		&& y == lev_fieldy	? 2 :
+			x == lev_fieldx	&& y == lev_fieldy	? 3 :
+			x == -1		|| x == lev_fieldx	? 4 :
+			y == -1		|| y == lev_fieldy	? 5 : 6);
 
   return border[steel_position][steel_type];
 }
@@ -1521,6 +1525,31 @@ void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y)
     DrawMiniGraphic(sx, sy, el2edimg(getBorderElement(x, y)));
 }
 
+void DrawEnvelopeBorder(int sx, int sy, int ex, int ey)
+{
+  int border[8][2] =
+  {
+    { EL_STEELWALL_TOPLEFT,		EL_INVISIBLE_STEELWALL_TOPLEFT     },
+    { EL_STEELWALL_TOPRIGHT,		EL_INVISIBLE_STEELWALL_TOPRIGHT    },
+    { EL_STEELWALL_BOTTOMLEFT,		EL_INVISIBLE_STEELWALL_BOTTOMLEFT  },
+    { EL_STEELWALL_BOTTOMRIGHT,		EL_INVISIBLE_STEELWALL_BOTTOMRIGHT },
+    { EL_STEELWALL_VERTICAL,		EL_INVISIBLE_STEELWALL_VERTICAL    },
+    { EL_STEELWALL_HORIZONTAL,		EL_INVISIBLE_STEELWALL_HORIZONTAL  },
+    { EL_STEELWALL,			EL_INVISIBLE_STEELWALL		   },
+    { EL_EMPTY,				EL_EMPTY			   }
+  };
+  int steel_type = (BorderElement == EL_STEELWALL ? 0 : 1);
+  int steel_position = (ex == -1 && ey == -1 ? 0 :
+			ex == +1 && ey == -1 ? 1 :
+			ex == -1 && ey == +1 ? 2 :
+			ex == +1 && ey == +1 ? 3 :
+			ex == -1 || ex == +1 ? 4 :
+			ey == -1 || ey == +1 ? 5 : 7);
+  int element = border[steel_position][steel_type];
+
+  DrawMiniGraphic(sx, sy, el2edimg(element));
+}
+
 void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
 {
   Bitmap *src_bitmap = graphic_info[graphic].bitmap;
@@ -1772,6 +1801,10 @@ boolean Request(char *text, unsigned int req_state)
   unsigned int old_door_state;
   int last_game_status = game_status;	/* save current game status */
 
+#if 1
+  SetMouseCursor(CURSOR_DEFAULT);
+#endif
+
 #if defined(PLATFORM_UNIX)
   /* pause network game while waiting for request to answer */
   if (options.network &&
@@ -1882,7 +1915,9 @@ boolean Request(char *text, unsigned int req_state)
 
   SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
 
+#if 0
   SetMouseCursor(CURSOR_DEFAULT);
+#endif
 
   while(result < 0)
   {