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.129 by root, Wed Sep 12 11:10:09 2007 UTC vs.
Revision 1.174 by root, Tue Nov 10 05:05:22 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT 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 <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <unistd.h> 25#include <unistd.h>
25 26
26#include "global.h" 27#include "global.h"
27#include "funcpoint.h"
28
29#include "loader.h" 28#include "loader.h"
30
31#include "path.h" 29#include "path.h"
30
31//+GPL
32
33sint8 maptile::outdoor_darkness;
32 34
33/* This rolls up wall, blocks_magic, blocks_view, etc, all into 35/* This rolls up wall, blocks_magic, blocks_view, etc, all into
34 * one function that just returns a P_.. value (see map.h) 36 * one function that just returns a P_.. value (see map.h)
35 * it will also do map translation for tiled maps, returning 37 * it will also do map translation for tiled maps, returning
36 * new values into newmap, nx, and ny. Any and all of those 38 * new values into newmap, nx, and ny. Any and all of those
71 * by the caller. 73 * by the caller.
72 */ 74 */
73int 75int
74blocked_link (object *ob, maptile *m, int sx, int sy) 76blocked_link (object *ob, maptile *m, int sx, int sy)
75{ 77{
76 object *tmp;
77 int mflags, blocked;
78
79 /* Make sure the coordinates are valid - they should be, as caller should 78 /* Make sure the coordinates are valid - they should be, as caller should
80 * have already checked this. 79 * have already checked this.
81 */ 80 */
82 if (OUT_OF_REAL_MAP (m, sx, sy)) 81 if (OUT_OF_REAL_MAP (m, sx, sy))
83 { 82 {
84 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 83 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");
85 return 1; 84 return 1;
86 } 85 }
87 86
88 /* Save some cycles - instead of calling get_map_flags(), just get the value 87 mapspace &ms = m->at (sx, sy);
89 * directly.
90 */
91 mflags = m->at (sx, sy).flags ();
92 88
93 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 89 int mflags = ms.flags ();
90 int blocked = ms.move_block;
94 91
95 /* If space is currently not blocked by anything, no need to 92 /* If space is currently not blocked by anything, no need to
96 * go further. Not true for players - all sorts of special 93 * go further. Not true for players - all sorts of special
97 * things we need to do for players. 94 * things we need to do for players.
98 */ 95 */
99 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 96 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
100 return 0; 97 return 0;
101 98
102 /* if there isn't anytyhing alive on this space, and this space isn't 99 /* if there isn't anything alive on this space, and this space isn't
103 * otherwise blocked, we can return now. Only if there is a living 100 * otherwise blocked, we can return now. Only if there is a living
104 * creature do we need to investigate if it is part of this creature 101 * creature do we need to investigate if it is part of this creature
105 * or another. Likewise, only if something is blocking us do we 102 * or another. Likewise, only if something is blocking us do we
106 * need to investigate if there is a special circumstance that would 103 * need to investigate if there is a special circumstance that would
107 * let the player through (inventory checkers for example) 104 * let the player through (inventory checkers for example)
114 /* We basically go through the stack of objects, and if there is 111 /* We basically go through the stack of objects, and if there is
115 * some other object that has NO_PASS or FLAG_ALIVE set, return 112 * some other object that has NO_PASS or FLAG_ALIVE set, return
116 * true. If we get through the entire stack, that must mean 113 * true. If we get through the entire stack, that must mean
117 * ob is blocking it, so return 0. 114 * ob is blocking it, so return 0.
118 */ 115 */
119 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 116 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
120 { 117 {
121 118 if (OB_MOVE_BLOCK (ob, tmp))
122 /* This must be before the checks below. Code for inventory checkers. */
123 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
124 { 119 {
125 /* If last_sp is set, the player/monster needs an object, 120 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
126 * so we check for it. If they don't have it, they can't 121 if (RESULT_INT (0))
127 * pass through this space. 122 return 1;
128 */ 123 else
129 if (tmp->last_sp) 124 continue;
125
126 if (tmp->type == CHECK_INV)
130 { 127 {
131 if (check_inv_recursive (ob, tmp) == NULL) 128 bool have = check_inv_recursive (ob, tmp);
129
130 // last_sp set means we block if we don't have.
131 if (logical_xor (have, tmp->last_sp))
132 return 1; 132 return 1;
133 else 133 }
134 continue; 134 else if (tmp->type == T_MATCH)
135 {
136 // T_MATCH allows "entrance" iff the match is true
137 // == blocks if the match fails
138
139 // we could have used an INVOKE_OBJECT, but decided against it, as we
140 // assume that T_MATCH is relatively common.
141 if (!match (tmp->slaying, ob, tmp, ob))
142 return 1;
135 } 143 }
136 else 144 else
137 { 145 return 1; // unconditional block
138 /* In this case, the player must not have the object - 146
139 * if they do, they can't pass through.
140 */
141 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
142 return 1;
143 else
144 continue;
145 }
146 } /* if check_inv */
147 else 147 } else {
148 { 148 // space does not block the ob, directly, but
149 /* Broke apart a big nasty if into several here to make 149 // anything alive that is not a door still
150 * this more readable. first check - if the space blocks 150 // blocks anything but wizards.
151 * movement, can't move here.
152 * second - if a monster, can't move there, unless it is a
153 * hidden dm
154 */
155 if (OB_MOVE_BLOCK (ob, tmp))
156 return 1;
157 151
158 if (tmp->flag [FLAG_ALIVE] 152 if (tmp->flag [FLAG_ALIVE]
159 && tmp->head_ () != ob 153 && tmp->head_ () != ob
160 && tmp != ob 154 && tmp != ob
161 && tmp->type != DOOR 155 && tmp->type != DOOR
162 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden)) 156 && !tmp->flag [FLAG_WIZPASS])
163 return 1; 157 return 1;
164 } 158 }
165
166 } 159 }
160
167 return 0; 161 return 0;
168} 162}
169 163
170/* 164/*
171 * Returns qthe blocking object if the given object can't fit in the given 165 * Returns qthe blocking object if the given object can't fit in the given
224 218
225 return 0; 219 return 0;
226} 220}
227 221
228/* When the map is loaded, load_object does not actually insert objects 222/* When the map is loaded, load_object does not actually insert objects
229 * into inventory, but just links them. What this does is go through 223 * into inventory, but just links them. What this does is go through
230 * and insert them properly. 224 * and insert them properly.
231 * The object 'container' is the object that contains the inventory. 225 * The object 'container' is the object that contains the inventory.
232 * This is needed so that we can update the containers weight. 226 * This is needed so that we can update the containers weight.
233 */ 227 */
234void 228static void
235fix_container (object *container) 229fix_container (object *container)
236{ 230{
237 object *tmp = container->inv, *next; 231 object *tmp = container->inv, *next;
238 232
239 container->inv = 0; 233 container->inv = 0;
245 239
246 insert_ob_in_ob (tmp, container); 240 insert_ob_in_ob (tmp, container);
247 tmp = next; 241 tmp = next;
248 } 242 }
249 243
250 /* sum_weight will go through and calculate what all the containers are 244 // go through and calculate what all the containers are carrying.
251 * carrying. 245 //TODO: remove
252 */ 246 container->update_weight ();
253 sum_weight (container);
254} 247}
248
249//-GPL
255 250
256void 251void
257maptile::set_object_flag (int flag, int value) 252maptile::set_object_flag (int flag, int value)
258{ 253{
259 if (!spaces) 254 if (!spaces)
261 256
262 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 257 for (mapspace *ms = spaces + size (); ms-- > spaces; )
263 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 258 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
264 tmp->flag [flag] = value; 259 tmp->flag [flag] = value;
265} 260}
261
262void
263maptile::post_load_original ()
264{
265 if (!spaces)
266 return;
267
268 set_object_flag (FLAG_OBJ_ORIGINAL);
269
270 for (mapspace *ms = spaces + size (); ms-- > spaces; )
271 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
272 INVOKE_OBJECT (RESET, tmp);
273}
274
275//+GPL
266 276
267/* link_multipart_objects go through all the objects on the map looking 277/* link_multipart_objects go through all the objects on the map looking
268 * for objects whose arch says they are multipart yet according to the 278 * for objects whose arch says they are multipart yet according to the
269 * info we have, they only have the head (as would be expected when 279 * info we have, they only have the head (as would be expected when
270 * they are saved). 280 * they are saved).
298 op = op->above; 308 op = op->above;
299 } 309 }
300 } 310 }
301} 311}
302 312
313//-GPL
314
303/* 315/*
304 * Loads (ands parses) the objects into a given map from the specified 316 * Loads (ands parses) the objects into a given map from the specified
305 * file pointer. 317 * file pointer.
306 */ 318 */
307bool 319bool
308maptile::_load_objects (object_thawer &f) 320maptile::_load_objects (object_thawer &f)
309{ 321{
310 for (;;) 322 for (;;)
311 { 323 {
312 coroapi::cede_to_tick_every (100); // cede once in a while 324 coroapi::cede_to_tick (); // cede once in a while
313 325
314 switch (f.kw) 326 switch (f.kw)
315 { 327 {
316 case KW_arch: 328 case KW_arch:
317 if (object *op = object::read (f, this)) 329 if (object *op = object::read (f, this))
318 { 330 {
331 // TODO: why?
319 if (op->inv) 332 if (op->inv)
320 sum_weight (op); 333 op->update_weight ();
321 334
322 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 335 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
336 {
337 // we insert manually because
338 // a) its way faster
339 // b) we remove manually, too, and there are good reasons for that
340 // c) it's correct
341 mapspace &ms = at (op->x, op->y);
342
343 op->flag [FLAG_REMOVED] = false;
344
345 op->above = 0;
346 op->below = ms.top;
347
348 *(ms.top ? &ms.top->above : &ms.bot) = op;
349
350 ms.top = op;
351 ms.flags_ = 0;
352 }
353 else
354 {
355 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
356 op->destroy ();
357 }
323 } 358 }
324 359
325 continue; 360 continue;
326 361
327 case KW_EOF: 362 case KW_EOF:
413 * map archetype. Mimic that behaviour. 448 * map archetype. Mimic that behaviour.
414 */ 449 */
415 width = 16; 450 width = 16;
416 height = 16; 451 height = 16;
417 timeout = 300; 452 timeout = 300;
418 max_nrof = 1000; // 1000 items of anything 453 max_items = MAX_ITEM_PER_ACTION;
419 max_volume = 2000000; // 2m³ 454 max_volume = 2000000; // 2m³
420} 455}
421 456
422maptile::maptile (int w, int h) 457maptile::maptile (int w, int h)
423{ 458{
444 if (spaces) 479 if (spaces)
445 return; 480 return;
446 481
447 spaces = salloc0<mapspace> (size ()); 482 spaces = salloc0<mapspace> (size ());
448} 483}
484
485//+GPL
449 486
450/* Takes a string from a map definition and outputs a pointer to the array of shopitems 487/* Takes a string from a map definition and outputs a pointer to the array of shopitems
451 * corresponding to that string. Memory is allocated for this, it must be freed 488 * corresponding to that string. Memory is allocated for this, it must be freed
452 * at a later date. 489 * at a later date.
453 * Called by parse_map_headers below. 490 * Called by parse_map_headers below.
530 return items; 567 return items;
531} 568}
532 569
533/* opposite of parse string, this puts the string that was originally fed in to 570/* opposite of parse string, this puts the string that was originally fed in to
534 * the map (or something equivilent) into output_string. */ 571 * the map (or something equivilent) into output_string. */
535static void 572static const char *
536print_shop_string (maptile *m, char *output_string) 573print_shop_string (maptile *m)
537{ 574{
538 int i; 575 static dynbuf_text buf; buf.clear ();
539 char tmp[MAX_BUF];
540 576
541 strcpy (output_string, "");
542 for (i = 0; i < m->shopitems[0].index; i++) 577 for (int i = 0; i < m->shopitems[0].index; i++)
543 { 578 {
544 if (m->shopitems[i].typenum) 579 if (m->shopitems[i].typenum)
545 { 580 {
546 if (m->shopitems[i].strength) 581 if (m->shopitems[i].strength)
547 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 582 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
548 else 583 else
549 sprintf (tmp, "%s;", m->shopitems[i].name); 584 buf.printf ("%s;", m->shopitems[i].name);
550 } 585 }
551 else 586 else
552 { 587 {
553 if (m->shopitems[i].strength) 588 if (m->shopitems[i].strength)
554 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 589 buf.printf ("*:%d;", m->shopitems[i].strength);
555 else 590 else
556 sprintf (tmp, "*"); 591 buf.printf ("*");
557 } 592 }
558
559 strcat (output_string, tmp);
560 } 593 }
594
595 return buf;
561} 596}
597
598//-GPL
562 599
563/* This loads the header information of the map. The header 600/* This loads the header information of the map. The header
564 * contains things like difficulty, size, timeout, etc. 601 * contains things like difficulty, size, timeout, etc.
565 * this used to be stored in the map object, but with the 602 * this used to be stored in the map object, but with the
566 * addition of tiling, fields beyond that easily named in an 603 * addition of tiling, fields beyond that easily named in an
617 case KW_sky: thawer.get (sky); break; 654 case KW_sky: thawer.get (sky); break;
618 655
619 case KW_per_player: thawer.get (per_player); break; 656 case KW_per_player: thawer.get (per_player); break;
620 case KW_per_party: thawer.get (per_party); break; 657 case KW_per_party: thawer.get (per_party); break;
621 case KW_no_reset: thawer.get (no_reset); break; 658 case KW_no_reset: thawer.get (no_reset); break;
659 case KW_no_drop: thawer.get (no_drop); break;
622 660
623 case KW_region: default_region = region::find (thawer.get_str ()); break; 661 case KW_region: default_region = region::find (thawer.get_str ()); break;
624 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 662 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
625 663
626 // old names new names 664 // old names new names
657 } 695 }
658 696
659 abort (); 697 abort ();
660} 698}
661 699
700//+GPL
701
662/****************************************************************************** 702/******************************************************************************
663 * This is the start of unique map handling code 703 * This is the start of unique map handling code
664 *****************************************************************************/ 704 *****************************************************************************/
665 705
666/* This goes through the maptile and removed any unique items on the map. */ 706/* This goes through the maptile and removed any unique items on the map. */
676 716
677 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 717 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
678 unique = 1; 718 unique = 1;
679 719
680 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 720 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
681 {
682 op->destroy_inv (false);
683 op->destroy (); 721 op->destroy ();
684 }
685 722
686 op = above; 723 op = above;
687 } 724 }
688 } 725 }
689} 726}
727
728//-GPL
690 729
691bool 730bool
692maptile::_save_header (object_freezer &freezer) 731maptile::_save_header (object_freezer &freezer)
693{ 732{
694#define MAP_OUT(k) freezer.put (KW_ ## k, k) 733#define MAP_OUT(k) freezer.put (KW_ ## k, k)
700 MAP_OUT (swap_time); 739 MAP_OUT (swap_time);
701 MAP_OUT (reset_time); 740 MAP_OUT (reset_time);
702 MAP_OUT (reset_timeout); 741 MAP_OUT (reset_timeout);
703 MAP_OUT (fixed_resettime); 742 MAP_OUT (fixed_resettime);
704 MAP_OUT (no_reset); 743 MAP_OUT (no_reset);
744 MAP_OUT (no_drop);
705 MAP_OUT (difficulty); 745 MAP_OUT (difficulty);
706
707 if (default_region) MAP_OUT2 (region, default_region->name); 746 if (default_region) MAP_OUT2 (region, default_region->name);
708 747
709 if (shopitems) 748 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
710 {
711 char shop[MAX_BUF];
712 print_shop_string (this, shop);
713 MAP_OUT2 (shopitems, shop);
714 }
715
716 MAP_OUT (shopgreed); 749 MAP_OUT (shopgreed);
717 MAP_OUT (shopmin); 750 MAP_OUT (shopmin);
718 MAP_OUT (shopmax); 751 MAP_OUT (shopmax);
719 if (shoprace) MAP_OUT (shoprace); 752 if (shoprace) MAP_OUT (shoprace);
753
720 MAP_OUT (darkness); 754 MAP_OUT (darkness);
721 MAP_OUT (width); 755 MAP_OUT (width);
722 MAP_OUT (height); 756 MAP_OUT (height);
723 MAP_OUT (enter_x); 757 MAP_OUT (enter_x);
724 MAP_OUT (enter_y); 758 MAP_OUT (enter_y);
757 return false; 791 return false;
758 792
759 return freezer.save (path); 793 return freezer.save (path);
760} 794}
761 795
796//+GPL
797
762/* 798/*
763 * Remove and free all objects in the given map. 799 * Remove and free all objects in the given map.
764 */ 800 */
765void 801void
766maptile::clear () 802maptile::clear ()
776 812
777 op->flag [FLAG_REMOVED] = true; 813 op->flag [FLAG_REMOVED] = true;
778 814
779 object *head = op->head_ (); 815 object *head = op->head_ ();
780 if (op == head) 816 if (op == head)
781 {
782 op->destroy_inv (false);
783 op->destroy (); 817 op->destroy ();
784 }
785 else if (head->map != op->map) 818 else if (head->map != op->map)
786 { 819 {
787 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ()); 820 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
788 head->destroy (); 821 head->destroy ();
789 } 822 }
790 } 823 }
791 824
792 sfree (spaces, size ()), spaces = 0; 825 sfree0 (spaces, size ());
793 } 826 }
794 827
795 if (buttons) 828 if (buttons)
796 free_objectlinkpt (buttons), buttons = 0; 829 free_objectlinkpt (buttons), buttons = 0;
797 830
798 sfree (regions, size ()); regions = 0; 831 sfree0 (regions, size ());
799 delete [] regionmap; regionmap = 0; 832 delete [] regionmap; regionmap = 0;
800} 833}
801 834
802void 835void
803maptile::clear_header () 836maptile::clear_header ()
904 op->destroy (); 937 op->destroy ();
905 } 938 }
906} 939}
907 940
908/* 941/*
909 * Updates every button on the map (by calling update_button() for them).
910 */
911void
912maptile::update_buttons ()
913{
914 for (oblinkpt *obp = buttons; obp; obp = obp->next)
915 for (objectlink *ol = obp->link; ol; ol = ol->next)
916 {
917 if (!ol->ob)
918 {
919 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
920 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
921 continue;
922 }
923
924 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
925 {
926 update_button (ol->ob);
927 break;
928 }
929 }
930}
931
932/*
933 * This routine is supposed to find out the difficulty of the map. 942 * This routine is supposed to find out the difficulty of the map.
934 * difficulty does not have a lot to do with character level, 943 * difficulty does not have a lot to do with character level,
935 * but does have a lot to do with treasure on the map. 944 * but does have a lot to do with treasure on the map.
936 * 945 *
937 * Difficulty can now be set by the map creature. If the value stored 946 * Difficulty can now be set by the map creator. If the value stored
938 * in the map is zero, then use this routine. Maps should really 947 * in the map is zero, then use this routine. Maps should really
939 * have a difficulty set than using this function - human calculation 948 * have a difficulty set rather than using this function - human calculation
940 * is much better than this functions guesswork. 949 * is much better than this function's guesswork.
941 */ 950 */
942int 951int
943maptile::estimate_difficulty () const 952maptile::estimate_difficulty () const
944{ 953{
945 long monster_cnt = 0; 954 long monster_cnt = 0;
957 966
958 if (QUERY_FLAG (op, FLAG_GENERATOR)) 967 if (QUERY_FLAG (op, FLAG_GENERATOR))
959 { 968 {
960 total_exp += op->stats.exp; 969 total_exp += op->stats.exp;
961 970
962 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 971 if (archetype *at = op->other_arch)
972 {
963 total_exp += at->stats.exp * 8; 973 total_exp += at->stats.exp * 8;
964
965 monster_cnt++; 974 monster_cnt++;
975 }
976
977 for (object *inv = op->inv; inv; inv = inv->below)
978 {
979 total_exp += op->stats.exp * 8;
980 monster_cnt++;
981 }
966 } 982 }
967 } 983 }
968 984
969 avgexp = (double) total_exp / monster_cnt; 985 avgexp = (double) total_exp / monster_cnt;
970 986
983 * postive values make it darker, negative make it brighter 999 * postive values make it darker, negative make it brighter
984 */ 1000 */
985int 1001int
986maptile::change_map_light (int change) 1002maptile::change_map_light (int change)
987{ 1003{
988 int new_level = darkness + change;
989
990 /* Nothing to do */ 1004 /* Nothing to do */
991 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 1005 if (!change)
992 return 0; 1006 return 0;
993 1007
994 /* inform all players on the map */ 1008 /* inform all players on the map */
995 if (change > 0) 1009 if (change > 0)
996 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1010 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
997 else 1011 else
998 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1012 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
999 1013
1000 /* Do extra checking. since darkness is a unsigned value, 1014 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1001 * we need to be extra careful about negative values.
1002 * In general, the checks below are only needed if change
1003 * is not +/-1
1004 */
1005 if (new_level < 0)
1006 darkness = 0;
1007 else if (new_level >= MAX_DARKNESS)
1008 darkness = MAX_DARKNESS;
1009 else
1010 darkness = new_level;
1011 1015
1012 /* All clients need to get re-updated for the change */ 1016 /* All clients need to get re-updated for the change */
1013 update_all_map_los (this); 1017 update_all_map_los (this);
1018
1014 return 1; 1019 return 1;
1015} 1020}
1016 1021
1017/* 1022/*
1018 * This function updates various attributes about a specific space 1023 * This function updates various attributes about a specific space
1021 * through, etc) 1026 * through, etc)
1022 */ 1027 */
1023void 1028void
1024mapspace::update_ () 1029mapspace::update_ ()
1025{ 1030{
1026 object *tmp, *last = 0; 1031 object *last = 0;
1027 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1032 uint8 flags = P_UPTODATE;
1033 sint8 light = 0;
1028 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1034 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1035 uint64_t volume = 0;
1036 uint32_t items = 0;
1037 object *anywhere = 0;
1038 uint8_t middle_visibility = 0;
1029 1039
1030 //object *middle = 0; 1040 //object *middle = 0;
1031 //object *top = 0; 1041 //object *top = 0;
1032 //object *floor = 0; 1042 //object *floor = 0;
1033 // this seems to generate better code than using locals, above 1043 // this seems to generate better code than using locals, above
1034 object *&top = faces_obj[0] = 0; 1044 object *&top = faces_obj[0] = 0;
1035 object *&middle = faces_obj[1] = 0; 1045 object *&middle = faces_obj[1] = 0;
1036 object *&floor = faces_obj[2] = 0; 1046 object *&floor = faces_obj[2] = 0;
1037 1047
1048 object::flags_t allflags; // all flags of all objects or'ed together
1049
1038 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1050 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1039 { 1051 {
1040 /* This could be made additive I guess (two lights better than 1052 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1041 * one). But if so, it shouldn't be a simple additive - 2
1042 * light bulbs do not illuminate twice as far as once since
1043 * it is a dissapation factor that is cubed.
1044 */
1045 if (tmp->glow_radius > light)
1046 light = tmp->glow_radius; 1053 light += tmp->glow_radius;
1047 1054
1048 /* This call is needed in order to update objects the player 1055 /* This call is needed in order to update objects the player
1049 * is standing in that have animations (ie, grass, fire, etc). 1056 * is standing in that have animations (ie, grass, fire, etc).
1050 * However, it also causes the look window to be re-drawn 1057 * However, it also causes the look window to be re-drawn
1051 * 3 times each time the player moves, because many of the 1058 * 3 times each time the player moves, because many of the
1052 * functions the move_player calls eventualy call this. 1059 * functions the move_player calls eventualy call this.
1053 * 1060 *
1054 * Always put the player down for drawing. 1061 * Always put the player down for drawing.
1055 */ 1062 */
1056 if (!tmp->invisible) 1063 if (expect_true (!tmp->invisible))
1057 { 1064 {
1058 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1065 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1059 top = tmp; 1066 top = tmp;
1060 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1067 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1061 { 1068 {
1062 /* If we got a floor, that means middle and top were below it, 1069 /* If we got a floor, that means middle and top were below it,
1063 * so should not be visible, so we clear them. 1070 * so should not be visible, so we clear them.
1064 */ 1071 */
1065 middle = 0; 1072 middle = 0;
1066 top = 0; 1073 top = 0;
1067 floor = tmp; 1074 floor = tmp;
1075 volume = 0;
1076 items = 0;
1068 } 1077 }
1069 /* Flag anywhere have high priority */ 1078 else
1070 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1071 { 1079 {
1080 if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1081 {
1082 ++items;
1083 volume += tmp->volume ();
1084 }
1085
1086 /* Flag anywhere have high priority */
1087 if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1088 anywhere = tmp;
1089
1090 /* Find the highest visible face around. If equal
1091 * visibilities, we still want the one nearer to the
1092 * top
1093 */
1094 if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
1095 {
1096 middle_visibility = ::faces [tmp->face].visibility;
1072 middle = tmp; 1097 middle = tmp;
1073 anywhere = 1; 1098 }
1074 } 1099 }
1075 /* Find the highest visible face around. If equal
1076 * visibilities, we still want the one nearer to the
1077 * top
1078 */
1079 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1080 middle = tmp;
1081 }
1082
1083 if (tmp == tmp->above)
1084 {
1085 LOG (llevError, "Error in structure of map\n");
1086 exit (-1);
1087 } 1100 }
1088 1101
1089 move_slow |= tmp->move_slow; 1102 move_slow |= tmp->move_slow;
1090 move_block |= tmp->move_block; 1103 move_block |= tmp->move_block;
1091 move_on |= tmp->move_on; 1104 move_on |= tmp->move_on;
1092 move_off |= tmp->move_off; 1105 move_off |= tmp->move_off;
1093 move_allow |= tmp->move_allow; 1106 move_allow |= tmp->move_allow;
1094 1107
1095 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1108 allflags |= tmp->flag;
1096 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1109
1097 if (tmp->type == PLAYER) flags |= P_PLAYER; 1110 if (tmp->type == PLAYER) flags |= P_PLAYER;
1098 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1111 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1099 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1100 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1101 } 1112 }
1102 1113
1103 this->light = light; 1114 // FLAG_SEE_ANYWHERE takes precedence
1115 if (anywhere)
1116 middle = anywhere;
1117
1118 // ORing all flags together and checking them here is much faster
1119 if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
1120 if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
1121 if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
1122 if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
1123
1124 this->light = min (light, MAX_LIGHT_RADIUS);
1104 this->flags_ = flags; 1125 this->flags_ = flags;
1105 this->move_block = move_block & ~move_allow; 1126 this->move_block = move_block & ~move_allow;
1106 this->move_on = move_on; 1127 this->move_on = move_on;
1107 this->move_off = move_off; 1128 this->move_off = move_off;
1108 this->move_slow = move_slow; 1129 this->move_slow = move_slow;
1130 this->volume_ = (volume + 1023) / 1024;
1131 this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1109 1132
1110 /* At this point, we have a floor face (if there is a floor), 1133 /* At this point, we have a floor face (if there is a floor),
1111 * and the floor is set - we are not going to touch it at 1134 * and the floor is set - we are not going to touch it at
1112 * this point. 1135 * this point.
1113 * middle contains the highest visibility face. 1136 * middle contains the highest visibility face.
1128 * 1) top face is set, need middle to be set. 1151 * 1) top face is set, need middle to be set.
1129 * 2) middle is set, need to set top. 1152 * 2) middle is set, need to set top.
1130 * 3) neither middle or top is set - need to set both. 1153 * 3) neither middle or top is set - need to set both.
1131 */ 1154 */
1132 1155
1133 for (tmp = last; tmp; tmp = tmp->below) 1156 for (object *tmp = last; tmp; tmp = tmp->below)
1134 { 1157 {
1135 /* Once we get to a floor, stop, since we already have a floor object */ 1158 /* Once we get to a floor, stop, since we already have a floor object */
1136 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1159 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1137 break; 1160 break;
1138 1161
1179 faces_obj [1] = middle; 1202 faces_obj [1] = middle;
1180 faces_obj [2] = floor; 1203 faces_obj [2] = floor;
1181#endif 1204#endif
1182} 1205}
1183 1206
1184uint64 1207maptile *
1185mapspace::volume () const
1186{
1187 uint64 vol = 0;
1188
1189 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1190 vol += op->volume ();
1191
1192 return vol;
1193}
1194
1195bool
1196maptile::tile_available (int dir, bool load) 1208maptile::tile_available (int dir, bool load)
1197{ 1209{
1198 if (!tile_path[dir]) 1210 if (tile_path[dir])
1199 return 0; 1211 {
1200
1201 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY)) 1212 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1202 return 1; 1213 return tile_map[dir];
1203 1214
1204 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1215 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1205 return 1; 1216 return tile_map[dir];
1217 }
1206 1218
1207 return 0; 1219 return 0;
1208} 1220}
1209 1221
1210/* this returns TRUE if the coordinates (x,y) are out of 1222/* this returns TRUE if the coordinates (x,y) are out of
1516 else 1528 else
1517 { 1529 {
1518 retval->distance_x += op2->x - x; 1530 retval->distance_x += op2->x - x;
1519 retval->distance_y += op2->y - y; 1531 retval->distance_y += op2->y - y;
1520 1532
1521 retval->part = NULL; 1533 retval->part = 0;
1522 retval->distance = idistance (retval->distance_x, retval->distance_y); 1534 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1523 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1535 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1524 } 1536 }
1525} 1537}
1526 1538
1527/* Returns true of op1 and op2 are effectively on the same map 1539/* Returns true of op1 and op2 are effectively on the same map
1538 int dx, dy; 1550 int dx, dy;
1539 1551
1540 return adjacent_map (op1->map, op2->map, &dx, &dy); 1552 return adjacent_map (op1->map, op2->map, &dx, &dy);
1541} 1553}
1542 1554
1555//-GPL
1556
1543object * 1557object *
1544maptile::insert (object *op, int x, int y, object *originator, int flags) 1558maptile::insert (object *op, int x, int y, object *originator, int flags)
1545{ 1559{
1546 if (!op->flag [FLAG_REMOVED])
1547 op->remove ();
1548
1549 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1560 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1550} 1561}
1551 1562
1552region * 1563region *
1553maptile::region (int x, int y) const 1564maptile::region (int x, int y) const
1562 return default_region; 1573 return default_region;
1563 1574
1564 return ::region::default_region (); 1575 return ::region::default_region ();
1565} 1576}
1566 1577
1578//+GPL
1579
1567/* picks a random object from a style map. 1580/* picks a random object from a style map.
1568 * Redone by MSW so it should be faster and not use static
1569 * variables to generate tables.
1570 */ 1581 */
1571object * 1582object *
1572maptile::pick_random_object () const 1583maptile::pick_random_object (rand_gen &gen) const
1573{ 1584{
1574 /* while returning a null object will result in a crash, that 1585 /* while returning a null object will result in a crash, that
1575 * is actually preferable to an infinite loop. That is because 1586 * is actually preferable to an infinite loop. That is because
1576 * most servers will automatically restart in case of crash. 1587 * most servers will automatically restart in case of crash.
1577 * Change the logic on getting the random space - shouldn't make 1588 * Change the logic on getting the random space - shouldn't make
1578 * any difference, but this seems clearer to me. 1589 * any difference, but this seems clearer to me.
1579 */ 1590 */
1580 for (int i = 1000; --i;) 1591 for (int i = 1000; --i;)
1581 { 1592 {
1582 object *pick = at (rndm (width), rndm (height)).bot; 1593 object *pick = at (gen (width), gen (height)).bot;
1583 1594
1584 // do not prefer big monsters just because they are big. 1595 // do not prefer big monsters just because they are big.
1585 if (pick && pick->head_ () == pick) 1596 if (pick && pick->is_head ())
1586 return pick->head_ (); 1597 return pick->head_ ();
1587 } 1598 }
1588 1599
1589 // instead of crashing in the unlikely(?) case, try to return *something* 1600 // instead of crashing in the unlikely(?) case, try to return *something*
1590 return get_archetype ("blocked"); 1601 return archetype::find (shstr_bug);
1591} 1602}
1603
1604//-GPL
1592 1605
1593void 1606void
1594maptile::play_sound (faceidx sound, int x, int y) const 1607maptile::play_sound (faceidx sound, int x, int y) const
1595{ 1608{
1596 if (!sound) 1609 if (!sound)
1597 return; 1610 return;
1598 1611
1612 for_all_players_on_map (pl, this)
1613 if (client *ns = pl->ns)
1614 {
1615 int dx = x - pl->ob->x;
1616 int dy = y - pl->ob->y;
1617
1618 int distance = idistance (dx, dy);
1619
1620 if (distance <= MAX_SOUND_DISTANCE)
1621 ns->play_sound (sound, dx, dy);
1622 }
1623}
1624
1625void
1626maptile::say_msg (const char *msg, int x, int y) const
1627{
1599 for_all_players (pl) 1628 for_all_players (pl)
1600 if (pl->observe->map == this)
1601 if (client *ns = pl->ns) 1629 if (client *ns = pl->ns)
1602 { 1630 {
1603 int dx = x - pl->observe->x; 1631 int dx = x - pl->ob->x;
1604 int dy = y - pl->observe->y; 1632 int dy = y - pl->ob->y;
1605 1633
1606 int distance = idistance (dx, dy); 1634 int distance = idistance (dx, dy);
1607 1635
1608 if (distance <= MAX_SOUND_DISTANCE) 1636 if (distance <= MAX_SOUND_DISTANCE)
1609 ns->play_sound (sound, dx, dy); 1637 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1610 } 1638 }
1611} 1639}
1612 1640
1641static void
1642split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1643{
1644 // clip to map to the left
1645 if (x0 < 0)
1646 {
1647 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1648 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1649
1650 if (x1 < 0) // entirely to the left
1651 return;
1652
1653 x0 = 0;
1654 }
1655
1656 // clip to map to the right
1657 if (x1 > m->width)
1658 {
1659 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1660 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1661
1662 if (x0 > m->width) // entirely to the right
1663 return;
1664
1665 x1 = m->width;
1666 }
1667
1668 // clip to map above
1669 if (y0 < 0)
1670 {
1671 if (maptile *tile = m->tile_available (TILE_UP, 1))
1672 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1673
1674 if (y1 < 0) // entirely above
1675 return;
1676
1677 y0 = 0;
1678 }
1679
1680 // clip to map below
1681 if (y1 > m->height)
1682 {
1683 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1684 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1685
1686 if (y0 > m->height) // entirely below
1687 return;
1688
1689 y1 = m->height;
1690 }
1691
1692 // if we get here, the rect is within the current map
1693 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1694
1695 r->m = m;
1696 r->x0 = x0;
1697 r->y0 = y0;
1698 r->x1 = x1;
1699 r->y1 = y1;
1700 r->dx = dx;
1701 r->dy = dy;
1702}
1703
1704maprect *
1705maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1706{
1707 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1708 buf.clear ();
1709
1710 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1711
1712 // add end marker
1713 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1714 r->m = 0;
1715
1716 return (maprect *)buf.linearise ();
1717}
1718

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines