| … | |
… | |
| 1677 | if (victim->type == PLAYER && EXIT_PATH (trap)) |
1677 | if (victim->type == PLAYER && EXIT_PATH (trap)) |
| 1678 | { |
1678 | { |
| 1679 | /* Basically, don't show exits leading to random maps the |
1679 | /* Basically, don't show exits leading to random maps the |
| 1680 | * players output. |
1680 | * players output. |
| 1681 | */ |
1681 | */ |
| 1682 | if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2) && strncmp (EXIT_PATH (trap), "/random/", 8)) |
1682 | if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2)) |
| 1683 | new_draw_info (NDI_NAVY, 0, victim, trap->msg); |
1683 | new_draw_info (NDI_NAVY, 0, victim, trap->msg); |
| 1684 | |
1684 | |
| 1685 | victim->enter_exit (trap); |
1685 | victim->enter_exit (trap); |
| 1686 | } |
1686 | } |
| 1687 | goto leave; |
1687 | goto leave; |
| … | |
… | |
| 2555 | { |
2555 | { |
| 2556 | new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); |
2556 | new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle."); |
| 2557 | play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); |
2557 | play_sound_map (tmp->map, tmp->x, tmp->y, SOUND_TURN_HANDLE); |
| 2558 | } |
2558 | } |
| 2559 | else |
2559 | else |
| 2560 | { |
|
|
| 2561 | new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); |
2560 | new_draw_info (NDI_UNIQUE, 0, op, "The handle doesn't move."); |
| 2562 | } |
2561 | |
| 2563 | return 1; |
2562 | return 1; |
| 2564 | |
2563 | |
| 2565 | case EXIT: |
2564 | case EXIT: |
| 2566 | if (op->type != PLAYER) |
2565 | if (op->type != PLAYER) |
| 2567 | return 0; |
2566 | return 0; |
|
|
2567 | |
| 2568 | if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) |
2568 | if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) |
| 2569 | { |
2569 | { |
| 2570 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp)); |
2570 | new_draw_info_format (NDI_UNIQUE, 0, op, "The %s is closed.", query_name (tmp)); |
| 2571 | } |
2571 | } |
| 2572 | else |
2572 | else |
| 2573 | { |
2573 | { |
| 2574 | /* Don't display messages for random maps. */ |
2574 | /* Don't display messages for random maps. */ |
| 2575 | if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2) && strncmp (EXIT_PATH (tmp), "/random/", 8)) |
2575 | if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) |
| 2576 | new_draw_info (NDI_NAVY, 0, op, tmp->msg); |
2576 | new_draw_info (NDI_NAVY, 0, op, tmp->msg); |
|
|
2577 | |
| 2577 | op->enter_exit (tmp); |
2578 | op->enter_exit (tmp); |
| 2578 | } |
2579 | } |
| 2579 | return 1; |
2580 | return 1; |
| 2580 | |
2581 | |
| 2581 | case SIGN: |
2582 | case SIGN: |
