| … | |
… | |
| 528 | if (!spaces) |
528 | if (!spaces) |
| 529 | return; |
529 | return; |
| 530 | |
530 | |
| 531 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
531 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
| 532 | for (object *op = ms->bot; op; op = op->above) |
532 | for (object *op = ms->bot; op; op = op->above) |
| 533 | op->activate (1); |
533 | op->activate_recursive (); |
| 534 | } |
534 | } |
| 535 | |
535 | |
| 536 | void |
536 | void |
| 537 | maptile::deactivate () |
537 | maptile::deactivate () |
| 538 | { |
538 | { |
| 539 | if (!spaces) |
539 | if (!spaces) |
| 540 | return; |
540 | return; |
| 541 | |
541 | |
| 542 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
542 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
| 543 | for (object *op = ms->bot; op; op = op->above) |
543 | for (object *op = ms->bot; op; op = op->above) |
| 544 | op->deactivate (1); |
544 | op->deactivate_recursive (); |
| 545 | } |
545 | } |
| 546 | |
546 | |
| 547 | bool |
547 | bool |
| 548 | maptile::save_objects (object_freezer &freezer, int flags) |
548 | maptile::save_objects (object_freezer &freezer, int flags) |
| 549 | { |
549 | { |
| … | |
… | |
| 789 | keyword kw = thawer.get_kv (); |
789 | keyword kw = thawer.get_kv (); |
| 790 | |
790 | |
| 791 | switch (kw) |
791 | switch (kw) |
| 792 | { |
792 | { |
| 793 | case KW_EOF: |
793 | case KW_EOF: |
| 794 | LOG (llevError, "%s: end of file while reading map header, aborting header load.", &path); |
794 | LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path); |
| 795 | return false; |
795 | return false; |
| 796 | |
796 | |
| 797 | case KW_end: |
797 | case KW_end: |
| 798 | return true; |
798 | return true; |
| 799 | |
799 | |
| … | |
… | |
| 957 | if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); |
957 | if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); |
| 958 | if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); |
958 | if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); |
| 959 | if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); |
959 | if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); |
| 960 | if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); |
960 | if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); |
| 961 | |
961 | |
| 962 | MAP_OUT2 (end, 0); |
962 | freezer.put (KW_end); |
| 963 | |
963 | |
| 964 | return true; |
964 | return true; |
| 965 | } |
965 | } |
| 966 | |
966 | |
| 967 | bool |
967 | bool |
