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.163 by root, Thu Oct 15 21:40:42 2009 UTC vs.
Revision 1.185 by root, Sun Apr 11 04:09:56 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)
… …
80 { 81 {
81 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 82 LOG (llevError, "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
… …
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.bot; tmp; tmp = tmp->above)
118 { 116 {
119 bool block = OB_MOVE_BLOCK (ob, tmp); 117 if (OB_MOVE_BLOCK (ob, tmp))
120
121 /* This must be before the checks below. Code for inventory checkers. */
122 if (block && tmp->type == CHECK_INV)
123 { 118 {
124 bool have = check_inv_recursive (ob, tmp); 119 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
125 120 if (RESULT_INT (0))
126 /* If last_sp is set, the player/monster needs an object, 121 return 1;
127 * so we check for it. If they don't have it, they can't
128 * pass through this space.
129 */ 122 else
130 if (tmp->last_sp) 123 continue;
124
125 if (tmp->type == CHECK_INV)
131 { 126 {
132 if (!have) 127 bool have = check_inv_recursive (ob, tmp);
128
129 // last_sp set means we block if we don't have.
130 if (logical_xor (have, tmp->last_sp))
131 return 1;
132 }
133 else if (tmp->type == T_MATCH)
134 {
135 // T_MATCH allows "entrance" iff the match is true
136 // == blocks if the match fails
137
138 // we could have used an INVOKE_OBJECT, but decided against it, as we
139 // assume that T_MATCH is relatively common.
140 if (!match (tmp->slaying, ob, tmp, ob))
133 return 1; 141 return 1;
134 } 142 }
135 else 143 else
136 { 144 return 1; // unconditional block
137 /* In this case, the player must not have the object - 145
138 * if they do, they can't pass through.
139 */
140 if (have)
141 return 1;
142 }
143 }
144 else if (block && tmp->type == T_MATCH)
145 {
146 //TODO
147 }
148 else 146 } else {
149 { 147 // space does not block the ob, directly, but
150 /* Broke apart a big nasty if into several here to make 148 // anything alive that is not a door still
151 * this more readable. first check - if the space blocks 149 // blocks anything but wizards.
152 * movement, can't move here.
153 * second - if a monster, can't move there, unless it is a
154 * dm.
155 */
156 if (block)
157 return 1;
158 150
159 if (tmp->flag [FLAG_ALIVE] 151 if (tmp->flag [FLAG_ALIVE]
160 && tmp->head_ () != ob 152 && tmp->head_ () != ob
161 && tmp != ob 153 && tmp != ob
162 && tmp->type != DOOR 154 && tmp->type != DOOR)
163 && !tmp->flag [FLAG_WIZ])
164 return 1; 155 return 1;
165 } 156 }
166 } 157 }
167 158
168 return 0; 159 return 0;
… …
224 } 215 }
225 216
226 return 0; 217 return 0;
227} 218}
228 219
229/* When the map is loaded, load_object does not actually insert objects 220//-GPL
230 * into inventory, but just links them. What this does is go through
231 * and insert them properly.
232 * The object 'container' is the object that contains the inventory.
233 * This is needed so that we can update the containers weight.
234 */
235void
236fix_container (object *container)
237{
238 object *tmp = container->inv, *next;
239
240 container->inv = 0;
241 while (tmp)
242 {
243 next = tmp->below;
244 if (tmp->inv)
245 fix_container (tmp);
246
247 insert_ob_in_ob (tmp, container);
248 tmp = next;
249 }
250
251 // go through and calculate what all the containers are carrying.
252 //TODO: remove
253 container->update_weight ();
254}
255 221
256void 222void
257maptile::set_object_flag (int flag, int value) 223maptile::set_object_flag (int flag, int value)
258{ 224{
259 if (!spaces) 225 if (!spaces)
… …
274 240
275 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 241 for (mapspace *ms = spaces + size (); ms-- > spaces; )
276 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 242 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
277 INVOKE_OBJECT (RESET, tmp); 243 INVOKE_OBJECT (RESET, tmp);
278} 244}
245
246void
247maptile::post_load ()
248{
249#if 0
250 if (!spaces)
251 return;
252
253 for (mapspace *ms = spaces + size (); ms-- > spaces; )
254 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
255 ; // nop
256#endif
257}
258
259//+GPL
279 260
280/* link_multipart_objects go through all the objects on the map looking 261/* link_multipart_objects go through all the objects on the map looking
281 * for objects whose arch says they are multipart yet according to the 262 * for objects whose arch says they are multipart yet according to the
282 * info we have, they only have the head (as would be expected when 263 * info we have, they only have the head (as would be expected when
283 * they are saved). 264 * they are saved).
… …
310 else 291 else
311 op = op->above; 292 op = op->above;
312 } 293 }
313 } 294 }
314} 295}
296
297//-GPL
315 298
316/* 299/*
317 * Loads (ands parses) the objects into a given map from the specified 300 * Loads (ands parses) the objects into a given map from the specified
318 * file pointer. 301 * file pointer.
319 */ 302 */
… …
449 * map archetype. Mimic that behaviour. 432 * map archetype. Mimic that behaviour.
450 */ 433 */
451 width = 16; 434 width = 16;
452 height = 16; 435 height = 16;
453 timeout = 300; 436 timeout = 300;
454 max_nrof = 1000; // 1000 items of anything 437 max_items = MAX_ITEM_PER_ACTION;
455 max_volume = 2000000; // 2m³ 438 max_volume = 2000000; // 2m³
456} 439}
457 440
458maptile::maptile (int w, int h) 441maptile::maptile (int w, int h)
459{ 442{
… …
480 if (spaces) 463 if (spaces)
481 return; 464 return;
482 465
483 spaces = salloc0<mapspace> (size ()); 466 spaces = salloc0<mapspace> (size ());
484} 467}
468
469//+GPL
485 470
486/* Takes a string from a map definition and outputs a pointer to the array of shopitems 471/* Takes a string from a map definition and outputs a pointer to the array of shopitems
487 * corresponding to that string. Memory is allocated for this, it must be freed 472 * corresponding to that string. Memory is allocated for this, it must be freed
488 * at a later date. 473 * at a later date.
489 * Called by parse_map_headers below. 474 * Called by parse_map_headers below.
… …
566 return items; 551 return items;
567} 552}
568 553
569/* opposite of parse string, this puts the string that was originally fed in to 554/* opposite of parse string, this puts the string that was originally fed in to
570 * the map (or something equivilent) into output_string. */ 555 * the map (or something equivilent) into output_string. */
571static void 556static const char *
572print_shop_string (maptile *m, char *output_string) 557print_shop_string (maptile *m)
573{ 558{
574 int i; 559 static dynbuf_text buf; buf.clear ();
575 char tmp[MAX_BUF];
576 560
577 strcpy (output_string, "");
578 for (i = 0; i < m->shopitems[0].index; i++) 561 for (int i = 0; i < m->shopitems[0].index; i++)
579 { 562 {
580 if (m->shopitems[i].typenum) 563 if (m->shopitems[i].typenum)
581 { 564 {
582 if (m->shopitems[i].strength) 565 if (m->shopitems[i].strength)
583 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 566 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
584 else 567 else
585 sprintf (tmp, "%s;", m->shopitems[i].name); 568 buf.printf ("%s;", m->shopitems[i].name);
586 } 569 }
587 else 570 else
588 { 571 {
589 if (m->shopitems[i].strength) 572 if (m->shopitems[i].strength)
590 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 573 buf.printf ("*:%d;", m->shopitems[i].strength);
591 else 574 else
592 sprintf (tmp, "*"); 575 buf.printf ("*");
593 } 576 }
594
595 strcat (output_string, tmp);
596 } 577 }
578
579 return buf;
597} 580}
581
582//-GPL
598 583
599/* This loads the header information of the map. The header 584/* This loads the header information of the map. The header
600 * contains things like difficulty, size, timeout, etc. 585 * contains things like difficulty, size, timeout, etc.
601 * this used to be stored in the map object, but with the 586 * this used to be stored in the map object, but with the
602 * addition of tiling, fields beyond that easily named in an 587 * addition of tiling, fields beyond that easily named in an
… …
643 case KW_shopgreed: thawer.get (shopgreed); break; 628 case KW_shopgreed: thawer.get (shopgreed); break;
644 case KW_shopmin: thawer.get (shopmin); break; 629 case KW_shopmin: thawer.get (shopmin); break;
645 case KW_shopmax: thawer.get (shopmax); break; 630 case KW_shopmax: thawer.get (shopmax); break;
646 case KW_shoprace: thawer.get (shoprace); break; 631 case KW_shoprace: thawer.get (shoprace); break;
647 case KW_outdoor: thawer.get (outdoor); break; 632 case KW_outdoor: thawer.get (outdoor); break;
648 case KW_temp: thawer.get (temp); break;
649 case KW_pressure: thawer.get (pressure); break;
650 case KW_humid: thawer.get (humid); break;
651 case KW_windspeed: thawer.get (windspeed); break;
652 case KW_winddir: thawer.get (winddir); break;
653 case KW_sky: thawer.get (sky); break;
654 633
655 case KW_per_player: thawer.get (per_player); break; 634 case KW_per_player: thawer.get (per_player); break;
656 case KW_per_party: thawer.get (per_party); break; 635 case KW_per_party: thawer.get (per_party); break;
657 case KW_no_reset: thawer.get (no_reset); break; 636 case KW_no_reset: thawer.get (no_reset); break;
658 case KW_no_drop: thawer.get (no_drop); break; 637 case KW_no_drop: thawer.get (no_drop); break;
… …
694 } 673 }
695 674
696 abort (); 675 abort ();
697} 676}
698 677
678//+GPL
679
699/****************************************************************************** 680/******************************************************************************
700 * This is the start of unique map handling code 681 * This is the start of unique map handling code
701 *****************************************************************************/ 682 *****************************************************************************/
702 683
703/* This goes through the maptile and removed any unique items on the map. */ 684/* This goes through the maptile and removed any unique items on the map. */
… …
709 int unique = 0; 690 int unique = 0;
710 for (object *op = spaces [i].bot; op; ) 691 for (object *op = spaces [i].bot; op; )
711 { 692 {
712 object *above = op->above; 693 object *above = op->above;
713 694
714 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 695 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
715 unique = 1; 696 unique = 1;
716 697
717 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 698 if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
718 op->destroy (); 699 op->destroy ();
719 700
720 op = above; 701 op = above;
721 } 702 }
722 } 703 }
723} 704}
724 705
706//-GPL
707
725bool 708bool
726maptile::_save_header (object_freezer &freezer) 709maptile::_save_header (object_freezer &freezer)
727{ 710{
728#define MAP_OUT(k) freezer.put (KW_ ## k, k) 711#define MAP_OUT(k) freezer.put (KW(k), k)
729#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 712#define MAP_OUT2(k,v) freezer.put (KW(k), v)
730 713
731 MAP_OUT2 (arch, "map"); 714 MAP_OUT2 (arch, CS(map));
732 715
733 if (name) MAP_OUT (name); 716 if (name) MAP_OUT (name);
734 MAP_OUT (swap_time); 717 MAP_OUT (swap_time);
735 MAP_OUT (reset_time); 718 MAP_OUT (reset_time);
736 MAP_OUT (reset_timeout); 719 MAP_OUT (reset_timeout);
737 MAP_OUT (fixed_resettime); 720 MAP_OUT (fixed_resettime);
738 MAP_OUT (no_reset); 721 MAP_OUT (no_reset);
739 MAP_OUT (no_drop); 722 MAP_OUT (no_drop);
740 MAP_OUT (difficulty); 723 MAP_OUT (difficulty);
741
742 if (default_region) MAP_OUT2 (region, default_region->name); 724 if (default_region) MAP_OUT2 (region, default_region->name);
743 725
744 if (shopitems) 726 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
745 {
746 char shop[MAX_BUF];
747 print_shop_string (this, shop);
748 MAP_OUT2 (shopitems, shop);
749 }
750
751 MAP_OUT (shopgreed); 727 MAP_OUT (shopgreed);
752 MAP_OUT (shopmin); 728 MAP_OUT (shopmin);
753 MAP_OUT (shopmax); 729 MAP_OUT (shopmax);
754 if (shoprace) MAP_OUT (shoprace); 730 if (shoprace) MAP_OUT (shoprace);
755 MAP_OUT (darkness); 731
756 MAP_OUT (width); 732 MAP_OUT (width);
757 MAP_OUT (height); 733 MAP_OUT (height);
758 MAP_OUT (enter_x); 734 MAP_OUT (enter_x);
759 MAP_OUT (enter_y); 735 MAP_OUT (enter_y);
760 736 MAP_OUT (darkness);
761 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
762 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
763
764 MAP_OUT (outdoor); 737 MAP_OUT (outdoor);
765 MAP_OUT (temp); 738
766 MAP_OUT (pressure); 739 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
767 MAP_OUT (humid); 740 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
768 MAP_OUT (windspeed);
769 MAP_OUT (winddir);
770 MAP_OUT (sky);
771 741
772 MAP_OUT (per_player); 742 MAP_OUT (per_player);
773 MAP_OUT (per_party); 743 MAP_OUT (per_party);
774 744
775 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 745 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
776 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 746 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
777 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 747 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
778 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 748 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
779 749
780 freezer.put (this); 750 freezer.put (this);
781 freezer.put (KW_end); 751 freezer.put (KW(end));
782 752
783 return true; 753 return true;
784} 754}
785 755
786bool 756bool
… …
791 if (!_save_header (freezer)) 761 if (!_save_header (freezer))
792 return false; 762 return false;
793 763
794 return freezer.save (path); 764 return freezer.save (path);
795} 765}
766
767//+GPL
796 768
797/* 769/*
798 * Remove and free all objects in the given map. 770 * Remove and free all objects in the given map.
799 */ 771 */
800void 772void
… …
869 841
870 clear (); 842 clear ();
871} 843}
872 844
873/* decay and destroy perishable items in a map */ 845/* decay and destroy perishable items in a map */
846// TODO: should be done regularly, not on map load?
874void 847void
875maptile::do_decay_objects () 848maptile::do_decay_objects ()
876{ 849{
877 if (!spaces) 850 if (!spaces)
878 return; 851 return;
… …
880 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 853 for (mapspace *ms = spaces + size (); ms-- > spaces; )
881 for (object *above, *op = ms->bot; op; op = above) 854 for (object *above, *op = ms->bot; op; op = above)
882 { 855 {
883 above = op->above; 856 above = op->above;
884 857
858 // do not decay anything above unique floor tiles (yet :)
859 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
860 break;
861
885 bool destroy = 0; 862 bool destroy = 0;
886 863
887 // do not decay anything above unique floor tiles (yet :) 864 if (op->flag [FLAG_IS_FLOOR]
888 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 865 || op->flag [FLAG_OBJ_ORIGINAL]
889 break; 866 || op->flag [FLAG_UNIQUE]
890 867 || op->flag [FLAG_OVERLAY_FLOOR]
891 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 868 || op->flag [FLAG_UNPAID]
892 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
893 || QUERY_FLAG (op, FLAG_UNIQUE)
894 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
895 || QUERY_FLAG (op, FLAG_UNPAID)
896 || op->is_alive ()) 869 || op->is_alive ())
897 ; // do not decay 870 ; // do not decay
898 else if (op->is_weapon ()) 871 else if (op->is_weapon ())
899 { 872 {
900 op->stats.dam--; 873 op->stats.dam--;
… …
925 || mat & M_LIQUID 898 || mat & M_LIQUID
926 || (mat & M_IRON && rndm (1, 5) == 1) 899 || (mat & M_IRON && rndm (1, 5) == 1)
927 || (mat & M_GLASS && rndm (1, 2) == 1) 900 || (mat & M_GLASS && rndm (1, 2) == 1)
928 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 901 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
929 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 902 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
930 || (mat & M_ICE && temp > 32)) 903 //|| (mat & M_ICE && temp > 32)
904 )
931 destroy = 1; 905 destroy = 1;
932 } 906 }
933 907
934 /* adjust overall chance below */ 908 /* adjust overall chance below */
935 if (destroy && rndm (0, 1)) 909 if (destroy && rndm (0, 1))
… …
955 sint64 total_exp = 0; 929 sint64 total_exp = 0;
956 930
957 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 931 for (mapspace *ms = spaces + size (); ms-- > spaces; )
958 for (object *op = ms->bot; op; op = op->above) 932 for (object *op = ms->bot; op; op = op->above)
959 { 933 {
960 if (QUERY_FLAG (op, FLAG_MONSTER)) 934 if (op->flag [FLAG_MONSTER])
961 { 935 {
962 total_exp += op->stats.exp; 936 total_exp += op->stats.exp;
963 monster_cnt++; 937 monster_cnt++;
964 } 938 }
965 939
966 if (QUERY_FLAG (op, FLAG_GENERATOR)) 940 if (op->flag [FLAG_GENERATOR])
967 { 941 {
968 total_exp += op->stats.exp; 942 total_exp += op->stats.exp;
969 943
970 if (archetype *at = op->other_arch) 944 if (archetype *at = op->other_arch)
971 { 945 {
… …
1026 */ 1000 */
1027void 1001void
1028mapspace::update_ () 1002mapspace::update_ ()
1029{ 1003{
1030 object *last = 0; 1004 object *last = 0;
1031 uint8 flags = P_UPTODATE, anywhere = 0; 1005 uint8 flags = P_UPTODATE;
1032 sint8 light = 0; 1006 sint8 light = 0;
1033 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1007 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1008 uint64_t volume = 0;
1009 uint32_t items = 0;
1010 object *anywhere = 0;
1011 uint8_t middle_visibility = 0;
1034 1012
1035 //object *middle = 0; 1013 //object *middle = 0;
1036 //object *top = 0; 1014 //object *top = 0;
1037 //object *floor = 0; 1015 //object *floor = 0;
1038 // this seems to generate better code than using locals, above 1016 // this seems to generate better code than using locals, above
1039 object *&top = faces_obj[0] = 0; 1017 object *&top = faces_obj[0] = 0;
1040 object *&middle = faces_obj[1] = 0; 1018 object *&middle = faces_obj[1] = 0;
1041 object *&floor = faces_obj[2] = 0; 1019 object *&floor = faces_obj[2] = 0;
1020
1021 object::flags_t allflags; // all flags of all objects or'ed together
1042 1022
1043 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above) 1023 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1044 { 1024 {
1045 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C) 1025 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1046 light += tmp->glow_radius; 1026 light += tmp->glow_radius;
… …
1051 * 3 times each time the player moves, because many of the 1031 * 3 times each time the player moves, because many of the
1052 * functions the move_player calls eventualy call this. 1032 * functions the move_player calls eventualy call this.
1053 * 1033 *
1054 * Always put the player down for drawing. 1034 * Always put the player down for drawing.
1055 */ 1035 */
1056 if (!tmp->invisible) 1036 if (expect_true (!tmp->invisible))
1057 { 1037 {
1058 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1038 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1059 top = tmp; 1039 top = tmp;
1060 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1040 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1061 { 1041 {
1062 /* If we got a floor, that means middle and top were below it, 1042 /* If we got a floor, that means middle and top were below it,
1063 * so should not be visible, so we clear them. 1043 * so should not be visible, so we clear them.
1064 */ 1044 */
1065 middle = 0; 1045 middle = 0;
1066 top = 0; 1046 top = 0;
1067 floor = tmp; 1047 floor = tmp;
1048 volume = 0;
1049 items = 0;
1068 } 1050 }
1069 /* Flag anywhere have high priority */ 1051 else
1070 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1071 { 1052 {
1053 if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1054 {
1055 ++items;
1056 volume += tmp->volume ();
1057 }
1058
1059 /* Flag anywhere have high priority */
1060 if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1061 anywhere = tmp;
1062
1063 /* Find the highest visible face around. If equal
1064 * visibilities, we still want the one nearer to the
1065 * top
1066 */
1067 if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
1068 {
1069 middle_visibility = ::faces [tmp->face].visibility;
1072 middle = tmp; 1070 middle = tmp;
1073 anywhere = 1; 1071 }
1074 } 1072 }
1075
1076 /* Find the highest visible face around. If equal
1077 * visibilities, we still want the one nearer to the
1078 * top
1079 */
1080 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1081 middle = tmp;
1082 }
1083
1084 if (tmp == tmp->above)
1085 {
1086 LOG (llevError, "Error in structure of map\n");
1087 exit (-1);
1088 } 1073 }
1089 1074
1090 move_slow |= tmp->move_slow; 1075 move_slow |= tmp->move_slow;
1091 move_block |= tmp->move_block; 1076 move_block |= tmp->move_block;
1092 move_on |= tmp->move_on; 1077 move_on |= tmp->move_on;
1093 move_off |= tmp->move_off; 1078 move_off |= tmp->move_off;
1094 move_allow |= tmp->move_allow; 1079 move_allow |= tmp->move_allow;
1095 1080
1096 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1081 allflags |= tmp->flag;
1097 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1082
1098 if (tmp->type == PLAYER) flags |= P_PLAYER; 1083 if (tmp->type == PLAYER) flags |= P_PLAYER;
1099 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1084 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1100 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1101 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1102 } 1085 }
1086
1087 // FLAG_SEE_ANYWHERE takes precedence
1088 if (anywhere)
1089 middle = anywhere;
1090
1091 // ORing all flags together and checking them here is much faster
1092 if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
1093 if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
1094 if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
1095 if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
1103 1096
1104 this->light = min (light, MAX_LIGHT_RADIUS); 1097 this->light = min (light, MAX_LIGHT_RADIUS);
1105 this->flags_ = flags; 1098 this->flags_ = flags;
1106 this->move_block = move_block & ~move_allow; 1099 this->move_block = move_block & ~move_allow;
1107 this->move_on = move_on; 1100 this->move_on = move_on;
1108 this->move_off = move_off; 1101 this->move_off = move_off;
1109 this->move_slow = move_slow; 1102 this->move_slow = move_slow;
1103 this->volume_ = (volume + 1023) / 1024;
1104 this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1110 1105
1111 /* At this point, we have a floor face (if there is a floor), 1106 /* At this point, we have a floor face (if there is a floor),
1112 * and the floor is set - we are not going to touch it at 1107 * and the floor is set - we are not going to touch it at
1113 * this point. 1108 * this point.
1114 * middle contains the highest visibility face. 1109 * middle contains the highest visibility face.
… …
1132 */ 1127 */
1133 1128
1134 for (object *tmp = last; tmp; tmp = tmp->below) 1129 for (object *tmp = last; tmp; tmp = tmp->below)
1135 { 1130 {
1136 /* Once we get to a floor, stop, since we already have a floor object */ 1131 /* Once we get to a floor, stop, since we already have a floor object */
1137 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1132 if (tmp->flag [FLAG_IS_FLOOR])
1138 break; 1133 break;
1139 1134
1140 /* If two top faces are already set, quit processing */ 1135 /* If two top faces are already set, quit processing */
1141 if (top && middle) 1136 if (top && middle)
1142 break; 1137 break;
… …
1180 faces_obj [1] = middle; 1175 faces_obj [1] = middle;
1181 faces_obj [2] = floor; 1176 faces_obj [2] = floor;
1182#endif 1177#endif
1183} 1178}
1184 1179
1185uint64
1186mapspace::volume () const
1187{
1188 uint64 vol = 0;
1189
1190 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1191 vol += op->volume ();
1192
1193 return vol;
1194}
1195
1196maptile * 1180maptile *
1197maptile::tile_available (int dir, bool load) 1181maptile::tile_available (int dir, bool load)
1198{ 1182{
1199 if (tile_path[dir]) 1183 if (tile_path[dir])
1200 { 1184 {
… …
1436 * 1420 *
1437 * currently, the only flag supported (0x1) is don't translate for 1421 * currently, the only flag supported (0x1) is don't translate for
1438 * closest body part of 'op1' 1422 * closest body part of 'op1'
1439 */ 1423 */
1440void 1424void
1441get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1425get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1442{ 1426{
1443 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1427 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1444 { 1428 {
1445 /* be conservative and fill in _some_ data */ 1429 /* be conservative and fill in _some_ data */
1446 retval->distance = 10000; 1430 retval->distance = 10000;
… …
1449 retval->direction = 0; 1433 retval->direction = 0;
1450 retval->part = 0; 1434 retval->part = 0;
1451 } 1435 }
1452 else 1436 else
1453 { 1437 {
1454 object *best;
1455
1456 retval->distance_x += op2->x - op1->x; 1438 retval->distance_x += op2->x - op1->x;
1457 retval->distance_y += op2->y - op1->y; 1439 retval->distance_y += op2->y - op1->y;
1458 1440
1459 best = op1; 1441 object *best = op1;
1442
1460 /* If this is multipart, find the closest part now */ 1443 /* If this is multipart, find the closest part now */
1461 if (!(flags & 0x1) && op1->more) 1444 if (!(flags & 1) && op1->more)
1462 { 1445 {
1463 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1446 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1464 1447
1465 /* we just take the offset of the piece to head to figure 1448 /* we just take the offset of the piece to head to figure
1466 * distance instead of doing all that work above again 1449 * distance instead of doing all that work above again
… …
1539 int dx, dy; 1522 int dx, dy;
1540 1523
1541 return adjacent_map (op1->map, op2->map, &dx, &dy); 1524 return adjacent_map (op1->map, op2->map, &dx, &dy);
1542} 1525}
1543 1526
1527//-GPL
1528
1544object * 1529object *
1545maptile::insert (object *op, int x, int y, object *originator, int flags) 1530maptile::insert (object *op, int x, int y, object *originator, int flags)
1546{ 1531{
1547 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1532 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1548} 1533}
… …
1559 if (default_region) 1544 if (default_region)
1560 return default_region; 1545 return default_region;
1561 1546
1562 return ::region::default_region (); 1547 return ::region::default_region ();
1563} 1548}
1549
1550//+GPL
1564 1551
1565/* picks a random object from a style map. 1552/* picks a random object from a style map.
1566 */ 1553 */
1567object * 1554object *
1568maptile::pick_random_object (rand_gen &gen) const 1555maptile::pick_random_object (rand_gen &gen) const
… …
1581 if (pick && pick->is_head ()) 1568 if (pick && pick->is_head ())
1582 return pick->head_ (); 1569 return pick->head_ ();
1583 } 1570 }
1584 1571
1585 // instead of crashing in the unlikely(?) case, try to return *something* 1572 // instead of crashing in the unlikely(?) case, try to return *something*
1586 return archetype::find ("bug"); 1573 return archetype::find (shstr_bug);
1587} 1574}
1575
1576//-GPL
1588 1577
1589void 1578void
1590maptile::play_sound (faceidx sound, int x, int y) const 1579maptile::play_sound (faceidx sound, int x, int y) const
1591{ 1580{
1592 if (!sound) 1581 if (!sound)
… …
1618 1607
1619 if (distance <= MAX_SOUND_DISTANCE) 1608 if (distance <= MAX_SOUND_DISTANCE)
1620 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg); 1609 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1621 } 1610 }
1622} 1611}
1612
1613dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1623 1614
1624static void 1615static void
1625split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy) 1616split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1626{ 1617{
1627 // clip to map to the left 1618 // clip to map to the left
… …
1683 r->dx = dx; 1674 r->dx = dx;
1684 r->dy = dy; 1675 r->dy = dy;
1685} 1676}
1686 1677
1687maprect * 1678maprect *
1688maptile::split_to_tiles (int x0, int y0, int x1, int y1) 1679maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1689{ 1680{
1690 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1691 buf.clear (); 1681 buf.clear ();
1692 1682
1693 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0); 1683 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1694 1684
1695 // add end marker 1685 // add end marker

Diff Legend

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