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.2 by root, Fri Feb 3 07:25:25 2006 UTC vs.
Revision 1.3 by root, Thu Feb 9 02:11:26 2006 UTC

1/* 1/*
2 * static char *rcsid_attack_c = 2 * static char *rcsid_attack_c =
3 * "$Id: attack.c,v 1.2 2006/02/03 07:25:25 root Exp $"; 3 * "$Id: attack.c,v 1.3 2006/02/09 02:11:26 root Exp $";
4 */ 4 */
5/* 5/*
6 CrossFire, A Multiplayer game for X-windows 6 CrossFire, A Multiplayer game for X-windows
7 7
8 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 8 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
1731 * doing damage - otherwise, the +1 in the coe below will make 1731 * doing damage - otherwise, the +1 in the coe below will make
1732 * an attack do damage before when it otherwise didn't 1732 * an attack do damage before when it otherwise didn't
1733 */ 1733 */
1734 friendlyfire = friendly_fire(op, hitter); 1734 friendlyfire = friendly_fire(op, hitter);
1735 if (friendlyfire && maxdam){ 1735 if (friendlyfire && maxdam){
1736 maxdam = ((dam * settings.set_friendly_fire) / 100)+0; 1736 maxdam = ((dam * settings.set_friendly_fire) / 100);
1737 1737#ifndef COZY_SERVER
1738 maxdam++;
1739#endif
1740
1738#ifdef ATTACK_DEBUG 1741#ifdef ATTACK_DEBUG
1739 LOG(llevDebug,"Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n", 1742 LOG(llevDebug,"Friendly fire (type:%d setting: %d%) did %d damage dropped to %d\n",
1740 friendlyfire, settings.set_friendly_fire, dam, maxdam); 1743 friendlyfire, settings.set_friendly_fire, dam, maxdam);
1741#endif 1744#endif
1742 } 1745 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines