| … | |
… | |
| 2669 | * person moving on it, also activate. Added code to make it |
2669 | * person moving on it, also activate. Added code to make it |
| 2670 | * so that at least one of players movement types be that which |
2670 | * so that at least one of players movement types be that which |
| 2671 | * the item needs. |
2671 | * the item needs. |
| 2672 | */ |
2672 | */ |
| 2673 | if (!tmp->invisible || (tmp->move_on & pl->move_type)) |
2673 | if (!tmp->invisible || (tmp->move_on & pl->move_type)) |
| 2674 | { |
|
|
| 2675 | if (player_apply (pl, tmp, 0, 1) == 1) |
2674 | if (player_apply (pl, tmp, 0, 1) == 1) |
| 2676 | return; |
2675 | return; |
| 2677 | } |
2676 | |
| 2678 | if (floors >= 2) |
2677 | if (floors >= 2) |
| 2679 | return; /* process at most two floor objects */ |
2678 | return; /* process at most two floor objects */ |
| 2680 | } |
2679 | } |
| 2681 | } |
2680 | } |
| 2682 | |
2681 | |
| … | |
… | |
| 2776 | op->destroy (); |
2775 | op->destroy (); |
| 2777 | who->insert (tmp2); |
2776 | who->insert (tmp2); |
| 2778 | who->update_stats (); |
2777 | who->update_stats (); |
| 2779 | |
2778 | |
| 2780 | if (who->contr) |
2779 | if (who->contr) |
| 2781 | { |
|
|
| 2782 | if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) |
2780 | if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) |
| 2783 | { |
2781 | { |
| 2784 | who->failmsg ("Oops, it feels deadly cold!"); |
2782 | who->failmsg ("Oops, it feels deadly cold!"); |
| 2785 | SET_FLAG (tmp2, FLAG_KNOWN_CURSED); |
2783 | SET_FLAG (tmp2, FLAG_KNOWN_CURSED); |
| 2786 | } |
2784 | } |
| 2787 | } |
|
|
| 2788 | } |
2785 | } |
| 2789 | |
2786 | |
| 2790 | return 1; /* otherwise, an attempt to drop causes problems */ |
2787 | return 1; /* otherwise, an attempt to drop causes problems */ |
| 2791 | |
2788 | |
| 2792 | case BOW: |
2789 | case BOW: |
| … | |
… | |
| 3314 | who->update_stats (); |
3311 | who->update_stats (); |
| 3315 | |
3312 | |
| 3316 | if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) |
3313 | if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) |
| 3317 | if (who->type == PLAYER) |
3314 | if (who->type == PLAYER) |
| 3318 | { |
3315 | { |
| 3319 | who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"); |
3316 | who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright (hrhrhr) idea to apply this cursed or damned item.>"); |
| 3320 | SET_FLAG (tmp2, FLAG_KNOWN_CURSED); |
3317 | SET_FLAG (tmp2, FLAG_KNOWN_CURSED); |
| 3321 | } |
3318 | } |
| 3322 | |
3319 | |
| 3323 | return 0; |
3320 | return 0; |
| 3324 | |
3321 | |
| … | |
… | |
| 3502 | if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) |
3499 | if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) |
| 3503 | if (who->type == PLAYER) |
3500 | if (who->type == PLAYER) |
| 3504 | { |
3501 | { |
| 3505 | who->failmsg ( |
3502 | who->failmsg ( |
| 3506 | "Oops, it feels deadly cold! " |
3503 | "Oops, it feels deadly cold! " |
| 3507 | "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>" |
3504 | "H<Maybe it wasn't such a bright idea to apply this cursed or damned item.>" |
| 3508 | ); |
3505 | ); |
| 3509 | SET_FLAG (op, FLAG_KNOWN_CURSED); |
3506 | SET_FLAG (op, FLAG_KNOWN_CURSED); |
| 3510 | } |
3507 | } |
| 3511 | |
3508 | |
| 3512 | if (object *pl = op->visible_to ()) |
3509 | if (object *pl = op->visible_to ()) |
