ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/living.C
(Generate patch)

Comparing deliantra/server/common/living.C (file contents):
Revision 1.69 by root, Wed Jul 4 18:03:48 2007 UTC vs.
Revision 1.72 by root, Sun Jul 22 14:17:56 2007 UTC

889 tmp->type == AMULET || tmp->type == GIRDLE || 889 tmp->type == AMULET || tmp->type == GIRDLE ||
890 tmp->type == BRACERS || tmp->type == CLOAK || 890 tmp->type == BRACERS || tmp->type == CLOAK ||
891 tmp->type == DISEASE || tmp->type == FORCE || 891 tmp->type == DISEASE || tmp->type == FORCE ||
892 tmp->type == SKILL) 892 tmp->type == SKILL)
893 { 893 {
894 contr->digestion += tmp->stats.food; 894 contr->digestion = clamp (int (contr->digestion) + tmp->stats.food, MIN_DIGESTION, MAX_DIGESTION);
895 contr->gen_hp += tmp->stats.hp; 895 contr->gen_hp += tmp->stats.hp;
896 contr->gen_sp += tmp->stats.sp; 896 contr->gen_sp += tmp->stats.sp;
897 contr->gen_grace += tmp->stats.grace; 897 contr->gen_grace += tmp->stats.grace;
898 contr->gen_sp_armour += tmp->gen_sp_armour; 898 contr->gen_sp_armour += tmp->gen_sp_armour;
899 } 899 }
1509 object *skin = NULL; /* pointer to dragon skin force */ 1509 object *skin = NULL; /* pointer to dragon skin force */
1510 object *tmp = NULL; /* tmp. object */ 1510 object *tmp = NULL; /* tmp. object */
1511 char buf[MAX_BUF]; /* tmp. string buffer */ 1511 char buf[MAX_BUF]; /* tmp. string buffer */
1512 1512
1513 /* now grab the 'dragon_ability'-forces from the player's inventory */ 1513 /* now grab the 'dragon_ability'-forces from the player's inventory */
1514 shstr_cmp dragon_ability_force ("dragon_ability_force");
1515 shstr_cmp dragon_skin_force ("dragon_skin_force");
1516
1517 for (tmp = who->inv; tmp; tmp = tmp->below) 1514 for (tmp = who->inv; tmp; tmp = tmp->below)
1518 if (tmp->type == FORCE) 1515 if (tmp->type == FORCE)
1519 if (tmp->arch->archname == dragon_ability_force) 1516 if (tmp->arch->archname == shstr_dragon_ability_force)
1520 abil = tmp; 1517 abil = tmp;
1521 else if (tmp->arch->archname == dragon_skin_force) 1518 else if (tmp->arch->archname == shstr_dragon_skin_force)
1522 skin = tmp; 1519 skin = tmp;
1523 1520
1524 /* if the force is missing -> bail out */ 1521 /* if the force is missing -> bail out */
1525 if (abil == NULL) 1522 if (abil == NULL)
1526 return; 1523 return;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines