--- deliantra/server/common/living.C	2007/06/04 13:04:00	1.67
+++ deliantra/server/common/living.C	2007/07/22 14:17:56	1.72
@@ -1,23 +1,22 @@
 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
  * 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
  * 
- * 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.
+ * 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 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.
+ * 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 Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of 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 <crossfire@schmorp.de>
  */
@@ -867,6 +866,8 @@
         {
           if (type == PLAYER)
             {
+              contr->item_power += tmp->item_power;
+
               if (tmp == contr->combat_ob || tmp == contr->ranged_ob)
                 if (tmp != current_weapon
                     && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)
@@ -890,12 +891,11 @@
                   tmp->type == DISEASE || tmp->type == FORCE  ||
                   tmp->type == SKILL)
                 {
-                  contr->digestion     += tmp->stats.food;
+                  contr->digestion     = clamp (int (contr->digestion) + tmp->stats.food, MIN_DIGESTION, MAX_DIGESTION);
                   contr->gen_hp        += tmp->stats.hp;
                   contr->gen_sp        += tmp->stats.sp;
                   contr->gen_grace     += tmp->stats.grace;
                   contr->gen_sp_armour += tmp->gen_sp_armour;
-                  contr->item_power    += tmp->item_power;
                 }
             }                   /* if this is a player */
           else
@@ -1511,14 +1511,11 @@
   char buf[MAX_BUF];            /* tmp. string buffer */
 
   /* now grab the 'dragon_ability'-forces from the player's inventory */
-  shstr_cmp dragon_ability_force ("dragon_ability_force");
-  shstr_cmp dragon_skin_force    ("dragon_skin_force");
-
   for (tmp = who->inv; tmp; tmp = tmp->below)
     if (tmp->type == FORCE)
-      if (tmp->arch->archname == dragon_ability_force)
+      if (tmp->arch->archname == shstr_dragon_ability_force)
         abil = tmp;
-      else if (tmp->arch->archname == dragon_skin_force)
+      else if (tmp->arch->archname == shstr_dragon_skin_force)
         skin = tmp;
 
   /* if the force is missing -> bail out */