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.166 by root, Wed Oct 21 00:44:39 2009 UTC vs.
Revision 1.198 by root, Thu Apr 29 12:24:04 2010 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 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 mapspace &ms = m->at (sx, sy); 86 mapspace &ms = m->at (sx, sy);
86 87
… …
89 90
90 /* If space is currently not blocked by anything, no need to 91 /* If space is currently not blocked by anything, no need to
91 * go further. Not true for players - all sorts of special 92 * go further. Not true for players - all sorts of special
92 * things we need to do for players. 93 * things we need to do for players.
93 */ 94 */
94 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 95 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
95 return 0; 96 return 0;
96 97
97 /* 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
98 * 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
99 * 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
… …
109 /* 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
110 * 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
111 * true. If we get through the entire stack, that must mean 112 * true. If we get through the entire stack, that must mean
112 * ob is blocking it, so return 0. 113 * ob is blocking it, so return 0.
113 */ 114 */
114 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 115 for (object *tmp = ms.top; tmp; tmp = tmp->below)
115 { 116 {
116 if (OB_MOVE_BLOCK (ob, tmp)) 117 if (OB_MOVE_BLOCK (ob, tmp))
117 { 118 {
118 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob)) 119 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
119 if (RESULT_INT (0)) 120 if (RESULT_INT (0))
… …
143 return 1; // unconditional block 144 return 1; // unconditional block
144 145
145 } else { 146 } else {
146 // space does not block the ob, directly, but 147 // space does not block the ob, directly, but
147 // anything alive that is not a door still 148 // anything alive that is not a door still
148 // blocks anything but wizards. 149 // blocks anything
149 150
150 if (tmp->flag [FLAG_ALIVE] 151 if (tmp->flag [FLAG_ALIVE]
151 && tmp->head_ () != ob
152 && tmp != ob
153 && tmp->type != DOOR 152 && tmp->type != DOOR
154 && !tmp->flag [FLAG_WIZPASS]) 153 && tmp->head_ () != ob) //TODO: maybe move these check up?
155 return 1; 154 return 1;
156 } 155 }
157 } 156 }
158 157
159 return 0; 158 return 0;
160} 159}
161 160
162/* 161/*
163 * 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
164 * 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,
165 * just calling get_map_blocked and checking that against movement type 164 * just calling get_map_blocked and checking that against movement type
166 * 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
167 * object and makes sure they can be inserted. 166 * object and makes sure they can be inserted.
168 * 167 *
… …
215 } 214 }
216 215
217 return 0; 216 return 0;
218} 217}
219 218
220/* When the map is loaded, load_object does not actually insert objects 219//-GPL
221 * into inventory, but just links them. What this does is go through
222 * and insert them properly.
223 * The object 'container' is the object that contains the inventory.
224 * This is needed so that we can update the containers weight.
225 */
226void
227fix_container (object *container)
228{
229 object *tmp = container->inv, *next;
230
231 container->inv = 0;
232 while (tmp)
233 {
234 next = tmp->below;
235 if (tmp->inv)
236 fix_container (tmp);
237
238 insert_ob_in_ob (tmp, container);
239 tmp = next;
240 }
241
242 // go through and calculate what all the containers are carrying.
243 //TODO: remove
244 container->update_weight ();
245}
246 220
247void 221void
248maptile::set_object_flag (int flag, int value) 222maptile::set_object_flag (int flag, int value)
249{ 223{
250 if (!spaces) 224 if (!spaces)
… …
265 239
266 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 240 for (mapspace *ms = spaces + size (); ms-- > spaces; )
267 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 241 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
268 INVOKE_OBJECT (RESET, tmp); 242 INVOKE_OBJECT (RESET, tmp);
269} 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
270 259
271/* 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
272 * 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
273 * 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
274 * they are saved). 263 * they are saved).
… …
301 else 290 else
302 op = op->above; 291 op = op->above;
303 } 292 }
304 } 293 }
305} 294}
295
296//-GPL
306 297
307/* 298/*
308 * 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
309 * file pointer. 300 * file pointer.
310 */ 301 */
… …
430 return false; 421 return false;
431 422
432 return freezer.save (path); 423 return freezer.save (path);
433} 424}
434 425
435maptile::maptile () 426void
427maptile::init ()
436{ 428{
437 in_memory = MAP_SWAPPED; 429 in_memory = MAP_SWAPPED;
438 430
439 /* The maps used to pick up default x and y values from the 431 /* The maps used to pick up default x and y values from the
440 * map archetype. Mimic that behaviour. 432 * map archetype. Mimic that behaviour.
441 */ 433 */
442 width = 16; 434 width = 16;
443 height = 16; 435 height = 16;
444 timeout = 300; 436 timeout = 300;
445 max_nrof = 1000; // 1000 items of anything 437 max_items = MAX_ITEM_PER_ACTION;
446 max_volume = 2000000; // 2m³ 438 max_volume = 2000000; // 2m³
447}
448
449maptile::maptile (int w, int h)
450{
451 in_memory = MAP_SWAPPED;
452
453 width = w;
454 height = h;
455 reset_timeout = 0; 439 reset_timeout = 0;
456 timeout = 300;
457 enter_x = 0; 440 enter_x = 0;
458 enter_y = 0; 441 enter_y = 0;
442}
443
444maptile::maptile ()
445{
446 init ();
447}
448
449maptile::maptile (int w, int h)
450{
451 init ();
452
453 width = w;
454 height = h;
459 455
460 alloc (); 456 alloc ();
461} 457}
462 458
463/* 459/*
… …
471 if (spaces) 467 if (spaces)
472 return; 468 return;
473 469
474 spaces = salloc0<mapspace> (size ()); 470 spaces = salloc0<mapspace> (size ());
475} 471}
472
473//+GPL
476 474
477/* Takes a string from a map definition and outputs a pointer to the array of shopitems 475/* Takes a string from a map definition and outputs a pointer to the array of shopitems
478 * corresponding to that string. Memory is allocated for this, it must be freed 476 * corresponding to that string. Memory is allocated for this, it must be freed
479 * at a later date. 477 * at a later date.
480 * Called by parse_map_headers below. 478 * Called by parse_map_headers below.
… …
561 * the map (or something equivilent) into output_string. */ 559 * the map (or something equivilent) into output_string. */
562static const char * 560static const char *
563print_shop_string (maptile *m) 561print_shop_string (maptile *m)
564{ 562{
565 static dynbuf_text buf; buf.clear (); 563 static dynbuf_text buf; buf.clear ();
564 bool first = true;
566 565
567 for (int i = 0; i < m->shopitems[0].index; i++) 566 for (int i = 0; i < m->shopitems[0].index; i++)
568 { 567 {
568 if (!first)
569 buf << ';';
570
571 first = false;
572
569 if (m->shopitems[i].typenum) 573 if (m->shopitems[i].typenum)
570 { 574 {
571 if (m->shopitems[i].strength) 575 if (m->shopitems[i].strength)
572 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 576 buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
573 else 577 else
574 buf.printf ("%s;", m->shopitems[i].name); 578 buf.printf ("%s", m->shopitems[i].name);
575 } 579 }
576 else 580 else
577 { 581 {
578 if (m->shopitems[i].strength) 582 if (m->shopitems[i].strength)
579 buf.printf ("*:%d;", m->shopitems[i].strength); 583 buf.printf ("*:%d", m->shopitems[i].strength);
580 else 584 else
581 buf.printf ("*"); 585 buf.printf ("*");
582 } 586 }
583 } 587 }
584 588
585 return buf; 589 return buf;
586} 590}
591
592//-GPL
587 593
588/* This loads the header information of the map. The header 594/* This loads the header information of the map. The header
589 * contains things like difficulty, size, timeout, etc. 595 * contains things like difficulty, size, timeout, etc.
590 * this used to be stored in the map object, but with the 596 * this used to be stored in the map object, but with the
591 * addition of tiling, fields beyond that easily named in an 597 * addition of tiling, fields beyond that easily named in an
… …
632 case KW_shopgreed: thawer.get (shopgreed); break; 638 case KW_shopgreed: thawer.get (shopgreed); break;
633 case KW_shopmin: thawer.get (shopmin); break; 639 case KW_shopmin: thawer.get (shopmin); break;
634 case KW_shopmax: thawer.get (shopmax); break; 640 case KW_shopmax: thawer.get (shopmax); break;
635 case KW_shoprace: thawer.get (shoprace); break; 641 case KW_shoprace: thawer.get (shoprace); break;
636 case KW_outdoor: thawer.get (outdoor); break; 642 case KW_outdoor: thawer.get (outdoor); break;
637 case KW_temp: thawer.get (temp); break;
638 case KW_pressure: thawer.get (pressure); break;
639 case KW_humid: thawer.get (humid); break;
640 case KW_windspeed: thawer.get (windspeed); break;
641 case KW_winddir: thawer.get (winddir); break;
642 case KW_sky: thawer.get (sky); break;
643 643
644 case KW_per_player: thawer.get (per_player); break; 644 case KW_per_player: thawer.get (per_player); break;
645 case KW_per_party: thawer.get (per_party); break; 645 case KW_per_party: thawer.get (per_party); break;
646 case KW_no_reset: thawer.get (no_reset); break; 646 case KW_no_reset: thawer.get (no_reset); break;
647 case KW_no_drop: thawer.get (no_drop); break; 647 case KW_no_drop: thawer.get (no_drop); break;
648 648
649 case KW_region: default_region = region::find (thawer.get_str ()); break; 649 case KW_region: thawer.get (default_region); break;
650 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 650 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
651 651
652 // old names new names 652 // old names new names
653 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 653 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
654 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 654 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
672 case KW_end: 672 case KW_end:
673 thawer.next (); 673 thawer.next ();
674 return true; 674 return true;
675 675
676 default: 676 default:
677 if (!thawer.parse_error ("map", 0)) 677 if (!thawer.parse_error ("map"))
678 return false; 678 return false;
679 break; 679 break;
680 } 680 }
681 681
682 thawer.next (); 682 thawer.next ();
683 } 683 }
684 684
685 abort (); 685 abort ();
686} 686}
687
688//+GPL
687 689
688/****************************************************************************** 690/******************************************************************************
689 * This is the start of unique map handling code 691 * This is the start of unique map handling code
690 *****************************************************************************/ 692 *****************************************************************************/
691 693
… …
698 int unique = 0; 700 int unique = 0;
699 for (object *op = spaces [i].bot; op; ) 701 for (object *op = spaces [i].bot; op; )
700 { 702 {
701 object *above = op->above; 703 object *above = op->above;
702 704
703 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 705 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
704 unique = 1; 706 unique = 1;
705 707
706 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 708 if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
707 op->destroy (); 709 op->destroy ();
708 710
709 op = above; 711 op = above;
710 } 712 }
711 } 713 }
712} 714}
713 715
716//-GPL
717
714bool 718bool
715maptile::_save_header (object_freezer &freezer) 719maptile::_save_header (object_freezer &freezer)
716{ 720{
717#define MAP_OUT(k) freezer.put (KW_ ## k, k) 721#define MAP_OUT(k) freezer.put (KW(k), k)
718#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 722#define MAP_OUT2(k,v) freezer.put (KW(k), v)
719 723
720 MAP_OUT2 (arch, "map"); 724 MAP_OUT2 (arch, CS(map));
721 725
722 if (name) MAP_OUT (name); 726 if (name) MAP_OUT (name);
723 MAP_OUT (swap_time); 727 MAP_OUT (swap_time);
724 MAP_OUT (reset_time); 728 MAP_OUT (reset_time);
725 MAP_OUT (reset_timeout); 729 MAP_OUT (reset_timeout);
… …
733 MAP_OUT (shopgreed); 737 MAP_OUT (shopgreed);
734 MAP_OUT (shopmin); 738 MAP_OUT (shopmin);
735 MAP_OUT (shopmax); 739 MAP_OUT (shopmax);
736 if (shoprace) MAP_OUT (shoprace); 740 if (shoprace) MAP_OUT (shoprace);
737 741
738 MAP_OUT (darkness);
739 MAP_OUT (width); 742 MAP_OUT (width);
740 MAP_OUT (height); 743 MAP_OUT (height);
741 MAP_OUT (enter_x); 744 MAP_OUT (enter_x);
742 MAP_OUT (enter_y); 745 MAP_OUT (enter_y);
743 746 MAP_OUT (darkness);
744 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
745 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
746
747 MAP_OUT (outdoor); 747 MAP_OUT (outdoor);
748 MAP_OUT (temp); 748
749 MAP_OUT (pressure); 749 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
750 MAP_OUT (humid); 750 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
751 MAP_OUT (windspeed);
752 MAP_OUT (winddir);
753 MAP_OUT (sky);
754 751
755 MAP_OUT (per_player); 752 MAP_OUT (per_player);
756 MAP_OUT (per_party); 753 MAP_OUT (per_party);
757 754
758 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 755 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
759 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 756 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
760 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 757 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
761 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 758 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
762 759
763 freezer.put (this); 760 freezer.put (this);
764 freezer.put (KW_end); 761 freezer.put (KW(end));
765 762
766 return true; 763 return true;
767} 764}
768 765
769bool 766bool
… …
774 if (!_save_header (freezer)) 771 if (!_save_header (freezer))
775 return false; 772 return false;
776 773
777 return freezer.save (path); 774 return freezer.save (path);
778} 775}
776
777//+GPL
779 778
780/* 779/*
781 * Remove and free all objects in the given map. 780 * Remove and free all objects in the given map.
782 */ 781 */
783void 782void
… …
852 851
853 clear (); 852 clear ();
854} 853}
855 854
856/* decay and destroy perishable items in a map */ 855/* decay and destroy perishable items in a map */
856// TODO: should be done regularly, not on map load?
857void 857void
858maptile::do_decay_objects () 858maptile::do_decay_objects ()
859{ 859{
860 if (!spaces) 860 if (!spaces)
861 return; 861 return;
… …
863 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 863 for (mapspace *ms = spaces + size (); ms-- > spaces; )
864 for (object *above, *op = ms->bot; op; op = above) 864 for (object *above, *op = ms->bot; op; op = above)
865 { 865 {
866 above = op->above; 866 above = op->above;
867 867
868 // do not decay anything above unique floor tiles (yet :)
869 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
870 break;
871
868 bool destroy = 0; 872 bool destroy = 0;
869 873
870 // do not decay anything above unique floor tiles (yet :) 874 if (op->flag [FLAG_IS_FLOOR]
871 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 875 || op->flag [FLAG_OBJ_ORIGINAL]
872 break; 876 || op->flag [FLAG_UNIQUE]
873 877 || op->flag [FLAG_OVERLAY_FLOOR]
874 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 878 || op->flag [FLAG_UNPAID]
875 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
876 || QUERY_FLAG (op, FLAG_UNIQUE)
877 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
878 || QUERY_FLAG (op, FLAG_UNPAID)
879 || op->is_alive ()) 879 || op->is_alive ())
880 ; // do not decay 880 ; // do not decay
881 else if (op->is_weapon ()) 881 else if (op->is_weapon ())
882 { 882 {
883 op->stats.dam--; 883 op->stats.dam--;
… …
908 || mat & M_LIQUID 908 || mat & M_LIQUID
909 || (mat & M_IRON && rndm (1, 5) == 1) 909 || (mat & M_IRON && rndm (1, 5) == 1)
910 || (mat & M_GLASS && rndm (1, 2) == 1) 910 || (mat & M_GLASS && rndm (1, 2) == 1)
911 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 911 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
912 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 912 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
913 || (mat & M_ICE && temp > 32)) 913 //|| (mat & M_ICE && temp > 32)
914 )
914 destroy = 1; 915 destroy = 1;
915 } 916 }
916 917
917 /* adjust overall chance below */ 918 /* adjust overall chance below */
918 if (destroy && rndm (0, 1)) 919 if (destroy && rndm (0, 1))
… …
938 sint64 total_exp = 0; 939 sint64 total_exp = 0;
939 940
940 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 941 for (mapspace *ms = spaces + size (); ms-- > spaces; )
941 for (object *op = ms->bot; op; op = op->above) 942 for (object *op = ms->bot; op; op = op->above)
942 { 943 {
943 if (QUERY_FLAG (op, FLAG_MONSTER)) 944 if (op->flag [FLAG_MONSTER])
944 { 945 {
945 total_exp += op->stats.exp; 946 total_exp += op->stats.exp;
946 monster_cnt++; 947 monster_cnt++;
947 } 948 }
948 949
949 if (QUERY_FLAG (op, FLAG_GENERATOR)) 950 if (op->flag [FLAG_GENERATOR])
950 { 951 {
951 total_exp += op->stats.exp; 952 total_exp += op->stats.exp;
952 953
953 if (archetype *at = op->other_arch) 954 if (archetype *at = op->other_arch)
954 { 955 {
… …
1009 */ 1010 */
1010void 1011void
1011mapspace::update_ () 1012mapspace::update_ ()
1012{ 1013{
1013 object *last = 0; 1014 object *last = 0;
1014 uint8 flags = P_UPTODATE, anywhere = 0; 1015 uint8 flags = P_UPTODATE;
1015 sint8 light = 0; 1016 sint8 light = 0;
1016 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1017 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1018 uint64_t volume = 0;
1019 uint32_t items = 0;
1020 object *anywhere = 0;
1021 uint8_t middle_visibility = 0;
1017 1022
1018 //object *middle = 0; 1023 //object *middle = 0;
1019 //object *top = 0; 1024 //object *top = 0;
1020 //object *floor = 0; 1025 //object *floor = 0;
1021 // this seems to generate better code than using locals, above 1026 // this seems to generate better code than using locals, above
1022 object *&top = faces_obj[0] = 0; 1027 object *&top = faces_obj[0] = 0;
1023 object *&middle = faces_obj[1] = 0; 1028 object *&middle = faces_obj[1] = 0;
1024 object *&floor = faces_obj[2] = 0; 1029 object *&floor = faces_obj[2] = 0;
1030
1031 object::flags_t allflags; // all flags of all objects or'ed together
1025 1032
1026 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above) 1033 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1027 { 1034 {
1028 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C) 1035 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1029 light += tmp->glow_radius; 1036 light += tmp->glow_radius;
… …
1034 * 3 times each time the player moves, because many of the 1041 * 3 times each time the player moves, because many of the
1035 * functions the move_player calls eventualy call this. 1042 * functions the move_player calls eventualy call this.
1036 * 1043 *
1037 * Always put the player down for drawing. 1044 * Always put the player down for drawing.
1038 */ 1045 */
1039 if (!tmp->invisible) 1046 if (expect_true (!tmp->invisible))
1040 { 1047 {
1041 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1048 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1042 top = tmp; 1049 top = tmp;
1043 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1050 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1044 { 1051 {
1045 /* If we got a floor, that means middle and top were below it, 1052 /* If we got a floor, that means middle and top were below it,
1046 * so should not be visible, so we clear them. 1053 * so should not be visible, so we clear them.
1047 */ 1054 */
1048 middle = 0; 1055 middle = 0;
1049 top = 0; 1056 top = 0;
1050 floor = tmp; 1057 floor = tmp;
1058 volume = 0;
1059 items = 0;
1051 } 1060 }
1052 /* Flag anywhere have high priority */ 1061 else
1053 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1054 { 1062 {
1063 if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1064 {
1065 ++items;
1066 volume += tmp->volume ();
1067 }
1068
1069 /* Flag anywhere have high priority */
1070 if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1071 anywhere = tmp;
1072
1073 /* Find the highest visible face around. If equal
1074 * visibilities, we still want the one nearer to the
1075 * top
1076 */
1077 if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
1078 {
1079 middle_visibility = ::faces [tmp->face].visibility;
1055 middle = tmp; 1080 middle = tmp;
1056 anywhere = 1; 1081 }
1057 } 1082 }
1058
1059 /* Find the highest visible face around. If equal
1060 * visibilities, we still want the one nearer to the
1061 * top
1062 */
1063 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1064 middle = tmp;
1065 }
1066
1067 if (tmp == tmp->above)
1068 {
1069 LOG (llevError, "Error in structure of map\n");
1070 exit (-1);
1071 } 1083 }
1072 1084
1073 move_slow |= tmp->move_slow; 1085 move_slow |= tmp->move_slow;
1074 move_block |= tmp->move_block; 1086 move_block |= tmp->move_block;
1075 move_on |= tmp->move_on; 1087 move_on |= tmp->move_on;
1076 move_off |= tmp->move_off; 1088 move_off |= tmp->move_off;
1077 move_allow |= tmp->move_allow; 1089 move_allow |= tmp->move_allow;
1078 1090
1079 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1091 allflags |= tmp->flag;
1080 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1092
1081 if (tmp->type == PLAYER) flags |= P_PLAYER; 1093 if (tmp->type == PLAYER) flags |= P_PLAYER;
1082 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1094 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1083 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1084 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1085 } 1095 }
1096
1097 // FLAG_SEE_ANYWHERE takes precedence
1098 if (anywhere)
1099 middle = anywhere;
1100
1101 // ORing all flags together and checking them here is much faster
1102 if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
1103 if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
1104 if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
1105 if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
1086 1106
1087 this->light = min (light, MAX_LIGHT_RADIUS); 1107 this->light = min (light, MAX_LIGHT_RADIUS);
1088 this->flags_ = flags; 1108 this->flags_ = flags;
1089 this->move_block = move_block & ~move_allow; 1109 this->move_block = move_block & ~move_allow;
1090 this->move_on = move_on; 1110 this->move_on = move_on;
1091 this->move_off = move_off; 1111 this->move_off = move_off;
1092 this->move_slow = move_slow; 1112 this->move_slow = move_slow;
1113 this->volume_ = (volume + 1023) / 1024;
1114 this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1093 1115
1094 /* At this point, we have a floor face (if there is a floor), 1116 /* At this point, we have a floor face (if there is a floor),
1095 * and the floor is set - we are not going to touch it at 1117 * and the floor is set - we are not going to touch it at
1096 * this point. 1118 * this point.
1097 * middle contains the highest visibility face. 1119 * middle contains the highest visibility face.
… …
1115 */ 1137 */
1116 1138
1117 for (object *tmp = last; tmp; tmp = tmp->below) 1139 for (object *tmp = last; tmp; tmp = tmp->below)
1118 { 1140 {
1119 /* Once we get to a floor, stop, since we already have a floor object */ 1141 /* Once we get to a floor, stop, since we already have a floor object */
1120 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1142 if (tmp->flag [FLAG_IS_FLOOR])
1121 break; 1143 break;
1122 1144
1123 /* If two top faces are already set, quit processing */ 1145 /* If two top faces are already set, quit processing */
1124 if (top && middle) 1146 if (top && middle)
1125 break; 1147 break;
… …
1163 faces_obj [1] = middle; 1185 faces_obj [1] = middle;
1164 faces_obj [2] = floor; 1186 faces_obj [2] = floor;
1165#endif 1187#endif
1166} 1188}
1167 1189
1168uint64
1169mapspace::volume () const
1170{
1171 uint64 vol = 0;
1172
1173 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1174 vol += op->volume ();
1175
1176 return vol;
1177}
1178
1179maptile * 1190maptile *
1180maptile::tile_available (int dir, bool load) 1191maptile::tile_available (int dir, bool load)
1181{ 1192{
1182 if (tile_path[dir]) 1193 if (tile_path[dir])
1183 { 1194 {
… …
1419 * 1430 *
1420 * currently, the only flag supported (0x1) is don't translate for 1431 * currently, the only flag supported (0x1) is don't translate for
1421 * closest body part of 'op1' 1432 * closest body part of 'op1'
1422 */ 1433 */
1423void 1434void
1424get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1435get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1425{ 1436{
1426 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1437 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1427 { 1438 {
1428 /* be conservative and fill in _some_ data */ 1439 /* be conservative and fill in _some_ data */
1429 retval->distance = 10000; 1440 retval->distance = 10000;
1430 retval->distance_x = 10000; 1441 retval->distance_x = 10000;
1431 retval->distance_y = 10000; 1442 retval->distance_y = 10000;
1432 retval->direction = 0; 1443 retval->direction = 0;
1433 retval->part = 0; 1444 retval->part = 0;
1434 } 1445 }
1435 else 1446 else
1436 { 1447 {
1437 object *best;
1438
1439 retval->distance_x += op2->x - op1->x; 1448 retval->distance_x += op2->x - op1->x;
1440 retval->distance_y += op2->y - op1->y; 1449 retval->distance_y += op2->y - op1->y;
1441 1450
1442 best = op1; 1451 object *best = op1;
1452
1443 /* If this is multipart, find the closest part now */ 1453 /* If this is multipart, find the closest part now */
1444 if (!(flags & 0x1) && op1->more) 1454 if (!(flags & 1) && op1->more)
1445 { 1455 {
1446 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1456 int best_distance = idistance (retval->distance_x, retval->distance_y);
1447 1457
1448 /* we just take the offset of the piece to head to figure 1458 /* we just take the offset of the piece to head to figure
1449 * distance instead of doing all that work above again 1459 * distance instead of doing all that work above again
1450 * since the distance fields we set above are positive in the 1460 * since the distance fields we set above are positive in the
1451 * same axis as is used for multipart objects, the simply arithmetic 1461 * same axis as is used for multipart objects, the simply arithmetic
1452 * below works. 1462 * below works.
1453 */ 1463 */
1454 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1464 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1455 { 1465 {
1456 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1466 int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1457 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1467
1458 if (tmpi < best_distance) 1468 if (tmpi < best_distance)
1459 { 1469 {
1460 best_distance = tmpi; 1470 best_distance = tmpi;
1461 best = tmp; 1471 best = tmp;
1462 } 1472 }
1463 } 1473 }
1464 1474
1465 if (best != op1) 1475 if (best != op1)
1466 { 1476 {
1467 retval->distance_x += op1->x - best->x; 1477 retval->distance_x += op1->x - best->x;
1468 retval->distance_y += op1->y - best->y; 1478 retval->distance_y += op1->y - best->y;
1469 } 1479 }
1470 } 1480 }
1471 1481
1472 retval->part = best; 1482 retval->part = best;
1473 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1483 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1474 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1484 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1475 } 1485 }
1476} 1486}
1477 1487
1478/* this is basically the same as get_rangevector above, but instead of 1488/* this is basically the same as get_rangevector above, but instead of
1479 * the first parameter being an object, it instead is the map 1489 * the first parameter being an object, it instead is the map
… …
1489get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1499get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1490{ 1500{
1491 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1501 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1492 { 1502 {
1493 /* be conservative and fill in _some_ data */ 1503 /* be conservative and fill in _some_ data */
1494 retval->distance = 100000; 1504 retval->distance = 100000;
1495 retval->distance_x = 32767; 1505 retval->distance_x = 32767;
1496 retval->distance_y = 32767; 1506 retval->distance_y = 32767;
1497 retval->direction = 0; 1507 retval->direction = 0;
1498 retval->part = 0; 1508 retval->part = 0;
1499 } 1509 }
1500 else 1510 else
1501 { 1511 {
1502 retval->distance_x += op2->x - x; 1512 retval->distance_x += op2->x - x;
1503 retval->distance_y += op2->y - y; 1513 retval->distance_y += op2->y - y;
1504 1514
1505 retval->part = 0; 1515 retval->part = 0;
1506 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1516 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1507 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1517 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1508 } 1518 }
1509} 1519}
1510 1520
1511/* Returns true of op1 and op2 are effectively on the same map 1521/* Returns true of op1 and op2 are effectively on the same map
1512 * (as related to map tiling). Note that this looks for a path from 1522 * (as related to map tiling). Note that this looks for a path from
… …
1522 int dx, dy; 1532 int dx, dy;
1523 1533
1524 return adjacent_map (op1->map, op2->map, &dx, &dy); 1534 return adjacent_map (op1->map, op2->map, &dx, &dy);
1525} 1535}
1526 1536
1537//-GPL
1538
1527object * 1539object *
1528maptile::insert (object *op, int x, int y, object *originator, int flags) 1540maptile::insert (object *op, int x, int y, object *originator, int flags)
1529{ 1541{
1530 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1542 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1531} 1543}
… …
1542 if (default_region) 1554 if (default_region)
1543 return default_region; 1555 return default_region;
1544 1556
1545 return ::region::default_region (); 1557 return ::region::default_region ();
1546} 1558}
1559
1560//+GPL
1547 1561
1548/* picks a random object from a style map. 1562/* picks a random object from a style map.
1549 */ 1563 */
1550object * 1564object *
1551maptile::pick_random_object (rand_gen &gen) const 1565maptile::pick_random_object (rand_gen &gen) const
… …
1558 */ 1572 */
1559 for (int i = 1000; --i;) 1573 for (int i = 1000; --i;)
1560 { 1574 {
1561 object *pick = at (gen (width), gen (height)).bot; 1575 object *pick = at (gen (width), gen (height)).bot;
1562 1576
1563 // do not prefer big monsters just because they are big. 1577 // must be head: do not prefer big monsters just because they are big.
1564 if (pick && pick->is_head ()) 1578 if (pick && pick->is_head ())
1565 return pick->head_ (); 1579 return pick;
1566 } 1580 }
1567 1581
1568 // instead of crashing in the unlikely(?) case, try to return *something* 1582 // instead of crashing in the unlikely(?) case, try to return *something*
1569 return archetype::find ("bug"); 1583 return archetype::find (shstr_bug);
1570} 1584}
1585
1586//-GPL
1571 1587
1572void 1588void
1573maptile::play_sound (faceidx sound, int x, int y) const 1589maptile::play_sound (faceidx sound, int x, int y) const
1574{ 1590{
1575 if (!sound) 1591 if (!sound)
… …
1601 1617
1602 if (distance <= MAX_SOUND_DISTANCE) 1618 if (distance <= MAX_SOUND_DISTANCE)
1603 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg); 1619 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1604 } 1620 }
1605} 1621}
1622
1623dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1606 1624
1607static void 1625static void
1608split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy) 1626split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1609{ 1627{
1610 // clip to map to the left 1628 // clip to map to the left
… …
1666 r->dx = dx; 1684 r->dx = dx;
1667 r->dy = dy; 1685 r->dy = dy;
1668} 1686}
1669 1687
1670maprect * 1688maprect *
1671maptile::split_to_tiles (int x0, int y0, int x1, int y1) 1689maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1672{ 1690{
1673 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1674 buf.clear (); 1691 buf.clear ();
1675 1692
1676 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0); 1693 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1677 1694
1678 // add end marker 1695 // add end marker

Diff Legend

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