--- deliantra/server/common/los.C	2009/01/06 19:17:06	1.55
+++ deliantra/server/common/los.C	2009/05/05 04:51:56	1.61
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
@@ -24,7 +24,8 @@
 #include <global.h>
 #include <cmath>
 
-#define SEE_IN_DARK_RADIUS 3
+#define SEE_IN_DARK_RADIUS 2
+#define MAX_VISION 10 // maximum visible radius
 
 // los flags
 enum {
@@ -272,7 +273,7 @@
 
 /* radius, distance => lightness adjust */
 static sint8 light_atten[MAX_LIGHT_RADIUS * 2 + 1][MAX_LIGHT_RADIUS * 3 / 2 + 1];
-static sint8 vision_atten[MAX_DARKNESS + SEE_IN_DARK_RADIUS + 1][(MAX_DARKNESS + SEE_IN_DARK_RADIUS) * 3 / 2 + 1];
+static sint8 vision_atten[MAX_VISION + 1][MAX_VISION * 3 / 2 + 1];
 
 static struct los_init
 {
@@ -289,7 +290,7 @@
           int intensity = min (LOS_MAX, abs (radius) + 1);
 
           // actual intensity
-          intensity = max (0, lerp_rd (distance, 0, abs (radius) + 1, intensity, 0));
+          intensity = max (0, lerp_ru (distance, 0, abs (radius) + 1, intensity, 0));
 
           light_atten [radius + MAX_LIGHT_RADIUS][distance] = radius < 0
             ? min (3, intensity)
@@ -297,9 +298,9 @@
         }
 
     /* for general vision */
-    for (int radius = 0; radius <= MAX_DARKNESS + SEE_IN_DARK_RADIUS; ++radius)
-      for (int distance = 0; distance <= (MAX_DARKNESS + SEE_IN_DARK_RADIUS) * 3 / 2; ++distance)
-        vision_atten [radius][distance] = distance <= radius ? 3 : 4;
+    for (int radius = 0; radius <= MAX_VISION; ++radius)
+      for (int distance = 0; distance <= MAX_VISION * 3 / 2; ++distance)
+        vision_atten [radius][distance] = distance <= radius ? clamp (lerp (radius, 0, MAX_DARKNESS, 3, 0), 0, 3) : 4;
   }
 } los_init;
 
@@ -358,6 +359,9 @@
     pl->observe->y + half_y + MAX_LIGHT_RADIUS + 1
   );
 
+  /* If the player can see in the dark, increase light/vision radius */
+  int bonus = op->flag [FLAG_SEE_IN_DARK] ? SEE_IN_DARK_RADIUS : 0;
+
   if (!darklevel)
     pass2 = 1;
   else
@@ -384,16 +388,24 @@
               if (light < 0)
                 pass2 = 1;
               else
-                apply_light<los_brighten> (pl, dx - pl->observe->x, dy - pl->observe->y, light, light_atten [light + MAX_LIGHT_RADIUS]);
+                {
+                  light = clamp (light + bonus, 0, MAX_LIGHT_RADIUS);
+                  apply_light<los_brighten> (pl, dx - pl->observe->x, dy - pl->observe->y, light, light_atten [light + MAX_LIGHT_RADIUS]);
+                }
           }
 
-      /* grant some vision to the player, based on the darklevel */
+      /* grant some vision to the player, based on outside, outdoor, and darklevel */
       {
-        int light = clamp (MAX_DARKNESS - darklevel, 0, MAX_DARKNESS);
+        int light;
 
-        /* If the player can see in the dark, lower the darklevel for him */
-        if (op->flag [FLAG_SEE_IN_DARK])
-          light += SEE_IN_DARK_RADIUS;
+        if (!op->map->outdoor) // not outdoor, darkness becomes light radius
+          light = MAX_DARKNESS - op->map->darkness;
+        else if (op->map->darkness > 0) // outdoor and darkness > 0 => use darkness as max radius
+          light = lerp_rd (maptile::outdoor_darkness + 0, 0, MAX_DARKNESS, MAX_DARKNESS - op->map->darkness, 0);
+        else // outdoor and darkness <= 0 => start wide and decrease quickly
+          light = lerp (maptile::outdoor_darkness + op->map->darkness, 0, MAX_DARKNESS, MAX_VISION, 2);
+
+        light = clamp (light + bonus, 0, MAX_VISION);
 
         apply_light<los_brighten> (pl, 0, 0, light, vision_atten [light]);
       }
@@ -411,7 +423,10 @@
           sint8 light = ms.light;
 
           if (expect_false (light < 0))
-            apply_light<los_darken> (pl, dx - pl->observe->x, dy - pl->observe->y, -light, light_atten [light + MAX_LIGHT_RADIUS]);
+            {
+              light = clamp (light - bonus, 0, MAX_DARKNESS);
+              apply_light<los_darken> (pl, dx - pl->observe->x, dy - pl->observe->y, -light, light_atten [light + MAX_LIGHT_RADIUS]);
+            }
         }
 }
 
@@ -489,10 +504,6 @@
 void
 update_all_los (const maptile *map, int x, int y)
 {
-  // no need to do anything if we don't have darkness
-  if (map->darklevel () <= 0)
-    return;
-
   map->at (x, y).invalidate ();
 
   for_all_players (pl)
@@ -503,54 +514,12 @@
       if (!pl->ob || !pl->ob->map || !pl->ns)
         continue;
 
-      /* Same map is simple case - see if pl is close enough.
-       * Note in all cases, we did the check for same map first,
-       * and then see if the player is close enough and update
-       * los if that is the case.  If the player is on the
-       * corresponding map, but not close enough, then the
-       * player can't be on another map that may be closer,
-       * so by setting it up this way, we trim processing
-       * some.
-       */
-      if (pl->ob->map == map)
-        if ((abs (pl->ob->x - x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
-          pl->do_los = 1;
-
-      /* Now we check to see if player is on adjacent
-       * maps to the one that changed and also within
-       * view.  The tile_maps[] could be null, but in that
-       * case it should never match the pl->ob->map, so
-       * we want ever try to dereference any of the data in it.
-       *
-       * The logic for 0 and 3 is to see how far the player is
-       * from the edge of the map (height/width) - pl->ob->(x,y)
-       * and to add current position on this map - that gives a
-       * distance.
-       * For 1 and 2, we check to see how far the given
-       * coordinate (x,y) is from the corresponding edge,
-       * and then add the players location, which gives
-       * a distance.
-       */
-      else if (pl->ob->map == map->tile_map[0])
-        {
-          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 - 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 - 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->tile_map[3]->width - pl->ob->x) <= pl->ns->mapx / 2) && (abs (pl->ob->y - y) <= pl->ns->mapy / 2))
-            pl->do_los = 1;
-        }
+      rv_vector rv;
+
+      get_rangevector_from_mapcoord (map, x, y, pl->ob, &rv);
+      
+      if ((abs (rv.distance_x) <= pl->ns->mapx / 2) && (abs (rv.distance_y) <= pl->ns->mapy / 2))
+        pl->do_los = 1;
     }
 }