| … | |
… | |
| 400 | * Loads (ands parses) the objects into a given map from the specified |
400 | * Loads (ands parses) the objects into a given map from the specified |
| 401 | * file pointer. |
401 | * file pointer. |
| 402 | * mapflags is the same as we get with load_original_map |
402 | * mapflags is the same as we get with load_original_map |
| 403 | */ |
403 | */ |
| 404 | bool |
404 | bool |
| 405 | maptile::load_objects (object_thawer &thawer) |
405 | maptile::_load_objects (object_thawer &thawer) |
| 406 | { |
406 | { |
| 407 | int unique; |
407 | int unique; |
| 408 | object *op, *prev = NULL, *last_more = NULL, *otmp; |
408 | object *op, *prev = NULL, *last_more = NULL, *otmp; |
| 409 | |
409 | |
| 410 | op = object::create (); |
410 | op = object::create (); |
| … | |
… | |
| 486 | for (object *op = ms->bot; op; op = op->above) |
486 | for (object *op = ms->bot; op; op = op->above) |
| 487 | op->deactivate_recursive (); |
487 | op->deactivate_recursive (); |
| 488 | } |
488 | } |
| 489 | |
489 | |
| 490 | bool |
490 | bool |
| 491 | maptile::save_objects (object_freezer &freezer, int flags) |
491 | maptile::_save_objects (object_freezer &freezer, int flags) |
| 492 | { |
492 | { |
| 493 | static int cede_count = 0; |
493 | static int cede_count = 0; |
| 494 | |
494 | |
| 495 | if (flags & IO_HEADER) |
495 | if (flags & IO_HEADER) |
| 496 | save_header (freezer); |
496 | _save_header (freezer); |
| 497 | |
497 | |
| 498 | if (!spaces) |
498 | if (!spaces) |
| 499 | return false; |
499 | return false; |
| 500 | |
500 | |
| 501 | for (int i = 0; i < size (); ++i) |
501 | for (int i = 0; i < size (); ++i) |
| … | |
… | |
| 530 | |
530 | |
| 531 | return true; |
531 | return true; |
| 532 | } |
532 | } |
| 533 | |
533 | |
| 534 | bool |
534 | bool |
| 535 | maptile::load_objects (const char *path, bool skip_header) |
535 | maptile::_load_objects (const char *path, bool skip_header) |
| 536 | { |
536 | { |
| 537 | object_thawer thawer (path); |
537 | object_thawer thawer (path); |
| 538 | |
538 | |
| 539 | if (!thawer) |
539 | if (!thawer) |
| 540 | return false; |
540 | return false; |
| … | |
… | |
| 548 | break; |
548 | break; |
| 549 | |
549 | |
| 550 | thawer.skip_kv (kw); |
550 | thawer.skip_kv (kw); |
| 551 | } |
551 | } |
| 552 | |
552 | |
| 553 | return load_objects (thawer); |
553 | return _load_objects (thawer); |
| 554 | } |
554 | } |
| 555 | |
555 | |
| 556 | bool |
556 | bool |
| 557 | maptile::save_objects (const char *path, int flags) |
557 | maptile::_save_objects (const char *path, int flags) |
| 558 | { |
558 | { |
| 559 | object_freezer freezer; |
559 | object_freezer freezer; |
| 560 | |
560 | |
| 561 | if (!save_objects (freezer, flags)) |
561 | if (!_save_objects (freezer, flags)) |
| 562 | return false; |
562 | return false; |
| 563 | |
563 | |
| 564 | return freezer.save (path); |
564 | return freezer.save (path); |
| 565 | } |
565 | } |
| 566 | |
566 | |
| … | |
… | |
| 730 | * This could be done in lex (like the object loader), but I think |
730 | * This could be done in lex (like the object loader), but I think |
| 731 | * currently, there are few enough fields this is not a big deal. |
731 | * currently, there are few enough fields this is not a big deal. |
| 732 | * MSW 2001-07-01 |
732 | * MSW 2001-07-01 |
| 733 | */ |
733 | */ |
| 734 | bool |
734 | bool |
| 735 | maptile::load_header (object_thawer &thawer) |
735 | maptile::_load_header (object_thawer &thawer) |
| 736 | { |
736 | { |
| 737 | for (;;) |
737 | for (;;) |
| 738 | { |
738 | { |
| 739 | keyword kw = thawer.get_kv (); |
739 | keyword kw = thawer.get_kv (); |
| 740 | |
740 | |
| … | |
… | |
| 816 | |
816 | |
| 817 | abort (); |
817 | abort (); |
| 818 | } |
818 | } |
| 819 | |
819 | |
| 820 | bool |
820 | bool |
| 821 | maptile::load_header (const char *path) |
821 | maptile::_load_header (const char *path) |
| 822 | { |
822 | { |
| 823 | object_thawer thawer (path); |
823 | object_thawer thawer (path); |
| 824 | |
824 | |
| 825 | if (!thawer) |
825 | if (!thawer) |
| 826 | return false; |
826 | return false; |
| 827 | |
827 | |
| 828 | return load_header (thawer); |
828 | return _load_header (thawer); |
| 829 | } |
829 | } |
| 830 | |
830 | |
| 831 | /****************************************************************************** |
831 | /****************************************************************************** |
| 832 | * This is the start of unique map handling code |
832 | * This is the start of unique map handling code |
| 833 | *****************************************************************************/ |
833 | *****************************************************************************/ |
| … | |
… | |
| 856 | } |
856 | } |
| 857 | } |
857 | } |
| 858 | } |
858 | } |
| 859 | |
859 | |
| 860 | bool |
860 | bool |
| 861 | maptile::save_header (object_freezer &freezer) |
861 | maptile::_save_header (object_freezer &freezer) |
| 862 | { |
862 | { |
| 863 | #define MAP_OUT(k) freezer.put (KW_ ## k, k) |
863 | #define MAP_OUT(k) freezer.put (KW_ ## k, k) |
| 864 | #define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) |
864 | #define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) |
| 865 | |
865 | |
| 866 | MAP_OUT2 (arch, "map"); |
866 | MAP_OUT2 (arch, "map"); |
| … | |
… | |
| 915 | |
915 | |
| 916 | return true; |
916 | return true; |
| 917 | } |
917 | } |
| 918 | |
918 | |
| 919 | bool |
919 | bool |
| 920 | maptile::save_header (const char *path) |
920 | maptile::_save_header (const char *path) |
| 921 | { |
921 | { |
| 922 | object_freezer freezer; |
922 | object_freezer freezer; |
| 923 | |
923 | |
| 924 | if (!save_header (freezer)) |
924 | if (!_save_header (freezer)) |
| 925 | return false; |
925 | return false; |
| 926 | |
926 | |
| 927 | return freezer.save (path); |
927 | return freezer.save (path); |
| 928 | } |
928 | } |
| 929 | |
929 | |
