| … | |
… | |
| 408 | |
408 | |
| 409 | return true; |
409 | return true; |
| 410 | } |
410 | } |
| 411 | |
411 | |
| 412 | bool |
412 | bool |
| 413 | maptile::_load_objects (const char *path, bool skip_header) |
|
|
| 414 | { |
|
|
| 415 | object_thawer f (path); |
|
|
| 416 | |
|
|
| 417 | if (!f) |
|
|
| 418 | return false; |
|
|
| 419 | |
|
|
| 420 | f.next (); |
|
|
| 421 | |
|
|
| 422 | if (skip_header) |
|
|
| 423 | for (;;) |
|
|
| 424 | { |
|
|
| 425 | keyword kw = f.kw; |
|
|
| 426 | f.skip (); |
|
|
| 427 | if (kw == KW_end) |
|
|
| 428 | break; |
|
|
| 429 | } |
|
|
| 430 | |
|
|
| 431 | return _load_objects (f); |
|
|
| 432 | } |
|
|
| 433 | |
|
|
| 434 | bool |
|
|
| 435 | maptile::_save_objects (const char *path, int flags) |
413 | maptile::_save_objects (const char *path, int flags) |
| 436 | { |
414 | { |
| 437 | object_freezer freezer; |
415 | object_freezer freezer; |
| 438 | |
416 | |
| 439 | if (!_save_objects (freezer, flags)) |
417 | if (!_save_objects (freezer, flags)) |
| … | |
… | |
| 611 | bool |
589 | bool |
| 612 | maptile::_load_header (object_thawer &thawer) |
590 | maptile::_load_header (object_thawer &thawer) |
| 613 | { |
591 | { |
| 614 | for (;;) |
592 | for (;;) |
| 615 | { |
593 | { |
| 616 | thawer.next (); |
|
|
| 617 | |
|
|
| 618 | switch (thawer.kw) |
594 | switch (thawer.kw) |
| 619 | { |
595 | { |
| 620 | case KW_msg: |
596 | case KW_msg: |
| 621 | thawer.get_ml (KW_endmsg, msg); |
597 | thawer.get_ml (KW_endmsg, msg); |
| 622 | break; |
598 | break; |
| … | |
… | |
| 677 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
653 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
| 678 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
654 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
| 679 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
655 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
| 680 | |
656 | |
| 681 | case KW_ERROR: |
657 | case KW_ERROR: |
| 682 | set_key (thawer.kw_str, thawer.value); |
658 | set_key_text (thawer.kw_str, thawer.value); |
| 683 | break; |
659 | break; |
| 684 | |
660 | |
| 685 | case KW_end: |
661 | case KW_end: |
|
|
662 | thawer.next (); |
| 686 | return true; |
663 | return true; |
| 687 | |
664 | |
| 688 | default: |
665 | default: |
| 689 | if (!thawer.parse_error ("map", 0)) |
666 | if (!thawer.parse_error ("map", 0)) |
| 690 | return false; |
667 | return false; |
| 691 | break; |
668 | break; |
| 692 | } |
669 | } |
|
|
670 | |
|
|
671 | thawer.next (); |
| 693 | } |
672 | } |
| 694 | |
673 | |
| 695 | abort (); |
674 | abort (); |
| 696 | } |
|
|
| 697 | |
|
|
| 698 | bool |
|
|
| 699 | maptile::_load_header (const char *path) |
|
|
| 700 | { |
|
|
| 701 | object_thawer thawer (path); |
|
|
| 702 | |
|
|
| 703 | if (!thawer) |
|
|
| 704 | return false; |
|
|
| 705 | |
|
|
| 706 | return _load_header (thawer); |
|
|
| 707 | } |
675 | } |
| 708 | |
676 | |
| 709 | /****************************************************************************** |
677 | /****************************************************************************** |
| 710 | * This is the start of unique map handling code |
678 | * This is the start of unique map handling code |
| 711 | *****************************************************************************/ |
679 | *****************************************************************************/ |
| … | |
… | |
| 810 | * Remove and free all objects in the given map. |
778 | * Remove and free all objects in the given map. |
| 811 | */ |
779 | */ |
| 812 | void |
780 | void |
| 813 | maptile::clear () |
781 | maptile::clear () |
| 814 | { |
782 | { |
| 815 | sfree (regions, size ()); regions = 0; |
|
|
| 816 | delete [] regionmap; regionmap = 0; |
|
|
| 817 | |
|
|
| 818 | if (spaces) |
783 | if (spaces) |
| 819 | { |
784 | { |
| 820 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
785 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
| 821 | while (object *op = ms->bot) |
786 | while (object *op = ms->bot) |
| 822 | { |
787 | { |
|
|
788 | // manually remove, as to not trigger anything |
|
|
789 | if (ms->bot = op->above) |
|
|
790 | ms->bot->below = 0; |
|
|
791 | |
|
|
792 | op->flag [FLAG_REMOVED] = true; |
|
|
793 | |
| 823 | op = op->head_ (); |
794 | if (op == op->head_ ()) |
|
|
795 | { |
| 824 | op->destroy_inv (false); |
796 | op->destroy_inv (false); |
| 825 | op->destroy (); |
797 | op->destroy (); |
|
|
798 | } |
| 826 | } |
799 | } |
| 827 | |
800 | |
| 828 | sfree (spaces, size ()), spaces = 0; |
801 | sfree (spaces, size ()), spaces = 0; |
| 829 | } |
802 | } |
| 830 | |
803 | |
| 831 | if (buttons) |
804 | if (buttons) |
| 832 | free_objectlinkpt (buttons), buttons = 0; |
805 | free_objectlinkpt (buttons), buttons = 0; |
|
|
806 | |
|
|
807 | sfree (regions, size ()); regions = 0; |
|
|
808 | delete [] regionmap; regionmap = 0; |
| 833 | } |
809 | } |
| 834 | |
810 | |
| 835 | void |
811 | void |
| 836 | maptile::clear_header () |
812 | maptile::clear_header () |
| 837 | { |
813 | { |
| … | |
… | |
| 1628 | { |
1604 | { |
| 1629 | if (!sound) |
1605 | if (!sound) |
| 1630 | return; |
1606 | return; |
| 1631 | |
1607 | |
| 1632 | for_all_players (pl) |
1608 | for_all_players (pl) |
| 1633 | if (pl->ob->map == this) |
1609 | if (pl->observe->map == this) |
| 1634 | if (client *ns = pl->ns) |
1610 | if (client *ns = pl->ns) |
| 1635 | { |
1611 | { |
| 1636 | int dx = x - pl->ob->x; |
1612 | int dx = x - pl->observe->x; |
| 1637 | int dy = y - pl->ob->y; |
1613 | int dy = y - pl->observe->y; |
| 1638 | |
1614 | |
| 1639 | int distance = idistance (dx, dy); |
1615 | int distance = idistance (dx, dy); |
| 1640 | |
1616 | |
| 1641 | if (distance <= MAX_SOUND_DISTANCE) |
1617 | if (distance <= MAX_SOUND_DISTANCE) |
| 1642 | ns->play_sound (sound, dx, dy); |
1618 | ns->play_sound (sound, dx, dy); |
