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.139 by root, Sun May 4 19:14:23 2008 UTC vs.
Revision 1.182 by root, Sun Feb 7 04:22:33 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 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,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <unistd.h> 25#include <unistd.h>
25 26
26#include "global.h" 27#include "global.h"
27
28#include "loader.h"
29
30#include "path.h" 28#include "path.h"
29
30//+GPL
31
32sint8 maptile::outdoor_darkness;
31 33
32/* This rolls up wall, blocks_magic, blocks_view, etc, all into 34/* This rolls up wall, blocks_magic, blocks_view, etc, all into
33 * one function that just returns a P_.. value (see map.h) 35 * one function that just returns a P_.. value (see map.h)
34 * it will also do map translation for tiled maps, returning 36 * it will also do map translation for tiled maps, returning
35 * new values into newmap, nx, and ny. Any and all of those 37 * new values into newmap, nx, and ny. Any and all of those
… …
70 * by the caller. 72 * by the caller.
71 */ 73 */
72int 74int
73blocked_link (object *ob, maptile *m, int sx, int sy) 75blocked_link (object *ob, maptile *m, int sx, int sy)
74{ 76{
75 object *tmp;
76 int mflags, blocked;
77
78 /* 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
79 * have already checked this. 78 * have already checked this.
80 */ 79 */
81 if (OUT_OF_REAL_MAP (m, sx, sy)) 80 if (OUT_OF_REAL_MAP (m, sx, sy))
82 { 81 {
83 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");
84 return 1; 83 return 1;
85 } 84 }
86 85
87 /* Save some cycles - instead of calling get_map_flags(), just get the value 86 mapspace &ms = m->at (sx, sy);
88 * directly.
89 */
90 mflags = m->at (sx, sy).flags ();
91 87
92 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 88 int mflags = ms.flags ();
89 int blocked = ms.move_block;
93 90
94 /* If space is currently not blocked by anything, no need to 91 /* If space is currently not blocked by anything, no need to
95 * go further. Not true for players - all sorts of special 92 * go further. Not true for players - all sorts of special
96 * things we need to do for players. 93 * things we need to do for players.
97 */ 94 */
98 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 95 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
99 return 0; 96 return 0;
100 97
101 /* if there isn't anytyhing alive on this space, and this space isn't 98 /* if there isn't anything alive on this space, and this space isn't
102 * otherwise blocked, we can return now. Only if there is a living 99 * otherwise blocked, we can return now. Only if there is a living
103 * creature do we need to investigate if it is part of this creature 100 * creature do we need to investigate if it is part of this creature
104 * or another. Likewise, only if something is blocking us do we 101 * or another. Likewise, only if something is blocking us do we
105 * need to investigate if there is a special circumstance that would 102 * need to investigate if there is a special circumstance that would
106 * let the player through (inventory checkers for example) 103 * let the player through (inventory checkers for example)
… …
113 /* 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
114 * 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
115 * true. If we get through the entire stack, that must mean 112 * true. If we get through the entire stack, that must mean
116 * ob is blocking it, so return 0. 113 * ob is blocking it, so return 0.
117 */ 114 */
118 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 115 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
119 { 116 {
120 117 if (OB_MOVE_BLOCK (ob, tmp))
121 /* This must be before the checks below. Code for inventory checkers. */
122 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
123 { 118 {
124 /* If last_sp is set, the player/monster needs an object, 119 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
125 * so we check for it. If they don't have it, they can't 120 if (RESULT_INT (0))
126 * pass through this space. 121 return 1;
127 */ 122 else
128 if (tmp->last_sp) 123 continue;
124
125 if (tmp->type == CHECK_INV)
129 { 126 {
130 if (check_inv_recursive (ob, tmp) == NULL) 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; 131 return 1;
132 else 132 }
133 continue; 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))
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 (check_inv_recursive (ob, tmp) != NULL) /* player has object */
141 return 1;
142 else
143 continue;
144 }
145 } /* if check_inv */
146 else 146 } else {
147 { 147 // space does not block the ob, directly, but
148 /* Broke apart a big nasty if into several here to make 148 // anything alive that is not a door still
149 * this more readable. first check - if the space blocks 149 // blocks anything but wizards.
150 * movement, can't move here.
151 * second - if a monster, can't move there, unless it is a
152 * hidden dm
153 */
154 if (OB_MOVE_BLOCK (ob, tmp))
155 return 1;
156 150
157 if (tmp->flag [FLAG_ALIVE] 151 if (tmp->flag [FLAG_ALIVE]
158 && tmp->head_ () != ob 152 && tmp->head_ () != ob
159 && tmp != ob 153 && tmp != ob
160 && tmp->type != DOOR 154 && tmp->type != DOOR)
161 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
162 return 1; 155 return 1;
163 } 156 }
164
165 } 157 }
158
166 return 0; 159 return 0;
167} 160}
168 161
169/* 162/*
170 * Returns qthe blocking object if the given object can't fit in the given 163 * Returns qthe blocking object if the given object can't fit in the given
… …
222 } 215 }
223 216
224 return 0; 217 return 0;
225} 218}
226 219
227/* When the map is loaded, load_object does not actually insert objects 220//-GPL
228 * into inventory, but just links them. What this does is go through
229 * and insert them properly.
230 * The object 'container' is the object that contains the inventory.
231 * This is needed so that we can update the containers weight.
232 */
233void
234fix_container (object *container)
235{
236 object *tmp = container->inv, *next;
237
238 container->inv = 0;
239 while (tmp)
240 {
241 next = tmp->below;
242 if (tmp->inv)
243 fix_container (tmp);
244
245 insert_ob_in_ob (tmp, container);
246 tmp = next;
247 }
248
249 // go through and calculate what all the containers are carrying.
250 //TODO: remove
251 container->update_weight ();
252}
253 221
254void 222void
255maptile::set_object_flag (int flag, int value) 223maptile::set_object_flag (int flag, int value)
256{ 224{
257 if (!spaces) 225 if (!spaces)
… …
259 227
260 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 228 for (mapspace *ms = spaces + size (); ms-- > spaces; )
261 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 229 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
262 tmp->flag [flag] = value; 230 tmp->flag [flag] = value;
263} 231}
232
233void
234maptile::post_load_original ()
235{
236 if (!spaces)
237 return;
238
239 set_object_flag (FLAG_OBJ_ORIGINAL);
240
241 for (mapspace *ms = spaces + size (); ms-- > spaces; )
242 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
243 INVOKE_OBJECT (RESET, tmp);
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
264 260
265/* 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
266 * 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
267 * 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
268 * they are saved). 264 * they are saved).
… …
296 op = op->above; 292 op = op->above;
297 } 293 }
298 } 294 }
299} 295}
300 296
297//-GPL
298
301/* 299/*
302 * 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
303 * file pointer. 301 * file pointer.
304 */ 302 */
305bool 303bool
… …
321 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) 319 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
322 { 320 {
323 // we insert manually because 321 // we insert manually because
324 // a) its way faster 322 // a) its way faster
325 // b) we remove manually, too, and there are good reasons for that 323 // b) we remove manually, too, and there are good reasons for that
326 // c) its correct 324 // c) it's correct
327 mapspace &ms = at (op->x, op->y); 325 mapspace &ms = at (op->x, op->y);
328 326
329 op->flag [FLAG_REMOVED] = false; 327 op->flag [FLAG_REMOVED] = false;
330 328
331 op->above = 0; 329 op->above = 0;
332 op->below = ms.top; 330 op->below = ms.top;
333 331
334 if (ms.top)
335 ms.top->above = op; 332 *(ms.top ? &ms.top->above : &ms.bot) = op;
336 else
337 ms.bot = op;
338 333
339 ms.top = op; 334 ms.top = op;
340 ms.flags_ = 0; 335 ms.flags_ = 0;
341 } 336 }
342 else 337 else
… …
437 * map archetype. Mimic that behaviour. 432 * map archetype. Mimic that behaviour.
438 */ 433 */
439 width = 16; 434 width = 16;
440 height = 16; 435 height = 16;
441 timeout = 300; 436 timeout = 300;
442 max_nrof = 1000; // 1000 items of anything 437 max_items = MAX_ITEM_PER_ACTION;
443 max_volume = 2000000; // 2m³ 438 max_volume = 2000000; // 2m³
444} 439}
445 440
446maptile::maptile (int w, int h) 441maptile::maptile (int w, int h)
447{ 442{
… …
468 if (spaces) 463 if (spaces)
469 return; 464 return;
470 465
471 spaces = salloc0<mapspace> (size ()); 466 spaces = salloc0<mapspace> (size ());
472} 467}
468
469//+GPL
473 470
474/* 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
475 * 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
476 * at a later date. 473 * at a later date.
477 * Called by parse_map_headers below. 474 * Called by parse_map_headers below.
… …
554 return items; 551 return items;
555} 552}
556 553
557/* 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
558 * the map (or something equivilent) into output_string. */ 555 * the map (or something equivilent) into output_string. */
559static void 556static const char *
560print_shop_string (maptile *m, char *output_string) 557print_shop_string (maptile *m)
561{ 558{
562 int i; 559 static dynbuf_text buf; buf.clear ();
563 char tmp[MAX_BUF];
564 560
565 strcpy (output_string, "");
566 for (i = 0; i < m->shopitems[0].index; i++) 561 for (int i = 0; i < m->shopitems[0].index; i++)
567 { 562 {
568 if (m->shopitems[i].typenum) 563 if (m->shopitems[i].typenum)
569 { 564 {
570 if (m->shopitems[i].strength) 565 if (m->shopitems[i].strength)
571 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);
572 else 567 else
573 sprintf (tmp, "%s;", m->shopitems[i].name); 568 buf.printf ("%s;", m->shopitems[i].name);
574 } 569 }
575 else 570 else
576 { 571 {
577 if (m->shopitems[i].strength) 572 if (m->shopitems[i].strength)
578 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 573 buf.printf ("*:%d;", m->shopitems[i].strength);
579 else 574 else
580 sprintf (tmp, "*"); 575 buf.printf ("*");
581 } 576 }
582
583 strcat (output_string, tmp);
584 } 577 }
578
579 return buf;
585} 580}
581
582//-GPL
586 583
587/* This loads the header information of the map. The header 584/* This loads the header information of the map. The header
588 * contains things like difficulty, size, timeout, etc. 585 * contains things like difficulty, size, timeout, etc.
589 * 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
590 * addition of tiling, fields beyond that easily named in an 587 * addition of tiling, fields beyond that easily named in an
… …
631 case KW_shopgreed: thawer.get (shopgreed); break; 628 case KW_shopgreed: thawer.get (shopgreed); break;
632 case KW_shopmin: thawer.get (shopmin); break; 629 case KW_shopmin: thawer.get (shopmin); break;
633 case KW_shopmax: thawer.get (shopmax); break; 630 case KW_shopmax: thawer.get (shopmax); break;
634 case KW_shoprace: thawer.get (shoprace); break; 631 case KW_shoprace: thawer.get (shoprace); break;
635 case KW_outdoor: thawer.get (outdoor); break; 632 case KW_outdoor: thawer.get (outdoor); break;
636 case KW_temp: thawer.get (temp); break;
637 case KW_pressure: thawer.get (pressure); break;
638 case KW_humid: thawer.get (humid); break;
639 case KW_windspeed: thawer.get (windspeed); break;
640 case KW_winddir: thawer.get (winddir); break;
641 case KW_sky: thawer.get (sky); break;
642 633
643 case KW_per_player: thawer.get (per_player); break; 634 case KW_per_player: thawer.get (per_player); break;
644 case KW_per_party: thawer.get (per_party); break; 635 case KW_per_party: thawer.get (per_party); break;
645 case KW_no_reset: thawer.get (no_reset); break; 636 case KW_no_reset: thawer.get (no_reset); break;
637 case KW_no_drop: thawer.get (no_drop); break;
646 638
647 case KW_region: default_region = region::find (thawer.get_str ()); break; 639 case KW_region: default_region = region::find (thawer.get_str ()); break;
648 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 640 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
649 641
650 // old names new names 642 // old names new names
… …
681 } 673 }
682 674
683 abort (); 675 abort ();
684} 676}
685 677
678//+GPL
679
686/****************************************************************************** 680/******************************************************************************
687 * This is the start of unique map handling code 681 * This is the start of unique map handling code
688 *****************************************************************************/ 682 *****************************************************************************/
689 683
690/* 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. */
… …
700 694
701 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 695 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
702 unique = 1; 696 unique = 1;
703 697
704 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 698 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
705 {
706 op->destroy_inv (false);
707 op->destroy (); 699 op->destroy ();
708 }
709 700
710 op = above; 701 op = above;
711 } 702 }
712 } 703 }
713} 704}
714 705
706//-GPL
707
715bool 708bool
716maptile::_save_header (object_freezer &freezer) 709maptile::_save_header (object_freezer &freezer)
717{ 710{
718#define MAP_OUT(k) freezer.put (KW_ ## k, k) 711#define MAP_OUT(k) freezer.put (KW(k), k)
719#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 712#define MAP_OUT2(k,v) freezer.put (KW(k), v)
720 713
721 MAP_OUT2 (arch, "map"); 714 MAP_OUT2 (arch, CS(map));
722 715
723 if (name) MAP_OUT (name); 716 if (name) MAP_OUT (name);
724 MAP_OUT (swap_time); 717 MAP_OUT (swap_time);
725 MAP_OUT (reset_time); 718 MAP_OUT (reset_time);
726 MAP_OUT (reset_timeout); 719 MAP_OUT (reset_timeout);
727 MAP_OUT (fixed_resettime); 720 MAP_OUT (fixed_resettime);
728 MAP_OUT (no_reset); 721 MAP_OUT (no_reset);
722 MAP_OUT (no_drop);
729 MAP_OUT (difficulty); 723 MAP_OUT (difficulty);
730
731 if (default_region) MAP_OUT2 (region, default_region->name); 724 if (default_region) MAP_OUT2 (region, default_region->name);
732 725
733 if (shopitems) 726 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
734 {
735 char shop[MAX_BUF];
736 print_shop_string (this, shop);
737 MAP_OUT2 (shopitems, shop);
738 }
739
740 MAP_OUT (shopgreed); 727 MAP_OUT (shopgreed);
741 MAP_OUT (shopmin); 728 MAP_OUT (shopmin);
742 MAP_OUT (shopmax); 729 MAP_OUT (shopmax);
743 if (shoprace) MAP_OUT (shoprace); 730 if (shoprace) MAP_OUT (shoprace);
744 MAP_OUT (darkness); 731
745 MAP_OUT (width); 732 MAP_OUT (width);
746 MAP_OUT (height); 733 MAP_OUT (height);
747 MAP_OUT (enter_x); 734 MAP_OUT (enter_x);
748 MAP_OUT (enter_y); 735 MAP_OUT (enter_y);
749 736 MAP_OUT (darkness);
750 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
751 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
752
753 MAP_OUT (outdoor); 737 MAP_OUT (outdoor);
754 MAP_OUT (temp); 738
755 MAP_OUT (pressure); 739 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
756 MAP_OUT (humid); 740 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
757 MAP_OUT (windspeed);
758 MAP_OUT (winddir);
759 MAP_OUT (sky);
760 741
761 MAP_OUT (per_player); 742 MAP_OUT (per_player);
762 MAP_OUT (per_party); 743 MAP_OUT (per_party);
763 744
764 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]);
765 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]);
766 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]);
767 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]);
768 749
769 freezer.put (this); 750 freezer.put (this);
770 freezer.put (KW_end); 751 freezer.put (KW(end));
771 752
772 return true; 753 return true;
773} 754}
774 755
775bool 756bool
… …
780 if (!_save_header (freezer)) 761 if (!_save_header (freezer))
781 return false; 762 return false;
782 763
783 return freezer.save (path); 764 return freezer.save (path);
784} 765}
766
767//+GPL
785 768
786/* 769/*
787 * Remove and free all objects in the given map. 770 * Remove and free all objects in the given map.
788 */ 771 */
789void 772void
… …
800 783
801 op->flag [FLAG_REMOVED] = true; 784 op->flag [FLAG_REMOVED] = true;
802 785
803 object *head = op->head_ (); 786 object *head = op->head_ ();
804 if (op == head) 787 if (op == head)
805 {
806 op->destroy_inv (false);
807 op->destroy (); 788 op->destroy ();
808 }
809 else if (head->map != op->map) 789 else if (head->map != op->map)
810 { 790 {
811 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ()); 791 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
812 head->destroy (); 792 head->destroy ();
813 } 793 }
… …
861 841
862 clear (); 842 clear ();
863} 843}
864 844
865/* 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?
866void 847void
867maptile::do_decay_objects () 848maptile::do_decay_objects ()
868{ 849{
869 if (!spaces) 850 if (!spaces)
870 return; 851 return;
… …
872 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 853 for (mapspace *ms = spaces + size (); ms-- > spaces; )
873 for (object *above, *op = ms->bot; op; op = above) 854 for (object *above, *op = ms->bot; op; op = above)
874 { 855 {
875 above = op->above; 856 above = op->above;
876 857
877 bool destroy = 0;
878
879 // do not decay anything above unique floor tiles (yet :) 858 // do not decay anything above unique floor tiles (yet :)
880 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 859 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
881 break; 860 break;
861
862 bool destroy = 0;
882 863
883 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 864 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
884 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 865 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
885 || QUERY_FLAG (op, FLAG_UNIQUE) 866 || QUERY_FLAG (op, FLAG_UNIQUE)
886 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 867 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
… …
917 || mat & M_LIQUID 898 || mat & M_LIQUID
918 || (mat & M_IRON && rndm (1, 5) == 1) 899 || (mat & M_IRON && rndm (1, 5) == 1)
919 || (mat & M_GLASS && rndm (1, 2) == 1) 900 || (mat & M_GLASS && rndm (1, 2) == 1)
920 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 901 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
921 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 902 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
922 || (mat & M_ICE && temp > 32)) 903 //|| (mat & M_ICE && temp > 32)
904 )
923 destroy = 1; 905 destroy = 1;
924 } 906 }
925 907
926 /* adjust overall chance below */ 908 /* adjust overall chance below */
927 if (destroy && rndm (0, 1)) 909 if (destroy && rndm (0, 1))
928 op->destroy (); 910 op->destroy ();
929 }
930}
931
932/*
933 * Updates every button on the map (by calling update_button() for them).
934 */
935void
936maptile::update_buttons ()
937{
938 for (oblinkpt *obp = buttons; obp; obp = obp->next)
939 for (objectlink *ol = obp->link; ol; ol = ol->next)
940 {
941 if (!ol->ob)
942 {
943 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
944 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
945 continue;
946 }
947
948 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
949 {
950 update_button (ol->ob);
951 break;
952 }
953 } 911 }
954} 912}
955 913
956/* 914/*
957 * This routine is supposed to find out the difficulty of the map. 915 * This routine is supposed to find out the difficulty of the map.
958 * difficulty does not have a lot to do with character level, 916 * difficulty does not have a lot to do with character level,
959 * but does have a lot to do with treasure on the map. 917 * but does have a lot to do with treasure on the map.
960 * 918 *
961 * Difficulty can now be set by the map creature. If the value stored 919 * Difficulty can now be set by the map creator. If the value stored
962 * in the map is zero, then use this routine. Maps should really 920 * in the map is zero, then use this routine. Maps should really
963 * have a difficulty set than using this function - human calculation 921 * have a difficulty set rather than using this function - human calculation
964 * is much better than this functions guesswork. 922 * is much better than this function's guesswork.
965 */ 923 */
966int 924int
967maptile::estimate_difficulty () const 925maptile::estimate_difficulty () const
968{ 926{
969 long monster_cnt = 0; 927 long monster_cnt = 0;
… …
981 939
982 if (QUERY_FLAG (op, FLAG_GENERATOR)) 940 if (QUERY_FLAG (op, FLAG_GENERATOR))
983 { 941 {
984 total_exp += op->stats.exp; 942 total_exp += op->stats.exp;
985 943
986 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 944 if (archetype *at = op->other_arch)
945 {
987 total_exp += at->stats.exp * 8; 946 total_exp += at->stats.exp * 8;
988
989 monster_cnt++; 947 monster_cnt++;
948 }
949
950 for (object *inv = op->inv; inv; inv = inv->below)
951 {
952 total_exp += op->stats.exp * 8;
953 monster_cnt++;
954 }
990 } 955 }
991 } 956 }
992 957
993 avgexp = (double) total_exp / monster_cnt; 958 avgexp = (double) total_exp / monster_cnt;
994 959
… …
1007 * postive values make it darker, negative make it brighter 972 * postive values make it darker, negative make it brighter
1008 */ 973 */
1009int 974int
1010maptile::change_map_light (int change) 975maptile::change_map_light (int change)
1011{ 976{
1012 int new_level = darkness + change;
1013
1014 /* Nothing to do */ 977 /* Nothing to do */
1015 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 978 if (!change)
1016 return 0; 979 return 0;
1017 980
1018 /* inform all players on the map */ 981 /* inform all players on the map */
1019 if (change > 0) 982 if (change > 0)
1020 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 983 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1021 else 984 else
1022 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 985 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1023 986
1024 /* Do extra checking. since darkness is a unsigned value, 987 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1025 * we need to be extra careful about negative values.
1026 * In general, the checks below are only needed if change
1027 * is not +/-1
1028 */
1029 if (new_level < 0)
1030 darkness = 0;
1031 else if (new_level >= MAX_DARKNESS)
1032 darkness = MAX_DARKNESS;
1033 else
1034 darkness = new_level;
1035 988
1036 /* All clients need to get re-updated for the change */ 989 /* All clients need to get re-updated for the change */
1037 update_all_map_los (this); 990 update_all_map_los (this);
991
1038 return 1; 992 return 1;
1039} 993}
1040 994
1041/* 995/*
1042 * This function updates various attributes about a specific space 996 * This function updates various attributes about a specific space
… …
1045 * through, etc) 999 * through, etc)
1046 */ 1000 */
1047void 1001void
1048mapspace::update_ () 1002mapspace::update_ ()
1049{ 1003{
1050 object *tmp, *last = 0; 1004 object *last = 0;
1051 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1005 uint8 flags = P_UPTODATE;
1006 sint8 light = 0;
1052 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;
1053 1012
1054 //object *middle = 0; 1013 //object *middle = 0;
1055 //object *top = 0; 1014 //object *top = 0;
1056 //object *floor = 0; 1015 //object *floor = 0;
1057 // this seems to generate better code than using locals, above 1016 // this seems to generate better code than using locals, above
1058 object *&top = faces_obj[0] = 0; 1017 object *&top = faces_obj[0] = 0;
1059 object *&middle = faces_obj[1] = 0; 1018 object *&middle = faces_obj[1] = 0;
1060 object *&floor = faces_obj[2] = 0; 1019 object *&floor = faces_obj[2] = 0;
1061 1020
1021 object::flags_t allflags; // all flags of all objects or'ed together
1022
1062 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1023 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1063 { 1024 {
1064 /* This could be made additive I guess (two lights better than 1025 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1065 * one). But if so, it shouldn't be a simple additive - 2
1066 * light bulbs do not illuminate twice as far as once since
1067 * it is a dissapation factor that is cubed.
1068 */
1069 light = max (light, tmp->glow_radius); 1026 light += tmp->glow_radius;
1070 1027
1071 /* This call is needed in order to update objects the player 1028 /* This call is needed in order to update objects the player
1072 * is standing in that have animations (ie, grass, fire, etc). 1029 * is standing in that have animations (ie, grass, fire, etc).
1073 * However, it also causes the look window to be re-drawn 1030 * However, it also causes the look window to be re-drawn
1074 * 3 times each time the player moves, because many of the 1031 * 3 times each time the player moves, because many of the
1075 * functions the move_player calls eventualy call this. 1032 * functions the move_player calls eventualy call this.
1076 * 1033 *
1077 * Always put the player down for drawing. 1034 * Always put the player down for drawing.
1078 */ 1035 */
1079 if (!tmp->invisible) 1036 if (expect_true (!tmp->invisible))
1080 { 1037 {
1081 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1038 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1082 top = tmp; 1039 top = tmp;
1083 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1040 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1084 { 1041 {
1085 /* 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,
1086 * so should not be visible, so we clear them. 1043 * so should not be visible, so we clear them.
1087 */ 1044 */
1088 middle = 0; 1045 middle = 0;
1089 top = 0; 1046 top = 0;
1090 floor = tmp; 1047 floor = tmp;
1048 volume = 0;
1049 items = 0;
1091 } 1050 }
1092 /* Flag anywhere have high priority */ 1051 else
1093 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1094 { 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;
1095 middle = tmp; 1070 middle = tmp;
1096 anywhere = 1; 1071 }
1097 } 1072 }
1098 /* Find the highest visible face around. If equal
1099 * visibilities, we still want the one nearer to the
1100 * top
1101 */
1102 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1103 middle = tmp;
1104 }
1105
1106 if (tmp == tmp->above)
1107 {
1108 LOG (llevError, "Error in structure of map\n");
1109 exit (-1);
1110 } 1073 }
1111 1074
1112 move_slow |= tmp->move_slow; 1075 move_slow |= tmp->move_slow;
1113 move_block |= tmp->move_block; 1076 move_block |= tmp->move_block;
1114 move_on |= tmp->move_on; 1077 move_on |= tmp->move_on;
1115 move_off |= tmp->move_off; 1078 move_off |= tmp->move_off;
1116 move_allow |= tmp->move_allow; 1079 move_allow |= tmp->move_allow;
1117 1080
1118 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1081 allflags |= tmp->flag;
1119 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1082
1120 if (tmp->type == PLAYER) flags |= P_PLAYER; 1083 if (tmp->type == PLAYER) flags |= P_PLAYER;
1121 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1084 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1122 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1123 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1124 } 1085 }
1125 1086
1126 this->light = light; 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;
1096
1097 this->light = min (light, MAX_LIGHT_RADIUS);
1127 this->flags_ = flags; 1098 this->flags_ = flags;
1128 this->move_block = move_block & ~move_allow; 1099 this->move_block = move_block & ~move_allow;
1129 this->move_on = move_on; 1100 this->move_on = move_on;
1130 this->move_off = move_off; 1101 this->move_off = move_off;
1131 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
1132 1105
1133 /* 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),
1134 * 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
1135 * this point. 1108 * this point.
1136 * middle contains the highest visibility face. 1109 * middle contains the highest visibility face.
… …
1151 * 1) top face is set, need middle to be set. 1124 * 1) top face is set, need middle to be set.
1152 * 2) middle is set, need to set top. 1125 * 2) middle is set, need to set top.
1153 * 3) neither middle or top is set - need to set both. 1126 * 3) neither middle or top is set - need to set both.
1154 */ 1127 */
1155 1128
1156 for (tmp = last; tmp; tmp = tmp->below) 1129 for (object *tmp = last; tmp; tmp = tmp->below)
1157 { 1130 {
1158 /* 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 */
1159 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1132 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1160 break; 1133 break;
1161 1134
… …
1202 faces_obj [1] = middle; 1175 faces_obj [1] = middle;
1203 faces_obj [2] = floor; 1176 faces_obj [2] = floor;
1204#endif 1177#endif
1205} 1178}
1206 1179
1207uint64 1180maptile *
1208mapspace::volume () const
1209{
1210 uint64 vol = 0;
1211
1212 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1213 vol += op->volume ();
1214
1215 return vol;
1216}
1217
1218bool
1219maptile::tile_available (int dir, bool load) 1181maptile::tile_available (int dir, bool load)
1220{ 1182{
1221 if (!tile_path[dir]) 1183 if (tile_path[dir])
1222 return 0; 1184 {
1223
1224 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1185 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1225 return 1; 1186 return tile_map[dir];
1226 1187
1227 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1188 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1228 return 1; 1189 return tile_map[dir];
1190 }
1229 1191
1230 return 0; 1192 return 0;
1231} 1193}
1232 1194
1233/* this returns TRUE if the coordinates (x,y) are out of 1195/* this returns TRUE if the coordinates (x,y) are out of
… …
1539 else 1501 else
1540 { 1502 {
1541 retval->distance_x += op2->x - x; 1503 retval->distance_x += op2->x - x;
1542 retval->distance_y += op2->y - y; 1504 retval->distance_y += op2->y - y;
1543 1505
1544 retval->part = NULL; 1506 retval->part = 0;
1545 retval->distance = idistance (retval->distance_x, retval->distance_y); 1507 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1546 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1508 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1547 } 1509 }
1548} 1510}
1549 1511
1550/* Returns true of op1 and op2 are effectively on the same map 1512/* Returns true of op1 and op2 are effectively on the same map
… …
1561 int dx, dy; 1523 int dx, dy;
1562 1524
1563 return adjacent_map (op1->map, op2->map, &dx, &dy); 1525 return adjacent_map (op1->map, op2->map, &dx, &dy);
1564} 1526}
1565 1527
1528//-GPL
1529
1566object * 1530object *
1567maptile::insert (object *op, int x, int y, object *originator, int flags) 1531maptile::insert (object *op, int x, int y, object *originator, int flags)
1568{ 1532{
1569 if (!op->flag [FLAG_REMOVED])
1570 op->remove ();
1571
1572 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1533 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1573} 1534}
1574 1535
1575region * 1536region *
1576maptile::region (int x, int y) const 1537maptile::region (int x, int y) const
… …
1584 if (default_region) 1545 if (default_region)
1585 return default_region; 1546 return default_region;
1586 1547
1587 return ::region::default_region (); 1548 return ::region::default_region ();
1588} 1549}
1550
1551//+GPL
1589 1552
1590/* picks a random object from a style map. 1553/* picks a random object from a style map.
1591 */ 1554 */
1592object * 1555object *
1593maptile::pick_random_object (rand_gen &gen) const 1556maptile::pick_random_object (rand_gen &gen) const
… …
1606 if (pick && pick->is_head ()) 1569 if (pick && pick->is_head ())
1607 return pick->head_ (); 1570 return pick->head_ ();
1608 } 1571 }
1609 1572
1610 // instead of crashing in the unlikely(?) case, try to return *something* 1573 // instead of crashing in the unlikely(?) case, try to return *something*
1611 return archetype::find ("bug"); 1574 return archetype::find (shstr_bug);
1612} 1575}
1576
1577//-GPL
1613 1578
1614void 1579void
1615maptile::play_sound (faceidx sound, int x, int y) const 1580maptile::play_sound (faceidx sound, int x, int y) const
1616{ 1581{
1617 if (!sound) 1582 if (!sound)
1618 return; 1583 return;
1619 1584
1585 for_all_players_on_map (pl, this)
1586 if (client *ns = pl->ns)
1587 {
1588 int dx = x - pl->ob->x;
1589 int dy = y - pl->ob->y;
1590
1591 int distance = idistance (dx, dy);
1592
1593 if (distance <= MAX_SOUND_DISTANCE)
1594 ns->play_sound (sound, dx, dy);
1595 }
1596}
1597
1598void
1599maptile::say_msg (const char *msg, int x, int y) const
1600{
1620 for_all_players (pl) 1601 for_all_players (pl)
1621 if (pl->ob->map == this)
1622 if (client *ns = pl->ns) 1602 if (client *ns = pl->ns)
1623 { 1603 {
1624 int dx = x - pl->ob->x; 1604 int dx = x - pl->ob->x;
1625 int dy = y - pl->ob->y; 1605 int dy = y - pl->ob->y;
1626 1606
1627 int distance = idistance (dx, dy); 1607 int distance = idistance (dx, dy);
1628 1608
1629 if (distance <= MAX_SOUND_DISTANCE) 1609 if (distance <= MAX_SOUND_DISTANCE)
1630 ns->play_sound (sound, dx, dy); 1610 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1631 } 1611 }
1632} 1612}
1633 1613
1614dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1615
1616static void
1617split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1618{
1619 // clip to map to the left
1620 if (x0 < 0)
1621 {
1622 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1623 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1624
1625 if (x1 < 0) // entirely to the left
1626 return;
1627
1628 x0 = 0;
1629 }
1630
1631 // clip to map to the right
1632 if (x1 > m->width)
1633 {
1634 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1635 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1636
1637 if (x0 > m->width) // entirely to the right
1638 return;
1639
1640 x1 = m->width;
1641 }
1642
1643 // clip to map above
1644 if (y0 < 0)
1645 {
1646 if (maptile *tile = m->tile_available (TILE_UP, 1))
1647 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1648
1649 if (y1 < 0) // entirely above
1650 return;
1651
1652 y0 = 0;
1653 }
1654
1655 // clip to map below
1656 if (y1 > m->height)
1657 {
1658 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1659 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1660
1661 if (y0 > m->height) // entirely below
1662 return;
1663
1664 y1 = m->height;
1665 }
1666
1667 // if we get here, the rect is within the current map
1668 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1669
1670 r->m = m;
1671 r->x0 = x0;
1672 r->y0 = y0;
1673 r->x1 = x1;
1674 r->y1 = y1;
1675 r->dx = dx;
1676 r->dy = dy;
1677}
1678
1679maprect *
1680maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1681{
1682 buf.clear ();
1683
1684 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1685
1686 // add end marker
1687 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1688 r->m = 0;
1689
1690 return (maprect *)buf.linearise ();
1691}
1692

Diff Legend

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