… | |
… | |
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) |
502 | { |
502 | { |
|
|
503 | #if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D |
503 | if (cede_count >= 500) |
504 | if (cede_count >= 500) |
504 | { |
505 | { |
505 | cede_count = 0; |
506 | cede_count = 0; |
506 | coroapi::cede (); |
507 | coroapi::cede (); |
507 | } |
508 | } |
|
|
509 | #endif |
508 | |
510 | |
509 | int unique = 0; |
511 | int unique = 0; |
510 | for (object *op = spaces [i].bot; op; op = op->above) |
512 | for (object *op = spaces [i].bot; op; op = op->above) |
511 | { |
513 | { |
512 | // count per-object, but cede only when modification-safe |
514 | // count per-object, but cede only when modification-safe |
… | |
… | |
530 | |
532 | |
531 | return true; |
533 | return true; |
532 | } |
534 | } |
533 | |
535 | |
534 | bool |
536 | bool |
535 | maptile::load_objects (const char *path, bool skip_header) |
537 | maptile::_load_objects (const char *path, bool skip_header) |
536 | { |
538 | { |
537 | object_thawer thawer (path); |
539 | object_thawer thawer (path); |
538 | |
540 | |
539 | if (!thawer) |
541 | if (!thawer) |
540 | return false; |
542 | return false; |
… | |
… | |
548 | break; |
550 | break; |
549 | |
551 | |
550 | thawer.skip_kv (kw); |
552 | thawer.skip_kv (kw); |
551 | } |
553 | } |
552 | |
554 | |
553 | return load_objects (thawer); |
555 | return _load_objects (thawer); |
554 | } |
556 | } |
555 | |
557 | |
556 | bool |
558 | bool |
557 | maptile::save_objects (const char *path, int flags) |
559 | maptile::_save_objects (const char *path, int flags) |
558 | { |
560 | { |
559 | object_freezer freezer; |
561 | object_freezer freezer; |
560 | |
562 | |
561 | if (!save_objects (freezer, flags)) |
563 | if (!_save_objects (freezer, flags)) |
562 | return false; |
564 | return false; |
563 | |
565 | |
564 | return freezer.save (path); |
566 | return freezer.save (path); |
565 | } |
567 | } |
566 | |
568 | |
… | |
… | |
730 | * This could be done in lex (like the object loader), but I think |
732 | * 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. |
733 | * currently, there are few enough fields this is not a big deal. |
732 | * MSW 2001-07-01 |
734 | * MSW 2001-07-01 |
733 | */ |
735 | */ |
734 | bool |
736 | bool |
735 | maptile::load_header (object_thawer &thawer) |
737 | maptile::_load_header (object_thawer &thawer) |
736 | { |
738 | { |
737 | for (;;) |
739 | for (;;) |
738 | { |
740 | { |
739 | keyword kw = thawer.get_kv (); |
741 | keyword kw = thawer.get_kv (); |
740 | |
742 | |
… | |
… | |
816 | |
818 | |
817 | abort (); |
819 | abort (); |
818 | } |
820 | } |
819 | |
821 | |
820 | bool |
822 | bool |
821 | maptile::load_header (const char *path) |
823 | maptile::_load_header (const char *path) |
822 | { |
824 | { |
823 | object_thawer thawer (path); |
825 | object_thawer thawer (path); |
824 | |
826 | |
825 | if (!thawer) |
827 | if (!thawer) |
826 | return false; |
828 | return false; |
827 | |
829 | |
828 | return load_header (thawer); |
830 | return _load_header (thawer); |
829 | } |
831 | } |
830 | |
832 | |
831 | /****************************************************************************** |
833 | /****************************************************************************** |
832 | * This is the start of unique map handling code |
834 | * This is the start of unique map handling code |
833 | *****************************************************************************/ |
835 | *****************************************************************************/ |
… | |
… | |
856 | } |
858 | } |
857 | } |
859 | } |
858 | } |
860 | } |
859 | |
861 | |
860 | bool |
862 | bool |
861 | maptile::save_header (object_freezer &freezer) |
863 | maptile::_save_header (object_freezer &freezer) |
862 | { |
864 | { |
863 | #define MAP_OUT(k) freezer.put (KW_ ## k, k) |
865 | #define MAP_OUT(k) freezer.put (KW_ ## k, k) |
864 | #define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) |
866 | #define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) |
865 | |
867 | |
866 | MAP_OUT2 (arch, "map"); |
868 | MAP_OUT2 (arch, "map"); |
… | |
… | |
915 | |
917 | |
916 | return true; |
918 | return true; |
917 | } |
919 | } |
918 | |
920 | |
919 | bool |
921 | bool |
920 | maptile::save_header (const char *path) |
922 | maptile::_save_header (const char *path) |
921 | { |
923 | { |
922 | object_freezer freezer; |
924 | object_freezer freezer; |
923 | |
925 | |
924 | if (!save_header (freezer)) |
926 | if (!_save_header (freezer)) |
925 | return false; |
927 | return false; |
926 | |
928 | |
927 | return freezer.save (path); |
929 | return freezer.save (path); |
928 | } |
930 | } |
929 | |
931 | |
… | |
… | |
1108 | */ |
1110 | */ |
1109 | void |
1111 | void |
1110 | mapspace::update_ () |
1112 | mapspace::update_ () |
1111 | { |
1113 | { |
1112 | object *tmp, *last = 0; |
1114 | object *tmp, *last = 0; |
1113 | uint8 flags = 0, light = 0, anywhere = 0; |
1115 | uint8 flags = P_UPTODATE, light = 0, anywhere = 0; |
1114 | New_Face *top, *floor, *middle; |
1116 | New_Face *top, *floor, *middle; |
1115 | object *top_obj, *floor_obj, *middle_obj; |
1117 | object *top_obj, *floor_obj, *middle_obj; |
1116 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1118 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1117 | |
1119 | |
1118 | middle = blank_face; |
1120 | middle = blank_face; |