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.67 by root, Mon Jun 4 13:04:00 2007 UTC vs.
Revision 1.69 by root, Wed Jul 4 18:03:48 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
865 || (tmp->type == SKILL 864 || (tmp->type == SKILL
866 && tmp->subtype == SK_PRAYING)) 865 && tmp->subtype == SK_PRAYING))
867 { 866 {
868 if (type == PLAYER) 867 if (type == PLAYER)
869 { 868 {
869 contr->item_power += tmp->item_power;
870
870 if (tmp == contr->combat_ob || tmp == contr->ranged_ob) 871 if (tmp == contr->combat_ob || tmp == contr->ranged_ob)
871 if (tmp != current_weapon 872 if (tmp != current_weapon
872 && (tmp->type != SKILL || tmp->subtype != SK_PRAYING) 873 && (tmp->type != SKILL || tmp->subtype != SK_PRAYING)
873 && !tmp->flag [FLAG_CURSED] 874 && !tmp->flag [FLAG_CURSED]
874 && !tmp->flag [FLAG_DAMNED]) 875 && !tmp->flag [FLAG_DAMNED])
893 contr->digestion += tmp->stats.food; 894 contr->digestion += tmp->stats.food;
894 contr->gen_hp += tmp->stats.hp; 895 contr->gen_hp += tmp->stats.hp;
895 contr->gen_sp += tmp->stats.sp; 896 contr->gen_sp += tmp->stats.sp;
896 contr->gen_grace += tmp->stats.grace; 897 contr->gen_grace += tmp->stats.grace;
897 contr->gen_sp_armour += tmp->gen_sp_armour; 898 contr->gen_sp_armour += tmp->gen_sp_armour;
898 contr->item_power += tmp->item_power;
899 } 899 }
900 } /* if this is a player */ 900 } /* if this is a player */
901 else 901 else
902 { 902 {
903 if (tmp->type == WEAPON) 903 if (tmp->type == WEAPON)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines