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.130 by root, Sun Sep 30 20:22:14 2007 UTC vs.
Revision 1.172 by root, Sun Nov 8 20:55:39 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
… …
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 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) 335 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
323 { 336 {
324 // we insert manually because 337 // we insert manually because
325 // a) its way faster 338 // a) its way faster
326 // b) we remove manually, too, and there are good reasons for that 339 // b) we remove manually, too, and there are good reasons for that
327 // c) its correct 340 // c) it's correct
328 mapspace &ms = at (op->x, op->y); 341 mapspace &ms = at (op->x, op->y);
329 342
330 op->flag [FLAG_REMOVED] = false; 343 op->flag [FLAG_REMOVED] = false;
331 344
332 op->above = 0; 345 op->above = 0;
333 op->below = ms.top; 346 op->below = ms.top;
334 347
335 if (ms.top)
336 ms.top->above = op; 348 *(ms.top ? &ms.top->above : &ms.bot) = op;
337 else
338 ms.bot = op;
339 349
340 ms.top = op; 350 ms.top = op;
341 ms.flags_ = 0; 351 ms.flags_ = 0;
342 } 352 }
343 else 353 else
… …
439 */ 449 */
440 width = 16; 450 width = 16;
441 height = 16; 451 height = 16;
442 timeout = 300; 452 timeout = 300;
443 max_nrof = 1000; // 1000 items of anything 453 max_nrof = 1000; // 1000 items of anything
454 max_items = MAX_ITEM_PER_ACTION;
444 max_volume = 2000000; // 2m³ 455 max_volume = 2000000; // 2m³
445} 456}
446 457
447maptile::maptile (int w, int h) 458maptile::maptile (int w, int h)
448{ 459{
… …
469 if (spaces) 480 if (spaces)
470 return; 481 return;
471 482
472 spaces = salloc0<mapspace> (size ()); 483 spaces = salloc0<mapspace> (size ());
473} 484}
485
486//+GPL
474 487
475/* Takes a string from a map definition and outputs a pointer to the array of shopitems 488/* Takes a string from a map definition and outputs a pointer to the array of shopitems
476 * corresponding to that string. Memory is allocated for this, it must be freed 489 * corresponding to that string. Memory is allocated for this, it must be freed
477 * at a later date. 490 * at a later date.
478 * Called by parse_map_headers below. 491 * Called by parse_map_headers below.
… …
555 return items; 568 return items;
556} 569}
557 570
558/* opposite of parse string, this puts the string that was originally fed in to 571/* opposite of parse string, this puts the string that was originally fed in to
559 * the map (or something equivilent) into output_string. */ 572 * the map (or something equivilent) into output_string. */
560static void 573static const char *
561print_shop_string (maptile *m, char *output_string) 574print_shop_string (maptile *m)
562{ 575{
563 int i; 576 static dynbuf_text buf; buf.clear ();
564 char tmp[MAX_BUF];
565 577
566 strcpy (output_string, "");
567 for (i = 0; i < m->shopitems[0].index; i++) 578 for (int i = 0; i < m->shopitems[0].index; i++)
568 { 579 {
569 if (m->shopitems[i].typenum) 580 if (m->shopitems[i].typenum)
570 { 581 {
571 if (m->shopitems[i].strength) 582 if (m->shopitems[i].strength)
572 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 583 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
573 else 584 else
574 sprintf (tmp, "%s;", m->shopitems[i].name); 585 buf.printf ("%s;", m->shopitems[i].name);
575 } 586 }
576 else 587 else
577 { 588 {
578 if (m->shopitems[i].strength) 589 if (m->shopitems[i].strength)
579 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 590 buf.printf ("*:%d;", m->shopitems[i].strength);
580 else 591 else
581 sprintf (tmp, "*"); 592 buf.printf ("*");
582 } 593 }
583
584 strcat (output_string, tmp);
585 } 594 }
595
596 return buf;
586} 597}
598
599//-GPL
587 600
588/* This loads the header information of the map. The header 601/* This loads the header information of the map. The header
589 * contains things like difficulty, size, timeout, etc. 602 * contains things like difficulty, size, timeout, etc.
590 * this used to be stored in the map object, but with the 603 * this used to be stored in the map object, but with the
591 * addition of tiling, fields beyond that easily named in an 604 * addition of tiling, fields beyond that easily named in an
… …
642 case KW_sky: thawer.get (sky); break; 655 case KW_sky: thawer.get (sky); break;
643 656
644 case KW_per_player: thawer.get (per_player); break; 657 case KW_per_player: thawer.get (per_player); break;
645 case KW_per_party: thawer.get (per_party); break; 658 case KW_per_party: thawer.get (per_party); break;
646 case KW_no_reset: thawer.get (no_reset); break; 659 case KW_no_reset: thawer.get (no_reset); break;
660 case KW_no_drop: thawer.get (no_drop); break;
647 661
648 case KW_region: default_region = region::find (thawer.get_str ()); break; 662 case KW_region: default_region = region::find (thawer.get_str ()); break;
649 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 663 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
650 664
651 // old names new names 665 // old names new names
… …
682 } 696 }
683 697
684 abort (); 698 abort ();
685} 699}
686 700
701//+GPL
702
687/****************************************************************************** 703/******************************************************************************
688 * This is the start of unique map handling code 704 * This is the start of unique map handling code
689 *****************************************************************************/ 705 *****************************************************************************/
690 706
691/* This goes through the maptile and removed any unique items on the map. */ 707/* This goes through the maptile and removed any unique items on the map. */
… …
701 717
702 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 718 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
703 unique = 1; 719 unique = 1;
704 720
705 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 721 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
706 {
707 op->destroy_inv (false);
708 op->destroy (); 722 op->destroy ();
709 }
710 723
711 op = above; 724 op = above;
712 } 725 }
713 } 726 }
714} 727}
728
729//-GPL
715 730
716bool 731bool
717maptile::_save_header (object_freezer &freezer) 732maptile::_save_header (object_freezer &freezer)
718{ 733{
719#define MAP_OUT(k) freezer.put (KW_ ## k, k) 734#define MAP_OUT(k) freezer.put (KW_ ## k, k)
… …
725 MAP_OUT (swap_time); 740 MAP_OUT (swap_time);
726 MAP_OUT (reset_time); 741 MAP_OUT (reset_time);
727 MAP_OUT (reset_timeout); 742 MAP_OUT (reset_timeout);
728 MAP_OUT (fixed_resettime); 743 MAP_OUT (fixed_resettime);
729 MAP_OUT (no_reset); 744 MAP_OUT (no_reset);
745 MAP_OUT (no_drop);
730 MAP_OUT (difficulty); 746 MAP_OUT (difficulty);
731
732 if (default_region) MAP_OUT2 (region, default_region->name); 747 if (default_region) MAP_OUT2 (region, default_region->name);
733 748
734 if (shopitems) 749 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
735 {
736 char shop[MAX_BUF];
737 print_shop_string (this, shop);
738 MAP_OUT2 (shopitems, shop);
739 }
740
741 MAP_OUT (shopgreed); 750 MAP_OUT (shopgreed);
742 MAP_OUT (shopmin); 751 MAP_OUT (shopmin);
743 MAP_OUT (shopmax); 752 MAP_OUT (shopmax);
744 if (shoprace) MAP_OUT (shoprace); 753 if (shoprace) MAP_OUT (shoprace);
754
745 MAP_OUT (darkness); 755 MAP_OUT (darkness);
746 MAP_OUT (width); 756 MAP_OUT (width);
747 MAP_OUT (height); 757 MAP_OUT (height);
748 MAP_OUT (enter_x); 758 MAP_OUT (enter_x);
749 MAP_OUT (enter_y); 759 MAP_OUT (enter_y);
… …
782 return false; 792 return false;
783 793
784 return freezer.save (path); 794 return freezer.save (path);
785} 795}
786 796
797//+GPL
798
787/* 799/*
788 * Remove and free all objects in the given map. 800 * Remove and free all objects in the given map.
789 */ 801 */
790void 802void
791maptile::clear () 803maptile::clear ()
… …
801 813
802 op->flag [FLAG_REMOVED] = true; 814 op->flag [FLAG_REMOVED] = true;
803 815
804 object *head = op->head_ (); 816 object *head = op->head_ ();
805 if (op == head) 817 if (op == head)
806 {
807 op->destroy_inv (false);
808 op->destroy (); 818 op->destroy ();
809 }
810 else if (head->map != op->map) 819 else if (head->map != op->map)
811 { 820 {
812 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ()); 821 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
813 head->destroy (); 822 head->destroy ();
814 } 823 }
815 } 824 }
816 825
817 sfree (spaces, size ()), spaces = 0; 826 sfree0 (spaces, size ());
818 } 827 }
819 828
820 if (buttons) 829 if (buttons)
821 free_objectlinkpt (buttons), buttons = 0; 830 free_objectlinkpt (buttons), buttons = 0;
822 831
823 sfree (regions, size ()); regions = 0; 832 sfree0 (regions, size ());
824 delete [] regionmap; regionmap = 0; 833 delete [] regionmap; regionmap = 0;
825} 834}
826 835
827void 836void
828maptile::clear_header () 837maptile::clear_header ()
… …
929 op->destroy (); 938 op->destroy ();
930 } 939 }
931} 940}
932 941
933/* 942/*
934 * Updates every button on the map (by calling update_button() for them).
935 */
936void
937maptile::update_buttons ()
938{
939 for (oblinkpt *obp = buttons; obp; obp = obp->next)
940 for (objectlink *ol = obp->link; ol; ol = ol->next)
941 {
942 if (!ol->ob)
943 {
944 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
945 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
946 continue;
947 }
948
949 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
950 {
951 update_button (ol->ob);
952 break;
953 }
954 }
955}
956
957/*
958 * This routine is supposed to find out the difficulty of the map. 943 * This routine is supposed to find out the difficulty of the map.
959 * difficulty does not have a lot to do with character level, 944 * difficulty does not have a lot to do with character level,
960 * but does have a lot to do with treasure on the map. 945 * but does have a lot to do with treasure on the map.
961 * 946 *
962 * Difficulty can now be set by the map creature. If the value stored 947 * Difficulty can now be set by the map creator. If the value stored
963 * in the map is zero, then use this routine. Maps should really 948 * in the map is zero, then use this routine. Maps should really
964 * have a difficulty set than using this function - human calculation 949 * have a difficulty set rather than using this function - human calculation
965 * is much better than this functions guesswork. 950 * is much better than this function's guesswork.
966 */ 951 */
967int 952int
968maptile::estimate_difficulty () const 953maptile::estimate_difficulty () const
969{ 954{
970 long monster_cnt = 0; 955 long monster_cnt = 0;
… …
982 967
983 if (QUERY_FLAG (op, FLAG_GENERATOR)) 968 if (QUERY_FLAG (op, FLAG_GENERATOR))
984 { 969 {
985 total_exp += op->stats.exp; 970 total_exp += op->stats.exp;
986 971
987 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 972 if (archetype *at = op->other_arch)
973 {
988 total_exp += at->stats.exp * 8; 974 total_exp += at->stats.exp * 8;
989
990 monster_cnt++; 975 monster_cnt++;
976 }
977
978 for (object *inv = op->inv; inv; inv = inv->below)
979 {
980 total_exp += op->stats.exp * 8;
981 monster_cnt++;
982 }
991 } 983 }
992 } 984 }
993 985
994 avgexp = (double) total_exp / monster_cnt; 986 avgexp = (double) total_exp / monster_cnt;
995 987
… …
1008 * postive values make it darker, negative make it brighter 1000 * postive values make it darker, negative make it brighter
1009 */ 1001 */
1010int 1002int
1011maptile::change_map_light (int change) 1003maptile::change_map_light (int change)
1012{ 1004{
1013 int new_level = darkness + change;
1014
1015 /* Nothing to do */ 1005 /* Nothing to do */
1016 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 1006 if (!change)
1017 return 0; 1007 return 0;
1018 1008
1019 /* inform all players on the map */ 1009 /* inform all players on the map */
1020 if (change > 0) 1010 if (change > 0)
1021 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1011 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1022 else 1012 else
1023 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1013 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1024 1014
1025 /* Do extra checking. since darkness is a unsigned value, 1015 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1026 * we need to be extra careful about negative values.
1027 * In general, the checks below are only needed if change
1028 * is not +/-1
1029 */
1030 if (new_level < 0)
1031 darkness = 0;
1032 else if (new_level >= MAX_DARKNESS)
1033 darkness = MAX_DARKNESS;
1034 else
1035 darkness = new_level;
1036 1016
1037 /* All clients need to get re-updated for the change */ 1017 /* All clients need to get re-updated for the change */
1038 update_all_map_los (this); 1018 update_all_map_los (this);
1019
1039 return 1; 1020 return 1;
1040} 1021}
1041 1022
1042/* 1023/*
1043 * This function updates various attributes about a specific space 1024 * This function updates various attributes about a specific space
… …
1046 * through, etc) 1027 * through, etc)
1047 */ 1028 */
1048void 1029void
1049mapspace::update_ () 1030mapspace::update_ ()
1050{ 1031{
1051 object *tmp, *last = 0; 1032 object *last = 0;
1052 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1033 uint8 flags = P_UPTODATE;
1034 sint8 light = 0;
1053 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1035 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1036 uint64_t volume = 0;
1037 uint32_t items = 0;
1038 object *anywhere = 0;
1054 1039
1055 //object *middle = 0; 1040 //object *middle = 0;
1056 //object *top = 0; 1041 //object *top = 0;
1057 //object *floor = 0; 1042 //object *floor = 0;
1058 // this seems to generate better code than using locals, above 1043 // this seems to generate better code than using locals, above
1059 object *&top = faces_obj[0] = 0; 1044 object *&top = faces_obj[0] = 0;
1060 object *&middle = faces_obj[1] = 0; 1045 object *&middle = faces_obj[1] = 0;
1061 object *&floor = faces_obj[2] = 0; 1046 object *&floor = faces_obj[2] = 0;
1062 1047
1048 object::flags_t allflags; // all flags of all objects or'ed together
1049
1063 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1050 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1064 { 1051 {
1065 /* This could be made additive I guess (two lights better than 1052 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1066 * one). But if so, it shouldn't be a simple additive - 2
1067 * light bulbs do not illuminate twice as far as once since
1068 * it is a dissapation factor that is cubed.
1069 */
1070 if (tmp->glow_radius > light)
1071 light = tmp->glow_radius; 1053 light += tmp->glow_radius;
1072 1054
1073 /* This call is needed in order to update objects the player 1055 /* This call is needed in order to update objects the player
1074 * is standing in that have animations (ie, grass, fire, etc). 1056 * is standing in that have animations (ie, grass, fire, etc).
1075 * However, it also causes the look window to be re-drawn 1057 * However, it also causes the look window to be re-drawn
1076 * 3 times each time the player moves, because many of the 1058 * 3 times each time the player moves, because many of the
1077 * functions the move_player calls eventualy call this. 1059 * functions the move_player calls eventualy call this.
1078 * 1060 *
1079 * Always put the player down for drawing. 1061 * Always put the player down for drawing.
1080 */ 1062 */
1081 if (!tmp->invisible) 1063 if (expect_true (!tmp->invisible))
1082 { 1064 {
1083 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1065 if (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER])
1084 top = tmp; 1066 top = tmp;
1085 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1067 else
1086 { 1068 {
1069 if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1070 {
1087 /* If we got a floor, that means middle and top were below it, 1071 /* If we got a floor, that means middle and top were below it,
1088 * so should not be visible, so we clear them. 1072 * so should not be visible, so we clear them.
1089 */ 1073 */
1090 middle = 0; 1074 middle = 0;
1091 top = 0; 1075 top = 0;
1092 floor = tmp; 1076 floor = tmp;
1077 volume = 0;
1078 items = 0;
1079 }
1080 else
1081 {
1082 if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1083 {
1084 ++items;
1085 volume += tmp->volume ();
1086 }
1087
1088 /* Flag anywhere have high priority */
1089 if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1090 anywhere = tmp;
1091 /* Find the highest visible face around. If equal
1092 * visibilities, we still want the one nearer to the
1093 * top
1094 */
1095 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility))
1096 middle = tmp;
1097 }
1093 } 1098 }
1094 /* Flag anywhere have high priority */
1095 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1096 {
1097 middle = tmp;
1098 anywhere = 1;
1099 }
1100 /* Find the highest visible face around. If equal
1101 * visibilities, we still want the one nearer to the
1102 * top
1103 */
1104 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1105 middle = tmp;
1106 }
1107
1108 if (tmp == tmp->above)
1109 {
1110 LOG (llevError, "Error in structure of map\n");
1111 exit (-1);
1112 } 1099 }
1113 1100
1114 move_slow |= tmp->move_slow; 1101 move_slow |= tmp->move_slow;
1115 move_block |= tmp->move_block; 1102 move_block |= tmp->move_block;
1116 move_on |= tmp->move_on; 1103 move_on |= tmp->move_on;
1117 move_off |= tmp->move_off; 1104 move_off |= tmp->move_off;
1118 move_allow |= tmp->move_allow; 1105 move_allow |= tmp->move_allow;
1119 1106
1120 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1107 allflags |= tmp->flag;
1121 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1108
1122 if (tmp->type == PLAYER) flags |= P_PLAYER; 1109 if (tmp->type == PLAYER) flags |= P_PLAYER;
1123 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1110 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1124 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1125 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1126 } 1111 }
1127 1112
1128 this->light = light; 1113 // FLAG_SEE_ANYWHERE takes precedence
1114 if (anywhere)
1115 middle = anywhere;
1116
1117 // ORing all flags together and checking them here is much faster
1118 if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
1119 if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
1120 if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
1121 if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
1122
1123 this->light = min (light, MAX_LIGHT_RADIUS);
1129 this->flags_ = flags; 1124 this->flags_ = flags;
1130 this->move_block = move_block & ~move_allow; 1125 this->move_block = move_block & ~move_allow;
1131 this->move_on = move_on; 1126 this->move_on = move_on;
1132 this->move_off = move_off; 1127 this->move_off = move_off;
1133 this->move_slow = move_slow; 1128 this->move_slow = move_slow;
1129 this->volume_ = (volume + 1023) / 1024;
1130 this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1134 1131
1135 /* At this point, we have a floor face (if there is a floor), 1132 /* At this point, we have a floor face (if there is a floor),
1136 * and the floor is set - we are not going to touch it at 1133 * and the floor is set - we are not going to touch it at
1137 * this point. 1134 * this point.
1138 * middle contains the highest visibility face. 1135 * middle contains the highest visibility face.
… …
1153 * 1) top face is set, need middle to be set. 1150 * 1) top face is set, need middle to be set.
1154 * 2) middle is set, need to set top. 1151 * 2) middle is set, need to set top.
1155 * 3) neither middle or top is set - need to set both. 1152 * 3) neither middle or top is set - need to set both.
1156 */ 1153 */
1157 1154
1158 for (tmp = last; tmp; tmp = tmp->below) 1155 for (object *tmp = last; tmp; tmp = tmp->below)
1159 { 1156 {
1160 /* Once we get to a floor, stop, since we already have a floor object */ 1157 /* Once we get to a floor, stop, since we already have a floor object */
1161 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1158 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1162 break; 1159 break;
1163 1160
… …
1204 faces_obj [1] = middle; 1201 faces_obj [1] = middle;
1205 faces_obj [2] = floor; 1202 faces_obj [2] = floor;
1206#endif 1203#endif
1207} 1204}
1208 1205
1209uint64 1206maptile *
1210mapspace::volume () const
1211{
1212 uint64 vol = 0;
1213
1214 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1215 vol += op->volume ();
1216
1217 return vol;
1218}
1219
1220bool
1221maptile::tile_available (int dir, bool load) 1207maptile::tile_available (int dir, bool load)
1222{ 1208{
1223 if (!tile_path[dir]) 1209 if (tile_path[dir])
1224 return 0; 1210 {
1225
1226 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY)) 1211 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1227 return 1; 1212 return tile_map[dir];
1228 1213
1229 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1214 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1230 return 1; 1215 return tile_map[dir];
1216 }
1231 1217
1232 return 0; 1218 return 0;
1233} 1219}
1234 1220
1235/* this returns TRUE if the coordinates (x,y) are out of 1221/* this returns TRUE if the coordinates (x,y) are out of
… …
1541 else 1527 else
1542 { 1528 {
1543 retval->distance_x += op2->x - x; 1529 retval->distance_x += op2->x - x;
1544 retval->distance_y += op2->y - y; 1530 retval->distance_y += op2->y - y;
1545 1531
1546 retval->part = NULL; 1532 retval->part = 0;
1547 retval->distance = idistance (retval->distance_x, retval->distance_y); 1533 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1548 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1534 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1549 } 1535 }
1550} 1536}
1551 1537
1552/* Returns true of op1 and op2 are effectively on the same map 1538/* Returns true of op1 and op2 are effectively on the same map
… …
1563 int dx, dy; 1549 int dx, dy;
1564 1550
1565 return adjacent_map (op1->map, op2->map, &dx, &dy); 1551 return adjacent_map (op1->map, op2->map, &dx, &dy);
1566} 1552}
1567 1553
1554//-GPL
1555
1568object * 1556object *
1569maptile::insert (object *op, int x, int y, object *originator, int flags) 1557maptile::insert (object *op, int x, int y, object *originator, int flags)
1570{ 1558{
1571 if (!op->flag [FLAG_REMOVED])
1572 op->remove ();
1573
1574 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1559 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1575} 1560}
1576 1561
1577region * 1562region *
1578maptile::region (int x, int y) const 1563maptile::region (int x, int y) const
… …
1587 return default_region; 1572 return default_region;
1588 1573
1589 return ::region::default_region (); 1574 return ::region::default_region ();
1590} 1575}
1591 1576
1577//+GPL
1578
1592/* picks a random object from a style map. 1579/* picks a random object from a style map.
1593 * Redone by MSW so it should be faster and not use static
1594 * variables to generate tables.
1595 */ 1580 */
1596object * 1581object *
1597maptile::pick_random_object () const 1582maptile::pick_random_object (rand_gen &gen) const
1598{ 1583{
1599 /* while returning a null object will result in a crash, that 1584 /* while returning a null object will result in a crash, that
1600 * is actually preferable to an infinite loop. That is because 1585 * is actually preferable to an infinite loop. That is because
1601 * most servers will automatically restart in case of crash. 1586 * most servers will automatically restart in case of crash.
1602 * Change the logic on getting the random space - shouldn't make 1587 * Change the logic on getting the random space - shouldn't make
1603 * any difference, but this seems clearer to me. 1588 * any difference, but this seems clearer to me.
1604 */ 1589 */
1605 for (int i = 1000; --i;) 1590 for (int i = 1000; --i;)
1606 { 1591 {
1607 object *pick = at (rndm (width), rndm (height)).bot; 1592 object *pick = at (gen (width), gen (height)).bot;
1608 1593
1609 // do not prefer big monsters just because they are big. 1594 // do not prefer big monsters just because they are big.
1610 if (pick && pick->head_ () == pick) 1595 if (pick && pick->is_head ())
1611 return pick->head_ (); 1596 return pick->head_ ();
1612 } 1597 }
1613 1598
1614 // instead of crashing in the unlikely(?) case, try to return *something* 1599 // instead of crashing in the unlikely(?) case, try to return *something*
1615 return get_archetype ("blocked"); 1600 return archetype::find (shstr_bug);
1616} 1601}
1602
1603//-GPL
1617 1604
1618void 1605void
1619maptile::play_sound (faceidx sound, int x, int y) const 1606maptile::play_sound (faceidx sound, int x, int y) const
1620{ 1607{
1621 if (!sound) 1608 if (!sound)
1622 return; 1609 return;
1623 1610
1611 for_all_players_on_map (pl, this)
1612 if (client *ns = pl->ns)
1613 {
1614 int dx = x - pl->ob->x;
1615 int dy = y - pl->ob->y;
1616
1617 int distance = idistance (dx, dy);
1618
1619 if (distance <= MAX_SOUND_DISTANCE)
1620 ns->play_sound (sound, dx, dy);
1621 }
1622}
1623
1624void
1625maptile::say_msg (const char *msg, int x, int y) const
1626{
1624 for_all_players (pl) 1627 for_all_players (pl)
1625 if (pl->observe->map == this)
1626 if (client *ns = pl->ns) 1628 if (client *ns = pl->ns)
1627 { 1629 {
1628 int dx = x - pl->observe->x; 1630 int dx = x - pl->ob->x;
1629 int dy = y - pl->observe->y; 1631 int dy = y - pl->ob->y;
1630 1632
1631 int distance = idistance (dx, dy); 1633 int distance = idistance (dx, dy);
1632 1634
1633 if (distance <= MAX_SOUND_DISTANCE) 1635 if (distance <= MAX_SOUND_DISTANCE)
1634 ns->play_sound (sound, dx, dy); 1636 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1635 } 1637 }
1636} 1638}
1637 1639
1640static void
1641split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1642{
1643 // clip to map to the left
1644 if (x0 < 0)
1645 {
1646 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1647 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1648
1649 if (x1 < 0) // entirely to the left
1650 return;
1651
1652 x0 = 0;
1653 }
1654
1655 // clip to map to the right
1656 if (x1 > m->width)
1657 {
1658 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1659 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1660
1661 if (x0 > m->width) // entirely to the right
1662 return;
1663
1664 x1 = m->width;
1665 }
1666
1667 // clip to map above
1668 if (y0 < 0)
1669 {
1670 if (maptile *tile = m->tile_available (TILE_UP, 1))
1671 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1672
1673 if (y1 < 0) // entirely above
1674 return;
1675
1676 y0 = 0;
1677 }
1678
1679 // clip to map below
1680 if (y1 > m->height)
1681 {
1682 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1683 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1684
1685 if (y0 > m->height) // entirely below
1686 return;
1687
1688 y1 = m->height;
1689 }
1690
1691 // if we get here, the rect is within the current map
1692 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1693
1694 r->m = m;
1695 r->x0 = x0;
1696 r->y0 = y0;
1697 r->x1 = x1;
1698 r->y1 = y1;
1699 r->dx = dx;
1700 r->dy = dy;
1701}
1702
1703maprect *
1704maptile::split_to_tiles (int x0, int y0, int x1, int y1)
1705{
1706 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1707 buf.clear ();
1708
1709 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1710
1711 // add end marker
1712 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1713 r->m = 0;
1714
1715 return (maprect *)buf.linearise ();
1716}
1717

Diff Legend

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