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.6 by elmex, Tue Aug 29 11:58:02 2006 UTC vs.
Revision 1.7 by root, Wed Aug 30 06:06:27 2006 UTC

1/* 1/*
2 * static char *rcsid_attack_c = 2 * static char *rcsid_attack_c =
3 * "$Id: attack.C,v 1.6 2006/08/29 11:58:02 elmex Exp $"; 3 * "$Id: attack.C,v 1.7 2006/08/30 06:06:27 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
678 678
679 if (get_attack_mode (&op, &hitter, &simple_attack)) 679 if (get_attack_mode (&op, &hitter, &simple_attack))
680 goto error; 680 goto error;
681 681
682 if (hitter->current_weapon) 682 if (hitter->current_weapon)
683 if (INVOKE_OBJECT (ATTACKS, hitter->current_weapon, ARG_OBJECT (hitter), ARG_OBJECT (op))) 683 if (INVOKE_OBJECT (WEAPON_ATTACK, hitter->current_weapon, ARG_OBJECT (hitter), ARG_OBJECT (op)))
684 return RESULT_INT (0); 684 return RESULT_INT (0);
685 685
686 if (INVOKE_OBJECT (ATTACK, op, ARG_OBJECT (hitter))) 686 if (INVOKE_OBJECT (ATTACK, op, ARG_OBJECT (hitter)))
687 return RESULT_INT (0); 687 return RESULT_INT (0);
688 688

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines