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.157 by root, Thu Jan 8 19:23:44 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).
… …
309 op = op->above; 294 op = op->above;
310 } 295 }
311 } 296 }
312} 297}
313 298
299//-GPL
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 */
318bool 305bool
… …
334 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) 321 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
335 { 322 {
336 // we insert manually because 323 // we insert manually because
337 // a) its way faster 324 // a) its way faster
338 // b) we remove manually, too, and there are good reasons for that 325 // b) we remove manually, too, and there are good reasons for that
339 // c) its correct 326 // c) it's correct
340 mapspace &ms = at (op->x, op->y); 327 mapspace &ms = at (op->x, op->y);
341 328
342 op->flag [FLAG_REMOVED] = false; 329 op->flag [FLAG_REMOVED] = false;
343 330
344 op->above = 0; 331 op->above = 0;
345 op->below = ms.top; 332 op->below = ms.top;
346 333
347 if (ms.top)
348 ms.top->above = op; 334 *(ms.top ? &ms.top->above : &ms.bot) = op;
349 else
350 ms.bot = op;
351 335
352 ms.top = op; 336 ms.top = op;
353 ms.flags_ = 0; 337 ms.flags_ = 0;
354 } 338 }
355 else 339 else
… …
450 * map archetype. Mimic that behaviour. 434 * map archetype. Mimic that behaviour.
451 */ 435 */
452 width = 16; 436 width = 16;
453 height = 16; 437 height = 16;
454 timeout = 300; 438 timeout = 300;
455 max_nrof = 1000; // 1000 items of anything 439 max_items = MAX_ITEM_PER_ACTION;
456 max_volume = 2000000; // 2m³ 440 max_volume = 2000000; // 2m³
457} 441}
458 442
459maptile::maptile (int w, int h) 443maptile::maptile (int w, int h)
460{ 444{
… …
481 if (spaces) 465 if (spaces)
482 return; 466 return;
483 467
484 spaces = salloc0<mapspace> (size ()); 468 spaces = salloc0<mapspace> (size ());
485} 469}
470
471//+GPL
486 472
487/* 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
488 * 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
489 * at a later date. 475 * at a later date.
490 * Called by parse_map_headers below. 476 * Called by parse_map_headers below.
… …
567 return items; 553 return items;
568} 554}
569 555
570/* 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
571 * the map (or something equivilent) into output_string. */ 557 * the map (or something equivilent) into output_string. */
572static void 558static const char *
573print_shop_string (maptile *m, char *output_string) 559print_shop_string (maptile *m)
574{ 560{
575 int i; 561 static dynbuf_text buf; buf.clear ();
576 char tmp[MAX_BUF];
577 562
578 strcpy (output_string, "");
579 for (i = 0; i < m->shopitems[0].index; i++) 563 for (int i = 0; i < m->shopitems[0].index; i++)
580 { 564 {
581 if (m->shopitems[i].typenum) 565 if (m->shopitems[i].typenum)
582 { 566 {
583 if (m->shopitems[i].strength) 567 if (m->shopitems[i].strength)
584 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);
585 else 569 else
586 sprintf (tmp, "%s;", m->shopitems[i].name); 570 buf.printf ("%s;", m->shopitems[i].name);
587 } 571 }
588 else 572 else
589 { 573 {
590 if (m->shopitems[i].strength) 574 if (m->shopitems[i].strength)
591 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 575 buf.printf ("*:%d;", m->shopitems[i].strength);
592 else 576 else
593 sprintf (tmp, "*"); 577 buf.printf ("*");
594 } 578 }
595
596 strcat (output_string, tmp);
597 } 579 }
580
581 return buf;
598} 582}
583
584//-GPL
599 585
600/* This loads the header information of the map. The header 586/* This loads the header information of the map. The header
601 * contains things like difficulty, size, timeout, etc. 587 * contains things like difficulty, size, timeout, etc.
602 * 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
603 * addition of tiling, fields beyond that easily named in an 589 * addition of tiling, fields beyond that easily named in an
… …
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;
… …
695 } 675 }
696 676
697 abort (); 677 abort ();
698} 678}
699 679
680//+GPL
681
700/****************************************************************************** 682/******************************************************************************
701 * This is the start of unique map handling code 683 * This is the start of unique map handling code
702 *****************************************************************************/ 684 *****************************************************************************/
703 685
704/* 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. */
… …
721 op = above; 703 op = above;
722 } 704 }
723 } 705 }
724} 706}
725 707
708//-GPL
709
726bool 710bool
727maptile::_save_header (object_freezer &freezer) 711maptile::_save_header (object_freezer &freezer)
728{ 712{
729#define MAP_OUT(k) freezer.put (KW_ ## k, k) 713#define MAP_OUT(k) freezer.put (KW(k), k)
730#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 714#define MAP_OUT2(k,v) freezer.put (KW(k), v)
731 715
732 MAP_OUT2 (arch, "map"); 716 MAP_OUT2 (arch, CS(map));
733 717
734 if (name) MAP_OUT (name); 718 if (name) MAP_OUT (name);
735 MAP_OUT (swap_time); 719 MAP_OUT (swap_time);
736 MAP_OUT (reset_time); 720 MAP_OUT (reset_time);
737 MAP_OUT (reset_timeout); 721 MAP_OUT (reset_timeout);
738 MAP_OUT (fixed_resettime); 722 MAP_OUT (fixed_resettime);
739 MAP_OUT (no_reset); 723 MAP_OUT (no_reset);
740 MAP_OUT (no_drop); 724 MAP_OUT (no_drop);
741 MAP_OUT (difficulty); 725 MAP_OUT (difficulty);
742
743 if (default_region) MAP_OUT2 (region, default_region->name); 726 if (default_region) MAP_OUT2 (region, default_region->name);
744 727
745 if (shopitems) 728 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
746 {
747 char shop[MAX_BUF];
748 print_shop_string (this, shop);
749 MAP_OUT2 (shopitems, shop);
750 }
751
752 MAP_OUT (shopgreed); 729 MAP_OUT (shopgreed);
753 MAP_OUT (shopmin); 730 MAP_OUT (shopmin);
754 MAP_OUT (shopmax); 731 MAP_OUT (shopmax);
755 if (shoprace) MAP_OUT (shoprace); 732 if (shoprace) MAP_OUT (shoprace);
756 MAP_OUT (darkness); 733
757 MAP_OUT (width); 734 MAP_OUT (width);
758 MAP_OUT (height); 735 MAP_OUT (height);
759 MAP_OUT (enter_x); 736 MAP_OUT (enter_x);
760 MAP_OUT (enter_y); 737 MAP_OUT (enter_y);
761 738 MAP_OUT (darkness);
762 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
763 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
764
765 MAP_OUT (outdoor); 739 MAP_OUT (outdoor);
766 MAP_OUT (temp); 740
767 MAP_OUT (pressure); 741 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
768 MAP_OUT (humid); 742 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
769 MAP_OUT (windspeed);
770 MAP_OUT (winddir);
771 MAP_OUT (sky);
772 743
773 MAP_OUT (per_player); 744 MAP_OUT (per_player);
774 MAP_OUT (per_party); 745 MAP_OUT (per_party);
775 746
776 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]);
777 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]);
778 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]);
779 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]);
780 751
781 freezer.put (this); 752 freezer.put (this);
782 freezer.put (KW_end); 753 freezer.put (KW(end));
783 754
784 return true; 755 return true;
785} 756}
786 757
787bool 758bool
… …
792 if (!_save_header (freezer)) 763 if (!_save_header (freezer))
793 return false; 764 return false;
794 765
795 return freezer.save (path); 766 return freezer.save (path);
796} 767}
768
769//+GPL
797 770
798/* 771/*
799 * Remove and free all objects in the given map. 772 * Remove and free all objects in the given map.
800 */ 773 */
801void 774void
… …
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?
875void 849void
876maptile::do_decay_objects () 850maptile::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))
… …
1027 */ 1002 */
1028void 1003void
1029mapspace::update_ () 1004mapspace::update_ ()
1030{ 1005{
1031 object *last = 0; 1006 object *last = 0;
1032 uint8 flags = P_UPTODATE, anywhere = 0; 1007 uint8 flags = P_UPTODATE;
1033 sint8 light = 0; 1008 sint8 light = 0;
1034 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;
1035 1014
1036 //object *middle = 0; 1015 //object *middle = 0;
1037 //object *top = 0; 1016 //object *top = 0;
1038 //object *floor = 0; 1017 //object *floor = 0;
1039 // this seems to generate better code than using locals, above 1018 // this seems to generate better code than using locals, above
1040 object *&top = faces_obj[0] = 0; 1019 object *&top = faces_obj[0] = 0;
1041 object *&middle = faces_obj[1] = 0; 1020 object *&middle = faces_obj[1] = 0;
1042 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
1043 1024
1044 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above) 1025 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1045 { 1026 {
1046 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C) 1027 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1047 light += tmp->glow_radius; 1028 light += tmp->glow_radius;
… …
1052 * 3 times each time the player moves, because many of the 1033 * 3 times each time the player moves, because many of the
1053 * functions the move_player calls eventualy call this. 1034 * functions the move_player calls eventualy call this.
1054 * 1035 *
1055 * Always put the player down for drawing. 1036 * Always put the player down for drawing.
1056 */ 1037 */
1057 if (!tmp->invisible) 1038 if (expect_true (!tmp->invisible))
1058 { 1039 {
1059 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1040 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1060 top = tmp; 1041 top = tmp;
1061 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1042 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1062 { 1043 {
1063 /* 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,
1064 * so should not be visible, so we clear them. 1045 * so should not be visible, so we clear them.
1065 */ 1046 */
1066 middle = 0; 1047 middle = 0;
1067 top = 0; 1048 top = 0;
1068 floor = tmp; 1049 floor = tmp;
1050 volume = 0;
1051 items = 0;
1069 } 1052 }
1070 /* Flag anywhere have high priority */ 1053 else
1071 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1072 { 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;
1073 middle = tmp; 1072 middle = tmp;
1074 anywhere = 1; 1073 }
1075 } 1074 }
1076
1077 /* Find the highest visible face around. If equal
1078 * visibilities, we still want the one nearer to the
1079 * top
1080 */
1081 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1082 middle = tmp;
1083 }
1084
1085 if (tmp == tmp->above)
1086 {
1087 LOG (llevError, "Error in structure of map\n");
1088 exit (-1);
1089 } 1075 }
1090 1076
1091 move_slow |= tmp->move_slow; 1077 move_slow |= tmp->move_slow;
1092 move_block |= tmp->move_block; 1078 move_block |= tmp->move_block;
1093 move_on |= tmp->move_on; 1079 move_on |= tmp->move_on;
1094 move_off |= tmp->move_off; 1080 move_off |= tmp->move_off;
1095 move_allow |= tmp->move_allow; 1081 move_allow |= tmp->move_allow;
1096 1082
1097 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1083 allflags |= tmp->flag;
1098 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1084
1099 if (tmp->type == PLAYER) flags |= P_PLAYER; 1085 if (tmp->type == PLAYER) flags |= P_PLAYER;
1100 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1086 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1101 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1102 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1103 } 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;
1104 1098
1105 this->light = min (light, MAX_LIGHT_RADIUS); 1099 this->light = min (light, MAX_LIGHT_RADIUS);
1106 this->flags_ = flags; 1100 this->flags_ = flags;
1107 this->move_block = move_block & ~move_allow; 1101 this->move_block = move_block & ~move_allow;
1108 this->move_on = move_on; 1102 this->move_on = move_on;
1109 this->move_off = move_off; 1103 this->move_off = move_off;
1110 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
1111 1107
1112 /* 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),
1113 * 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
1114 * this point. 1110 * this point.
1115 * middle contains the highest visibility face. 1111 * middle contains the highest visibility face.
… …
1181 faces_obj [1] = middle; 1177 faces_obj [1] = middle;
1182 faces_obj [2] = floor; 1178 faces_obj [2] = floor;
1183#endif 1179#endif
1184} 1180}
1185 1181
1186uint64
1187mapspace::volume () const
1188{
1189 uint64 vol = 0;
1190
1191 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1192 vol += op->volume ();
1193
1194 return vol;
1195}
1196
1197maptile * 1182maptile *
1198maptile::tile_available (int dir, bool load) 1183maptile::tile_available (int dir, bool load)
1199{ 1184{
1200 if (tile_path[dir]) 1185 if (tile_path[dir])
1201 { 1186 {
… …
1518 else 1503 else
1519 { 1504 {
1520 retval->distance_x += op2->x - x; 1505 retval->distance_x += op2->x - x;
1521 retval->distance_y += op2->y - y; 1506 retval->distance_y += op2->y - y;
1522 1507
1523 retval->part = NULL; 1508 retval->part = 0;
1524 retval->distance = idistance (retval->distance_x, retval->distance_y); 1509 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1525 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1510 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1526 } 1511 }
1527} 1512}
1528 1513
1529/* Returns true of op1 and op2 are effectively on the same map 1514/* Returns true of op1 and op2 are effectively on the same map
… …
1540 int dx, dy; 1525 int dx, dy;
1541 1526
1542 return adjacent_map (op1->map, op2->map, &dx, &dy); 1527 return adjacent_map (op1->map, op2->map, &dx, &dy);
1543} 1528}
1544 1529
1530//-GPL
1531
1545object * 1532object *
1546maptile::insert (object *op, int x, int y, object *originator, int flags) 1533maptile::insert (object *op, int x, int y, object *originator, int flags)
1547{ 1534{
1548 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);
1549} 1536}
… …
1560 if (default_region) 1547 if (default_region)
1561 return default_region; 1548 return default_region;
1562 1549
1563 return ::region::default_region (); 1550 return ::region::default_region ();
1564} 1551}
1552
1553//+GPL
1565 1554
1566/* picks a random object from a style map. 1555/* picks a random object from a style map.
1567 */ 1556 */
1568object * 1557object *
1569maptile::pick_random_object (rand_gen &gen) const 1558maptile::pick_random_object (rand_gen &gen) const
… …
1582 if (pick && pick->is_head ()) 1571 if (pick && pick->is_head ())
1583 return pick->head_ (); 1572 return pick->head_ ();
1584 } 1573 }
1585 1574
1586 // instead of crashing in the unlikely(?) case, try to return *something* 1575 // instead of crashing in the unlikely(?) case, try to return *something*
1587 return archetype::find ("bug"); 1576 return archetype::find (shstr_bug);
1588} 1577}
1578
1579//-GPL
1589 1580
1590void 1581void
1591maptile::play_sound (faceidx sound, int x, int y) const 1582maptile::play_sound (faceidx sound, int x, int y) const
1592{ 1583{
1593 if (!sound) 1584 if (!sound)

Diff Legend

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