--- deliantra/server/common/los.C	2006/12/25 14:43:22	1.13
+++ deliantra/server/common/los.C	2007/01/06 14:42:29	1.16
@@ -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
 
@@ -295,7 +296,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 +333,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 +352,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;
     }