--- deliantra/server/common/los.C	2006/09/10 16:00:23	1.4
+++ deliantra/server/common/los.C	2006/12/11 21:32:16	1.7
@@ -1,9 +1,3 @@
-
-/*
- * static char *rcsid_los_c =
- *   "$Id: los.C,v 1.4 2006/09/10 16:00:23 root Exp $";
- */
-
 /*
     CrossFire, A Multiplayer game for X-windows
 
@@ -24,7 +18,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
+    The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 
 /* Nov 95 - inserted USE_LIGHTING code stuff in here - b.t. */
@@ -152,7 +146,7 @@
                    * the line is off
                    */
 
-                  d1 = (float) (pow (MAP_CLIENT_X / 2 - dx, 2) + pow (MAP_CLIENT_Y / 2 - dy, 2));
+                  d1 = (float) (pow (MAP_CLIENT_X / 2 - dx, 2.f) + pow (MAP_CLIENT_Y / 2 - dy, 2.f));
                   r = (float) ((dy - y) * (dy - MAP_CLIENT_Y / 2) - (dx - x) * (MAP_CLIENT_X / 2 - dx)) / d1;
                   s = (float) ((dy - y) * (MAP_CLIENT_X / 2 - dx) - (dx - x) * (MAP_CLIENT_Y / 2 - dy)) / d1;
                   l = FABS (sqrt (d1) * s);
@@ -335,7 +329,7 @@
 expand_lighted_sight (object *op)
 {
   int x, y, darklevel, ax, ay, basex, basey, mflags, light, x1, y1;
-  mapstruct *m = op->map;
+  maptile *m = op->map;
   sint16 nx, ny;
 
   darklevel = MAP_DARKNESS (m);
@@ -525,7 +519,7 @@
  * change_map_light function
  */
 void
-update_all_map_los (mapstruct *map)
+update_all_map_los (maptile *map)
 {
   player *pl;
 
@@ -551,7 +545,7 @@
  */
 
 void
-update_all_los (const mapstruct *map, int x, int y)
+update_all_los (const maptile *map, int x, int y)
 {
   player *pl;