--- deliantra/server/common/living.C	2007/05/22 10:49:57	1.63
+++ deliantra/server/common/living.C	2007/06/04 12:19:08	1.66
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * This program 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 2 of the License, or
- * (at your option) any later version.
+ * Crossfire TRT 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 2 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.
+ * 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * You should have received a copy of the GNU General Public License along
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 #include <global.h>
@@ -816,12 +816,6 @@
    */
   for (tmp = inv; tmp; tmp = tmp->below)
     {
-      /* See note in map.c:update_position about making this additive 
-       * since light sources are never applied, need to put check here.
-       */
-      if (tmp->glow_radius > glow_radius)
-        glow_radius = tmp->glow_radius;
-
       /* This happens because apply_potion calls change_abil with the potion
        * applied so we can tell the player what changed. But change_abil
        * then calls this function.
@@ -829,6 +823,12 @@
       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.
+       */
+      if (tmp->glow_radius > glow_radius)
+        glow_radius = tmp->glow_radius;
+
       /* For some things, we don't care what is equipped */
       if (tmp->type == SKILL)
         {
@@ -1516,9 +1516,9 @@
 
   for (tmp = who->inv; tmp; tmp = tmp->below)
     if (tmp->type == FORCE)
-      if (tmp->arch->name == dragon_ability_force)
+      if (tmp->arch->archname == dragon_ability_force)
         abil = tmp;
-      else if (tmp->arch->name == dragon_skin_force)
+      else if (tmp->arch->archname == dragon_skin_force)
         skin = tmp;
 
   /* if the force is missing -> bail out */