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.108 by root, Tue Jun 5 13:05:02 2007 UTC vs.
Revision 1.109 by root, Thu Jun 7 19:12:22 2007 UTC

714 case KW_winddir: thawer.get (winddir); break; 714 case KW_winddir: thawer.get (winddir); break;
715 case KW_sky: thawer.get (sky); break; 715 case KW_sky: thawer.get (sky); break;
716 716
717 case KW_per_player: thawer.get (per_player); break; 717 case KW_per_player: thawer.get (per_player); break;
718 case KW_per_party: thawer.get (per_party); break; 718 case KW_per_party: thawer.get (per_party); break;
719 case KW_no_reset: thawer.get (no_reset); break;
719 720
720 case KW_region: default_region = region::find (thawer.get_str ()); break; 721 case KW_region: default_region = region::find (thawer.get_str ()); break;
721 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 722 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
722 723
723 // old names new names 724 // old names new names
800 if (name) MAP_OUT (name); 801 if (name) MAP_OUT (name);
801 MAP_OUT (swap_time); 802 MAP_OUT (swap_time);
802 MAP_OUT (reset_time); 803 MAP_OUT (reset_time);
803 MAP_OUT (reset_timeout); 804 MAP_OUT (reset_timeout);
804 MAP_OUT (fixed_resettime); 805 MAP_OUT (fixed_resettime);
806 MAP_OUT (no_reset);
805 MAP_OUT (difficulty); 807 MAP_OUT (difficulty);
806 808
807 if (default_region) MAP_OUT2 (region, default_region->name); 809 if (default_region) MAP_OUT2 (region, default_region->name);
808 810
809 if (shopitems) 811 if (shopitems)
920maptile::do_destroy () 922maptile::do_destroy ()
921{ 923{
922 attachable::do_destroy (); 924 attachable::do_destroy ();
923 925
924 clear (); 926 clear ();
927}
928
929/* decay and destroy perishable items in a map */
930void
931maptile::do_decay_objects ()
932{
933 if (!spaces)
934 return;
935
936 for (mapspace *ms = spaces + size (); ms-- > spaces; )
937 for (object *above, *op = ms->bot; op; op = above)
938 {
939 above = op->above;
940
941 bool destroy = 0;
942
943 // do not decay anything above unique floor tiles (yet :)
944 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
945 break;
946
947 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
948 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
949 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
950 || QUERY_FLAG (op, FLAG_UNIQUE)
951 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
952 || QUERY_FLAG (op, FLAG_UNPAID)
953 || op->is_alive ())
954 ; // do not decay
955 else if (op->is_weapon ())
956 {
957 op->stats.dam--;
958 if (op->stats.dam < 0)
959 destroy = 1;
960 }
961 else if (op->is_armor ())
962 {
963 op->stats.ac--;
964 if (op->stats.ac < 0)
965 destroy = 1;
966 }
967 else if (op->type == FOOD)
968 {
969 op->stats.food -= rndm (5, 20);
970 if (op->stats.food < 0)
971 destroy = 1;
972 }
973 else
974 {
975 int mat = op->materials;
976
977 if (mat & M_PAPER
978 || mat & M_LEATHER
979 || mat & M_WOOD
980 || mat & M_ORGANIC
981 || mat & M_CLOTH
982 || mat & M_LIQUID
983 || (mat & M_IRON && rndm (1, 5) == 1)
984 || (mat & M_GLASS && rndm (1, 2) == 1)
985 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
986 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
987 || (mat & M_ICE && temp > 32))
988 destroy = 1;
989 }
990
991 /* adjust overall chance below */
992 if (destroy && rndm (0, 1))
993 op->destroy ();
994 }
925} 995}
926 996
927/* 997/*
928 * Updates every button on the map (by calling update_button() for them). 998 * Updates every button on the map (by calling update_button() for them).
929 */ 999 */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines