| 1 | |
1 | |
| 2 | /* |
2 | /* |
| 3 | * static char *rcsid_attack_c = |
3 | * static char *rcsid_attack_c = |
| 4 | * "$Id: attack.C,v 1.11 2006/09/11 20:26:41 root Exp $"; |
4 | * "$Id: attack.C,v 1.12 2006/09/12 19:20:08 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 | |
| … | |
… | |
| 1687 | { |
1687 | { |
| 1688 | play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0); |
1688 | play_sound_player_only (owner1->contr, SOUND_PET_IS_KILLED, 0, 0); |
| 1689 | /* Maybe we should include the owner that killed this, maybe not */ |
1689 | /* Maybe we should include the owner that killed this, maybe not */ |
| 1690 | new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name); |
1690 | new_draw_info_format (NDI_UNIQUE, 0, owner1, "Your pet, the %s, is killed by %s.", &op->name, &hitter->name); |
| 1691 | } |
1691 | } |
|
|
1692 | |
| 1692 | remove_friendly_object (op); |
1693 | remove_friendly_object (op); |
| 1693 | } |
1694 | } |
|
|
1695 | |
| 1694 | remove_ob (op); |
1696 | remove_ob (op); |
| 1695 | free_object (op); |
1697 | free_object (op); |
| 1696 | } |
1698 | } |
| 1697 | /* Player has been killed! */ |
1699 | /* Player has been killed! */ |
| 1698 | else |
1700 | else |
| … | |
… | |
| 1700 | if (owner->type == PLAYER) |
1702 | if (owner->type == PLAYER) |
| 1701 | { |
1703 | { |
| 1702 | snprintf (op->contr->killer, BIG_NAME, "%s the %s", &owner->name, owner->contr->title); |
1704 | snprintf (op->contr->killer, BIG_NAME, "%s the %s", &owner->name, owner->contr->title); |
| 1703 | } |
1705 | } |
| 1704 | else |
1706 | else |
| 1705 | { |
|
|
| 1706 | strncpy (op->contr->killer, hitter->name, BIG_NAME); |
1707 | assign (op->contr->killer, hitter->name); |
| 1707 | op->contr->killer[BIG_NAME - 1] = '\0'; |
|
|
| 1708 | } |
|
|
| 1709 | } |
1708 | } |
|
|
1709 | |
| 1710 | /* This was return -1 - that doesn't seem correct - if we return -1, process |
1710 | /* This was return -1 - that doesn't seem correct - if we return -1, process |
| 1711 | * continues in the calling function. |
1711 | * continues in the calling function. |
| 1712 | */ |
1712 | */ |
| 1713 | return maxdam; |
1713 | return maxdam; |
| 1714 | } |
1714 | } |
