--- deliantra/server/common/map.C	2008/09/29 10:32:50	1.149
+++ deliantra/server/common/map.C	2008/12/04 03:48:19	1.150
@@ -1063,7 +1063,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;
@@ -1076,12 +1077,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,7 +1136,7 @@
       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;