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.68 by root, Sun Jul 1 05:00:17 2007 UTC vs.
Revision 1.69 by root, Wed Jul 4 18:03:48 2007 UTC

864 || (tmp->type == SKILL 864 || (tmp->type == SKILL
865 && tmp->subtype == SK_PRAYING)) 865 && tmp->subtype == SK_PRAYING))
866 { 866 {
867 if (type == PLAYER) 867 if (type == PLAYER)
868 { 868 {
869 contr->item_power += tmp->item_power;
870
869 if (tmp == contr->combat_ob || tmp == contr->ranged_ob) 871 if (tmp == contr->combat_ob || tmp == contr->ranged_ob)
870 if (tmp != current_weapon 872 if (tmp != current_weapon
871 && (tmp->type != SKILL || tmp->subtype != SK_PRAYING) 873 && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)
872 && !tmp->flag [FLAG_CURSED] 874 && !tmp->flag [FLAG_CURSED]
873 && !tmp->flag [FLAG_DAMNED]) 875 && !tmp->flag [FLAG_DAMNED])
892 contr->digestion += tmp->stats.food; 894 contr->digestion += tmp->stats.food;
893 contr->gen_hp += tmp->stats.hp; 895 contr->gen_hp += tmp->stats.hp;
894 contr->gen_sp += tmp->stats.sp; 896 contr->gen_sp += tmp->stats.sp;
895 contr->gen_grace += tmp->stats.grace; 897 contr->gen_grace += tmp->stats.grace;
896 contr->gen_sp_armour += tmp->gen_sp_armour; 898 contr->gen_sp_armour += tmp->gen_sp_armour;
897 contr->item_power += tmp->item_power;
898 } 899 }
899 } /* if this is a player */ 900 } /* if this is a player */
900 else 901 else
901 { 902 {
902 if (tmp->type == WEAPON) 903 if (tmp->type == WEAPON)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines