--- deliantra/server/common/living.C	2008/12/18 19:56:09	1.93
+++ deliantra/server/common/living.C	2009/11/06 12:49:19	1.99
@@ -5,18 +5,19 @@
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -860,10 +861,7 @@
       if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
         continue;
 
-      /* See note in map.c:update_position about making this additive 
-       * since light sources are never applied, need to put check here.
-       */
-      glow_radius = max (glow_radius, tmp->glow_radius);
+      glow_radius += tmp->glow_radius;
 
       /* For some things, we don't care what is equipped */
       if (tmp->type == SKILL)
@@ -1139,10 +1137,10 @@
                   }
 
                 if (tmp->stats.wc)
-                  wc -= (tmp->stats.wc + tmp->magic);
+                  wc -= tmp->stats.wc + tmp->magic;
 
                 if (tmp->stats.ac)
-                  ac -= (tmp->stats.ac + tmp->magic);
+                  ac -= tmp->stats.ac + tmp->magic;
 
                 if (ARMOUR_SPEED (tmp))
                   max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
@@ -1152,6 +1150,8 @@
         }                       /* item is equipped */
     }                           /* for loop of items */
 
+  glow_radius = min (glow_radius, MAX_LIGHT_RADIUS);
+
   /* We've gone through all the objects the player has equipped.  For many things, we
    * have generated intermediate values which we now need to assign.
    */
@@ -1330,9 +1330,6 @@
 
       if (settings.search_items && contr->search_str[0])
         speed -= 1;
-
-      if (attacktype == 0)
-        attacktype = arch->attacktype;
     }                           /* End if player */
 
   if (added_speed >= 0)
@@ -1421,6 +1418,22 @@
     map->at (x, y).flags_ = 0;
 }
 
+void
+object::set_glow_radius (sint8 rad)
+{
+  glow_radius = rad;
+  
+  if (is_on_map ())
+    update_all_los (map, x, y);
+  else if (object *env = outer_env ())
+    {
+      env->update_stats ();
+
+      if (env->is_on_map ())
+        update_all_los (env->map, env->x, env->y);
+    }
+}
+
 /*
  * Returns true if the given player is a legal class.
  * The function to add and remove class-bonuses to the stats doesn't
@@ -1492,7 +1505,7 @@
  * an overall level. Here, the dragon might gain new abilities
  * or change the ability-focus.
  */
-void
+static void
 dragon_level_gain (object *who)
 {
   object *abil = NULL;          /* pointer to dragon ability force */
@@ -1778,7 +1791,7 @@
  * the 'exp' value passed should be positive - this is the
  * amount that should get subtract from the player.
  */
-sint64
+static sint64
 check_exp_loss (const object *op, sint64 exp)
 {
   sint64 del_exp;