| … | |
… | |
| 964 | } |
964 | } |
| 965 | else if (map) |
965 | else if (map) |
| 966 | { |
966 | { |
| 967 | if (type == PLAYER) |
967 | if (type == PLAYER) |
| 968 | { |
968 | { |
|
|
969 | // leaving a spot always closes any open container on the ground |
|
|
970 | if (container && !container->env) |
|
|
971 | // this causes spurious floorbox updates, but it ensures |
|
|
972 | // that the CLOSE event is being sent. |
|
|
973 | close_container (); |
|
|
974 | |
| 969 | --map->players; |
975 | --map->players; |
| 970 | map->touch (); |
976 | map->touch (); |
| 971 | } |
977 | } |
| 972 | |
978 | |
| 973 | map->dirty = true; |
979 | map->dirty = true; |
| … | |
… | |
| 2627 | shstr unknown ("unknown"); |
2633 | shstr unknown ("unknown"); |
| 2628 | |
2634 | |
| 2629 | return name_to_material (unknown); |
2635 | return name_to_material (unknown); |
| 2630 | } |
2636 | } |
| 2631 | |
2637 | |
|
|
2638 | void |
|
|
2639 | object::open_container (object *new_container) |
|
|
2640 | { |
|
|
2641 | if (container == new_container) |
|
|
2642 | return; |
|
|
2643 | |
|
|
2644 | if (object *old_container = container) |
|
|
2645 | { |
|
|
2646 | if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this))) |
|
|
2647 | return; |
|
|
2648 | |
|
|
2649 | #if 0 |
|
|
2650 | // remove the "Close old_container" object. |
|
|
2651 | if (object *closer = old_container->inv) |
|
|
2652 | if (closer->type == CLOSE_CON) |
|
|
2653 | closer->destroy (); |
|
|
2654 | #endif |
|
|
2655 | |
|
|
2656 | old_container->flag [FLAG_APPLIED] = 0; |
|
|
2657 | container = 0; |
|
|
2658 | |
|
|
2659 | esrv_update_item (UPD_FLAGS, this, old_container); |
|
|
2660 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
|
|
2661 | } |
|
|
2662 | |
|
|
2663 | if (new_container) |
|
|
2664 | { |
|
|
2665 | if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) |
|
|
2666 | return; |
|
|
2667 | |
|
|
2668 | // TODO: this does not seem to serve any purpose anymore? |
|
|
2669 | #if 0 |
|
|
2670 | // insert the "Close Container" object. |
|
|
2671 | if (archetype *closer = new_container->other_arch) |
|
|
2672 | { |
|
|
2673 | object *closer = arch_to_object (new_container->other_arch); |
|
|
2674 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
|
|
2675 | new_container->insert (closer); |
|
|
2676 | } |
|
|
2677 | #endif |
|
|
2678 | |
|
|
2679 | new_container->flag [FLAG_APPLIED] = 1; |
|
|
2680 | container = new_container; |
|
|
2681 | |
|
|
2682 | esrv_update_item (UPD_FLAGS, this, new_container); |
|
|
2683 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
|
|
2684 | } |
|
|
2685 | |
|
|
2686 | if (contr && contr->ns) |
|
|
2687 | contr->ns->floorbox_update (); |
|
|
2688 | } |
|
|
2689 | |
|
|
2690 | |
