--- deliantra/server/common/map.C	2008/08/11 23:23:41	1.145
+++ deliantra/server/common/map.C	2008/12/24 01:37:24	1.154
@@ -27,6 +27,8 @@
 #include "loader.h"
 #include "path.h"
 
+sint8 maptile::outdoor_darkness;
+
 /* This rolls up wall, blocks_magic, blocks_view, etc, all into
  * one function that just returns a P_.. value (see map.h)
  * it will also do map translation for tiled maps, returning
@@ -714,10 +716,7 @@
             unique = 1;
 
           if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
-            {
-              op->destroy_inv (false);
-              op->destroy ();
-            }
+            op->destroy ();
 
           op = above;
         }
@@ -815,10 +814,7 @@
 
             object *head = op->head_ ();
             if (op == head)
-              {
-                op->destroy_inv (false);
-                op->destroy ();
-              }
+              op->destroy ();
             else if (head->map != op->map)
               {
                 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
@@ -971,10 +967,10 @@
  * difficulty does not have a lot to do with character level,
  * but does have a lot to do with treasure on the map.
  *
- * Difficulty can now be set by the map creature.  If the value stored
- * in the map is zero, then use this routine.  Maps should really
- * have a difficulty set than using this function - human calculation
- * is much better than this functions guesswork.
+ * Difficulty can now be set by the map creator. If the value stored
+ * in the map is zero, then use this routine. Maps should really
+ * have a difficulty set rather than using this function - human calculation
+ * is much better than this function's guesswork.
  */
 int
 maptile::estimate_difficulty () const
@@ -1029,10 +1025,8 @@
 int
 maptile::change_map_light (int change)
 {
-  int new_level = darkness + change;
-
   /* Nothing to do */
-  if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS))
+  if (!change)
     return 0;
 
   /* inform all players on the map */
@@ -1041,17 +1035,7 @@
   else
     new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
 
-  /* Do extra checking.  since darkness is a unsigned value,
-   * we need to be extra careful about negative values.
-   * In general, the checks below are only needed if change
-   * is not +/-1
-   */
-  if (new_level < 0)
-    darkness = 0;
-  else if (new_level >= MAX_DARKNESS)
-    darkness = MAX_DARKNESS;
-  else
-    darkness = new_level;
+  darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
 
   /* All clients need to get re-updated for the change */
   update_all_map_los (this);
@@ -1069,7 +1053,8 @@
 mapspace::update_ ()
 {
   object *last = 0;
-  uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
+  uint8 flags = P_UPTODATE, anywhere = 0;
+  sint8 light = 0;
   MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
 
   //object *middle = 0;
@@ -1082,12 +1067,8 @@
 
   for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
     {
-      /* This could be made additive I guess (two lights better than
-       * one). But if so, it shouldn't be a simple additive - 2
-       * light bulbs do not illuminate twice as far as once since
-       * it is a dissapation factor that is cubed.
-       */
-      light = max (light, tmp->glow_radius);
+      // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
+      light += tmp->glow_radius;
 
       /* This call is needed in order to update objects the player
        * is standing in that have animations (ie, grass, fire, etc).
@@ -1139,12 +1120,13 @@
 
       if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW;
       if (QUERY_FLAG (tmp, FLAG_NO_MAGIC))   flags |= P_NO_MAGIC;
+      if (tmp->type == PLAYER)               flags |= P_PLAYER;
       if (tmp->type == SAFE_GROUND)          flags |= P_SAFE;
       if (QUERY_FLAG (tmp, FLAG_ALIVE))      flags |= P_IS_ALIVE;
       if (QUERY_FLAG (tmp, FLAG_DAMNED))     flags |= P_NO_CLERIC;
     }
 
-  this->light      = light;
+  this->light      = min (light, MAX_LIGHT_RADIUS);
   this->flags_     = flags;
   this->move_block = move_block & ~move_allow;
   this->move_on    = move_on;
@@ -1635,17 +1617,16 @@
   if (!sound)
     return;
 
-  for_all_players (pl)
-    if (pl->ob->map == this)
-      if (client *ns = pl->ns)
-        {
-          int dx = x - pl->ob->x;
-          int dy = y - pl->ob->y;
+  for_all_players_on_map (pl, this)
+    if (client *ns = pl->ns)
+      {
+        int dx = x - pl->ob->x;
+        int dy = y - pl->ob->y;
 
-          int distance = idistance (dx, dy);
+        int distance = idistance (dx, dy);
 
-          if (distance <= MAX_SOUND_DISTANCE)
-            ns->play_sound (sound, dx, dy);
-        }
+        if (distance <= MAX_SOUND_DISTANCE)
+          ns->play_sound (sound, dx, dy);
+      }
 }