--- deliantra/server/socket/request.C	2007/01/19 17:50:11	1.63
+++ deliantra/server/socket/request.C	2007/02/15 04:04:23	1.66
@@ -1,26 +1,26 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
-    Copyright (C) 2001 Mark Wedel
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    The author can be reached via e-mail to <crossfire@schmorp.de>
-*/
+ * CrossFire, A Multiplayer game for X-windows
+ * 
+ * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (C) 2001 Mark Wedel
+ * Copyright (C) 1992 Frank Tore Johansen
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * The author can be reached via e-mail to <crossfire@schmorp.de>
+ */
 
 /**
  * \file
@@ -149,7 +149,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 +203,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);
+    }
 }
 
 /**
@@ -800,9 +807,9 @@
   pl->count = 0;
 
   //TODO: schmorp thinks whatever this calculates, it makes no sense at all
-  int time = FABS (pl->ob->speed) < 0.001
+  int time = fabs (pl->ob->speed) < 0.001
                 ? time = MAX_TIME * 100
-                : time = (int) (MAX_TIME / FABS (pl->ob->speed));
+                : time = (int) (MAX_TIME / fabs (pl->ob->speed));
 
   /* Send confirmation of command execution now */
   packet sl ("comc");