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.23 by root, Mon Dec 4 15:33:52 2006 UTC vs.
Revision 1.24 by root, Sat Dec 9 16:11:09 2006 UTC

1450 } 1450 }
1451 1451
1452 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER) 1452 if (QUERY_FLAG (op, FLAG_FRIENDLY) && op->type != PLAYER)
1453 { 1453 {
1454 remove_friendly_object (op); 1454 remove_friendly_object (op);
1455
1455 if (get_owner (op) && op->owner->type == PLAYER && op->owner->contr->ranges[range_golem] == op) 1456 if (get_owner (op) && op->owner->type == PLAYER && op->owner->contr->ranges[range_golem] == op)
1456 {
1457 op->owner->contr->ranges[range_golem] = 0; 1457 op->owner->contr->ranges[range_golem] = 0;
1458 op->owner->contr->golem_count = 0;
1459 }
1460 1458
1461 remove_ob (op); 1459 remove_ob (op);
1462 free_object (op); 1460 free_object (op);
1463 return maxdam; 1461 return maxdam;
1464 } 1462 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines