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

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.13 by root, Thu Sep 14 00:14:51 2006 UTC vs.
Revision 1.14 by root, Thu Sep 14 17:10:25 2006 UTC

1 1
2/* 2/*
3 * static char *rcsid_attack_c = 3 * static char *rcsid_attack_c =
4 * "$Id: attack.C,v 1.13 2006/09/14 00:14:51 root Exp $"; 4 * "$Id: attack.C,v 1.14 2006/09/14 17:10:25 root Exp $";
5 */ 5 */
6 6
7/* 7/*
8 CrossFire, A Multiplayer game for X-windows 8 CrossFire, A Multiplayer game for X-windows
9 9
1335 break; 1335 break;
1336 case ATNR_TURN_UNDEAD: 1336 case ATNR_TURN_UNDEAD:
1337 { 1337 {
1338 if (QUERY_FLAG (op, FLAG_UNDEAD)) 1338 if (QUERY_FLAG (op, FLAG_UNDEAD))
1339 { 1339 {
1340 object *owner = get_owner (hitter) == NULL ? hitter : get_owner (hitter); 1340 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1341 object *god = find_god (determine_god (owner)); 1341 object *god = find_god (determine_god (owner));
1342 int div = 1; 1342 int div = 1;
1343 1343
1344 /* if undead are not an enemy of your god, you turn them 1344 /* if undead are not an enemy of your god, you turn them
1345 * at half strength */ 1345 * at half strength */
1371 break; 1371 break;
1372 case ATNR_HOLYWORD: 1372 case ATNR_HOLYWORD:
1373 { 1373 {
1374 /* This has already been handled by hit_player, 1374 /* This has already been handled by hit_player,
1375 * no need to check twice -- DAMN */ 1375 * no need to check twice -- DAMN */
1376 1376 object *owner = hitter->owner ? (object *)hitter->owner : hitter;
1377 object *owner = get_owner (hitter) == NULL ? hitter : get_owner (hitter);
1378 1377
1379 /* As with turn undead above, give a bonus on the saving throw */ 1378 /* As with turn undead above, give a bonus on the saving throw */
1380 if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis]) 1379 if ((op->level + (op->resist[ATNR_HOLYWORD] / 100)) < owner->level + turn_bonus[owner->stats.Wis])
1381 scare_creature (op, owner); 1380 scare_creature (op, owner);
1382 } 1381 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines