| … | |
… | |
| 1513 | } /* Was it a player that hit somethign */ |
1513 | } /* Was it a player that hit somethign */ |
| 1514 | else |
1514 | else |
| 1515 | skill = 0; |
1515 | skill = 0; |
| 1516 | |
1516 | |
| 1517 | /* Pet (or spell) killed something. */ |
1517 | /* Pet (or spell) killed something. */ |
|
|
1518 | if (op->type == PLAYER) |
|
|
1519 | { |
| 1518 | if (owner != hitter) |
1520 | if (owner != hitter) |
| 1519 | sprintf (buf, "%s killed %s with %s%s%s.", &owner->name, |
1521 | sprintf (buf, "%s killed %s with %s%s%s.", &owner->name, |
| 1520 | query_name (op), query_name (hitter), battleg ? " (duel)" : "", pk ? " (pk)" : ""); |
1522 | query_name (op), query_name (hitter), battleg ? " (duel)" : "", pk ? " (pk)" : ""); |
| 1521 | else |
1523 | else |
| 1522 | sprintf (buf, "%s killed %s%s%s%s.", &hitter->name, &op->name, |
1524 | sprintf (buf, "%s killed %s%s%s%s.", &hitter->name, &op->name, |
| 1523 | (QUERY_FLAG (hitter, FLAG_MONSTER)) || hitter->type == PLAYER ? |
1525 | (QUERY_FLAG (hitter, FLAG_MONSTER)) || hitter->type == PLAYER ? |
| 1524 | " in hand to hand combat" : "", battleg ? " (duel)" : "", pk ? " (pk)" : ""); |
1526 | " in hand to hand combat" : "", battleg ? " (duel)" : "", pk ? " (pk)" : ""); |
|
|
1527 | |
|
|
1528 | new_draw_info (NDI_ALL, 0, NULL, buf); |
|
|
1529 | } |
| 1525 | |
1530 | |
| 1526 | /* These may have been set in the player code section above */ |
1531 | /* These may have been set in the player code section above */ |
| 1527 | if (!skop) |
1532 | if (!skop) |
| 1528 | skop = hitter->chosen_skill; |
1533 | skop = hitter->chosen_skill; |
| 1529 | |
1534 | |
| 1530 | if (!skill && skop) |
1535 | if (!skill && skop) |
| 1531 | skill = skop->skill; |
1536 | skill = skop->skill; |
| 1532 | |
|
|
| 1533 | new_draw_info (NDI_ALL, op->type == PLAYER ? 1 : 10, NULL, buf); |
|
|
| 1534 | |
1537 | |
| 1535 | /* If you didn't kill yourself, and your not the wizard */ |
1538 | /* If you didn't kill yourself, and your not the wizard */ |
| 1536 | if (owner != op && !QUERY_FLAG (op, FLAG_WIZ)) |
1539 | if (owner != op && !QUERY_FLAG (op, FLAG_WIZ)) |
| 1537 | { |
1540 | { |
| 1538 | int exp; |
1541 | int exp; |
