ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.177 by root, Wed Nov 11 23:27:56 2009 UTC vs.
Revision 1.178 by root, Sun Nov 29 09:41:27 2009 UTC

… …
630 case KW_shopgreed: thawer.get (shopgreed); break; 630 case KW_shopgreed: thawer.get (shopgreed); break;
631 case KW_shopmin: thawer.get (shopmin); break; 631 case KW_shopmin: thawer.get (shopmin); break;
632 case KW_shopmax: thawer.get (shopmax); break; 632 case KW_shopmax: thawer.get (shopmax); break;
633 case KW_shoprace: thawer.get (shoprace); break; 633 case KW_shoprace: thawer.get (shoprace); break;
634 case KW_outdoor: thawer.get (outdoor); break; 634 case KW_outdoor: thawer.get (outdoor); break;
635 case KW_temp: thawer.get (temp); break;
636 case KW_pressure: thawer.get (pressure); break;
637 case KW_humid: thawer.get (humid); break;
638 case KW_windspeed: thawer.get (windspeed); break;
639 case KW_winddir: thawer.get (winddir); break;
640 case KW_sky: thawer.get (sky); break;
641 635
642 case KW_per_player: thawer.get (per_player); break; 636 case KW_per_player: thawer.get (per_player); break;
643 case KW_per_party: thawer.get (per_party); break; 637 case KW_per_party: thawer.get (per_party); break;
644 case KW_no_reset: thawer.get (no_reset); break; 638 case KW_no_reset: thawer.get (no_reset); break;
645 case KW_no_drop: thawer.get (no_drop); break; 639 case KW_no_drop: thawer.get (no_drop); break;
… …
735 MAP_OUT (shopgreed); 729 MAP_OUT (shopgreed);
736 MAP_OUT (shopmin); 730 MAP_OUT (shopmin);
737 MAP_OUT (shopmax); 731 MAP_OUT (shopmax);
738 if (shoprace) MAP_OUT (shoprace); 732 if (shoprace) MAP_OUT (shoprace);
739 733
740 MAP_OUT (darkness);
741 MAP_OUT (width); 734 MAP_OUT (width);
742 MAP_OUT (height); 735 MAP_OUT (height);
743 MAP_OUT (enter_x); 736 MAP_OUT (enter_x);
744 MAP_OUT (enter_y); 737 MAP_OUT (enter_y);
738 MAP_OUT (darkness);
739 MAP_OUT (outdoor);
745 740
746 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg); 741 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
747 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore); 742 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
748
749 MAP_OUT (outdoor);
750 MAP_OUT (temp);
751 MAP_OUT (pressure);
752 MAP_OUT (humid);
753 MAP_OUT (windspeed);
754 MAP_OUT (winddir);
755 MAP_OUT (sky);
756 743
757 MAP_OUT (per_player); 744 MAP_OUT (per_player);
758 MAP_OUT (per_party); 745 MAP_OUT (per_party);
759 746
760 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]);
… …
856 843
857 clear (); 844 clear ();
858} 845}
859 846
860/* 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?
861void 849void
862maptile::do_decay_objects () 850maptile::do_decay_objects ()
863{ 851{
864 if (!spaces) 852 if (!spaces)
865 return; 853 return;
… …
912 || mat & M_LIQUID 900 || mat & M_LIQUID
913 || (mat & M_IRON && rndm (1, 5) == 1) 901 || (mat & M_IRON && rndm (1, 5) == 1)
914 || (mat & M_GLASS && rndm (1, 2) == 1) 902 || (mat & M_GLASS && rndm (1, 2) == 1)
915 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 903 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
916 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 904 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
917 || (mat & M_ICE && temp > 32)) 905 //|| (mat & M_ICE && temp > 32)
906 )
918 destroy = 1; 907 destroy = 1;
919 } 908 }
920 909
921 /* adjust overall chance below */ 910 /* adjust overall chance below */
922 if (destroy && rndm (0, 1)) 911 if (destroy && rndm (0, 1))

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines