… | |
… | |
217 | } |
217 | } |
218 | |
218 | |
219 | return 0; |
219 | return 0; |
220 | } |
220 | } |
221 | |
221 | |
222 | /* When the map is loaded, load_object does not actually insert objects |
|
|
223 | * into inventory, but just links them. What this does is go through |
|
|
224 | * and insert them properly. |
|
|
225 | * The object 'container' is the object that contains the inventory. |
|
|
226 | * This is needed so that we can update the containers weight. |
|
|
227 | */ |
|
|
228 | static void |
|
|
229 | fix_container (object *container) |
|
|
230 | { |
|
|
231 | object *tmp = container->inv, *next; |
|
|
232 | |
|
|
233 | container->inv = 0; |
|
|
234 | while (tmp) |
|
|
235 | { |
|
|
236 | next = tmp->below; |
|
|
237 | if (tmp->inv) |
|
|
238 | fix_container (tmp); |
|
|
239 | |
|
|
240 | insert_ob_in_ob (tmp, container); |
|
|
241 | tmp = next; |
|
|
242 | } |
|
|
243 | |
|
|
244 | // go through and calculate what all the containers are carrying. |
|
|
245 | //TODO: remove |
|
|
246 | container->update_weight (); |
|
|
247 | } |
|
|
248 | |
|
|
249 | //-GPL |
222 | //-GPL |
250 | |
223 | |
251 | void |
224 | void |
252 | maptile::set_object_flag (int flag, int value) |
225 | maptile::set_object_flag (int flag, int value) |
253 | { |
226 | { |
… | |
… | |
268 | set_object_flag (FLAG_OBJ_ORIGINAL); |
241 | set_object_flag (FLAG_OBJ_ORIGINAL); |
269 | |
242 | |
270 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
243 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
271 | for (object *tmp = ms->bot; tmp; tmp = tmp->above) |
244 | for (object *tmp = ms->bot; tmp; tmp = tmp->above) |
272 | INVOKE_OBJECT (RESET, tmp); |
245 | INVOKE_OBJECT (RESET, tmp); |
|
|
246 | } |
|
|
247 | |
|
|
248 | void |
|
|
249 | maptile::post_load () |
|
|
250 | { |
|
|
251 | #if 0 |
|
|
252 | if (!spaces) |
|
|
253 | return; |
|
|
254 | |
|
|
255 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
|
|
256 | for (object *tmp = ms->bot; tmp; tmp = tmp->above) |
|
|
257 | ; // nop |
|
|
258 | #endif |
273 | } |
259 | } |
274 | |
260 | |
275 | //+GPL |
261 | //+GPL |
276 | |
262 | |
277 | /* link_multipart_objects go through all the objects on the map looking |
263 | /* link_multipart_objects go through all the objects on the map looking |
… | |
… | |
644 | case KW_shopgreed: thawer.get (shopgreed); break; |
630 | case KW_shopgreed: thawer.get (shopgreed); break; |
645 | case KW_shopmin: thawer.get (shopmin); break; |
631 | case KW_shopmin: thawer.get (shopmin); break; |
646 | case KW_shopmax: thawer.get (shopmax); break; |
632 | case KW_shopmax: thawer.get (shopmax); break; |
647 | case KW_shoprace: thawer.get (shoprace); break; |
633 | case KW_shoprace: thawer.get (shoprace); break; |
648 | case KW_outdoor: thawer.get (outdoor); break; |
634 | case KW_outdoor: thawer.get (outdoor); break; |
649 | case KW_temp: thawer.get (temp); break; |
|
|
650 | case KW_pressure: thawer.get (pressure); break; |
|
|
651 | case KW_humid: thawer.get (humid); break; |
|
|
652 | case KW_windspeed: thawer.get (windspeed); break; |
|
|
653 | case KW_winddir: thawer.get (winddir); break; |
|
|
654 | case KW_sky: thawer.get (sky); break; |
|
|
655 | |
635 | |
656 | case KW_per_player: thawer.get (per_player); break; |
636 | case KW_per_player: thawer.get (per_player); break; |
657 | case KW_per_party: thawer.get (per_party); break; |
637 | case KW_per_party: thawer.get (per_party); break; |
658 | case KW_no_reset: thawer.get (no_reset); break; |
638 | case KW_no_reset: thawer.get (no_reset); break; |
659 | case KW_no_drop: thawer.get (no_drop); break; |
639 | case KW_no_drop: thawer.get (no_drop); break; |
… | |
… | |
728 | //-GPL |
708 | //-GPL |
729 | |
709 | |
730 | bool |
710 | bool |
731 | maptile::_save_header (object_freezer &freezer) |
711 | maptile::_save_header (object_freezer &freezer) |
732 | { |
712 | { |
733 | #define MAP_OUT(k) freezer.put (KW_ ## k, k) |
713 | #define MAP_OUT(k) freezer.put (KW(k), k) |
734 | #define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) |
714 | #define MAP_OUT2(k,v) freezer.put (KW(k), v) |
735 | |
715 | |
736 | MAP_OUT2 (arch, "map"); |
716 | MAP_OUT2 (arch, CS(map)); |
737 | |
717 | |
738 | if (name) MAP_OUT (name); |
718 | if (name) MAP_OUT (name); |
739 | MAP_OUT (swap_time); |
719 | MAP_OUT (swap_time); |
740 | MAP_OUT (reset_time); |
720 | MAP_OUT (reset_time); |
741 | MAP_OUT (reset_timeout); |
721 | MAP_OUT (reset_timeout); |
… | |
… | |
749 | MAP_OUT (shopgreed); |
729 | MAP_OUT (shopgreed); |
750 | MAP_OUT (shopmin); |
730 | MAP_OUT (shopmin); |
751 | MAP_OUT (shopmax); |
731 | MAP_OUT (shopmax); |
752 | if (shoprace) MAP_OUT (shoprace); |
732 | if (shoprace) MAP_OUT (shoprace); |
753 | |
733 | |
754 | MAP_OUT (darkness); |
|
|
755 | MAP_OUT (width); |
734 | MAP_OUT (width); |
756 | MAP_OUT (height); |
735 | MAP_OUT (height); |
757 | MAP_OUT (enter_x); |
736 | MAP_OUT (enter_x); |
758 | MAP_OUT (enter_y); |
737 | MAP_OUT (enter_y); |
759 | |
738 | MAP_OUT (darkness); |
760 | if (msg) freezer.put (KW_msg , KW_endmsg , msg); |
|
|
761 | if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore); |
|
|
762 | |
|
|
763 | MAP_OUT (outdoor); |
739 | MAP_OUT (outdoor); |
764 | MAP_OUT (temp); |
740 | |
765 | MAP_OUT (pressure); |
741 | if (msg) freezer.put (KW(msg) , KW(endmsg) , msg); |
766 | MAP_OUT (humid); |
742 | if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore); |
767 | MAP_OUT (windspeed); |
|
|
768 | MAP_OUT (winddir); |
|
|
769 | MAP_OUT (sky); |
|
|
770 | |
743 | |
771 | MAP_OUT (per_player); |
744 | MAP_OUT (per_player); |
772 | MAP_OUT (per_party); |
745 | MAP_OUT (per_party); |
773 | |
746 | |
774 | if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); |
747 | if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); |
775 | if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); |
748 | if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); |
776 | if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); |
749 | if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); |
777 | if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); |
750 | if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); |
778 | |
751 | |
779 | freezer.put (this); |
752 | freezer.put (this); |
780 | freezer.put (KW_end); |
753 | freezer.put (KW(end)); |
781 | |
754 | |
782 | return true; |
755 | return true; |
783 | } |
756 | } |
784 | |
757 | |
785 | bool |
758 | bool |
… | |
… | |
870 | |
843 | |
871 | clear (); |
844 | clear (); |
872 | } |
845 | } |
873 | |
846 | |
874 | /* decay and destroy perishable items in a map */ |
847 | /* decay and destroy perishable items in a map */ |
|
|
848 | // TODO: should be done regularly, not on map load? |
875 | void |
849 | void |
876 | maptile::do_decay_objects () |
850 | maptile::do_decay_objects () |
877 | { |
851 | { |
878 | if (!spaces) |
852 | if (!spaces) |
879 | return; |
853 | return; |
… | |
… | |
926 | || mat & M_LIQUID |
900 | || mat & M_LIQUID |
927 | || (mat & M_IRON && rndm (1, 5) == 1) |
901 | || (mat & M_IRON && rndm (1, 5) == 1) |
928 | || (mat & M_GLASS && rndm (1, 2) == 1) |
902 | || (mat & M_GLASS && rndm (1, 2) == 1) |
929 | || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) |
903 | || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) |
930 | || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) |
904 | || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) |
931 | || (mat & M_ICE && temp > 32)) |
905 | //|| (mat & M_ICE && temp > 32) |
|
|
906 | ) |
932 | destroy = 1; |
907 | destroy = 1; |
933 | } |
908 | } |
934 | |
909 | |
935 | /* adjust overall chance below */ |
910 | /* adjust overall chance below */ |
936 | if (destroy && rndm (0, 1)) |
911 | if (destroy && rndm (0, 1)) |