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.57 by root, Mon May 14 21:32:26 2007 UTC vs.
Revision 1.59 by root, Thu May 17 00:33:29 2007 UTC

866 && tmp->subtype == SK_PRAYING)) 866 && tmp->subtype == SK_PRAYING))
867 { 867 {
868 if (type == PLAYER) 868 if (type == PLAYER)
869 { 869 {
870 if (tmp == contr->combat_ob || tmp == contr->ranged_ob) 870 if (tmp == contr->combat_ob || tmp == contr->ranged_ob)
871 if (tmp != current_weapon
871 if (tmp != current_weapon && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)) 872 && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)
873 && !tmp->flag [FLAG_CURSED]
874 && !tmp->flag [FLAG_DAMNED])
872 continue; 875 continue;
873 876
874 for (i = 0; i < NUM_STATS; i++) 877 for (i = 0; i < NUM_STATS; i++)
875 change_attr_value (&stats, i, tmp->stats.stat (i)); 878 change_attr_value (&stats, i, tmp->stats.stat (i));
876 879
877 /* these are the items that currently can change digestion, regeneration, 880 /* These are the items that currently can change digestion, regeneration,
878 * spell point recovery and mana point recovery. Seems sort of an arbitary 881 * spell point recovery and mana point recovery. Seems sort of an arbitary
879 * list, but other items store other info into stats array. 882 * list, but other items store other info into stats array.
880 */ 883 */
881 if (tmp->type == WEAPON || tmp->type == BOW || 884 if (tmp->type == WEAPON || tmp->type == BOW ||
882 tmp->type == ARMOUR || tmp->type == HELMET || 885 tmp->type == ARMOUR || tmp->type == HELMET ||
883 tmp->type == SHIELD || tmp->type == RING || 886 tmp->type == SHIELD || tmp->type == RING ||

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines