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.159 by root, Tue May 5 04:51:56 2009 UTC vs.
Revision 1.178 by root, Sun Nov 29 09:41:27 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <unistd.h> 25#include <unistd.h>
25 26
26#include "global.h" 27#include "global.h"
27#include "loader.h" 28#include "loader.h"
28#include "path.h" 29#include "path.h"
30
31//+GPL
29 32
30sint8 maptile::outdoor_darkness; 33sint8 maptile::outdoor_darkness;
31 34
32/* This rolls up wall, blocks_magic, blocks_view, etc, all into 35/* This rolls up wall, blocks_magic, blocks_view, etc, all into
33 * one function that just returns a P_.. value (see map.h) 36 * one function that just returns a P_.. value (see map.h)
… …
70 * by the caller. 73 * by the caller.
71 */ 74 */
72int 75int
73blocked_link (object *ob, maptile *m, int sx, int sy) 76blocked_link (object *ob, maptile *m, int sx, int sy)
74{ 77{
75 object *tmp;
76 int mflags, blocked;
77
78 /* Make sure the coordinates are valid - they should be, as caller should 78 /* Make sure the coordinates are valid - they should be, as caller should
79 * have already checked this. 79 * have already checked this.
80 */ 80 */
81 if (OUT_OF_REAL_MAP (m, sx, sy)) 81 if (OUT_OF_REAL_MAP (m, sx, sy))
82 { 82 {
83 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 83 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");
84 return 1; 84 return 1;
85 } 85 }
86 86
87 /* Save some cycles - instead of calling get_map_flags(), just get the value 87 mapspace &ms = m->at (sx, sy);
88 * directly.
89 */
90 mflags = m->at (sx, sy).flags ();
91 88
92 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 89 int mflags = ms.flags ();
90 int blocked = ms.move_block;
93 91
94 /* If space is currently not blocked by anything, no need to 92 /* If space is currently not blocked by anything, no need to
95 * go further. Not true for players - all sorts of special 93 * go further. Not true for players - all sorts of special
96 * things we need to do for players. 94 * things we need to do for players.
97 */ 95 */
98 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 96 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
99 return 0; 97 return 0;
100 98
101 /* if there isn't anytyhing alive on this space, and this space isn't 99 /* if there isn't anything alive on this space, and this space isn't
102 * otherwise blocked, we can return now. Only if there is a living 100 * otherwise blocked, we can return now. Only if there is a living
103 * creature do we need to investigate if it is part of this creature 101 * creature do we need to investigate if it is part of this creature
104 * or another. Likewise, only if something is blocking us do we 102 * or another. Likewise, only if something is blocking us do we
105 * need to investigate if there is a special circumstance that would 103 * need to investigate if there is a special circumstance that would
106 * let the player through (inventory checkers for example) 104 * let the player through (inventory checkers for example)
… …
113 /* We basically go through the stack of objects, and if there is 111 /* We basically go through the stack of objects, and if there is
114 * some other object that has NO_PASS or FLAG_ALIVE set, return 112 * some other object that has NO_PASS or FLAG_ALIVE set, return
115 * true. If we get through the entire stack, that must mean 113 * true. If we get through the entire stack, that must mean
116 * ob is blocking it, so return 0. 114 * ob is blocking it, so return 0.
117 */ 115 */
118 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 116 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
119 { 117 {
120 118 if (OB_MOVE_BLOCK (ob, tmp))
121 /* This must be before the checks below. Code for inventory checkers. */
122 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
123 { 119 {
124 /* If last_sp is set, the player/monster needs an object, 120 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
125 * so we check for it. If they don't have it, they can't 121 if (RESULT_INT (0))
126 * pass through this space. 122 return 1;
127 */ 123 else
128 if (tmp->last_sp) 124 continue;
125
126 if (tmp->type == CHECK_INV)
129 { 127 {
130 if (check_inv_recursive (ob, tmp) == NULL) 128 bool have = check_inv_recursive (ob, tmp);
129
130 // last_sp set means we block if we don't have.
131 if (logical_xor (have, tmp->last_sp))
131 return 1; 132 return 1;
132 else 133 }
133 continue; 134 else if (tmp->type == T_MATCH)
135 {
136 // T_MATCH allows "entrance" iff the match is true
137 // == blocks if the match fails
138
139 // we could have used an INVOKE_OBJECT, but decided against it, as we
140 // assume that T_MATCH is relatively common.
141 if (!match (tmp->slaying, ob, tmp, ob))
142 return 1;
134 } 143 }
135 else 144 else
136 { 145 return 1; // unconditional block
137 /* In this case, the player must not have the object - 146
138 * if they do, they can't pass through.
139 */
140 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
141 return 1;
142 else
143 continue;
144 }
145 } /* if check_inv */
146 else 147 } else {
147 { 148 // space does not block the ob, directly, but
148 /* Broke apart a big nasty if into several here to make 149 // anything alive that is not a door still
149 * this more readable. first check - if the space blocks 150 // blocks anything but wizards.
150 * movement, can't move here.
151 * second - if a monster, can't move there, unless it is a
152 * hidden dm
153 */
154 if (OB_MOVE_BLOCK (ob, tmp))
155 return 1;
156 151
157 if (tmp->flag [FLAG_ALIVE] 152 if (tmp->flag [FLAG_ALIVE]
158 && tmp->head_ () != ob 153 && tmp->head_ () != ob
159 && tmp != ob 154 && tmp != ob
160 && tmp->type != DOOR 155 && tmp->type != DOOR
161 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden)) 156 && !tmp->flag [FLAG_WIZPASS])
162 return 1; 157 return 1;
163 } 158 }
164
165 } 159 }
160
166 return 0; 161 return 0;
167} 162}
168 163
169/* 164/*
170 * Returns qthe blocking object if the given object can't fit in the given 165 * Returns qthe blocking object if the given object can't fit in the given
… …
222 } 217 }
223 218
224 return 0; 219 return 0;
225} 220}
226 221
227/* When the map is loaded, load_object does not actually insert objects 222//-GPL
228 * into inventory, but just links them. What this does is go through
229 * and insert them properly.
230 * The object 'container' is the object that contains the inventory.
231 * This is needed so that we can update the containers weight.
232 */
233void
234fix_container (object *container)
235{
236 object *tmp = container->inv, *next;
237
238 container->inv = 0;
239 while (tmp)
240 {
241 next = tmp->below;
242 if (tmp->inv)
243 fix_container (tmp);
244
245 insert_ob_in_ob (tmp, container);
246 tmp = next;
247 }
248
249 // go through and calculate what all the containers are carrying.
250 //TODO: remove
251 container->update_weight ();
252}
253 223
254void 224void
255maptile::set_object_flag (int flag, int value) 225maptile::set_object_flag (int flag, int value)
256{ 226{
257 if (!spaces) 227 if (!spaces)
… …
272 242
273 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 243 for (mapspace *ms = spaces + size (); ms-- > spaces; )
274 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 244 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
275 INVOKE_OBJECT (RESET, tmp); 245 INVOKE_OBJECT (RESET, tmp);
276} 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
259}
260
261//+GPL
277 262
278/* 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
279 * for objects whose arch says they are multipart yet according to the 264 * for objects whose arch says they are multipart yet according to the
280 * info we have, they only have the head (as would be expected when 265 * info we have, they only have the head (as would be expected when
281 * they are saved). 266 * they are saved).
… …
308 else 293 else
309 op = op->above; 294 op = op->above;
310 } 295 }
311 } 296 }
312} 297}
298
299//-GPL
313 300
314/* 301/*
315 * Loads (ands parses) the objects into a given map from the specified 302 * Loads (ands parses) the objects into a given map from the specified
316 * file pointer. 303 * file pointer.
317 */ 304 */
… …
447 * map archetype. Mimic that behaviour. 434 * map archetype. Mimic that behaviour.
448 */ 435 */
449 width = 16; 436 width = 16;
450 height = 16; 437 height = 16;
451 timeout = 300; 438 timeout = 300;
452 max_nrof = 1000; // 1000 items of anything 439 max_items = MAX_ITEM_PER_ACTION;
453 max_volume = 2000000; // 2m³ 440 max_volume = 2000000; // 2m³
454} 441}
455 442
456maptile::maptile (int w, int h) 443maptile::maptile (int w, int h)
457{ 444{
… …
478 if (spaces) 465 if (spaces)
479 return; 466 return;
480 467
481 spaces = salloc0<mapspace> (size ()); 468 spaces = salloc0<mapspace> (size ());
482} 469}
470
471//+GPL
483 472
484/* Takes a string from a map definition and outputs a pointer to the array of shopitems 473/* Takes a string from a map definition and outputs a pointer to the array of shopitems
485 * corresponding to that string. Memory is allocated for this, it must be freed 474 * corresponding to that string. Memory is allocated for this, it must be freed
486 * at a later date. 475 * at a later date.
487 * Called by parse_map_headers below. 476 * Called by parse_map_headers below.
… …
564 return items; 553 return items;
565} 554}
566 555
567/* opposite of parse string, this puts the string that was originally fed in to 556/* opposite of parse string, this puts the string that was originally fed in to
568 * the map (or something equivilent) into output_string. */ 557 * the map (or something equivilent) into output_string. */
569static void 558static const char *
570print_shop_string (maptile *m, char *output_string) 559print_shop_string (maptile *m)
571{ 560{
572 int i; 561 static dynbuf_text buf; buf.clear ();
573 char tmp[MAX_BUF];
574 562
575 strcpy (output_string, "");
576 for (i = 0; i < m->shopitems[0].index; i++) 563 for (int i = 0; i < m->shopitems[0].index; i++)
577 { 564 {
578 if (m->shopitems[i].typenum) 565 if (m->shopitems[i].typenum)
579 { 566 {
580 if (m->shopitems[i].strength) 567 if (m->shopitems[i].strength)
581 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 568 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
582 else 569 else
583 sprintf (tmp, "%s;", m->shopitems[i].name); 570 buf.printf ("%s;", m->shopitems[i].name);
584 } 571 }
585 else 572 else
586 { 573 {
587 if (m->shopitems[i].strength) 574 if (m->shopitems[i].strength)
588 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 575 buf.printf ("*:%d;", m->shopitems[i].strength);
589 else 576 else
590 sprintf (tmp, "*"); 577 buf.printf ("*");
591 } 578 }
592
593 strcat (output_string, tmp);
594 } 579 }
580
581 return buf;
595} 582}
583
584//-GPL
596 585
597/* This loads the header information of the map. The header 586/* This loads the header information of the map. The header
598 * contains things like difficulty, size, timeout, etc. 587 * contains things like difficulty, size, timeout, etc.
599 * this used to be stored in the map object, but with the 588 * this used to be stored in the map object, but with the
600 * addition of tiling, fields beyond that easily named in an 589 * addition of tiling, fields beyond that easily named in an
… …
641 case KW_shopgreed: thawer.get (shopgreed); break; 630 case KW_shopgreed: thawer.get (shopgreed); break;
642 case KW_shopmin: thawer.get (shopmin); break; 631 case KW_shopmin: thawer.get (shopmin); break;
643 case KW_shopmax: thawer.get (shopmax); break; 632 case KW_shopmax: thawer.get (shopmax); break;
644 case KW_shoprace: thawer.get (shoprace); break; 633 case KW_shoprace: thawer.get (shoprace); break;
645 case KW_outdoor: thawer.get (outdoor); break; 634 case KW_outdoor: thawer.get (outdoor); break;
646 case KW_temp: thawer.get (temp); break;
647 case KW_pressure: thawer.get (pressure); break;
648 case KW_humid: thawer.get (humid); break;
649 case KW_windspeed: thawer.get (windspeed); break;
650 case KW_winddir: thawer.get (winddir); break;
651 case KW_sky: thawer.get (sky); break;
652 635
653 case KW_per_player: thawer.get (per_player); break; 636 case KW_per_player: thawer.get (per_player); break;
654 case KW_per_party: thawer.get (per_party); break; 637 case KW_per_party: thawer.get (per_party); break;
655 case KW_no_reset: thawer.get (no_reset); break; 638 case KW_no_reset: thawer.get (no_reset); break;
656 case KW_no_drop: thawer.get (no_drop); break; 639 case KW_no_drop: thawer.get (no_drop); break;
… …
692 } 675 }
693 676
694 abort (); 677 abort ();
695} 678}
696 679
680//+GPL
681
697/****************************************************************************** 682/******************************************************************************
698 * This is the start of unique map handling code 683 * This is the start of unique map handling code
699 *****************************************************************************/ 684 *****************************************************************************/
700 685
701/* This goes through the maptile and removed any unique items on the map. */ 686/* This goes through the maptile and removed any unique items on the map. */
… …
718 op = above; 703 op = above;
719 } 704 }
720 } 705 }
721} 706}
722 707
708//-GPL
709
723bool 710bool
724maptile::_save_header (object_freezer &freezer) 711maptile::_save_header (object_freezer &freezer)
725{ 712{
726#define MAP_OUT(k) freezer.put (KW_ ## k, k) 713#define MAP_OUT(k) freezer.put (KW(k), k)
727#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 714#define MAP_OUT2(k,v) freezer.put (KW(k), v)
728 715
729 MAP_OUT2 (arch, "map"); 716 MAP_OUT2 (arch, CS(map));
730 717
731 if (name) MAP_OUT (name); 718 if (name) MAP_OUT (name);
732 MAP_OUT (swap_time); 719 MAP_OUT (swap_time);
733 MAP_OUT (reset_time); 720 MAP_OUT (reset_time);
734 MAP_OUT (reset_timeout); 721 MAP_OUT (reset_timeout);
735 MAP_OUT (fixed_resettime); 722 MAP_OUT (fixed_resettime);
736 MAP_OUT (no_reset); 723 MAP_OUT (no_reset);
737 MAP_OUT (no_drop); 724 MAP_OUT (no_drop);
738 MAP_OUT (difficulty); 725 MAP_OUT (difficulty);
739
740 if (default_region) MAP_OUT2 (region, default_region->name); 726 if (default_region) MAP_OUT2 (region, default_region->name);
741 727
742 if (shopitems) 728 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
743 {
744 char shop[MAX_BUF];
745 print_shop_string (this, shop);
746 MAP_OUT2 (shopitems, shop);
747 }
748
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 MAP_OUT (darkness); 733
754 MAP_OUT (width); 734 MAP_OUT (width);
755 MAP_OUT (height); 735 MAP_OUT (height);
756 MAP_OUT (enter_x); 736 MAP_OUT (enter_x);
757 MAP_OUT (enter_y); 737 MAP_OUT (enter_y);
758 738 MAP_OUT (darkness);
759 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
760 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
761
762 MAP_OUT (outdoor); 739 MAP_OUT (outdoor);
763 MAP_OUT (temp); 740
764 MAP_OUT (pressure); 741 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
765 MAP_OUT (humid); 742 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
766 MAP_OUT (windspeed);
767 MAP_OUT (winddir);
768 MAP_OUT (sky);
769 743
770 MAP_OUT (per_player); 744 MAP_OUT (per_player);
771 MAP_OUT (per_party); 745 MAP_OUT (per_party);
772 746
773 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]);
774 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]);
775 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]);
776 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]);
777 751
778 freezer.put (this); 752 freezer.put (this);
779 freezer.put (KW_end); 753 freezer.put (KW(end));
780 754
781 return true; 755 return true;
782} 756}
783 757
784bool 758bool
… …
789 if (!_save_header (freezer)) 763 if (!_save_header (freezer))
790 return false; 764 return false;
791 765
792 return freezer.save (path); 766 return freezer.save (path);
793} 767}
768
769//+GPL
794 770
795/* 771/*
796 * Remove and free all objects in the given map. 772 * Remove and free all objects in the given map.
797 */ 773 */
798void 774void
… …
867 843
868 clear (); 844 clear ();
869} 845}
870 846
871/* 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?
872void 849void
873maptile::do_decay_objects () 850maptile::do_decay_objects ()
874{ 851{
875 if (!spaces) 852 if (!spaces)
876 return; 853 return;
… …
923 || mat & M_LIQUID 900 || mat & M_LIQUID
924 || (mat & M_IRON && rndm (1, 5) == 1) 901 || (mat & M_IRON && rndm (1, 5) == 1)
925 || (mat & M_GLASS && rndm (1, 2) == 1) 902 || (mat & M_GLASS && rndm (1, 2) == 1)
926 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 903 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
927 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 904 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
928 || (mat & M_ICE && temp > 32)) 905 //|| (mat & M_ICE && temp > 32)
906 )
929 destroy = 1; 907 destroy = 1;
930 } 908 }
931 909
932 /* adjust overall chance below */ 910 /* adjust overall chance below */
933 if (destroy && rndm (0, 1)) 911 if (destroy && rndm (0, 1))
… …
1024 */ 1002 */
1025void 1003void
1026mapspace::update_ () 1004mapspace::update_ ()
1027{ 1005{
1028 object *last = 0; 1006 object *last = 0;
1029 uint8 flags = P_UPTODATE, anywhere = 0; 1007 uint8 flags = P_UPTODATE;
1030 sint8 light = 0; 1008 sint8 light = 0;
1031 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;
1010 uint64_t volume = 0;
1011 uint32_t items = 0;
1012 object *anywhere = 0;
1013 uint8_t middle_visibility = 0;
1032 1014
1033 //object *middle = 0; 1015 //object *middle = 0;
1034 //object *top = 0; 1016 //object *top = 0;
1035 //object *floor = 0; 1017 //object *floor = 0;
1036 // this seems to generate better code than using locals, above 1018 // this seems to generate better code than using locals, above
1037 object *&top = faces_obj[0] = 0; 1019 object *&top = faces_obj[0] = 0;
1038 object *&middle = faces_obj[1] = 0; 1020 object *&middle = faces_obj[1] = 0;
1039 object *&floor = faces_obj[2] = 0; 1021 object *&floor = faces_obj[2] = 0;
1022
1023 object::flags_t allflags; // all flags of all objects or'ed together
1040 1024
1041 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above) 1025 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1042 { 1026 {
1043 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C) 1027 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1044 light += tmp->glow_radius; 1028 light += tmp->glow_radius;
… …
1049 * 3 times each time the player moves, because many of the 1033 * 3 times each time the player moves, because many of the
1050 * functions the move_player calls eventualy call this. 1034 * functions the move_player calls eventualy call this.
1051 * 1035 *
1052 * Always put the player down for drawing. 1036 * Always put the player down for drawing.
1053 */ 1037 */
1054 if (!tmp->invisible) 1038 if (expect_true (!tmp->invisible))
1055 { 1039 {
1056 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1040 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1057 top = tmp; 1041 top = tmp;
1058 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1042 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1059 { 1043 {
1060 /* If we got a floor, that means middle and top were below it, 1044 /* If we got a floor, that means middle and top were below it,
1061 * so should not be visible, so we clear them. 1045 * so should not be visible, so we clear them.
1062 */ 1046 */
1063 middle = 0; 1047 middle = 0;
1064 top = 0; 1048 top = 0;
1065 floor = tmp; 1049 floor = tmp;
1050 volume = 0;
1051 items = 0;
1066 } 1052 }
1067 /* Flag anywhere have high priority */ 1053 else
1068 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1069 { 1054 {
1055 if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1056 {
1057 ++items;
1058 volume += tmp->volume ();
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
1068 */
1069 if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
1070 {
1071 middle_visibility = ::faces [tmp->face].visibility;
1070 middle = tmp; 1072 middle = tmp;
1071 anywhere = 1; 1073 }
1072 } 1074 }
1073
1074 /* Find the highest visible face around. If equal
1075 * visibilities, we still want the one nearer to the
1076 * top
1077 */
1078 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1079 middle = tmp;
1080 }
1081
1082 if (tmp == tmp->above)
1083 {
1084 LOG (llevError, "Error in structure of map\n");
1085 exit (-1);
1086 } 1075 }
1087 1076
1088 move_slow |= tmp->move_slow; 1077 move_slow |= tmp->move_slow;
1089 move_block |= tmp->move_block; 1078 move_block |= tmp->move_block;
1090 move_on |= tmp->move_on; 1079 move_on |= tmp->move_on;
1091 move_off |= tmp->move_off; 1080 move_off |= tmp->move_off;
1092 move_allow |= tmp->move_allow; 1081 move_allow |= tmp->move_allow;
1093 1082
1094 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1083 allflags |= tmp->flag;
1095 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1084
1096 if (tmp->type == PLAYER) flags |= P_PLAYER; 1085 if (tmp->type == PLAYER) flags |= P_PLAYER;
1097 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1086 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1098 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1099 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1100 } 1087 }
1088
1089 // FLAG_SEE_ANYWHERE takes precedence
1090 if (anywhere)
1091 middle = anywhere;
1092
1093 // ORing all flags together and checking them here is much faster
1094 if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
1095 if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
1096 if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
1097 if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
1101 1098
1102 this->light = min (light, MAX_LIGHT_RADIUS); 1099 this->light = min (light, MAX_LIGHT_RADIUS);
1103 this->flags_ = flags; 1100 this->flags_ = flags;
1104 this->move_block = move_block & ~move_allow; 1101 this->move_block = move_block & ~move_allow;
1105 this->move_on = move_on; 1102 this->move_on = move_on;
1106 this->move_off = move_off; 1103 this->move_off = move_off;
1107 this->move_slow = move_slow; 1104 this->move_slow = move_slow;
1105 this->volume_ = (volume + 1023) / 1024;
1106 this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1108 1107
1109 /* At this point, we have a floor face (if there is a floor), 1108 /* At this point, we have a floor face (if there is a floor),
1110 * and the floor is set - we are not going to touch it at 1109 * and the floor is set - we are not going to touch it at
1111 * this point. 1110 * this point.
1112 * middle contains the highest visibility face. 1111 * middle contains the highest visibility face.
… …
1178 faces_obj [1] = middle; 1177 faces_obj [1] = middle;
1179 faces_obj [2] = floor; 1178 faces_obj [2] = floor;
1180#endif 1179#endif
1181} 1180}
1182 1181
1183uint64
1184mapspace::volume () const
1185{
1186 uint64 vol = 0;
1187
1188 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1189 vol += op->volume ();
1190
1191 return vol;
1192}
1193
1194maptile * 1182maptile *
1195maptile::tile_available (int dir, bool load) 1183maptile::tile_available (int dir, bool load)
1196{ 1184{
1197 if (tile_path[dir]) 1185 if (tile_path[dir])
1198 { 1186 {
… …
1537 int dx, dy; 1525 int dx, dy;
1538 1526
1539 return adjacent_map (op1->map, op2->map, &dx, &dy); 1527 return adjacent_map (op1->map, op2->map, &dx, &dy);
1540} 1528}
1541 1529
1530//-GPL
1531
1542object * 1532object *
1543maptile::insert (object *op, int x, int y, object *originator, int flags) 1533maptile::insert (object *op, int x, int y, object *originator, int flags)
1544{ 1534{
1545 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1535 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1546} 1536}
… …
1557 if (default_region) 1547 if (default_region)
1558 return default_region; 1548 return default_region;
1559 1549
1560 return ::region::default_region (); 1550 return ::region::default_region ();
1561} 1551}
1552
1553//+GPL
1562 1554
1563/* picks a random object from a style map. 1555/* picks a random object from a style map.
1564 */ 1556 */
1565object * 1557object *
1566maptile::pick_random_object (rand_gen &gen) const 1558maptile::pick_random_object (rand_gen &gen) const
… …
1579 if (pick && pick->is_head ()) 1571 if (pick && pick->is_head ())
1580 return pick->head_ (); 1572 return pick->head_ ();
1581 } 1573 }
1582 1574
1583 // instead of crashing in the unlikely(?) case, try to return *something* 1575 // instead of crashing in the unlikely(?) case, try to return *something*
1584 return archetype::find ("bug"); 1576 return archetype::find (shstr_bug);
1585} 1577}
1578
1579//-GPL
1586 1580
1587void 1581void
1588maptile::play_sound (faceidx sound, int x, int y) const 1582maptile::play_sound (faceidx sound, int x, int y) const
1589{ 1583{
1590 if (!sound) 1584 if (!sound)

Diff Legend

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