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.165 by root, Tue Oct 20 05:57:08 2009 UTC vs.
Revision 1.203 by root, Sat Apr 23 04:56:46 2011 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,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
23 */ 23 */
24 24
25#include <unistd.h> 25#include <unistd.h>
26 26
27#include "global.h" 27#include "global.h"
28#include "loader.h"
29#include "path.h" 28#include "path.h"
29
30//+GPL
30 31
31sint8 maptile::outdoor_darkness; 32sint8 maptile::outdoor_darkness;
32 33
33/* This rolls up wall, blocks_magic, blocks_view, etc, all into 34/* This rolls up wall, blocks_magic, blocks_view, etc, all into
34 * one function that just returns a P_.. value (see map.h) 35 * one function that just returns a P_.. value (see map.h)
… …
76 /* Make sure the coordinates are valid - they should be, as caller should 77 /* Make sure the coordinates are valid - they should be, as caller should
77 * have already checked this. 78 * have already checked this.
78 */ 79 */
79 if (OUT_OF_REAL_MAP (m, sx, sy)) 80 if (OUT_OF_REAL_MAP (m, sx, sy))
80 { 81 {
81 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 82 LOG (llevError | logBacktrace, "blocked_link: Passed map, x, y coordinates outside of map\n");
82 return 1; 83 return 1;
83 } 84 }
84 85
85 /* Save some cycles - instead of calling get_map_flags(), just get the value
86 * directly.
87 */
88 mapspace &ms = m->at (sx, sy); 86 mapspace &ms = m->at (sx, sy);
89 87
90 int mflags = ms.flags (); 88 int mflags = ms.flags ();
91 int blocked = ms.move_block; 89 int blocked = ms.move_block;
92 90
93 /* If space is currently not blocked by anything, no need to 91 /* If space is currently not blocked by anything, no need to
94 * go further. Not true for players - all sorts of special 92 * go further. Not true for players - all sorts of special
95 * things we need to do for players. 93 * things we need to do for players.
96 */ 94 */
97 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 95 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
98 return 0; 96 return 0;
99 97
100 /* if there isn't anything alive on this space, and this space isn't 98 /* if there isn't anything alive on this space, and this space isn't
101 * otherwise blocked, we can return now. Only if there is a living 99 * otherwise blocked, we can return now. Only if there is a living
102 * creature do we need to investigate if it is part of this creature 100 * creature do we need to investigate if it is part of this creature
… …
112 /* We basically go through the stack of objects, and if there is 110 /* We basically go through the stack of objects, and if there is
113 * some other object that has NO_PASS or FLAG_ALIVE set, return 111 * some other object that has NO_PASS or FLAG_ALIVE set, return
114 * true. If we get through the entire stack, that must mean 112 * true. If we get through the entire stack, that must mean
115 * ob is blocking it, so return 0. 113 * ob is blocking it, so return 0.
116 */ 114 */
117 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 115 for (object *tmp = ms.top; tmp; tmp = tmp->below)
118 { 116 {
119 if (OB_MOVE_BLOCK (ob, tmp)) 117 if (OB_MOVE_BLOCK (ob, tmp))
120 { 118 {
119 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
120 if (RESULT_INT (0))
121 return 1;
122 else
123 continue;
124
121 if (tmp->type == CHECK_INV) 125 if (tmp->type == CHECK_INV)
122 { 126 {
123 bool have = check_inv_recursive (ob, tmp); 127 bool have = check_inv_recursive (ob, tmp);
124 128
125 // last_sp set means we block if we don't have. 129 // last_sp set means we block if we don't have.
… …
130 { 134 {
131 // T_MATCH allows "entrance" iff the match is true 135 // T_MATCH allows "entrance" iff the match is true
132 // == blocks if the match fails 136 // == blocks if the match fails
133 137
134 // we could have used an INVOKE_OBJECT, but decided against it, as we 138 // we could have used an INVOKE_OBJECT, but decided against it, as we
135 // assume that T_MATCH is very common. 139 // assume that T_MATCH is relatively common.
136 if (!match (tmp->slaying, ob, tmp, ob)) 140 if (!match (tmp->slaying, ob, tmp, ob))
137 return 1; 141 return 1;
138 } 142 }
139 else 143 else
140 return 1; // unconditional block 144 return 1; // unconditional block
141 145
142 } else { 146 } else {
143 // space does not block the ob, directly, but 147 // space does not block the ob, directly, but
144 // anything alive that is not a door still 148 // anything alive that is not a door still
145 // blocks anything but wizards. 149 // blocks anything
146 150
147 if (tmp->flag [FLAG_ALIVE] 151 if (tmp->flag [FLAG_ALIVE]
148 && tmp->head_ () != ob
149 && tmp != ob
150 && tmp->type != DOOR 152 && tmp->type != DOOR
151 && !tmp->flag [FLAG_WIZPASS]) 153 && tmp->head_ () != ob) //TODO: maybe move these check up?
152 return 1; 154 return 1;
153 } 155 }
154 } 156 }
155 157
156 return 0; 158 return 0;
157} 159}
158 160
159/* 161/*
160 * Returns qthe blocking object if the given object can't fit in the given 162 * Returns the blocking object if the given object can't fit in the given
161 * spot. This is meant for multi space objects - for single space objecs, 163 * spot. This is meant for multi space objects - for single space objecs,
162 * just calling get_map_blocked and checking that against movement type 164 * just calling get_map_blocked and checking that against movement type
163 * of object. This function goes through all the parts of the multipart 165 * of object. This function goes through all the parts of the multipart
164 * object and makes sure they can be inserted. 166 * object and makes sure they can be inserted.
165 * 167 *
… …
212 } 214 }
213 215
214 return 0; 216 return 0;
215} 217}
216 218
217/* When the map is loaded, load_object does not actually insert objects 219//-GPL
218 * into inventory, but just links them. What this does is go through
219 * and insert them properly.
220 * The object 'container' is the object that contains the inventory.
221 * This is needed so that we can update the containers weight.
222 */
223void
224fix_container (object *container)
225{
226 object *tmp = container->inv, *next;
227
228 container->inv = 0;
229 while (tmp)
230 {
231 next = tmp->below;
232 if (tmp->inv)
233 fix_container (tmp);
234
235 insert_ob_in_ob (tmp, container);
236 tmp = next;
237 }
238
239 // go through and calculate what all the containers are carrying.
240 //TODO: remove
241 container->update_weight ();
242}
243 220
244void 221void
245maptile::set_object_flag (int flag, int value) 222maptile::set_object_flag (int flag, int value)
246{ 223{
247 if (!spaces) 224 if (!spaces)
… …
262 239
263 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 240 for (mapspace *ms = spaces + size (); ms-- > spaces; )
264 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 241 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
265 INVOKE_OBJECT (RESET, tmp); 242 INVOKE_OBJECT (RESET, tmp);
266} 243}
244
245void
246maptile::post_load ()
247{
248#if 0
249 if (!spaces)
250 return;
251
252 for (mapspace *ms = spaces + size (); ms-- > spaces; )
253 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
254 ; // nop
255#endif
256}
257
258//+GPL
267 259
268/* link_multipart_objects go through all the objects on the map looking 260/* link_multipart_objects go through all the objects on the map looking
269 * for objects whose arch says they are multipart yet according to the 261 * for objects whose arch says they are multipart yet according to the
270 * info we have, they only have the head (as would be expected when 262 * info we have, they only have the head (as would be expected when
271 * they are saved). 263 * they are saved).
… …
299 op = op->above; 291 op = op->above;
300 } 292 }
301 } 293 }
302} 294}
303 295
296//-GPL
297
304/* 298/*
305 * Loads (ands parses) the objects into a given map from the specified 299 * Loads (ands parses) the objects into a given map from the specified
306 * file pointer. 300 * file pointer.
307 */ 301 */
308bool 302bool
… …
317 case KW_arch: 311 case KW_arch:
318 if (object *op = object::read (f, this)) 312 if (object *op = object::read (f, this))
319 { 313 {
320 // TODO: why? 314 // TODO: why?
321 if (op->inv) 315 if (op->inv)
316 {
317 op->carrying = 0;
322 op->update_weight (); 318 op->update_weight ();
319 }
323 320
324 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))
325 { 322 {
326 // we insert manually because 323 // we insert manually because
327 // a) its way faster 324 // a) its way faster
… …
427 return false; 424 return false;
428 425
429 return freezer.save (path); 426 return freezer.save (path);
430} 427}
431 428
432maptile::maptile () 429void
430maptile::init ()
433{ 431{
434 in_memory = MAP_SWAPPED; 432 in_memory = MAP_SWAPPED;
435 433
436 /* The maps used to pick up default x and y values from the 434 /* The maps used to pick up default x and y values from the
437 * map archetype. Mimic that behaviour. 435 * map archetype. Mimic that behaviour.
438 */ 436 */
439 width = 16; 437 width = 16;
440 height = 16; 438 height = 16;
441 timeout = 300; 439 timeout = 300;
442 max_nrof = 1000; // 1000 items of anything 440 max_items = MAX_ITEM_PER_ACTION;
443 max_volume = 2000000; // 2m³ 441 max_volume = 2000000; // 2m³
444}
445
446maptile::maptile (int w, int h)
447{
448 in_memory = MAP_SWAPPED;
449
450 width = w;
451 height = h;
452 reset_timeout = 0; 442 reset_timeout = 0;
453 timeout = 300;
454 enter_x = 0; 443 enter_x = 0;
455 enter_y = 0; 444 enter_y = 0;
445}
446
447maptile::maptile ()
448{
449 init ();
450}
451
452maptile::maptile (int w, int h)
453{
454 init ();
455
456 width = w;
457 height = h;
456 458
457 alloc (); 459 alloc ();
458} 460}
459 461
460/* 462/*
… …
468 if (spaces) 470 if (spaces)
469 return; 471 return;
470 472
471 spaces = salloc0<mapspace> (size ()); 473 spaces = salloc0<mapspace> (size ());
472} 474}
475
476//+GPL
473 477
474/* Takes a string from a map definition and outputs a pointer to the array of shopitems 478/* Takes a string from a map definition and outputs a pointer to the array of shopitems
475 * corresponding to that string. Memory is allocated for this, it must be freed 479 * corresponding to that string. Memory is allocated for this, it must be freed
476 * at a later date. 480 * at a later date.
477 * Called by parse_map_headers below. 481 * Called by parse_map_headers below.
… …
558 * the map (or something equivilent) into output_string. */ 562 * the map (or something equivilent) into output_string. */
559static const char * 563static const char *
560print_shop_string (maptile *m) 564print_shop_string (maptile *m)
561{ 565{
562 static dynbuf_text buf; buf.clear (); 566 static dynbuf_text buf; buf.clear ();
567 bool first = true;
563 568
564 for (int i = 0; i < m->shopitems[0].index; i++) 569 for (int i = 0; i < m->shopitems[0].index; i++)
565 { 570 {
571 if (!first)
572 buf << ';';
573
574 first = false;
575
566 if (m->shopitems[i].typenum) 576 if (m->shopitems[i].typenum)
567 { 577 {
568 if (m->shopitems[i].strength) 578 if (m->shopitems[i].strength)
569 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 579 buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
570 else 580 else
571 buf.printf ("%s;", m->shopitems[i].name); 581 buf.printf ("%s", m->shopitems[i].name);
572 } 582 }
573 else 583 else
574 { 584 {
575 if (m->shopitems[i].strength) 585 if (m->shopitems[i].strength)
576 buf.printf ("*:%d;", m->shopitems[i].strength); 586 buf.printf ("*:%d", m->shopitems[i].strength);
577 else 587 else
578 buf.printf ("*"); 588 buf.printf ("*");
579 } 589 }
580 } 590 }
581 591
582 return buf; 592 return buf;
583} 593}
594
595//-GPL
584 596
585/* This loads the header information of the map. The header 597/* This loads the header information of the map. The header
586 * contains things like difficulty, size, timeout, etc. 598 * contains things like difficulty, size, timeout, etc.
587 * this used to be stored in the map object, but with the 599 * this used to be stored in the map object, but with the
588 * addition of tiling, fields beyond that easily named in an 600 * addition of tiling, fields beyond that easily named in an
… …
602 { 614 {
603 case KW_msg: 615 case KW_msg:
604 thawer.get_ml (KW_endmsg, msg); 616 thawer.get_ml (KW_endmsg, msg);
605 break; 617 break;
606 618
607 case KW_lore: // CF+ extension 619 case KW_lore: // deliantra extension
608 thawer.get_ml (KW_endlore, maplore); 620 thawer.get_ml (KW_endlore, maplore);
609 break; 621 break;
610 622
611 case KW_maplore: 623 case KW_maplore:
612 thawer.get_ml (KW_endmaplore, maplore); 624 thawer.get_ml (KW_endmaplore, maplore);
… …
629 case KW_shopgreed: thawer.get (shopgreed); break; 641 case KW_shopgreed: thawer.get (shopgreed); break;
630 case KW_shopmin: thawer.get (shopmin); break; 642 case KW_shopmin: thawer.get (shopmin); break;
631 case KW_shopmax: thawer.get (shopmax); break; 643 case KW_shopmax: thawer.get (shopmax); break;
632 case KW_shoprace: thawer.get (shoprace); break; 644 case KW_shoprace: thawer.get (shoprace); break;
633 case KW_outdoor: thawer.get (outdoor); break; 645 case KW_outdoor: thawer.get (outdoor); break;
634 case KW_temp: thawer.get (temp); break;
635 case KW_pressure: thawer.get (pressure); break;
636 case KW_humid: thawer.get (humid); break;
637 case KW_windspeed: thawer.get (windspeed); break;
638 case KW_winddir: thawer.get (winddir); break;
639 case KW_sky: thawer.get (sky); break;
640 646
641 case KW_per_player: thawer.get (per_player); break; 647 case KW_per_player: thawer.get (per_player); break;
642 case KW_per_party: thawer.get (per_party); break; 648 case KW_per_party: thawer.get (per_party); break;
643 case KW_no_reset: thawer.get (no_reset); break; 649 case KW_no_reset: thawer.get (no_reset); break;
644 case KW_no_drop: thawer.get (no_drop); break; 650 case KW_no_drop: thawer.get (no_drop); break;
645 651
646 case KW_region: default_region = region::find (thawer.get_str ()); break; 652 case KW_region: thawer.get (default_region); break;
647 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 653 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
648 654
649 // old names new names 655 // old names new names
650 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 656 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
651 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 657 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
659 665
660 case KW_tile_path_1: thawer.get (tile_path [0]); break; 666 case KW_tile_path_1: thawer.get (tile_path [0]); break;
661 case KW_tile_path_2: thawer.get (tile_path [1]); break; 667 case KW_tile_path_2: thawer.get (tile_path [1]); break;
662 case KW_tile_path_3: thawer.get (tile_path [2]); break; 668 case KW_tile_path_3: thawer.get (tile_path [2]); break;
663 case KW_tile_path_4: thawer.get (tile_path [3]); break; 669 case KW_tile_path_4: thawer.get (tile_path [3]); break;
670 case KW_tile_path_5: thawer.get (tile_path [4]); break;
671 case KW_tile_path_6: thawer.get (tile_path [5]); break;
664 672
665 case KW_ERROR: 673 case KW_ERROR:
666 set_key_text (thawer.kw_str, thawer.value); 674 set_key_text (thawer.kw_str, thawer.value);
667 break; 675 break;
668 676
669 case KW_end: 677 case KW_end:
670 thawer.next (); 678 thawer.next ();
671 return true; 679 return true;
672 680
673 default: 681 default:
674 if (!thawer.parse_error ("map", 0)) 682 if (!thawer.parse_error ("map"))
675 return false; 683 return false;
676 break; 684 break;
677 } 685 }
678 686
679 thawer.next (); 687 thawer.next ();
680 } 688 }
681 689
682 abort (); 690 abort ();
683} 691}
692
693//+GPL
684 694
685/****************************************************************************** 695/******************************************************************************
686 * This is the start of unique map handling code 696 * This is the start of unique map handling code
687 *****************************************************************************/ 697 *****************************************************************************/
688 698
… …
695 int unique = 0; 705 int unique = 0;
696 for (object *op = spaces [i].bot; op; ) 706 for (object *op = spaces [i].bot; op; )
697 { 707 {
698 object *above = op->above; 708 object *above = op->above;
699 709
700 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 710 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
701 unique = 1; 711 unique = 1;
702 712
703 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 713 if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
704 op->destroy (); 714 op->destroy ();
705 715
706 op = above; 716 op = above;
707 } 717 }
708 } 718 }
709} 719}
710 720
721//-GPL
722
711bool 723bool
712maptile::_save_header (object_freezer &freezer) 724maptile::_save_header (object_freezer &freezer)
713{ 725{
714#define MAP_OUT(k) freezer.put (KW_ ## k, k) 726#define MAP_OUT(k) freezer.put (KW(k), k)
715#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 727#define MAP_OUT2(k,v) freezer.put (KW(k), v)
716 728
717 MAP_OUT2 (arch, "map"); 729 MAP_OUT2 (arch, CS(map));
718 730
719 if (name) MAP_OUT (name); 731 if (name) MAP_OUT (name);
720 MAP_OUT (swap_time); 732 MAP_OUT (swap_time);
721 MAP_OUT (reset_time); 733 MAP_OUT (reset_time);
722 MAP_OUT (reset_timeout); 734 MAP_OUT (reset_timeout);
… …
730 MAP_OUT (shopgreed); 742 MAP_OUT (shopgreed);
731 MAP_OUT (shopmin); 743 MAP_OUT (shopmin);
732 MAP_OUT (shopmax); 744 MAP_OUT (shopmax);
733 if (shoprace) MAP_OUT (shoprace); 745 if (shoprace) MAP_OUT (shoprace);
734 746
735 MAP_OUT (darkness);
736 MAP_OUT (width); 747 MAP_OUT (width);
737 MAP_OUT (height); 748 MAP_OUT (height);
738 MAP_OUT (enter_x); 749 MAP_OUT (enter_x);
739 MAP_OUT (enter_y); 750 MAP_OUT (enter_y);
740 751 MAP_OUT (darkness);
741 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
742 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
743
744 MAP_OUT (outdoor); 752 MAP_OUT (outdoor);
745 MAP_OUT (temp); 753
746 MAP_OUT (pressure); 754 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
747 MAP_OUT (humid); 755 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
748 MAP_OUT (windspeed);
749 MAP_OUT (winddir);
750 MAP_OUT (sky);
751 756
752 MAP_OUT (per_player); 757 MAP_OUT (per_player);
753 MAP_OUT (per_party); 758 MAP_OUT (per_party);
754 759
755 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 760 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
756 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 761 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
757 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 762 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
758 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 763 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
764 if (tile_path [4]) MAP_OUT2 (tile_path_5, tile_path [4]);
765 if (tile_path [5]) MAP_OUT2 (tile_path_6, tile_path [5]);
759 766
760 freezer.put (this); 767 freezer.put (this);
761 freezer.put (KW_end); 768 freezer.put (KW(end));
762 769
763 return true; 770 return true;
764} 771}
765 772
766bool 773bool
… …
771 if (!_save_header (freezer)) 778 if (!_save_header (freezer))
772 return false; 779 return false;
773 780
774 return freezer.save (path); 781 return freezer.save (path);
775} 782}
783
784//+GPL
776 785
777/* 786/*
778 * Remove and free all objects in the given map. 787 * Remove and free all objects in the given map.
779 */ 788 */
780void 789void
… …
818 msg = 0; 827 msg = 0;
819 maplore = 0; 828 maplore = 0;
820 shoprace = 0; 829 shoprace = 0;
821 delete [] shopitems, shopitems = 0; 830 delete [] shopitems, shopitems = 0;
822 831
823 for (int i = 0; i < 4; i++) 832 for (int i = 0; i < TILE_NUM; i++)
824 tile_path [i] = 0; 833 tile_path [i] = 0;
825} 834}
826 835
827maptile::~maptile () 836maptile::~maptile ()
828{ 837{
… …
849 858
850 clear (); 859 clear ();
851} 860}
852 861
853/* decay and destroy perishable items in a map */ 862/* decay and destroy perishable items in a map */
863// TODO: should be done regularly, not on map load?
854void 864void
855maptile::do_decay_objects () 865maptile::do_decay_objects ()
856{ 866{
857 if (!spaces) 867 if (!spaces)
858 return; 868 return;
… …
860 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 870 for (mapspace *ms = spaces + size (); ms-- > spaces; )
861 for (object *above, *op = ms->bot; op; op = above) 871 for (object *above, *op = ms->bot; op; op = above)
862 { 872 {
863 above = op->above; 873 above = op->above;
864 874
875 // do not decay anything above unique floor tiles (yet :)
876 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
877 break;
878
865 bool destroy = 0; 879 bool destroy = 0;
866 880
867 // do not decay anything above unique floor tiles (yet :) 881 if (op->flag [FLAG_IS_FLOOR]
868 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 882 || op->flag [FLAG_OBJ_ORIGINAL]
869 break; 883 || op->flag [FLAG_UNIQUE]
870 884 || op->flag [FLAG_OVERLAY_FLOOR]
871 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 885 || op->flag [FLAG_UNPAID]
872 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
873 || QUERY_FLAG (op, FLAG_UNIQUE)
874 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
875 || QUERY_FLAG (op, FLAG_UNPAID)
876 || op->is_alive ()) 886 || op->is_alive ())
877 ; // do not decay 887 ; // do not decay
878 else if (op->is_weapon ()) 888 else if (op->is_weapon ())
879 { 889 {
880 op->stats.dam--; 890 op->stats.dam--;
… …
905 || mat & M_LIQUID 915 || mat & M_LIQUID
906 || (mat & M_IRON && rndm (1, 5) == 1) 916 || (mat & M_IRON && rndm (1, 5) == 1)
907 || (mat & M_GLASS && rndm (1, 2) == 1) 917 || (mat & M_GLASS && rndm (1, 2) == 1)
908 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 918 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
909 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 919 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
910 || (mat & M_ICE && temp > 32)) 920 //|| (mat & M_ICE && temp > 32)
921 )
911 destroy = 1; 922 destroy = 1;
912 } 923 }
913 924
914 /* adjust overall chance below */ 925 /* adjust overall chance below */
915 if (destroy && rndm (0, 1)) 926 if (destroy && rndm (0, 1))
… …
935 sint64 total_exp = 0; 946 sint64 total_exp = 0;
936 947
937 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 948 for (mapspace *ms = spaces + size (); ms-- > spaces; )
938 for (object *op = ms->bot; op; op = op->above) 949 for (object *op = ms->bot; op; op = op->above)
939 { 950 {
940 if (QUERY_FLAG (op, FLAG_MONSTER)) 951 if (op->flag [FLAG_MONSTER])
941 { 952 {
942 total_exp += op->stats.exp; 953 total_exp += op->stats.exp;
943 monster_cnt++; 954 monster_cnt++;
944 } 955 }
945 956
946 if (QUERY_FLAG (op, FLAG_GENERATOR)) 957 if (op->flag [FLAG_GENERATOR])
947 { 958 {
948 total_exp += op->stats.exp; 959 total_exp += op->stats.exp;
949 960
950 if (archetype *at = op->other_arch) 961 if (archetype *at = op->other_arch)
951 { 962 {
… …
1006 */ 1017 */
1007void 1018void
1008mapspace::update_ () 1019mapspace::update_ ()
1009{ 1020{
1010 object *last = 0; 1021 object *last = 0;
1011 uint8 flags = P_UPTODATE, anywhere = 0; 1022 uint8 flags = P_UPTODATE;
1012 sint8 light = 0; 1023 sint8 light = 0;
1013 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1024 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1025 uint64_t volume = 0;
1026 uint32_t items = 0;
1027 object *anywhere = 0;
1028 uint8_t middle_visibility = 0;
1014 1029
1015 //object *middle = 0; 1030 //object *middle = 0;
1016 //object *top = 0; 1031 //object *top = 0;
1017 //object *floor = 0; 1032 //object *floor = 0;
1018 // this seems to generate better code than using locals, above 1033 // this seems to generate better code than using locals, above
1019 object *&top = faces_obj[0] = 0; 1034 object *&top = faces_obj[0] = 0;
1020 object *&middle = faces_obj[1] = 0; 1035 object *&middle = faces_obj[1] = 0;
1021 object *&floor = faces_obj[2] = 0; 1036 object *&floor = faces_obj[2] = 0;
1037
1038 object::flags_t allflags; // all flags of all objects or'ed together
1022 1039
1023 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above) 1040 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1024 { 1041 {
1025 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C) 1042 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1026 light += tmp->glow_radius; 1043 light += tmp->glow_radius;
… …
1031 * 3 times each time the player moves, because many of the 1048 * 3 times each time the player moves, because many of the
1032 * functions the move_player calls eventualy call this. 1049 * functions the move_player calls eventualy call this.
1033 * 1050 *
1034 * Always put the player down for drawing. 1051 * Always put the player down for drawing.
1035 */ 1052 */
1036 if (!tmp->invisible) 1053 if (expect_true (!tmp->invisible))
1037 { 1054 {
1038 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1055 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1039 top = tmp; 1056 top = tmp;
1040 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1057 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1041 { 1058 {
1042 /* If we got a floor, that means middle and top were below it, 1059 /* If we got a floor, that means middle and top were below it,
1043 * so should not be visible, so we clear them. 1060 * so should not be visible, so we clear them.
1044 */ 1061 */
1045 middle = 0; 1062 middle = 0;
1046 top = 0; 1063 top = 0;
1047 floor = tmp; 1064 floor = tmp;
1065 volume = 0;
1066 items = 0;
1048 } 1067 }
1049 /* Flag anywhere have high priority */ 1068 else
1050 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1051 { 1069 {
1070 if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1071 {
1072 ++items;
1073 volume += tmp->volume ();
1074 }
1075
1076 /* Flag anywhere have high priority */
1077 if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1078 anywhere = tmp;
1079
1080 /* Find the highest visible face around. If equal
1081 * visibilities, we still want the one nearer to the
1082 * top
1083 */
1084 if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
1085 {
1086 middle_visibility = ::faces [tmp->face].visibility;
1052 middle = tmp; 1087 middle = tmp;
1053 anywhere = 1; 1088 }
1054 } 1089 }
1055
1056 /* Find the highest visible face around. If equal
1057 * visibilities, we still want the one nearer to the
1058 * top
1059 */
1060 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1061 middle = tmp;
1062 }
1063
1064 if (tmp == tmp->above)
1065 {
1066 LOG (llevError, "Error in structure of map\n");
1067 exit (-1);
1068 } 1090 }
1069 1091
1070 move_slow |= tmp->move_slow; 1092 move_slow |= tmp->move_slow;
1071 move_block |= tmp->move_block; 1093 move_block |= tmp->move_block;
1072 move_on |= tmp->move_on; 1094 move_on |= tmp->move_on;
1073 move_off |= tmp->move_off; 1095 move_off |= tmp->move_off;
1074 move_allow |= tmp->move_allow; 1096 move_allow |= tmp->move_allow;
1075 1097
1076 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1098 allflags |= tmp->flag;
1077 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1099
1078 if (tmp->type == PLAYER) flags |= P_PLAYER; 1100 if (tmp->type == PLAYER) flags |= P_PLAYER;
1079 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1101 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1080 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1081 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1082 } 1102 }
1103
1104 // FLAG_SEE_ANYWHERE takes precedence
1105 if (anywhere)
1106 middle = anywhere;
1107
1108 // ORing all flags together and checking them here is much faster
1109 if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
1110 if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
1111 if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
1112 if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
1083 1113
1084 this->light = min (light, MAX_LIGHT_RADIUS); 1114 this->light = min (light, MAX_LIGHT_RADIUS);
1085 this->flags_ = flags; 1115 this->flags_ = flags;
1086 this->move_block = move_block & ~move_allow; 1116 this->move_block = move_block & ~move_allow;
1087 this->move_on = move_on; 1117 this->move_on = move_on;
1088 this->move_off = move_off; 1118 this->move_off = move_off;
1089 this->move_slow = move_slow; 1119 this->move_slow = move_slow;
1120 this->volume_ = (volume + 1023) / 1024;
1121 this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1090 1122
1091 /* At this point, we have a floor face (if there is a floor), 1123 /* At this point, we have a floor face (if there is a floor),
1092 * and the floor is set - we are not going to touch it at 1124 * and the floor is set - we are not going to touch it at
1093 * this point. 1125 * this point.
1094 * middle contains the highest visibility face. 1126 * middle contains the highest visibility face.
… …
1112 */ 1144 */
1113 1145
1114 for (object *tmp = last; tmp; tmp = tmp->below) 1146 for (object *tmp = last; tmp; tmp = tmp->below)
1115 { 1147 {
1116 /* Once we get to a floor, stop, since we already have a floor object */ 1148 /* Once we get to a floor, stop, since we already have a floor object */
1117 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1149 if (tmp->flag [FLAG_IS_FLOOR])
1118 break; 1150 break;
1119 1151
1120 /* If two top faces are already set, quit processing */ 1152 /* If two top faces are already set, quit processing */
1121 if (top && middle) 1153 if (top && middle)
1122 break; 1154 break;
… …
1160 faces_obj [1] = middle; 1192 faces_obj [1] = middle;
1161 faces_obj [2] = floor; 1193 faces_obj [2] = floor;
1162#endif 1194#endif
1163} 1195}
1164 1196
1165uint64
1166mapspace::volume () const
1167{
1168 uint64 vol = 0;
1169
1170 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1171 vol += op->volume ();
1172
1173 return vol;
1174}
1175
1176maptile * 1197maptile *
1177maptile::tile_available (int dir, bool load) 1198maptile::tile_available (int dir, bool load)
1178{ 1199{
1179 if (tile_path[dir]) 1200 if (tile_path[dir])
1180 { 1201 {
1202 // map is there and we don't need to load it OR it's loaded => return what we have
1181 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1203 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1182 return tile_map[dir]; 1204 return tile_map[dir];
1183 1205
1206 // well, try to locate it then, if possible - maybe it's there already
1184 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1207 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1185 return tile_map[dir]; 1208 return tile_map[dir];
1186 } 1209 }
1187 1210
1188 return 0; 1211 return 0;
… …
1300/** 1323/**
1301 * Return whether map2 is adjacent to map1. If so, store the distance from 1324 * Return whether map2 is adjacent to map1. If so, store the distance from
1302 * map1 to map2 in dx/dy. 1325 * map1 to map2 in dx/dy.
1303 */ 1326 */
1304int 1327int
1305adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1328adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy)
1306{ 1329{
1307 if (!map1 || !map2) 1330 if (!map1 || !map2)
1308 return 0; 1331 return 0;
1309 1332
1310 //TODO: this doesn't actually check correctly when intermediate maps are not loaded 1333 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
… …
1312 if (map1 == map2) 1335 if (map1 == map2)
1313 { 1336 {
1314 *dx = 0; 1337 *dx = 0;
1315 *dy = 0; 1338 *dy = 0;
1316 } 1339 }
1317 else if (map1->tile_map[0] == map2) 1340 else if (map1->tile_available (TILE_NORTH, false) == map2)
1318 { /* up */ 1341 {
1319 *dx = 0; 1342 *dx = 0;
1320 *dy = -map2->height; 1343 *dy = -map2->height;
1321 } 1344 }
1322 else if (map1->tile_map[1] == map2) 1345 else if (map1->tile_available (TILE_EAST , false) == map2)
1323 { /* right */ 1346 {
1324 *dx = map1->width; 1347 *dx = map1->width;
1325 *dy = 0; 1348 *dy = 0;
1326 } 1349 }
1327 else if (map1->tile_map[2] == map2) 1350 else if (map1->tile_available (TILE_SOUTH, false) == map2)
1328 { /* down */ 1351 {
1329 *dx = 0; 1352 *dx = 0;
1330 *dy = map1->height; 1353 *dy = map1->height;
1331 } 1354 }
1332 else if (map1->tile_map[3] == map2) 1355 else if (map1->tile_available (TILE_WEST , false) == map2)
1333 { /* left */ 1356 {
1334 *dx = -map2->width; 1357 *dx = -map2->width;
1335 *dy = 0; 1358 *dy = 0;
1336 } 1359 }
1337 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1360 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1338 { /* up right */ 1361 { /* up right */
1339 *dx = map1->tile_map[0]->width; 1362 *dx = +map1->tile_map[TILE_NORTH]->width;
1340 *dy = -map1->tile_map[0]->height; 1363 *dy = -map1->tile_map[TILE_NORTH]->height;
1341 } 1364 }
1342 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 1365 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1343 { /* up left */ 1366 { /* up left */
1344 *dx = -map2->width; 1367 *dx = -map2->width;
1345 *dy = -map1->tile_map[0]->height; 1368 *dy = -map1->tile_map[TILE_NORTH]->height;
1346 } 1369 }
1347 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 1370 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1348 { /* right up */ 1371 { /* right up */
1349 *dx = map1->width; 1372 *dx = +map1->width;
1350 *dy = -map2->height; 1373 *dy = -map2->height;
1351 } 1374 }
1352 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 1375 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1353 { /* right down */ 1376 { /* right down */
1354 *dx = map1->width; 1377 *dx = +map1->width;
1355 *dy = map1->tile_map[1]->height; 1378 *dy = +map1->tile_map[TILE_EAST]->height;
1356 } 1379 }
1357 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 1380 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1358 { /* down right */ 1381 { /* down right */
1359 *dx = map1->tile_map[2]->width; 1382 *dx = +map1->tile_map[TILE_SOUTH]->width;
1360 *dy = map1->height; 1383 *dy = +map1->height;
1361 } 1384 }
1362 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 1385 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1363 { /* down left */ 1386 { /* down left */
1364 *dx = -map2->width; 1387 *dx = -map2->width;
1365 *dy = map1->height; 1388 *dy = +map1->height;
1366 } 1389 }
1367 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 1390 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1368 { /* left up */ 1391 { /* left up */
1369 *dx = -map1->tile_map[3]->width; 1392 *dx = -map1->tile_map[TILE_WEST]->width;
1370 *dy = -map2->height; 1393 *dy = -map2->height;
1371 } 1394 }
1372 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1395 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1373 { /* left down */ 1396 { /* left down */
1374 *dx = -map1->tile_map[3]->width; 1397 *dx = -map1->tile_map[TILE_WEST]->width;
1375 *dy = map1->tile_map[3]->height; 1398 *dy = +map1->tile_map[TILE_WEST]->height;
1376 } 1399 }
1377 else 1400 else
1378 return 0; 1401 return 0;
1379 1402
1380 return 1; 1403 return 1;
… …
1416 * 1439 *
1417 * currently, the only flag supported (0x1) is don't translate for 1440 * currently, the only flag supported (0x1) is don't translate for
1418 * closest body part of 'op1' 1441 * closest body part of 'op1'
1419 */ 1442 */
1420void 1443void
1421get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1444get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1422{ 1445{
1423 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1446 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1424 { 1447 {
1425 /* be conservative and fill in _some_ data */ 1448 /* be conservative and fill in _some_ data */
1426 retval->distance = 10000; 1449 retval->distance = 10000;
1427 retval->distance_x = 10000; 1450 retval->distance_x = 10000;
1428 retval->distance_y = 10000; 1451 retval->distance_y = 10000;
1429 retval->direction = 0; 1452 retval->direction = 0;
1430 retval->part = 0; 1453 retval->part = 0;
1431 } 1454 }
1432 else 1455 else
1433 { 1456 {
1434 object *best;
1435
1436 retval->distance_x += op2->x - op1->x; 1457 retval->distance_x += op2->x - op1->x;
1437 retval->distance_y += op2->y - op1->y; 1458 retval->distance_y += op2->y - op1->y;
1438 1459
1439 best = op1; 1460 object *best = op1;
1461
1440 /* If this is multipart, find the closest part now */ 1462 /* If this is multipart, find the closest part now */
1441 if (!(flags & 0x1) && op1->more) 1463 if (!(flags & 1) && op1->more)
1442 { 1464 {
1443 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1465 int best_distance = idistance (retval->distance_x, retval->distance_y);
1444 1466
1445 /* we just take the offset of the piece to head to figure 1467 /* we just take the offset of the piece to head to figure
1446 * distance instead of doing all that work above again 1468 * distance instead of doing all that work above again
1447 * since the distance fields we set above are positive in the 1469 * since the distance fields we set above are positive in the
1448 * same axis as is used for multipart objects, the simply arithmetic 1470 * same axis as is used for multipart objects, the simply arithmetic
1449 * below works. 1471 * below works.
1450 */ 1472 */
1451 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1473 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1452 { 1474 {
1453 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1475 int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1454 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1476
1455 if (tmpi < best_distance) 1477 if (tmpi < best_distance)
1456 { 1478 {
1457 best_distance = tmpi; 1479 best_distance = tmpi;
1458 best = tmp; 1480 best = tmp;
1459 } 1481 }
1460 } 1482 }
1461 1483
1462 if (best != op1) 1484 if (best != op1)
1463 { 1485 {
1464 retval->distance_x += op1->x - best->x; 1486 retval->distance_x += op1->x - best->x;
1465 retval->distance_y += op1->y - best->y; 1487 retval->distance_y += op1->y - best->y;
1466 } 1488 }
1467 } 1489 }
1468 1490
1469 retval->part = best; 1491 retval->part = best;
1470 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1492 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1471 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1493 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1472 } 1494 }
1473} 1495}
1474 1496
1475/* this is basically the same as get_rangevector above, but instead of 1497/* this is basically the same as get_rangevector above, but instead of
1476 * the first parameter being an object, it instead is the map 1498 * the first parameter being an object, it instead is the map
… …
1481 * be more consistant with the above function and also in case they are needed 1503 * be more consistant with the above function and also in case they are needed
1482 * for something in the future. Also, since no object is pasted, the best 1504 * for something in the future. Also, since no object is pasted, the best
1483 * field of the rv_vector is set to NULL. 1505 * field of the rv_vector is set to NULL.
1484 */ 1506 */
1485void 1507void
1486get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1508get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1487{ 1509{
1488 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1510 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1489 { 1511 {
1490 /* be conservative and fill in _some_ data */ 1512 /* be conservative and fill in _some_ data */
1491 retval->distance = 100000; 1513 retval->distance = 100000;
1492 retval->distance_x = 32767; 1514 retval->distance_x = 32767;
1493 retval->distance_y = 32767; 1515 retval->distance_y = 32767;
1494 retval->direction = 0; 1516 retval->direction = 0;
1495 retval->part = 0; 1517 retval->part = 0;
1496 } 1518 }
1497 else 1519 else
1498 { 1520 {
1499 retval->distance_x += op2->x - x; 1521 retval->distance_x += op2->x - x;
1500 retval->distance_y += op2->y - y; 1522 retval->distance_y += op2->y - y;
1501 1523
1502 retval->part = 0; 1524 retval->part = 0;
1503 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1525 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1504 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1526 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1505 } 1527 }
1506} 1528}
1507 1529
1508/* Returns true of op1 and op2 are effectively on the same map 1530/* Returns true of op1 and op2 are effectively on the same map
1509 * (as related to map tiling). Note that this looks for a path from 1531 * (as related to map tiling). Note that this looks for a path from
… …
1519 int dx, dy; 1541 int dx, dy;
1520 1542
1521 return adjacent_map (op1->map, op2->map, &dx, &dy); 1543 return adjacent_map (op1->map, op2->map, &dx, &dy);
1522} 1544}
1523 1545
1546//-GPL
1547
1524object * 1548object *
1525maptile::insert (object *op, int x, int y, object *originator, int flags) 1549maptile::insert (object *op, int x, int y, object *originator, int flags)
1526{ 1550{
1527 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1551 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1528} 1552}
… …
1539 if (default_region) 1563 if (default_region)
1540 return default_region; 1564 return default_region;
1541 1565
1542 return ::region::default_region (); 1566 return ::region::default_region ();
1543} 1567}
1568
1569//+GPL
1544 1570
1545/* picks a random object from a style map. 1571/* picks a random object from a style map.
1546 */ 1572 */
1547object * 1573object *
1548maptile::pick_random_object (rand_gen &gen) const 1574maptile::pick_random_object (rand_gen &gen) const
… …
1555 */ 1581 */
1556 for (int i = 1000; --i;) 1582 for (int i = 1000; --i;)
1557 { 1583 {
1558 object *pick = at (gen (width), gen (height)).bot; 1584 object *pick = at (gen (width), gen (height)).bot;
1559 1585
1560 // do not prefer big monsters just because they are big. 1586 // must be head: do not prefer big monsters just because they are big.
1561 if (pick && pick->is_head ()) 1587 if (pick && pick->is_head ())
1562 return pick->head_ (); 1588 return pick;
1563 } 1589 }
1564 1590
1565 // instead of crashing in the unlikely(?) case, try to return *something* 1591 // instead of crashing in the unlikely(?) case, try to return *something*
1566 return archetype::find ("bug"); 1592 return archetype::find (shstr_bug);
1567} 1593}
1594
1595//-GPL
1568 1596
1569void 1597void
1570maptile::play_sound (faceidx sound, int x, int y) const 1598maptile::play_sound (faceidx sound, int x, int y) const
1571{ 1599{
1572 if (!sound) 1600 if (!sound)
… …
1599 if (distance <= MAX_SOUND_DISTANCE) 1627 if (distance <= MAX_SOUND_DISTANCE)
1600 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg); 1628 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1601 } 1629 }
1602} 1630}
1603 1631
1632dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1633
1604static void 1634static void
1605split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy) 1635split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1606{ 1636{
1607 // clip to map to the left 1637 // clip to map to the left
1608 if (x0 < 0) 1638 if (x0 < 0)
1609 { 1639 {
1610 if (maptile *tile = m->tile_available (TILE_LEFT, 1)) 1640 if (maptile *tile = m->tile_available (TILE_WEST, 1))
1611 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy); 1641 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1612 1642
1613 if (x1 < 0) // entirely to the left 1643 if (x1 < 0) // entirely to the left
1614 return; 1644 return;
1615 1645
… …
1617 } 1647 }
1618 1648
1619 // clip to map to the right 1649 // clip to map to the right
1620 if (x1 > m->width) 1650 if (x1 > m->width)
1621 { 1651 {
1622 if (maptile *tile = m->tile_available (TILE_RIGHT, 1)) 1652 if (maptile *tile = m->tile_available (TILE_EAST, 1))
1623 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy); 1653 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1624 1654
1625 if (x0 > m->width) // entirely to the right 1655 if (x0 > m->width) // entirely to the right
1626 return; 1656 return;
1627 1657
… …
1629 } 1659 }
1630 1660
1631 // clip to map above 1661 // clip to map above
1632 if (y0 < 0) 1662 if (y0 < 0)
1633 { 1663 {
1634 if (maptile *tile = m->tile_available (TILE_UP, 1)) 1664 if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1635 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height); 1665 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1636 1666
1637 if (y1 < 0) // entirely above 1667 if (y1 < 0) // entirely above
1638 return; 1668 return;
1639 1669
… …
1641 } 1671 }
1642 1672
1643 // clip to map below 1673 // clip to map below
1644 if (y1 > m->height) 1674 if (y1 > m->height)
1645 { 1675 {
1646 if (maptile *tile = m->tile_available (TILE_DOWN, 1)) 1676 if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1647 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height); 1677 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1648 1678
1649 if (y0 > m->height) // entirely below 1679 if (y0 > m->height) // entirely below
1650 return; 1680 return;
1651 1681
… …
1663 r->dx = dx; 1693 r->dx = dx;
1664 r->dy = dy; 1694 r->dy = dy;
1665} 1695}
1666 1696
1667maprect * 1697maprect *
1668maptile::split_to_tiles (int x0, int y0, int x1, int y1) 1698maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1669{ 1699{
1670 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1671 buf.clear (); 1700 buf.clear ();
1672 1701
1673 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0); 1702 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1674 1703
1675 // add end marker 1704 // add end marker

Diff Legend

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