--- deliantra/server/common/living.C	2008/12/04 03:48:19	1.92
+++ deliantra/server/common/living.C	2009/10/12 14:00:57	1.98
@@ -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
@@ -1771,7 +1784,7 @@
 }
 
 /* This function checks to make sure that object 'op' can
- * lost 'exp' experience.  It returns the amount of exp
+ * lose 'exp' experience. It returns the amount of exp
  * object 'op' can in fact lose - it basically makes
  * adjustments based on permanent exp and the like.
  * This function should always be used for losing experience -
@@ -1785,14 +1798,18 @@
 
   if (exp > op->stats.exp)
     exp = op->stats.exp;
+
   if (settings.permanent_exp_ratio)
     {
       del_exp = (sint64) ((op->stats.exp - op->perm_exp) * PERM_EXP_MAX_LOSS_RATIO);
+
       if (del_exp < 0)
         del_exp = 0;
+
       if (exp > del_exp)
         exp = del_exp;
     }
+
   return exp;
 }
 
@@ -1802,7 +1819,7 @@
   if (exp < 0)
     return check_exp_loss (op, exp);
   else
-    return MIN (exp, (sint64) MAX_EXPERIENCE - op->stats.exp);
+    return min (exp, (sint64)MAX_EXPERIENCE - op->stats.exp);
 }
 
 /* Subtracts experience from player.
@@ -1925,15 +1942,13 @@
 void
 apply_death_exp_penalty (object *op)
 {
-  object *tmp;
   sint64 loss;
   sint64 percentage_loss;       /* defined by the setting 'death_penalty_percent' */
   sint64 level_loss;            /* defined by the setting 'death_penalty_levels */
 
-  for (tmp = op->inv; tmp; tmp = tmp->below)
+  for (object *tmp = op->inv; tmp; tmp = tmp->below)
     if (tmp->type == SKILL && tmp->stats.exp)
       {
-
         percentage_loss = tmp->stats.exp * settings.death_penalty_ratio / 100;
         level_loss = tmp->stats.exp - levels[MAX (0, tmp->level - settings.death_penalty_level)];
 
@@ -1945,18 +1960,19 @@
         if (level_loss < 0)
           level_loss = 0;
 
-        loss = check_exp_loss (tmp, MIN (level_loss, percentage_loss));
+        loss = check_exp_loss (tmp, min (level_loss, percentage_loss));
 
         tmp->stats.exp -= loss;
         player_lvl_adj (op, tmp);
       }
 
   percentage_loss = op->stats.exp * settings.death_penalty_ratio / 100;
-  level_loss = op->stats.exp - levels[MAX (0, op->level - settings.death_penalty_level)];
+  level_loss = op->stats.exp - levels[max (0, op->level - settings.death_penalty_level)];
 
   if (level_loss < 0)
     level_loss = 0;
-  loss = check_exp_loss (op, MIN (level_loss, percentage_loss));
+
+  loss = check_exp_loss (op, min (level_loss, percentage_loss));
 
   op->stats.exp -= loss;
   player_lvl_adj (op, NULL);