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.195 by root, Wed Apr 21 06:42:33 2010 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,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * 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"
30
31#include "path.h" 28#include "path.h"
29
30//+GPL
31
32sint8 maptile::outdoor_darkness;
32 33
33/* This rolls up wall, blocks_magic, blocks_view, etc, all into 34/* This rolls up wall, blocks_magic, blocks_view, etc, all into
34 * one function that just returns a P_.. value (see map.h) 35 * one function that just returns a P_.. value (see map.h)
35 * it will also do map translation for tiled maps, returning 36 * it will also do map translation for tiled maps, returning
36 * 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
… …
71 * by the caller. 72 * by the caller.
72 */ 73 */
73int 74int
74blocked_link (object *ob, maptile *m, int sx, int sy) 75blocked_link (object *ob, maptile *m, int sx, int sy)
75{ 76{
76 object *tmp;
77 int mflags, blocked;
78
79 /* 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
80 * have already checked this. 78 * have already checked this.
81 */ 79 */
82 if (OUT_OF_REAL_MAP (m, sx, sy)) 80 if (OUT_OF_REAL_MAP (m, sx, sy))
83 { 81 {
84 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 82 LOG (llevError | logBacktrace, "blocked_link: Passed map, x, y coordinates outside of map\n");
85 return 1; 83 return 1;
86 } 84 }
87 85
88 /* Save some cycles - instead of calling get_map_flags(), just get the value 86 mapspace &ms = m->at (sx, sy);
89 * directly.
90 */
91 mflags = m->at (sx, sy).flags ();
92 87
93 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 88 int mflags = ms.flags ();
89 int blocked = ms.move_block;
94 90
95 /* If space is currently not blocked by anything, no need to 91 /* If space is currently not blocked by anything, no need to
96 * go further. Not true for players - all sorts of special 92 * go further. Not true for players - all sorts of special
97 * things we need to do for players. 93 * things we need to do for players.
98 */ 94 */
99 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 95 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
100 return 0; 96 return 0;
101 97
102 /* 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
103 * 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
104 * 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
105 * or another. Likewise, only if something is blocking us do we 101 * or another. Likewise, only if something is blocking us do we
106 * need to investigate if there is a special circumstance that would 102 * need to investigate if there is a special circumstance that would
107 * let the player through (inventory checkers for example) 103 * let the player through (inventory checkers for example)
… …
114 /* 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
115 * 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
116 * true. If we get through the entire stack, that must mean 112 * true. If we get through the entire stack, that must mean
117 * ob is blocking it, so return 0. 113 * ob is blocking it, so return 0.
118 */ 114 */
119 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 115 for (object *tmp = ms.top; tmp; tmp = tmp->below)
120 { 116 {
121 117 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 { 118 {
125 /* If last_sp is set, the player/monster needs an object, 119 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
126 * so we check for it. If they don't have it, they can't 120 if (RESULT_INT (0))
127 * pass through this space. 121 return 1;
128 */ 122 else
129 if (tmp->last_sp) 123 continue;
124
125 if (tmp->type == CHECK_INV)
130 { 126 {
131 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))
132 return 1; 131 return 1;
133 else 132 }
134 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;
135 } 142 }
136 else 143 else
137 { 144 return 1; // unconditional block
138 /* In this case, the player must not have the object - 145
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 146 } else {
148 { 147 // space does not block the ob, directly, but
149 /* Broke apart a big nasty if into several here to make 148 // anything alive that is not a door still
150 * this more readable. first check - if the space blocks 149 // blocks anything
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 150
158 if (tmp->flag [FLAG_ALIVE] 151 if (tmp->flag [FLAG_ALIVE]
159 && tmp->head_ () != ob
160 && tmp != ob
161 && tmp->type != DOOR 152 && tmp->type != DOOR
162 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden)) 153 && tmp->head_ () != ob) //TODO: maybe move these check up?
163 return 1; 154 return 1;
164 } 155 }
165
166 } 156 }
157
167 return 0; 158 return 0;
168} 159}
169 160
170/* 161/*
171 * Returns qthe blocking object if the given object can't fit in the given 162 * Returns the blocking object if the given object can't fit in the given
172 * spot. This is meant for multi space objects - for single space objecs, 163 * spot. This is meant for multi space objects - for single space objecs,
173 * just calling get_map_blocked and checking that against movement type 164 * just calling get_map_blocked and checking that against movement type
174 * of object. This function goes through all the parts of the multipart 165 * of object. This function goes through all the parts of the multipart
175 * object and makes sure they can be inserted. 166 * object and makes sure they can be inserted.
176 * 167 *
… …
223 } 214 }
224 215
225 return 0; 216 return 0;
226} 217}
227 218
228/* When the map is loaded, load_object does not actually insert objects 219//-GPL
229 * into inventory, but just links them. What this does is go through
230 * and insert them properly.
231 * The object 'container' is the object that contains the inventory.
232 * This is needed so that we can update the containers weight.
233 */
234void
235fix_container (object *container)
236{
237 object *tmp = container->inv, *next;
238
239 container->inv = 0;
240 while (tmp)
241 {
242 next = tmp->below;
243 if (tmp->inv)
244 fix_container (tmp);
245
246 insert_ob_in_ob (tmp, container);
247 tmp = next;
248 }
249
250 /* sum_weight will go through and calculate what all the containers are
251 * carrying.
252 */
253 sum_weight (container);
254}
255 220
256void 221void
257maptile::set_object_flag (int flag, int value) 222maptile::set_object_flag (int flag, int value)
258{ 223{
259 if (!spaces) 224 if (!spaces)
… …
261 226
262 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 227 for (mapspace *ms = spaces + size (); ms-- > spaces; )
263 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 228 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
264 tmp->flag [flag] = value; 229 tmp->flag [flag] = value;
265} 230}
231
232void
233maptile::post_load_original ()
234{
235 if (!spaces)
236 return;
237
238 set_object_flag (FLAG_OBJ_ORIGINAL);
239
240 for (mapspace *ms = spaces + size (); ms-- > spaces; )
241 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
242 INVOKE_OBJECT (RESET, tmp);
243}
244
245void
246maptile::post_load ()
247{
248#if 0
249 if (!spaces)
250 return;
251
252 for (mapspace *ms = spaces + size (); ms-- > spaces; )
253 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
254 ; // nop
255#endif
256}
257
258//+GPL
266 259
267/* link_multipart_objects go through all the objects on the map looking 260/* link_multipart_objects go through all the objects on the map looking
268 * for objects whose arch says they are multipart yet according to the 261 * for objects whose arch says they are multipart yet according to the
269 * info we have, they only have the head (as would be expected when 262 * info we have, they only have the head (as would be expected when
270 * they are saved). 263 * they are saved).
… …
298 op = op->above; 291 op = op->above;
299 } 292 }
300 } 293 }
301} 294}
302 295
296//-GPL
297
303/* 298/*
304 * Loads (ands parses) the objects into a given map from the specified 299 * Loads (ands parses) the objects into a given map from the specified
305 * file pointer. 300 * file pointer.
306 */ 301 */
307bool 302bool
308maptile::_load_objects (object_thawer &f) 303maptile::_load_objects (object_thawer &f)
309{ 304{
310 for (;;) 305 for (;;)
311 { 306 {
312 coroapi::cede_to_tick_every (100); // cede once in a while 307 coroapi::cede_to_tick (); // cede once in a while
313 308
314 switch (f.kw) 309 switch (f.kw)
315 { 310 {
316 case KW_arch: 311 case KW_arch:
317 if (object *op = object::read (f, this)) 312 if (object *op = object::read (f, this))
318 { 313 {
314 // TODO: why?
319 if (op->inv) 315 if (op->inv)
320 sum_weight (op); 316 op->update_weight ();
321 317
322 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 318 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
319 {
320 // we insert manually because
321 // a) its way faster
322 // b) we remove manually, too, and there are good reasons for that
323 // c) it's correct
324 mapspace &ms = at (op->x, op->y);
325
326 op->flag [FLAG_REMOVED] = false;
327
328 op->above = 0;
329 op->below = ms.top;
330
331 *(ms.top ? &ms.top->above : &ms.bot) = op;
332
333 ms.top = op;
334 ms.flags_ = 0;
335 }
336 else
337 {
338 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
339 op->destroy ();
340 }
323 } 341 }
324 342
325 continue; 343 continue;
326 344
327 case KW_EOF: 345 case KW_EOF:
… …
403 return false; 421 return false;
404 422
405 return freezer.save (path); 423 return freezer.save (path);
406} 424}
407 425
408maptile::maptile () 426void
427maptile::init ()
409{ 428{
410 in_memory = MAP_SWAPPED; 429 in_memory = MAP_SWAPPED;
411 430
412 /* The maps used to pick up default x and y values from the 431 /* The maps used to pick up default x and y values from the
413 * map archetype. Mimic that behaviour. 432 * map archetype. Mimic that behaviour.
414 */ 433 */
415 width = 16; 434 width = 16;
416 height = 16; 435 height = 16;
417 timeout = 300; 436 timeout = 300;
418 max_nrof = 1000; // 1000 items of anything 437 max_items = MAX_ITEM_PER_ACTION;
419 max_volume = 2000000; // 2m³ 438 max_volume = 2000000; // 2m³
420}
421
422maptile::maptile (int w, int h)
423{
424 in_memory = MAP_SWAPPED;
425
426 width = w;
427 height = h;
428 reset_timeout = 0; 439 reset_timeout = 0;
429 timeout = 300;
430 enter_x = 0; 440 enter_x = 0;
431 enter_y = 0; 441 enter_y = 0;
442}
443
444maptile::maptile ()
445{
446 init ();
447}
448
449maptile::maptile (int w, int h)
450{
451 init ();
452
453 width = w;
454 height = h;
432 455
433 alloc (); 456 alloc ();
434} 457}
435 458
436/* 459/*
… …
444 if (spaces) 467 if (spaces)
445 return; 468 return;
446 469
447 spaces = salloc0<mapspace> (size ()); 470 spaces = salloc0<mapspace> (size ());
448} 471}
472
473//+GPL
449 474
450/* Takes a string from a map definition and outputs a pointer to the array of shopitems 475/* Takes a string from a map definition and outputs a pointer to the array of shopitems
451 * corresponding to that string. Memory is allocated for this, it must be freed 476 * corresponding to that string. Memory is allocated for this, it must be freed
452 * at a later date. 477 * at a later date.
453 * Called by parse_map_headers below. 478 * Called by parse_map_headers below.
… …
530 return items; 555 return items;
531} 556}
532 557
533/* opposite of parse string, this puts the string that was originally fed in to 558/* opposite of parse string, this puts the string that was originally fed in to
534 * the map (or something equivilent) into output_string. */ 559 * the map (or something equivilent) into output_string. */
535static void 560static const char *
536print_shop_string (maptile *m, char *output_string) 561print_shop_string (maptile *m)
537{ 562{
538 int i; 563 static dynbuf_text buf; buf.clear ();
539 char tmp[MAX_BUF];
540 564
541 strcpy (output_string, "");
542 for (i = 0; i < m->shopitems[0].index; i++) 565 for (int i = 0; i < m->shopitems[0].index; i++)
543 { 566 {
544 if (m->shopitems[i].typenum) 567 if (m->shopitems[i].typenum)
545 { 568 {
546 if (m->shopitems[i].strength) 569 if (m->shopitems[i].strength)
547 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 570 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
548 else 571 else
549 sprintf (tmp, "%s;", m->shopitems[i].name); 572 buf.printf ("%s;", m->shopitems[i].name);
550 } 573 }
551 else 574 else
552 { 575 {
553 if (m->shopitems[i].strength) 576 if (m->shopitems[i].strength)
554 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 577 buf.printf ("*:%d;", m->shopitems[i].strength);
555 else 578 else
556 sprintf (tmp, "*"); 579 buf.printf ("*");
557 } 580 }
558
559 strcat (output_string, tmp);
560 } 581 }
582
583 return buf;
561} 584}
585
586//-GPL
562 587
563/* This loads the header information of the map. The header 588/* This loads the header information of the map. The header
564 * contains things like difficulty, size, timeout, etc. 589 * contains things like difficulty, size, timeout, etc.
565 * this used to be stored in the map object, but with the 590 * this used to be stored in the map object, but with the
566 * addition of tiling, fields beyond that easily named in an 591 * addition of tiling, fields beyond that easily named in an
… …
607 case KW_shopgreed: thawer.get (shopgreed); break; 632 case KW_shopgreed: thawer.get (shopgreed); break;
608 case KW_shopmin: thawer.get (shopmin); break; 633 case KW_shopmin: thawer.get (shopmin); break;
609 case KW_shopmax: thawer.get (shopmax); break; 634 case KW_shopmax: thawer.get (shopmax); break;
610 case KW_shoprace: thawer.get (shoprace); break; 635 case KW_shoprace: thawer.get (shoprace); break;
611 case KW_outdoor: thawer.get (outdoor); break; 636 case KW_outdoor: thawer.get (outdoor); break;
612 case KW_temp: thawer.get (temp); break;
613 case KW_pressure: thawer.get (pressure); break;
614 case KW_humid: thawer.get (humid); break;
615 case KW_windspeed: thawer.get (windspeed); break;
616 case KW_winddir: thawer.get (winddir); break;
617 case KW_sky: thawer.get (sky); break;
618 637
619 case KW_per_player: thawer.get (per_player); break; 638 case KW_per_player: thawer.get (per_player); break;
620 case KW_per_party: thawer.get (per_party); break; 639 case KW_per_party: thawer.get (per_party); break;
621 case KW_no_reset: thawer.get (no_reset); break; 640 case KW_no_reset: thawer.get (no_reset); break;
641 case KW_no_drop: thawer.get (no_drop); break;
622 642
623 case KW_region: default_region = region::find (thawer.get_str ()); break; 643 case KW_region: default_region = region::find (thawer.get_str ()); break;
624 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 644 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
625 645
626 // old names new names 646 // old names new names
… …
646 case KW_end: 666 case KW_end:
647 thawer.next (); 667 thawer.next ();
648 return true; 668 return true;
649 669
650 default: 670 default:
651 if (!thawer.parse_error ("map", 0)) 671 if (!thawer.parse_error ("map"))
652 return false; 672 return false;
653 break; 673 break;
654 } 674 }
655 675
656 thawer.next (); 676 thawer.next ();
657 } 677 }
658 678
659 abort (); 679 abort ();
660} 680}
681
682//+GPL
661 683
662/****************************************************************************** 684/******************************************************************************
663 * This is the start of unique map handling code 685 * This is the start of unique map handling code
664 *****************************************************************************/ 686 *****************************************************************************/
665 687
… …
672 int unique = 0; 694 int unique = 0;
673 for (object *op = spaces [i].bot; op; ) 695 for (object *op = spaces [i].bot; op; )
674 { 696 {
675 object *above = op->above; 697 object *above = op->above;
676 698
677 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 699 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
678 unique = 1; 700 unique = 1;
679 701
680 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 702 if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
681 {
682 op->destroy_inv (false);
683 op->destroy (); 703 op->destroy ();
684 }
685 704
686 op = above; 705 op = above;
687 } 706 }
688 } 707 }
689} 708}
690 709
710//-GPL
711
691bool 712bool
692maptile::_save_header (object_freezer &freezer) 713maptile::_save_header (object_freezer &freezer)
693{ 714{
694#define MAP_OUT(k) freezer.put (KW_ ## k, k) 715#define MAP_OUT(k) freezer.put (KW(k), k)
695#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 716#define MAP_OUT2(k,v) freezer.put (KW(k), v)
696 717
697 MAP_OUT2 (arch, "map"); 718 MAP_OUT2 (arch, CS(map));
698 719
699 if (name) MAP_OUT (name); 720 if (name) MAP_OUT (name);
700 MAP_OUT (swap_time); 721 MAP_OUT (swap_time);
701 MAP_OUT (reset_time); 722 MAP_OUT (reset_time);
702 MAP_OUT (reset_timeout); 723 MAP_OUT (reset_timeout);
703 MAP_OUT (fixed_resettime); 724 MAP_OUT (fixed_resettime);
704 MAP_OUT (no_reset); 725 MAP_OUT (no_reset);
726 MAP_OUT (no_drop);
705 MAP_OUT (difficulty); 727 MAP_OUT (difficulty);
706
707 if (default_region) MAP_OUT2 (region, default_region->name); 728 if (default_region) MAP_OUT2 (region, default_region->name);
708 729
709 if (shopitems) 730 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); 731 MAP_OUT (shopgreed);
717 MAP_OUT (shopmin); 732 MAP_OUT (shopmin);
718 MAP_OUT (shopmax); 733 MAP_OUT (shopmax);
719 if (shoprace) MAP_OUT (shoprace); 734 if (shoprace) MAP_OUT (shoprace);
720 MAP_OUT (darkness); 735
721 MAP_OUT (width); 736 MAP_OUT (width);
722 MAP_OUT (height); 737 MAP_OUT (height);
723 MAP_OUT (enter_x); 738 MAP_OUT (enter_x);
724 MAP_OUT (enter_y); 739 MAP_OUT (enter_y);
725 740 MAP_OUT (darkness);
726 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
727 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
728
729 MAP_OUT (outdoor); 741 MAP_OUT (outdoor);
730 MAP_OUT (temp); 742
731 MAP_OUT (pressure); 743 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
732 MAP_OUT (humid); 744 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
733 MAP_OUT (windspeed);
734 MAP_OUT (winddir);
735 MAP_OUT (sky);
736 745
737 MAP_OUT (per_player); 746 MAP_OUT (per_player);
738 MAP_OUT (per_party); 747 MAP_OUT (per_party);
739 748
740 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 749 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
741 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 750 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
742 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 751 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
743 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 752 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
744 753
745 freezer.put (this); 754 freezer.put (this);
746 freezer.put (KW_end); 755 freezer.put (KW(end));
747 756
748 return true; 757 return true;
749} 758}
750 759
751bool 760bool
… …
756 if (!_save_header (freezer)) 765 if (!_save_header (freezer))
757 return false; 766 return false;
758 767
759 return freezer.save (path); 768 return freezer.save (path);
760} 769}
770
771//+GPL
761 772
762/* 773/*
763 * Remove and free all objects in the given map. 774 * Remove and free all objects in the given map.
764 */ 775 */
765void 776void
… …
776 787
777 op->flag [FLAG_REMOVED] = true; 788 op->flag [FLAG_REMOVED] = true;
778 789
779 object *head = op->head_ (); 790 object *head = op->head_ ();
780 if (op == head) 791 if (op == head)
781 {
782 op->destroy_inv (false);
783 op->destroy (); 792 op->destroy ();
784 }
785 else if (head->map != op->map) 793 else if (head->map != op->map)
786 { 794 {
787 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ()); 795 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
788 head->destroy (); 796 head->destroy ();
789 } 797 }
790 } 798 }
791 799
792 sfree (spaces, size ()), spaces = 0; 800 sfree0 (spaces, size ());
793 } 801 }
794 802
795 if (buttons) 803 if (buttons)
796 free_objectlinkpt (buttons), buttons = 0; 804 free_objectlinkpt (buttons), buttons = 0;
797 805
798 sfree (regions, size ()); regions = 0; 806 sfree0 (regions, size ());
799 delete [] regionmap; regionmap = 0; 807 delete [] regionmap; regionmap = 0;
800} 808}
801 809
802void 810void
803maptile::clear_header () 811maptile::clear_header ()
… …
837 845
838 clear (); 846 clear ();
839} 847}
840 848
841/* decay and destroy perishable items in a map */ 849/* decay and destroy perishable items in a map */
850// TODO: should be done regularly, not on map load?
842void 851void
843maptile::do_decay_objects () 852maptile::do_decay_objects ()
844{ 853{
845 if (!spaces) 854 if (!spaces)
846 return; 855 return;
… …
848 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 857 for (mapspace *ms = spaces + size (); ms-- > spaces; )
849 for (object *above, *op = ms->bot; op; op = above) 858 for (object *above, *op = ms->bot; op; op = above)
850 { 859 {
851 above = op->above; 860 above = op->above;
852 861
862 // do not decay anything above unique floor tiles (yet :)
863 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
864 break;
865
853 bool destroy = 0; 866 bool destroy = 0;
854 867
855 // do not decay anything above unique floor tiles (yet :) 868 if (op->flag [FLAG_IS_FLOOR]
856 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 869 || op->flag [FLAG_OBJ_ORIGINAL]
857 break; 870 || op->flag [FLAG_UNIQUE]
858 871 || op->flag [FLAG_OVERLAY_FLOOR]
859 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 872 || op->flag [FLAG_UNPAID]
860 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
861 || QUERY_FLAG (op, FLAG_UNIQUE)
862 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
863 || QUERY_FLAG (op, FLAG_UNPAID)
864 || op->is_alive ()) 873 || op->is_alive ())
865 ; // do not decay 874 ; // do not decay
866 else if (op->is_weapon ()) 875 else if (op->is_weapon ())
867 { 876 {
868 op->stats.dam--; 877 op->stats.dam--;
… …
893 || mat & M_LIQUID 902 || mat & M_LIQUID
894 || (mat & M_IRON && rndm (1, 5) == 1) 903 || (mat & M_IRON && rndm (1, 5) == 1)
895 || (mat & M_GLASS && rndm (1, 2) == 1) 904 || (mat & M_GLASS && rndm (1, 2) == 1)
896 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 905 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
897 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 906 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
898 || (mat & M_ICE && temp > 32)) 907 //|| (mat & M_ICE && temp > 32)
908 )
899 destroy = 1; 909 destroy = 1;
900 } 910 }
901 911
902 /* adjust overall chance below */ 912 /* adjust overall chance below */
903 if (destroy && rndm (0, 1)) 913 if (destroy && rndm (0, 1))
904 op->destroy (); 914 op->destroy ();
905 }
906}
907
908/*
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 } 915 }
930} 916}
931 917
932/* 918/*
933 * This routine is supposed to find out the difficulty of the map. 919 * This routine is supposed to find out the difficulty of the map.
934 * difficulty does not have a lot to do with character level, 920 * difficulty does not have a lot to do with character level,
935 * but does have a lot to do with treasure on the map. 921 * but does have a lot to do with treasure on the map.
936 * 922 *
937 * Difficulty can now be set by the map creature. If the value stored 923 * 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 924 * in the map is zero, then use this routine. Maps should really
939 * have a difficulty set than using this function - human calculation 925 * have a difficulty set rather than using this function - human calculation
940 * is much better than this functions guesswork. 926 * is much better than this function's guesswork.
941 */ 927 */
942int 928int
943maptile::estimate_difficulty () const 929maptile::estimate_difficulty () const
944{ 930{
945 long monster_cnt = 0; 931 long monster_cnt = 0;
… …
947 sint64 total_exp = 0; 933 sint64 total_exp = 0;
948 934
949 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 935 for (mapspace *ms = spaces + size (); ms-- > spaces; )
950 for (object *op = ms->bot; op; op = op->above) 936 for (object *op = ms->bot; op; op = op->above)
951 { 937 {
952 if (QUERY_FLAG (op, FLAG_MONSTER)) 938 if (op->flag [FLAG_MONSTER])
953 { 939 {
954 total_exp += op->stats.exp; 940 total_exp += op->stats.exp;
955 monster_cnt++; 941 monster_cnt++;
956 } 942 }
957 943
958 if (QUERY_FLAG (op, FLAG_GENERATOR)) 944 if (op->flag [FLAG_GENERATOR])
959 { 945 {
960 total_exp += op->stats.exp; 946 total_exp += op->stats.exp;
961 947
962 if (archetype *at = type_to_archetype (GENERATE_TYPE (op))) 948 if (archetype *at = op->other_arch)
949 {
963 total_exp += at->stats.exp * 8; 950 total_exp += at->stats.exp * 8;
964
965 monster_cnt++; 951 monster_cnt++;
952 }
953
954 for (object *inv = op->inv; inv; inv = inv->below)
955 {
956 total_exp += op->stats.exp * 8;
957 monster_cnt++;
958 }
966 } 959 }
967 } 960 }
968 961
969 avgexp = (double) total_exp / monster_cnt; 962 avgexp = (double) total_exp / monster_cnt;
970 963
… …
983 * postive values make it darker, negative make it brighter 976 * postive values make it darker, negative make it brighter
984 */ 977 */
985int 978int
986maptile::change_map_light (int change) 979maptile::change_map_light (int change)
987{ 980{
988 int new_level = darkness + change;
989
990 /* Nothing to do */ 981 /* Nothing to do */
991 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 982 if (!change)
992 return 0; 983 return 0;
993 984
994 /* inform all players on the map */ 985 /* inform all players on the map */
995 if (change > 0) 986 if (change > 0)
996 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 987 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
997 else 988 else
998 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 989 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
999 990
1000 /* Do extra checking. since darkness is a unsigned value, 991 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 992
1012 /* All clients need to get re-updated for the change */ 993 /* All clients need to get re-updated for the change */
1013 update_all_map_los (this); 994 update_all_map_los (this);
995
1014 return 1; 996 return 1;
1015} 997}
1016 998
1017/* 999/*
1018 * This function updates various attributes about a specific space 1000 * This function updates various attributes about a specific space
… …
1021 * through, etc) 1003 * through, etc)
1022 */ 1004 */
1023void 1005void
1024mapspace::update_ () 1006mapspace::update_ ()
1025{ 1007{
1026 object *tmp, *last = 0; 1008 object *last = 0;
1027 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1009 uint8 flags = P_UPTODATE;
1010 sint8 light = 0;
1028 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1011 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1012 uint64_t volume = 0;
1013 uint32_t items = 0;
1014 object *anywhere = 0;
1015 uint8_t middle_visibility = 0;
1029 1016
1030 //object *middle = 0; 1017 //object *middle = 0;
1031 //object *top = 0; 1018 //object *top = 0;
1032 //object *floor = 0; 1019 //object *floor = 0;
1033 // this seems to generate better code than using locals, above 1020 // this seems to generate better code than using locals, above
1034 object *&top = faces_obj[0] = 0; 1021 object *&top = faces_obj[0] = 0;
1035 object *&middle = faces_obj[1] = 0; 1022 object *&middle = faces_obj[1] = 0;
1036 object *&floor = faces_obj[2] = 0; 1023 object *&floor = faces_obj[2] = 0;
1037 1024
1025 object::flags_t allflags; // all flags of all objects or'ed together
1026
1038 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1027 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1039 { 1028 {
1040 /* This could be made additive I guess (two lights better than 1029 // 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; 1030 light += tmp->glow_radius;
1047 1031
1048 /* This call is needed in order to update objects the player 1032 /* This call is needed in order to update objects the player
1049 * is standing in that have animations (ie, grass, fire, etc). 1033 * is standing in that have animations (ie, grass, fire, etc).
1050 * However, it also causes the look window to be re-drawn 1034 * However, it also causes the look window to be re-drawn
1051 * 3 times each time the player moves, because many of the 1035 * 3 times each time the player moves, because many of the
1052 * functions the move_player calls eventualy call this. 1036 * functions the move_player calls eventualy call this.
1053 * 1037 *
1054 * Always put the player down for drawing. 1038 * Always put the player down for drawing.
1055 */ 1039 */
1056 if (!tmp->invisible) 1040 if (expect_true (!tmp->invisible))
1057 { 1041 {
1058 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1042 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1059 top = tmp; 1043 top = tmp;
1060 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1044 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1061 { 1045 {
1062 /* If we got a floor, that means middle and top were below it, 1046 /* If we got a floor, that means middle and top were below it,
1063 * so should not be visible, so we clear them. 1047 * so should not be visible, so we clear them.
1064 */ 1048 */
1065 middle = 0; 1049 middle = 0;
1066 top = 0; 1050 top = 0;
1067 floor = tmp; 1051 floor = tmp;
1052 volume = 0;
1053 items = 0;
1068 } 1054 }
1069 /* Flag anywhere have high priority */ 1055 else
1070 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1071 { 1056 {
1057 if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1058 {
1059 ++items;
1060 volume += tmp->volume ();
1061 }
1062
1063 /* Flag anywhere have high priority */
1064 if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1065 anywhere = tmp;
1066
1067 /* Find the highest visible face around. If equal
1068 * visibilities, we still want the one nearer to the
1069 * top
1070 */
1071 if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
1072 {
1073 middle_visibility = ::faces [tmp->face].visibility;
1072 middle = tmp; 1074 middle = tmp;
1073 anywhere = 1; 1075 }
1074 } 1076 }
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 } 1077 }
1088 1078
1089 move_slow |= tmp->move_slow; 1079 move_slow |= tmp->move_slow;
1090 move_block |= tmp->move_block; 1080 move_block |= tmp->move_block;
1091 move_on |= tmp->move_on; 1081 move_on |= tmp->move_on;
1092 move_off |= tmp->move_off; 1082 move_off |= tmp->move_off;
1093 move_allow |= tmp->move_allow; 1083 move_allow |= tmp->move_allow;
1094 1084
1095 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1085 allflags |= tmp->flag;
1096 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1086
1097 if (tmp->type == PLAYER) flags |= P_PLAYER; 1087 if (tmp->type == PLAYER) flags |= P_PLAYER;
1098 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1088 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 } 1089 }
1102 1090
1103 this->light = light; 1091 // FLAG_SEE_ANYWHERE takes precedence
1092 if (anywhere)
1093 middle = anywhere;
1094
1095 // ORing all flags together and checking them here is much faster
1096 if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
1097 if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
1098 if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
1099 if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
1100
1101 this->light = min (light, MAX_LIGHT_RADIUS);
1104 this->flags_ = flags; 1102 this->flags_ = flags;
1105 this->move_block = move_block & ~move_allow; 1103 this->move_block = move_block & ~move_allow;
1106 this->move_on = move_on; 1104 this->move_on = move_on;
1107 this->move_off = move_off; 1105 this->move_off = move_off;
1108 this->move_slow = move_slow; 1106 this->move_slow = move_slow;
1107 this->volume_ = (volume + 1023) / 1024;
1108 this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1109 1109
1110 /* At this point, we have a floor face (if there is a floor), 1110 /* 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 1111 * and the floor is set - we are not going to touch it at
1112 * this point. 1112 * this point.
1113 * middle contains the highest visibility face. 1113 * middle contains the highest visibility face.
… …
1128 * 1) top face is set, need middle to be set. 1128 * 1) top face is set, need middle to be set.
1129 * 2) middle is set, need to set top. 1129 * 2) middle is set, need to set top.
1130 * 3) neither middle or top is set - need to set both. 1130 * 3) neither middle or top is set - need to set both.
1131 */ 1131 */
1132 1132
1133 for (tmp = last; tmp; tmp = tmp->below) 1133 for (object *tmp = last; tmp; tmp = tmp->below)
1134 { 1134 {
1135 /* Once we get to a floor, stop, since we already have a floor object */ 1135 /* Once we get to a floor, stop, since we already have a floor object */
1136 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1136 if (tmp->flag [FLAG_IS_FLOOR])
1137 break; 1137 break;
1138 1138
1139 /* If two top faces are already set, quit processing */ 1139 /* If two top faces are already set, quit processing */
1140 if (top && middle) 1140 if (top && middle)
1141 break; 1141 break;
… …
1179 faces_obj [1] = middle; 1179 faces_obj [1] = middle;
1180 faces_obj [2] = floor; 1180 faces_obj [2] = floor;
1181#endif 1181#endif
1182} 1182}
1183 1183
1184uint64 1184maptile *
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) 1185maptile::tile_available (int dir, bool load)
1197{ 1186{
1198 if (!tile_path[dir]) 1187 if (tile_path[dir])
1199 return 0; 1188 {
1200
1201 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_IN_MEMORY)) 1189 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1202 return 1; 1190 return tile_map[dir];
1203 1191
1204 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1192 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1205 return 1; 1193 return tile_map[dir];
1194 }
1206 1195
1207 return 0; 1196 return 0;
1208} 1197}
1209 1198
1210/* this returns TRUE if the coordinates (x,y) are out of 1199/* this returns TRUE if the coordinates (x,y) are out of
… …
1435 * 1424 *
1436 * currently, the only flag supported (0x1) is don't translate for 1425 * currently, the only flag supported (0x1) is don't translate for
1437 * closest body part of 'op1' 1426 * closest body part of 'op1'
1438 */ 1427 */
1439void 1428void
1440get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1429get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1441{ 1430{
1442 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1431 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1443 { 1432 {
1444 /* be conservative and fill in _some_ data */ 1433 /* be conservative and fill in _some_ data */
1445 retval->distance = 10000; 1434 retval->distance = 10000;
1446 retval->distance_x = 10000; 1435 retval->distance_x = 10000;
1447 retval->distance_y = 10000; 1436 retval->distance_y = 10000;
1448 retval->direction = 0; 1437 retval->direction = 0;
1449 retval->part = 0; 1438 retval->part = 0;
1450 } 1439 }
1451 else 1440 else
1452 { 1441 {
1453 object *best;
1454
1455 retval->distance_x += op2->x - op1->x; 1442 retval->distance_x += op2->x - op1->x;
1456 retval->distance_y += op2->y - op1->y; 1443 retval->distance_y += op2->y - op1->y;
1457 1444
1458 best = op1; 1445 object *best = op1;
1446
1459 /* If this is multipart, find the closest part now */ 1447 /* If this is multipart, find the closest part now */
1460 if (!(flags & 0x1) && op1->more) 1448 if (!(flags & 1) && op1->more)
1461 { 1449 {
1462 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1450 int best_distance = idistance (retval->distance_x, retval->distance_y);
1463 1451
1464 /* we just take the offset of the piece to head to figure 1452 /* we just take the offset of the piece to head to figure
1465 * distance instead of doing all that work above again 1453 * distance instead of doing all that work above again
1466 * since the distance fields we set above are positive in the 1454 * since the distance fields we set above are positive in the
1467 * same axis as is used for multipart objects, the simply arithmetic 1455 * same axis as is used for multipart objects, the simply arithmetic
1468 * below works. 1456 * below works.
1469 */ 1457 */
1470 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1458 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1471 { 1459 {
1472 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1460 int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1473 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1461
1474 if (tmpi < best_distance) 1462 if (tmpi < best_distance)
1475 { 1463 {
1476 best_distance = tmpi; 1464 best_distance = tmpi;
1477 best = tmp; 1465 best = tmp;
1478 } 1466 }
1479 } 1467 }
1480 1468
1481 if (best != op1) 1469 if (best != op1)
1482 { 1470 {
1483 retval->distance_x += op1->x - best->x; 1471 retval->distance_x += op1->x - best->x;
1484 retval->distance_y += op1->y - best->y; 1472 retval->distance_y += op1->y - best->y;
1485 } 1473 }
1486 } 1474 }
1487 1475
1488 retval->part = best; 1476 retval->part = best;
1489 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1477 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1490 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1478 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1491 } 1479 }
1492} 1480}
1493 1481
1494/* this is basically the same as get_rangevector above, but instead of 1482/* this is basically the same as get_rangevector above, but instead of
1495 * the first parameter being an object, it instead is the map 1483 * the first parameter being an object, it instead is the map
… …
1505get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1493get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1506{ 1494{
1507 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1495 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1508 { 1496 {
1509 /* be conservative and fill in _some_ data */ 1497 /* be conservative and fill in _some_ data */
1510 retval->distance = 100000; 1498 retval->distance = 100000;
1511 retval->distance_x = 32767; 1499 retval->distance_x = 32767;
1512 retval->distance_y = 32767; 1500 retval->distance_y = 32767;
1513 retval->direction = 0; 1501 retval->direction = 0;
1514 retval->part = 0; 1502 retval->part = 0;
1515 } 1503 }
1516 else 1504 else
1517 { 1505 {
1518 retval->distance_x += op2->x - x; 1506 retval->distance_x += op2->x - x;
1519 retval->distance_y += op2->y - y; 1507 retval->distance_y += op2->y - y;
1520 1508
1521 retval->part = NULL; 1509 retval->part = 0;
1522 retval->distance = idistance (retval->distance_x, retval->distance_y); 1510 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1523 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1511 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1524 } 1512 }
1525} 1513}
1526 1514
1527/* Returns true of op1 and op2 are effectively on the same map 1515/* Returns true of op1 and op2 are effectively on the same map
1528 * (as related to map tiling). Note that this looks for a path from 1516 * (as related to map tiling). Note that this looks for a path from
… …
1538 int dx, dy; 1526 int dx, dy;
1539 1527
1540 return adjacent_map (op1->map, op2->map, &dx, &dy); 1528 return adjacent_map (op1->map, op2->map, &dx, &dy);
1541} 1529}
1542 1530
1531//-GPL
1532
1543object * 1533object *
1544maptile::insert (object *op, int x, int y, object *originator, int flags) 1534maptile::insert (object *op, int x, int y, object *originator, int flags)
1545{ 1535{
1546 if (!op->flag [FLAG_REMOVED])
1547 op->remove ();
1548
1549 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1536 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1550} 1537}
1551 1538
1552region * 1539region *
1553maptile::region (int x, int y) const 1540maptile::region (int x, int y) const
… …
1562 return default_region; 1549 return default_region;
1563 1550
1564 return ::region::default_region (); 1551 return ::region::default_region ();
1565} 1552}
1566 1553
1554//+GPL
1555
1567/* picks a random object from a style map. 1556/* 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 */ 1557 */
1571object * 1558object *
1572maptile::pick_random_object () const 1559maptile::pick_random_object (rand_gen &gen) const
1573{ 1560{
1574 /* while returning a null object will result in a crash, that 1561 /* while returning a null object will result in a crash, that
1575 * is actually preferable to an infinite loop. That is because 1562 * is actually preferable to an infinite loop. That is because
1576 * most servers will automatically restart in case of crash. 1563 * most servers will automatically restart in case of crash.
1577 * Change the logic on getting the random space - shouldn't make 1564 * Change the logic on getting the random space - shouldn't make
1578 * any difference, but this seems clearer to me. 1565 * any difference, but this seems clearer to me.
1579 */ 1566 */
1580 for (int i = 1000; --i;) 1567 for (int i = 1000; --i;)
1581 { 1568 {
1582 object *pick = at (rndm (width), rndm (height)).bot; 1569 object *pick = at (gen (width), gen (height)).bot;
1583 1570
1584 // do not prefer big monsters just because they are big. 1571 // must be head: do not prefer big monsters just because they are big.
1585 if (pick && pick->head_ () == pick) 1572 if (pick && pick->is_head ())
1586 return pick->head_ (); 1573 return pick;
1587 } 1574 }
1588 1575
1589 // instead of crashing in the unlikely(?) case, try to return *something* 1576 // instead of crashing in the unlikely(?) case, try to return *something*
1590 return get_archetype ("blocked"); 1577 return archetype::find (shstr_bug);
1591} 1578}
1579
1580//-GPL
1592 1581
1593void 1582void
1594maptile::play_sound (faceidx sound, int x, int y) const 1583maptile::play_sound (faceidx sound, int x, int y) const
1595{ 1584{
1596 if (!sound) 1585 if (!sound)
1597 return; 1586 return;
1598 1587
1588 for_all_players_on_map (pl, this)
1589 if (client *ns = pl->ns)
1590 {
1591 int dx = x - pl->ob->x;
1592 int dy = y - pl->ob->y;
1593
1594 int distance = idistance (dx, dy);
1595
1596 if (distance <= MAX_SOUND_DISTANCE)
1597 ns->play_sound (sound, dx, dy);
1598 }
1599}
1600
1601void
1602maptile::say_msg (const char *msg, int x, int y) const
1603{
1599 for_all_players (pl) 1604 for_all_players (pl)
1600 if (pl->observe->map == this)
1601 if (client *ns = pl->ns) 1605 if (client *ns = pl->ns)
1602 { 1606 {
1603 int dx = x - pl->observe->x; 1607 int dx = x - pl->ob->x;
1604 int dy = y - pl->observe->y; 1608 int dy = y - pl->ob->y;
1605 1609
1606 int distance = idistance (dx, dy); 1610 int distance = idistance (dx, dy);
1607 1611
1608 if (distance <= MAX_SOUND_DISTANCE) 1612 if (distance <= MAX_SOUND_DISTANCE)
1609 ns->play_sound (sound, dx, dy); 1613 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1610 } 1614 }
1611} 1615}
1612 1616
1617dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1618
1619static void
1620split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1621{
1622 // clip to map to the left
1623 if (x0 < 0)
1624 {
1625 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1626 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1627
1628 if (x1 < 0) // entirely to the left
1629 return;
1630
1631 x0 = 0;
1632 }
1633
1634 // clip to map to the right
1635 if (x1 > m->width)
1636 {
1637 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1638 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1639
1640 if (x0 > m->width) // entirely to the right
1641 return;
1642
1643 x1 = m->width;
1644 }
1645
1646 // clip to map above
1647 if (y0 < 0)
1648 {
1649 if (maptile *tile = m->tile_available (TILE_UP, 1))
1650 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1651
1652 if (y1 < 0) // entirely above
1653 return;
1654
1655 y0 = 0;
1656 }
1657
1658 // clip to map below
1659 if (y1 > m->height)
1660 {
1661 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1662 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1663
1664 if (y0 > m->height) // entirely below
1665 return;
1666
1667 y1 = m->height;
1668 }
1669
1670 // if we get here, the rect is within the current map
1671 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1672
1673 r->m = m;
1674 r->x0 = x0;
1675 r->y0 = y0;
1676 r->x1 = x1;
1677 r->y1 = y1;
1678 r->dx = dx;
1679 r->dy = dy;
1680}
1681
1682maprect *
1683maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1684{
1685 buf.clear ();
1686
1687 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1688
1689 // add end marker
1690 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1691 r->m = 0;
1692
1693 return (maprect *)buf.linearise ();
1694}
1695

Diff Legend

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