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.172 by root, Sun Nov 8 20:55:39 2009 UTC vs.
Revision 1.178 by root, Sun Nov 29 09:41:27 2009 UTC

… …
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 */
228static void
229fix_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
251void 224void
252maptile::set_object_flag (int flag, int value) 225maptile::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
248void
249maptile::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
… …
448 * map archetype. Mimic that behaviour. 434 * map archetype. Mimic that behaviour.
449 */ 435 */
450 width = 16; 436 width = 16;
451 height = 16; 437 height = 16;
452 timeout = 300; 438 timeout = 300;
453 max_nrof = 1000; // 1000 items of anything
454 max_items = MAX_ITEM_PER_ACTION; 439 max_items = MAX_ITEM_PER_ACTION;
455 max_volume = 2000000; // 2m³ 440 max_volume = 2000000; // 2m³
456} 441}
457 442
458maptile::maptile (int w, int h) 443maptile::maptile (int w, int h)
… …
645 case KW_shopgreed: thawer.get (shopgreed); break; 630 case KW_shopgreed: thawer.get (shopgreed); break;
646 case KW_shopmin: thawer.get (shopmin); break; 631 case KW_shopmin: thawer.get (shopmin); break;
647 case KW_shopmax: thawer.get (shopmax); break; 632 case KW_shopmax: thawer.get (shopmax); break;
648 case KW_shoprace: thawer.get (shoprace); break; 633 case KW_shoprace: thawer.get (shoprace); break;
649 case KW_outdoor: thawer.get (outdoor); break; 634 case KW_outdoor: thawer.get (outdoor); break;
650 case KW_temp: thawer.get (temp); break;
651 case KW_pressure: thawer.get (pressure); break;
652 case KW_humid: thawer.get (humid); break;
653 case KW_windspeed: thawer.get (windspeed); break;
654 case KW_winddir: thawer.get (winddir); break;
655 case KW_sky: thawer.get (sky); break;
656 635
657 case KW_per_player: thawer.get (per_player); break; 636 case KW_per_player: thawer.get (per_player); break;
658 case KW_per_party: thawer.get (per_party); break; 637 case KW_per_party: thawer.get (per_party); break;
659 case KW_no_reset: thawer.get (no_reset); break; 638 case KW_no_reset: thawer.get (no_reset); break;
660 case KW_no_drop: thawer.get (no_drop); break; 639 case KW_no_drop: thawer.get (no_drop); break;
… …
729//-GPL 708//-GPL
730 709
731bool 710bool
732maptile::_save_header (object_freezer &freezer) 711maptile::_save_header (object_freezer &freezer)
733{ 712{
734#define MAP_OUT(k) freezer.put (KW_ ## k, k) 713#define MAP_OUT(k) freezer.put (KW(k), k)
735#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 714#define MAP_OUT2(k,v) freezer.put (KW(k), v)
736 715
737 MAP_OUT2 (arch, "map"); 716 MAP_OUT2 (arch, CS(map));
738 717
739 if (name) MAP_OUT (name); 718 if (name) MAP_OUT (name);
740 MAP_OUT (swap_time); 719 MAP_OUT (swap_time);
741 MAP_OUT (reset_time); 720 MAP_OUT (reset_time);
742 MAP_OUT (reset_timeout); 721 MAP_OUT (reset_timeout);
… …
750 MAP_OUT (shopgreed); 729 MAP_OUT (shopgreed);
751 MAP_OUT (shopmin); 730 MAP_OUT (shopmin);
752 MAP_OUT (shopmax); 731 MAP_OUT (shopmax);
753 if (shoprace) MAP_OUT (shoprace); 732 if (shoprace) MAP_OUT (shoprace);
754 733
755 MAP_OUT (darkness);
756 MAP_OUT (width); 734 MAP_OUT (width);
757 MAP_OUT (height); 735 MAP_OUT (height);
758 MAP_OUT (enter_x); 736 MAP_OUT (enter_x);
759 MAP_OUT (enter_y); 737 MAP_OUT (enter_y);
760 738 MAP_OUT (darkness);
761 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
762 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
763
764 MAP_OUT (outdoor); 739 MAP_OUT (outdoor);
765 MAP_OUT (temp); 740
766 MAP_OUT (pressure); 741 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
767 MAP_OUT (humid); 742 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
768 MAP_OUT (windspeed);
769 MAP_OUT (winddir);
770 MAP_OUT (sky);
771 743
772 MAP_OUT (per_player); 744 MAP_OUT (per_player);
773 MAP_OUT (per_party); 745 MAP_OUT (per_party);
774 746
775 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]);
776 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]);
777 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]);
778 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]);
779 751
780 freezer.put (this); 752 freezer.put (this);
781 freezer.put (KW_end); 753 freezer.put (KW(end));
782 754
783 return true; 755 return true;
784} 756}
785 757
786bool 758bool
… …
871 843
872 clear (); 844 clear ();
873} 845}
874 846
875/* 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?
876void 849void
877maptile::do_decay_objects () 850maptile::do_decay_objects ()
878{ 851{
879 if (!spaces) 852 if (!spaces)
880 return; 853 return;
… …
927 || mat & M_LIQUID 900 || mat & M_LIQUID
928 || (mat & M_IRON && rndm (1, 5) == 1) 901 || (mat & M_IRON && rndm (1, 5) == 1)
929 || (mat & M_GLASS && rndm (1, 2) == 1) 902 || (mat & M_GLASS && rndm (1, 2) == 1)
930 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 903 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
931 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 904 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
932 || (mat & M_ICE && temp > 32)) 905 //|| (mat & M_ICE && temp > 32)
906 )
933 destroy = 1; 907 destroy = 1;
934 } 908 }
935 909
936 /* adjust overall chance below */ 910 /* adjust overall chance below */
937 if (destroy && rndm (0, 1)) 911 if (destroy && rndm (0, 1))
… …
1034 sint8 light = 0; 1008 sint8 light = 0;
1035 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1009 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1036 uint64_t volume = 0; 1010 uint64_t volume = 0;
1037 uint32_t items = 0; 1011 uint32_t items = 0;
1038 object *anywhere = 0; 1012 object *anywhere = 0;
1013 uint8_t middle_visibility = 0;
1039 1014
1040 //object *middle = 0; 1015 //object *middle = 0;
1041 //object *top = 0; 1016 //object *top = 0;
1042 //object *floor = 0; 1017 //object *floor = 0;
1043 // this seems to generate better code than using locals, above 1018 // this seems to generate better code than using locals, above
… …
1060 * 1035 *
1061 * Always put the player down for drawing. 1036 * Always put the player down for drawing.
1062 */ 1037 */
1063 if (expect_true (!tmp->invisible)) 1038 if (expect_true (!tmp->invisible))
1064 { 1039 {
1065 if (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]) 1040 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1066 top = tmp; 1041 top = tmp;
1042 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1043 {
1044 /* If we got a floor, that means middle and top were below it,
1045 * so should not be visible, so we clear them.
1046 */
1047 middle = 0;
1048 top = 0;
1049 floor = tmp;
1050 volume = 0;
1051 items = 0;
1052 }
1067 else 1053 else
1068 { 1054 {
1069 if (expect_false (tmp->flag [FLAG_IS_FLOOR])) 1055 if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1070 { 1056 {
1071 /* If we got a floor, that means middle and top were below it,
1072 * so should not be visible, so we clear them.
1073 */
1074 middle = 0;
1075 top = 0;
1076 floor = tmp;
1077 volume = 0;
1078 items = 0; 1057 ++items;
1058 volume += tmp->volume ();
1079 } 1059 }
1060
1061 /* Flag anywhere have high priority */
1062 if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1063 anywhere = tmp;
1064
1065 /* Find the highest visible face around. If equal
1066 * visibilities, we still want the one nearer to the
1067 * top
1080 else 1068 */
1069 if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
1081 { 1070 {
1082 if (expect_true (!tmp->flag [FLAG_NO_PICK])) 1071 middle_visibility = ::faces [tmp->face].visibility;
1083 {
1084 ++items;
1085 volume += tmp->volume ();
1086 }
1087
1088 /* Flag anywhere have high priority */
1089 if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1090 anywhere = tmp;
1091 /* Find the highest visible face around. If equal
1092 * visibilities, we still want the one nearer to the
1093 * top
1094 */
1095 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility))
1096 middle = tmp; 1072 middle = tmp;
1097 } 1073 }
1098 } 1074 }
1099 } 1075 }
1100 1076
1101 move_slow |= tmp->move_slow; 1077 move_slow |= tmp->move_slow;

Diff Legend

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