--- deliantra/server/common/los.C	2006/12/25 11:25:49	1.12
+++ deliantra/server/common/los.C	2007/01/07 02:39:13	1.17
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -27,7 +28,6 @@
 #include <funcpoint.h>
 #include <math.h>
 
-
 /* Distance must be less than this for the object to be blocked.
  * An object is 1.0 wide, so if set to 0.5, it means the object
  * that blocks half the view (0.0 is complete block) will
@@ -295,7 +295,7 @@
           }
       }
 
-  if (MAP_DARKNESS (op->map) > 0)       /* player is on a dark map */
+  if (op->map->darkness > 0)       /* player is on a dark map */
     expand_lighted_sight (op);
 
 
@@ -332,7 +332,7 @@
   maptile *m = op->map;
   sint16 nx, ny;
 
-  darklevel = MAP_DARKNESS (m);
+  darklevel = m->darkness;
 
   /* If the player can see in the dark, lower the darklevel for him */
   if (QUERY_FLAG (op, FLAG_SEE_IN_DARK))
@@ -351,7 +351,7 @@
    */
   if (darklevel > MAX_DARKNESS)
     {
-      LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, op->map->path, darklevel);
+      LOG (llevError, "Map darkness for %s on %s is too high (%d)\n", &op->name, &op->map->path, darklevel);
       darklevel = MAX_DARKNESS;
     }
 
@@ -581,22 +581,22 @@
        */
       else if (pl->ob->map == map->tile_map[0])
         {
-          if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (y + MAP_HEIGHT (map->tile_map[0]) - pl->ob->y) <= pl->ns->mapy / 2))
+          if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (y + map->tile_map[0]->height - pl->ob->y) <= pl->ns->mapy / 2))
             pl->do_los = 1;
         }
       else if (pl->ob->map == map->tile_map[2])
         {
-          if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y + MAP_HEIGHT (map) - y) <= pl->ns->mapy / 2))
+          if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y + map->height - y) <= pl->ns->mapy / 2))
             pl->do_los = 1;
         }
       else if (pl->ob->map == map->tile_map[1])
         {
-          if ((abs (pl->ob->x + MAP_WIDTH (map) - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
+          if ((abs (pl->ob->x + map->width - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
             pl->do_los = 1;
         }
       else if (pl->ob->map == map->tile_map[3])
         {
-          if ((abs (x + MAP_WIDTH (map->tile_map[3]) - pl->ob->x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
+          if ((abs (x + map->tile_map[3]->width - pl->ob->x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
             pl->do_los = 1;
         }
     }