--- deliantra/server/socket/request.C	2007/01/21 21:28:27	1.65
+++ deliantra/server/socket/request.C	2007/03/01 12:28:17	1.67
@@ -38,9 +38,6 @@
  *
  * esrv_map_new starts updating the map
  *
- * esrv_map_setbelow allows filling in all of the faces for the map.
- * if a face has not already been sent to the client, it is sent now.
- *
  */
 
 #include <global.h>
@@ -149,7 +146,7 @@
   pl->ns->floorbox_reset ();
 }
 
-/** check for map change and send new map data */
+/** check for map/region change and send new map data */
 static void
 check_map_change (player *pl)
 {
@@ -203,6 +200,13 @@
 
   socket.current_x = ob->x;
   socket.current_y = ob->y;
+
+  region *reg = ob->region ();
+  if (socket.current_region != reg)
+    {
+      socket.current_region = reg;
+      socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
+    }
 }
 
 /**
@@ -1162,28 +1166,6 @@
  *
  ******************************************************************************/
 
-/**
- * This adds face_num to a map cell at x,y.  If the client doesn't have
- * the face yet, we will also send it.
- */
-static void
-esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
-{
-  if (newmap->cells[x][y].count >= MAP_LAYERS)
-    {
-      //TODO: one or the other, can't both have abort and return, verify and act
-      LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
-      return;
-      abort ();
-    }
-
-  newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
-  newmap->cells[x][y].count++;
-
-  if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
-    esrv_send_face (ns, face_num, 0);
-}
-
 /** Clears a map cell */
 static void
 map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
@@ -1993,10 +1975,8 @@
 draw_client_map (object *pl)
 {
   int i, j;
-  sint16 ax, ay, nx, ny;        /* ax and ay goes from 0 to max-size of arrays */
-  facetile *face, *floor;
-  facetile *floor2;
-  int d, mflags;
+  sint16 ax, ay;        /* ax and ay goes from 0 to max-size of arrays */
+  int mflags;
   struct Map newmap;
   maptile *m, *pm;
 
@@ -2187,7 +2167,7 @@
 static void
 append_spell (player *pl, packet &sl, object *spell)
 {
-  int len, i, skill = 0;
+  int i, skill = 0;
 
   if (!(spell->name))
     {