| … | |
… | |
| 1624 | } |
1624 | } |
| 1625 | |
1625 | |
| 1626 | op->destroy (); |
1626 | op->destroy (); |
| 1627 | } |
1627 | } |
| 1628 | else |
1628 | else |
| 1629 | { |
|
|
| 1630 | /* Player has been killed! */ |
1629 | /* Player has been killed! */ |
| 1631 | if (owner->type == PLAYER) |
1630 | op->contr->killer = owner->type == PLAYER ? owner : hitter; |
| 1632 | snprintf (op->contr->killer, sizeof (op->contr->killer), "%s the %s", &owner->name, owner->contr->title); |
|
|
| 1633 | else |
|
|
| 1634 | assign (op->contr->killer, hitter->name); |
|
|
| 1635 | } |
|
|
| 1636 | |
1631 | |
| 1637 | /* This was return -1 - that doesn't seem correct - if we return -1, process |
1632 | /* This was return -1 - that doesn't seem correct - if we return -1, process |
| 1638 | * continues in the calling function. |
1633 | * continues in the calling function. |
| 1639 | */ |
1634 | */ |
| 1640 | return maxdam; |
1635 | return maxdam; |
