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.142 by root, Sun May 18 17:52:53 2008 UTC vs.
Revision 1.198 by root, Thu Apr 29 12:24:04 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <unistd.h> 25#include <unistd.h>
25 26
26#include "global.h" 27#include "global.h"
27
28#include "loader.h"
29
30#include "path.h" 28#include "path.h"
29
30//+GPL
31
32sint8 maptile::outdoor_darkness;
31 33
32/* This rolls up wall, blocks_magic, blocks_view, etc, all into 34/* This rolls up wall, blocks_magic, blocks_view, etc, all into
33 * one function that just returns a P_.. value (see map.h) 35 * one function that just returns a P_.. value (see map.h)
34 * it will also do map translation for tiled maps, returning 36 * it will also do map translation for tiled maps, returning
35 * new values into newmap, nx, and ny. Any and all of those 37 * new values into newmap, nx, and ny. Any and all of those
… …
70 * by the caller. 72 * by the caller.
71 */ 73 */
72int 74int
73blocked_link (object *ob, maptile *m, int sx, int sy) 75blocked_link (object *ob, maptile *m, int sx, int sy)
74{ 76{
75 object *tmp;
76 int mflags, blocked;
77
78 /* Make sure the coordinates are valid - they should be, as caller should 77 /* Make sure the coordinates are valid - they should be, as caller should
79 * have already checked this. 78 * have already checked this.
80 */ 79 */
81 if (OUT_OF_REAL_MAP (m, sx, sy)) 80 if (OUT_OF_REAL_MAP (m, sx, sy))
82 { 81 {
83 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 82 LOG (llevError | logBacktrace, "blocked_link: Passed map, x, y coordinates outside of map\n");
84 return 1; 83 return 1;
85 } 84 }
86 85
87 /* Save some cycles - instead of calling get_map_flags(), just get the value 86 mapspace &ms = m->at (sx, sy);
88 * directly.
89 */
90 mflags = m->at (sx, sy).flags ();
91 87
92 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 88 int mflags = ms.flags ();
89 int blocked = ms.move_block;
93 90
94 /* If space is currently not blocked by anything, no need to 91 /* If space is currently not blocked by anything, no need to
95 * go further. Not true for players - all sorts of special 92 * go further. Not true for players - all sorts of special
96 * things we need to do for players. 93 * things we need to do for players.
97 */ 94 */
98 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 95 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
99 return 0; 96 return 0;
100 97
101 /* if there isn't anytyhing alive on this space, and this space isn't 98 /* if there isn't anything alive on this space, and this space isn't
102 * otherwise blocked, we can return now. Only if there is a living 99 * otherwise blocked, we can return now. Only if there is a living
103 * creature do we need to investigate if it is part of this creature 100 * creature do we need to investigate if it is part of this creature
104 * or another. Likewise, only if something is blocking us do we 101 * or another. Likewise, only if something is blocking us do we
105 * need to investigate if there is a special circumstance that would 102 * need to investigate if there is a special circumstance that would
106 * let the player through (inventory checkers for example) 103 * let the player through (inventory checkers for example)
… …
113 /* We basically go through the stack of objects, and if there is 110 /* We basically go through the stack of objects, and if there is
114 * some other object that has NO_PASS or FLAG_ALIVE set, return 111 * some other object that has NO_PASS or FLAG_ALIVE set, return
115 * true. If we get through the entire stack, that must mean 112 * true. If we get through the entire stack, that must mean
116 * ob is blocking it, so return 0. 113 * ob is blocking it, so return 0.
117 */ 114 */
118 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 115 for (object *tmp = ms.top; tmp; tmp = tmp->below)
119 { 116 {
120 117 if (OB_MOVE_BLOCK (ob, tmp))
121 /* This must be before the checks below. Code for inventory checkers. */
122 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
123 { 118 {
124 /* If last_sp is set, the player/monster needs an object, 119 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
125 * so we check for it. If they don't have it, they can't 120 if (RESULT_INT (0))
126 * pass through this space. 121 return 1;
127 */ 122 else
128 if (tmp->last_sp) 123 continue;
124
125 if (tmp->type == CHECK_INV)
129 { 126 {
130 if (check_inv_recursive (ob, tmp) == NULL) 127 bool have = check_inv_recursive (ob, tmp);
128
129 // last_sp set means we block if we don't have.
130 if (logical_xor (have, tmp->last_sp))
131 return 1; 131 return 1;
132 else 132 }
133 continue; 133 else if (tmp->type == T_MATCH)
134 {
135 // T_MATCH allows "entrance" iff the match is true
136 // == blocks if the match fails
137
138 // we could have used an INVOKE_OBJECT, but decided against it, as we
139 // assume that T_MATCH is relatively common.
140 if (!match (tmp->slaying, ob, tmp, ob))
141 return 1;
134 } 142 }
135 else 143 else
136 { 144 return 1; // unconditional block
137 /* In this case, the player must not have the object - 145
138 * if they do, they can't pass through.
139 */
140 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
141 return 1;
142 else
143 continue;
144 }
145 } /* if check_inv */
146 else 146 } else {
147 { 147 // space does not block the ob, directly, but
148 /* Broke apart a big nasty if into several here to make 148 // anything alive that is not a door still
149 * this more readable. first check - if the space blocks 149 // blocks anything
150 * movement, can't move here.
151 * second - if a monster, can't move there, unless it is a
152 * hidden dm
153 */
154 if (OB_MOVE_BLOCK (ob, tmp))
155 return 1;
156 150
157 if (tmp->flag [FLAG_ALIVE] 151 if (tmp->flag [FLAG_ALIVE]
158 && tmp->head_ () != ob
159 && tmp != ob
160 && tmp->type != DOOR 152 && tmp->type != DOOR
161 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden)) 153 && tmp->head_ () != ob) //TODO: maybe move these check up?
162 return 1; 154 return 1;
163 } 155 }
164
165 } 156 }
157
166 return 0; 158 return 0;
167} 159}
168 160
169/* 161/*
170 * 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
171 * 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,
172 * just calling get_map_blocked and checking that against movement type 164 * just calling get_map_blocked and checking that against movement type
173 * 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
174 * object and makes sure they can be inserted. 166 * object and makes sure they can be inserted.
175 * 167 *
… …
222 } 214 }
223 215
224 return 0; 216 return 0;
225} 217}
226 218
227/* When the map is loaded, load_object does not actually insert objects 219//-GPL
228 * into inventory, but just links them. What this does is go through
229 * and insert them properly.
230 * The object 'container' is the object that contains the inventory.
231 * This is needed so that we can update the containers weight.
232 */
233void
234fix_container (object *container)
235{
236 object *tmp = container->inv, *next;
237
238 container->inv = 0;
239 while (tmp)
240 {
241 next = tmp->below;
242 if (tmp->inv)
243 fix_container (tmp);
244
245 insert_ob_in_ob (tmp, container);
246 tmp = next;
247 }
248
249 // go through and calculate what all the containers are carrying.
250 //TODO: remove
251 container->update_weight ();
252}
253 220
254void 221void
255maptile::set_object_flag (int flag, int value) 222maptile::set_object_flag (int flag, int value)
256{ 223{
257 if (!spaces) 224 if (!spaces)
… …
259 226
260 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 227 for (mapspace *ms = spaces + size (); ms-- > spaces; )
261 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 228 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
262 tmp->flag [flag] = value; 229 tmp->flag [flag] = value;
263} 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
264 259
265/* 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
266 * 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
267 * 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
268 * they are saved). 263 * they are saved).
… …
296 op = op->above; 291 op = op->above;
297 } 292 }
298 } 293 }
299} 294}
300 295
296//-GPL
297
301/* 298/*
302 * 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
303 * file pointer. 300 * file pointer.
304 */ 301 */
305bool 302bool
… …
321 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) 318 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
322 { 319 {
323 // we insert manually because 320 // we insert manually because
324 // a) its way faster 321 // a) its way faster
325 // b) we remove manually, too, and there are good reasons for that 322 // b) we remove manually, too, and there are good reasons for that
326 // c) its correct 323 // c) it's correct
327 mapspace &ms = at (op->x, op->y); 324 mapspace &ms = at (op->x, op->y);
328 325
329 op->flag [FLAG_REMOVED] = false; 326 op->flag [FLAG_REMOVED] = false;
330 327
331 op->above = 0; 328 op->above = 0;
332 op->below = ms.top; 329 op->below = ms.top;
333 330
334 if (ms.top)
335 ms.top->above = op; 331 *(ms.top ? &ms.top->above : &ms.bot) = op;
336 else
337 ms.bot = op;
338 332
339 ms.top = op; 333 ms.top = op;
340 ms.flags_ = 0; 334 ms.flags_ = 0;
341 } 335 }
342 else 336 else
… …
427 return false; 421 return false;
428 422
429 return freezer.save (path); 423 return freezer.save (path);
430} 424}
431 425
432maptile::maptile () 426void
427maptile::init ()
433{ 428{
434 in_memory = MAP_SWAPPED; 429 in_memory = MAP_SWAPPED;
435 430
436 /* 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
437 * map archetype. Mimic that behaviour. 432 * map archetype. Mimic that behaviour.
438 */ 433 */
439 width = 16; 434 width = 16;
440 height = 16; 435 height = 16;
441 timeout = 300; 436 timeout = 300;
442 max_nrof = 1000; // 1000 items of anything 437 max_items = MAX_ITEM_PER_ACTION;
443 max_volume = 2000000; // 2m³ 438 max_volume = 2000000; // 2m³
444}
445
446maptile::maptile (int w, int h)
447{
448 in_memory = MAP_SWAPPED;
449
450 width = w;
451 height = h;
452 reset_timeout = 0; 439 reset_timeout = 0;
453 timeout = 300;
454 enter_x = 0; 440 enter_x = 0;
455 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;
456 455
457 alloc (); 456 alloc ();
458} 457}
459 458
460/* 459/*
… …
468 if (spaces) 467 if (spaces)
469 return; 468 return;
470 469
471 spaces = salloc0<mapspace> (size ()); 470 spaces = salloc0<mapspace> (size ());
472} 471}
472
473//+GPL
473 474
474/* 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
475 * 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
476 * at a later date. 477 * at a later date.
477 * Called by parse_map_headers below. 478 * Called by parse_map_headers below.
… …
554 return items; 555 return items;
555} 556}
556 557
557/* 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
558 * the map (or something equivilent) into output_string. */ 559 * the map (or something equivilent) into output_string. */
559static void 560static const char *
560print_shop_string (maptile *m, char *output_string) 561print_shop_string (maptile *m)
561{ 562{
562 int i; 563 static dynbuf_text buf; buf.clear ();
563 char tmp[MAX_BUF]; 564 bool first = true;
564 565
565 strcpy (output_string, "");
566 for (i = 0; i < m->shopitems[0].index; i++) 566 for (int i = 0; i < m->shopitems[0].index; i++)
567 { 567 {
568 if (!first)
569 buf << ';';
570
571 first = false;
572
568 if (m->shopitems[i].typenum) 573 if (m->shopitems[i].typenum)
569 { 574 {
570 if (m->shopitems[i].strength) 575 if (m->shopitems[i].strength)
571 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 576 buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
572 else 577 else
573 sprintf (tmp, "%s;", m->shopitems[i].name); 578 buf.printf ("%s", m->shopitems[i].name);
574 } 579 }
575 else 580 else
576 { 581 {
577 if (m->shopitems[i].strength) 582 if (m->shopitems[i].strength)
578 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 583 buf.printf ("*:%d", m->shopitems[i].strength);
579 else 584 else
580 sprintf (tmp, "*"); 585 buf.printf ("*");
581 } 586 }
582
583 strcat (output_string, tmp);
584 } 587 }
588
589 return buf;
585} 590}
591
592//-GPL
586 593
587/* This loads the header information of the map. The header 594/* This loads the header information of the map. The header
588 * contains things like difficulty, size, timeout, etc. 595 * contains things like difficulty, size, timeout, etc.
589 * this used to be stored in the map object, but with the 596 * this used to be stored in the map object, but with the
590 * addition of tiling, fields beyond that easily named in an 597 * addition of tiling, fields beyond that easily named in an
… …
631 case KW_shopgreed: thawer.get (shopgreed); break; 638 case KW_shopgreed: thawer.get (shopgreed); break;
632 case KW_shopmin: thawer.get (shopmin); break; 639 case KW_shopmin: thawer.get (shopmin); break;
633 case KW_shopmax: thawer.get (shopmax); break; 640 case KW_shopmax: thawer.get (shopmax); break;
634 case KW_shoprace: thawer.get (shoprace); break; 641 case KW_shoprace: thawer.get (shoprace); break;
635 case KW_outdoor: thawer.get (outdoor); break; 642 case KW_outdoor: thawer.get (outdoor); break;
636 case KW_temp: thawer.get (temp); break;
637 case KW_pressure: thawer.get (pressure); break;
638 case KW_humid: thawer.get (humid); break;
639 case KW_windspeed: thawer.get (windspeed); break;
640 case KW_winddir: thawer.get (winddir); break;
641 case KW_sky: thawer.get (sky); break;
642 643
643 case KW_per_player: thawer.get (per_player); break; 644 case KW_per_player: thawer.get (per_player); break;
644 case KW_per_party: thawer.get (per_party); break; 645 case KW_per_party: thawer.get (per_party); break;
645 case KW_no_reset: thawer.get (no_reset); break; 646 case KW_no_reset: thawer.get (no_reset); break;
646 case KW_no_drop: thawer.get (no_drop); break; 647 case KW_no_drop: thawer.get (no_drop); break;
647 648
648 case KW_region: default_region = region::find (thawer.get_str ()); break; 649 case KW_region: thawer.get (default_region); break;
649 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 650 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
650 651
651 // old names new names 652 // old names new names
652 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 653 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
653 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 654 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
671 case KW_end: 672 case KW_end:
672 thawer.next (); 673 thawer.next ();
673 return true; 674 return true;
674 675
675 default: 676 default:
676 if (!thawer.parse_error ("map", 0)) 677 if (!thawer.parse_error ("map"))
677 return false; 678 return false;
678 break; 679 break;
679 } 680 }
680 681
681 thawer.next (); 682 thawer.next ();
682 } 683 }
683 684
684 abort (); 685 abort ();
685} 686}
687
688//+GPL
686 689
687/****************************************************************************** 690/******************************************************************************
688 * This is the start of unique map handling code 691 * This is the start of unique map handling code
689 *****************************************************************************/ 692 *****************************************************************************/
690 693
… …
697 int unique = 0; 700 int unique = 0;
698 for (object *op = spaces [i].bot; op; ) 701 for (object *op = spaces [i].bot; op; )
699 { 702 {
700 object *above = op->above; 703 object *above = op->above;
701 704
702 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 705 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
703 unique = 1; 706 unique = 1;
704 707
705 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 708 if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
706 {
707 op->destroy_inv (false);
708 op->destroy (); 709 op->destroy ();
709 }
710 710
711 op = above; 711 op = above;
712 } 712 }
713 } 713 }
714} 714}
715 715
716//-GPL
717
716bool 718bool
717maptile::_save_header (object_freezer &freezer) 719maptile::_save_header (object_freezer &freezer)
718{ 720{
719#define MAP_OUT(k) freezer.put (KW_ ## k, k) 721#define MAP_OUT(k) freezer.put (KW(k), k)
720#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 722#define MAP_OUT2(k,v) freezer.put (KW(k), v)
721 723
722 MAP_OUT2 (arch, "map"); 724 MAP_OUT2 (arch, CS(map));
723 725
724 if (name) MAP_OUT (name); 726 if (name) MAP_OUT (name);
725 MAP_OUT (swap_time); 727 MAP_OUT (swap_time);
726 MAP_OUT (reset_time); 728 MAP_OUT (reset_time);
727 MAP_OUT (reset_timeout); 729 MAP_OUT (reset_timeout);
728 MAP_OUT (fixed_resettime); 730 MAP_OUT (fixed_resettime);
729 MAP_OUT (no_reset); 731 MAP_OUT (no_reset);
730 MAP_OUT (no_drop); 732 MAP_OUT (no_drop);
731 MAP_OUT (difficulty); 733 MAP_OUT (difficulty);
732
733 if (default_region) MAP_OUT2 (region, default_region->name); 734 if (default_region) MAP_OUT2 (region, default_region->name);
734 735
735 if (shopitems) 736 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
736 {
737 char shop[MAX_BUF];
738 print_shop_string (this, shop);
739 MAP_OUT2 (shopitems, shop);
740 }
741
742 MAP_OUT (shopgreed); 737 MAP_OUT (shopgreed);
743 MAP_OUT (shopmin); 738 MAP_OUT (shopmin);
744 MAP_OUT (shopmax); 739 MAP_OUT (shopmax);
745 if (shoprace) MAP_OUT (shoprace); 740 if (shoprace) MAP_OUT (shoprace);
746 MAP_OUT (darkness); 741
747 MAP_OUT (width); 742 MAP_OUT (width);
748 MAP_OUT (height); 743 MAP_OUT (height);
749 MAP_OUT (enter_x); 744 MAP_OUT (enter_x);
750 MAP_OUT (enter_y); 745 MAP_OUT (enter_y);
751 746 MAP_OUT (darkness);
752 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
753 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
754
755 MAP_OUT (outdoor); 747 MAP_OUT (outdoor);
756 MAP_OUT (temp); 748
757 MAP_OUT (pressure); 749 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
758 MAP_OUT (humid); 750 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
759 MAP_OUT (windspeed);
760 MAP_OUT (winddir);
761 MAP_OUT (sky);
762 751
763 MAP_OUT (per_player); 752 MAP_OUT (per_player);
764 MAP_OUT (per_party); 753 MAP_OUT (per_party);
765 754
766 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 755 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
767 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 756 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
768 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 757 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
769 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 758 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
770 759
771 freezer.put (this); 760 freezer.put (this);
772 freezer.put (KW_end); 761 freezer.put (KW(end));
773 762
774 return true; 763 return true;
775} 764}
776 765
777bool 766bool
… …
782 if (!_save_header (freezer)) 771 if (!_save_header (freezer))
783 return false; 772 return false;
784 773
785 return freezer.save (path); 774 return freezer.save (path);
786} 775}
776
777//+GPL
787 778
788/* 779/*
789 * Remove and free all objects in the given map. 780 * Remove and free all objects in the given map.
790 */ 781 */
791void 782void
… …
802 793
803 op->flag [FLAG_REMOVED] = true; 794 op->flag [FLAG_REMOVED] = true;
804 795
805 object *head = op->head_ (); 796 object *head = op->head_ ();
806 if (op == head) 797 if (op == head)
807 {
808 op->destroy_inv (false);
809 op->destroy (); 798 op->destroy ();
810 }
811 else if (head->map != op->map) 799 else if (head->map != op->map)
812 { 800 {
813 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ()); 801 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
814 head->destroy (); 802 head->destroy ();
815 } 803 }
… …
863 851
864 clear (); 852 clear ();
865} 853}
866 854
867/* decay and destroy perishable items in a map */ 855/* decay and destroy perishable items in a map */
856// TODO: should be done regularly, not on map load?
868void 857void
869maptile::do_decay_objects () 858maptile::do_decay_objects ()
870{ 859{
871 if (!spaces) 860 if (!spaces)
872 return; 861 return;
… …
874 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 863 for (mapspace *ms = spaces + size (); ms-- > spaces; )
875 for (object *above, *op = ms->bot; op; op = above) 864 for (object *above, *op = ms->bot; op; op = above)
876 { 865 {
877 above = op->above; 866 above = op->above;
878 867
868 // do not decay anything above unique floor tiles (yet :)
869 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
870 break;
871
879 bool destroy = 0; 872 bool destroy = 0;
880 873
881 // do not decay anything above unique floor tiles (yet :) 874 if (op->flag [FLAG_IS_FLOOR]
882 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 875 || op->flag [FLAG_OBJ_ORIGINAL]
883 break; 876 || op->flag [FLAG_UNIQUE]
884 877 || op->flag [FLAG_OVERLAY_FLOOR]
885 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 878 || op->flag [FLAG_UNPAID]
886 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
887 || QUERY_FLAG (op, FLAG_UNIQUE)
888 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
889 || QUERY_FLAG (op, FLAG_UNPAID)
890 || op->is_alive ()) 879 || op->is_alive ())
891 ; // do not decay 880 ; // do not decay
892 else if (op->is_weapon ()) 881 else if (op->is_weapon ())
893 { 882 {
894 op->stats.dam--; 883 op->stats.dam--;
… …
919 || mat & M_LIQUID 908 || mat & M_LIQUID
920 || (mat & M_IRON && rndm (1, 5) == 1) 909 || (mat & M_IRON && rndm (1, 5) == 1)
921 || (mat & M_GLASS && rndm (1, 2) == 1) 910 || (mat & M_GLASS && rndm (1, 2) == 1)
922 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 911 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
923 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 912 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
924 || (mat & M_ICE && temp > 32)) 913 //|| (mat & M_ICE && temp > 32)
914 )
925 destroy = 1; 915 destroy = 1;
926 } 916 }
927 917
928 /* adjust overall chance below */ 918 /* adjust overall chance below */
929 if (destroy && rndm (0, 1)) 919 if (destroy && rndm (0, 1))
930 op->destroy (); 920 op->destroy ();
931 }
932}
933
934/*
935 * Updates every button on the map (by calling update_button() for them).
936 */
937void
938maptile::update_buttons ()
939{
940 for (oblinkpt *obp = buttons; obp; obp = obp->next)
941 for (objectlink *ol = obp->link; ol; ol = ol->next)
942 {
943 if (!ol->ob)
944 {
945 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
946 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
947 continue;
948 }
949
950 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
951 {
952 update_button (ol->ob);
953 break;
954 }
955 } 921 }
956} 922}
957 923
958/* 924/*
959 * This routine is supposed to find out the difficulty of the map. 925 * This routine is supposed to find out the difficulty of the map.
960 * difficulty does not have a lot to do with character level, 926 * difficulty does not have a lot to do with character level,
961 * but does have a lot to do with treasure on the map. 927 * but does have a lot to do with treasure on the map.
962 * 928 *
963 * Difficulty can now be set by the map creature. If the value stored 929 * Difficulty can now be set by the map creator. If the value stored
964 * in the map is zero, then use this routine. Maps should really 930 * in the map is zero, then use this routine. Maps should really
965 * have a difficulty set than using this function - human calculation 931 * have a difficulty set rather than using this function - human calculation
966 * is much better than this functions guesswork. 932 * is much better than this function's guesswork.
967 */ 933 */
968int 934int
969maptile::estimate_difficulty () const 935maptile::estimate_difficulty () const
970{ 936{
971 long monster_cnt = 0; 937 long monster_cnt = 0;
… …
973 sint64 total_exp = 0; 939 sint64 total_exp = 0;
974 940
975 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 941 for (mapspace *ms = spaces + size (); ms-- > spaces; )
976 for (object *op = ms->bot; op; op = op->above) 942 for (object *op = ms->bot; op; op = op->above)
977 { 943 {
978 if (QUERY_FLAG (op, FLAG_MONSTER)) 944 if (op->flag [FLAG_MONSTER])
979 { 945 {
980 total_exp += op->stats.exp; 946 total_exp += op->stats.exp;
981 monster_cnt++; 947 monster_cnt++;
982 } 948 }
983 949
984 if (QUERY_FLAG (op, FLAG_GENERATOR)) 950 if (op->flag [FLAG_GENERATOR])
985 { 951 {
986 total_exp += op->stats.exp; 952 total_exp += op->stats.exp;
987 953
988 if (archetype *at = op->other_arch) 954 if (archetype *at = op->other_arch)
989 { 955 {
… …
1016 * postive values make it darker, negative make it brighter 982 * postive values make it darker, negative make it brighter
1017 */ 983 */
1018int 984int
1019maptile::change_map_light (int change) 985maptile::change_map_light (int change)
1020{ 986{
1021 int new_level = darkness + change;
1022
1023 /* Nothing to do */ 987 /* Nothing to do */
1024 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 988 if (!change)
1025 return 0; 989 return 0;
1026 990
1027 /* inform all players on the map */ 991 /* inform all players on the map */
1028 if (change > 0) 992 if (change > 0)
1029 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 993 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1030 else 994 else
1031 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 995 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1032 996
1033 /* Do extra checking. since darkness is a unsigned value, 997 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1034 * we need to be extra careful about negative values.
1035 * In general, the checks below are only needed if change
1036 * is not +/-1
1037 */
1038 if (new_level < 0)
1039 darkness = 0;
1040 else if (new_level >= MAX_DARKNESS)
1041 darkness = MAX_DARKNESS;
1042 else
1043 darkness = new_level;
1044 998
1045 /* All clients need to get re-updated for the change */ 999 /* All clients need to get re-updated for the change */
1046 update_all_map_los (this); 1000 update_all_map_los (this);
1047 1001
1048 return 1; 1002 return 1;
… …
1056 */ 1010 */
1057void 1011void
1058mapspace::update_ () 1012mapspace::update_ ()
1059{ 1013{
1060 object *last = 0; 1014 object *last = 0;
1061 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1015 uint8 flags = P_UPTODATE;
1016 sint8 light = 0;
1062 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1017 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1018 uint64_t volume = 0;
1019 uint32_t items = 0;
1020 object *anywhere = 0;
1021 uint8_t middle_visibility = 0;
1063 1022
1064 //object *middle = 0; 1023 //object *middle = 0;
1065 //object *top = 0; 1024 //object *top = 0;
1066 //object *floor = 0; 1025 //object *floor = 0;
1067 // this seems to generate better code than using locals, above 1026 // this seems to generate better code than using locals, above
1068 object *&top = faces_obj[0] = 0; 1027 object *&top = faces_obj[0] = 0;
1069 object *&middle = faces_obj[1] = 0; 1028 object *&middle = faces_obj[1] = 0;
1070 object *&floor = faces_obj[2] = 0; 1029 object *&floor = faces_obj[2] = 0;
1071 1030
1031 object::flags_t allflags; // all flags of all objects or'ed together
1032
1072 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above) 1033 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1073 { 1034 {
1074 /* This could be made additive I guess (two lights better than 1035 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1075 * one). But if so, it shouldn't be a simple additive - 2
1076 * light bulbs do not illuminate twice as far as once since
1077 * it is a dissapation factor that is cubed.
1078 */
1079 light = max (light, tmp->glow_radius); 1036 light += tmp->glow_radius;
1080 1037
1081 /* This call is needed in order to update objects the player 1038 /* This call is needed in order to update objects the player
1082 * is standing in that have animations (ie, grass, fire, etc). 1039 * is standing in that have animations (ie, grass, fire, etc).
1083 * However, it also causes the look window to be re-drawn 1040 * However, it also causes the look window to be re-drawn
1084 * 3 times each time the player moves, because many of the 1041 * 3 times each time the player moves, because many of the
1085 * functions the move_player calls eventualy call this. 1042 * functions the move_player calls eventualy call this.
1086 * 1043 *
1087 * Always put the player down for drawing. 1044 * Always put the player down for drawing.
1088 */ 1045 */
1089 if (!tmp->invisible) 1046 if (expect_true (!tmp->invisible))
1090 { 1047 {
1091 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1048 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1092 top = tmp; 1049 top = tmp;
1093 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1050 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1094 { 1051 {
1095 /* If we got a floor, that means middle and top were below it, 1052 /* If we got a floor, that means middle and top were below it,
1096 * so should not be visible, so we clear them. 1053 * so should not be visible, so we clear them.
1097 */ 1054 */
1098 middle = 0; 1055 middle = 0;
1099 top = 0; 1056 top = 0;
1100 floor = tmp; 1057 floor = tmp;
1058 volume = 0;
1059 items = 0;
1101 } 1060 }
1102 /* Flag anywhere have high priority */ 1061 else
1103 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1104 { 1062 {
1063 if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1064 {
1065 ++items;
1066 volume += tmp->volume ();
1067 }
1068
1069 /* Flag anywhere have high priority */
1070 if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1071 anywhere = tmp;
1072
1073 /* Find the highest visible face around. If equal
1074 * visibilities, we still want the one nearer to the
1075 * top
1076 */
1077 if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
1078 {
1079 middle_visibility = ::faces [tmp->face].visibility;
1105 middle = tmp; 1080 middle = tmp;
1106 anywhere = 1; 1081 }
1107 } 1082 }
1108 /* Find the highest visible face around. If equal
1109 * visibilities, we still want the one nearer to the
1110 * top
1111 */
1112 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1113 middle = tmp;
1114 }
1115
1116 if (tmp == tmp->above)
1117 {
1118 LOG (llevError, "Error in structure of map\n");
1119 exit (-1);
1120 } 1083 }
1121 1084
1122 move_slow |= tmp->move_slow; 1085 move_slow |= tmp->move_slow;
1123 move_block |= tmp->move_block; 1086 move_block |= tmp->move_block;
1124 move_on |= tmp->move_on; 1087 move_on |= tmp->move_on;
1125 move_off |= tmp->move_off; 1088 move_off |= tmp->move_off;
1126 move_allow |= tmp->move_allow; 1089 move_allow |= tmp->move_allow;
1127 1090
1128 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1091 allflags |= tmp->flag;
1129 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1092
1130 if (tmp->type == PLAYER) flags |= P_PLAYER; 1093 if (tmp->type == PLAYER) flags |= P_PLAYER;
1131 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1094 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1132 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1133 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1134 } 1095 }
1135 1096
1136 this->light = light; 1097 // FLAG_SEE_ANYWHERE takes precedence
1098 if (anywhere)
1099 middle = anywhere;
1100
1101 // ORing all flags together and checking them here is much faster
1102 if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
1103 if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
1104 if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
1105 if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
1106
1107 this->light = min (light, MAX_LIGHT_RADIUS);
1137 this->flags_ = flags; 1108 this->flags_ = flags;
1138 this->move_block = move_block & ~move_allow; 1109 this->move_block = move_block & ~move_allow;
1139 this->move_on = move_on; 1110 this->move_on = move_on;
1140 this->move_off = move_off; 1111 this->move_off = move_off;
1141 this->move_slow = move_slow; 1112 this->move_slow = move_slow;
1113 this->volume_ = (volume + 1023) / 1024;
1114 this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1142 1115
1143 /* At this point, we have a floor face (if there is a floor), 1116 /* At this point, we have a floor face (if there is a floor),
1144 * and the floor is set - we are not going to touch it at 1117 * and the floor is set - we are not going to touch it at
1145 * this point. 1118 * this point.
1146 * middle contains the highest visibility face. 1119 * middle contains the highest visibility face.
… …
1164 */ 1137 */
1165 1138
1166 for (object *tmp = last; tmp; tmp = tmp->below) 1139 for (object *tmp = last; tmp; tmp = tmp->below)
1167 { 1140 {
1168 /* Once we get to a floor, stop, since we already have a floor object */ 1141 /* Once we get to a floor, stop, since we already have a floor object */
1169 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1142 if (tmp->flag [FLAG_IS_FLOOR])
1170 break; 1143 break;
1171 1144
1172 /* If two top faces are already set, quit processing */ 1145 /* If two top faces are already set, quit processing */
1173 if (top && middle) 1146 if (top && middle)
1174 break; 1147 break;
… …
1212 faces_obj [1] = middle; 1185 faces_obj [1] = middle;
1213 faces_obj [2] = floor; 1186 faces_obj [2] = floor;
1214#endif 1187#endif
1215} 1188}
1216 1189
1217uint64 1190maptile *
1218mapspace::volume () const
1219{
1220 uint64 vol = 0;
1221
1222 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1223 vol += op->volume ();
1224
1225 return vol;
1226}
1227
1228bool
1229maptile::tile_available (int dir, bool load) 1191maptile::tile_available (int dir, bool load)
1230{ 1192{
1231 if (!tile_path[dir]) 1193 if (tile_path[dir])
1232 return 0; 1194 {
1233
1234 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1195 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1235 return 1; 1196 return tile_map[dir];
1236 1197
1237 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1198 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1238 return 1; 1199 return tile_map[dir];
1200 }
1239 1201
1240 return 0; 1202 return 0;
1241} 1203}
1242 1204
1243/* this returns TRUE if the coordinates (x,y) are out of 1205/* this returns TRUE if the coordinates (x,y) are out of
… …
1468 * 1430 *
1469 * currently, the only flag supported (0x1) is don't translate for 1431 * currently, the only flag supported (0x1) is don't translate for
1470 * closest body part of 'op1' 1432 * closest body part of 'op1'
1471 */ 1433 */
1472void 1434void
1473get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1435get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1474{ 1436{
1475 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1437 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1476 { 1438 {
1477 /* be conservative and fill in _some_ data */ 1439 /* be conservative and fill in _some_ data */
1478 retval->distance = 10000; 1440 retval->distance = 10000;
1479 retval->distance_x = 10000; 1441 retval->distance_x = 10000;
1480 retval->distance_y = 10000; 1442 retval->distance_y = 10000;
1481 retval->direction = 0; 1443 retval->direction = 0;
1482 retval->part = 0; 1444 retval->part = 0;
1483 } 1445 }
1484 else 1446 else
1485 { 1447 {
1486 object *best;
1487
1488 retval->distance_x += op2->x - op1->x; 1448 retval->distance_x += op2->x - op1->x;
1489 retval->distance_y += op2->y - op1->y; 1449 retval->distance_y += op2->y - op1->y;
1490 1450
1491 best = op1; 1451 object *best = op1;
1452
1492 /* If this is multipart, find the closest part now */ 1453 /* If this is multipart, find the closest part now */
1493 if (!(flags & 0x1) && op1->more) 1454 if (!(flags & 1) && op1->more)
1494 { 1455 {
1495 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1456 int best_distance = idistance (retval->distance_x, retval->distance_y);
1496 1457
1497 /* we just take the offset of the piece to head to figure 1458 /* we just take the offset of the piece to head to figure
1498 * distance instead of doing all that work above again 1459 * distance instead of doing all that work above again
1499 * since the distance fields we set above are positive in the 1460 * since the distance fields we set above are positive in the
1500 * same axis as is used for multipart objects, the simply arithmetic 1461 * same axis as is used for multipart objects, the simply arithmetic
1501 * below works. 1462 * below works.
1502 */ 1463 */
1503 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1464 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1504 { 1465 {
1505 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1466 int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1506 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1467
1507 if (tmpi < best_distance) 1468 if (tmpi < best_distance)
1508 { 1469 {
1509 best_distance = tmpi; 1470 best_distance = tmpi;
1510 best = tmp; 1471 best = tmp;
1511 } 1472 }
1512 } 1473 }
1513 1474
1514 if (best != op1) 1475 if (best != op1)
1515 { 1476 {
1516 retval->distance_x += op1->x - best->x; 1477 retval->distance_x += op1->x - best->x;
1517 retval->distance_y += op1->y - best->y; 1478 retval->distance_y += op1->y - best->y;
1518 } 1479 }
1519 } 1480 }
1520 1481
1521 retval->part = best; 1482 retval->part = best;
1522 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1483 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1523 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1484 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1524 } 1485 }
1525} 1486}
1526 1487
1527/* this is basically the same as get_rangevector above, but instead of 1488/* this is basically the same as get_rangevector above, but instead of
1528 * the first parameter being an object, it instead is the map 1489 * the first parameter being an object, it instead is the map
… …
1538get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1499get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1539{ 1500{
1540 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1501 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1541 { 1502 {
1542 /* be conservative and fill in _some_ data */ 1503 /* be conservative and fill in _some_ data */
1543 retval->distance = 100000; 1504 retval->distance = 100000;
1544 retval->distance_x = 32767; 1505 retval->distance_x = 32767;
1545 retval->distance_y = 32767; 1506 retval->distance_y = 32767;
1546 retval->direction = 0; 1507 retval->direction = 0;
1547 retval->part = 0; 1508 retval->part = 0;
1548 } 1509 }
1549 else 1510 else
1550 { 1511 {
1551 retval->distance_x += op2->x - x; 1512 retval->distance_x += op2->x - x;
1552 retval->distance_y += op2->y - y; 1513 retval->distance_y += op2->y - y;
1553 1514
1554 retval->part = NULL; 1515 retval->part = 0;
1555 retval->distance = idistance (retval->distance_x, retval->distance_y); 1516 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1556 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1517 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1557 } 1518 }
1558} 1519}
1559 1520
1560/* Returns true of op1 and op2 are effectively on the same map 1521/* Returns true of op1 and op2 are effectively on the same map
1561 * (as related to map tiling). Note that this looks for a path from 1522 * (as related to map tiling). Note that this looks for a path from
… …
1571 int dx, dy; 1532 int dx, dy;
1572 1533
1573 return adjacent_map (op1->map, op2->map, &dx, &dy); 1534 return adjacent_map (op1->map, op2->map, &dx, &dy);
1574} 1535}
1575 1536
1537//-GPL
1538
1576object * 1539object *
1577maptile::insert (object *op, int x, int y, object *originator, int flags) 1540maptile::insert (object *op, int x, int y, object *originator, int flags)
1578{ 1541{
1579 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1542 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1580} 1543}
… …
1591 if (default_region) 1554 if (default_region)
1592 return default_region; 1555 return default_region;
1593 1556
1594 return ::region::default_region (); 1557 return ::region::default_region ();
1595} 1558}
1559
1560//+GPL
1596 1561
1597/* picks a random object from a style map. 1562/* picks a random object from a style map.
1598 */ 1563 */
1599object * 1564object *
1600maptile::pick_random_object (rand_gen &gen) const 1565maptile::pick_random_object (rand_gen &gen) const
… …
1607 */ 1572 */
1608 for (int i = 1000; --i;) 1573 for (int i = 1000; --i;)
1609 { 1574 {
1610 object *pick = at (gen (width), gen (height)).bot; 1575 object *pick = at (gen (width), gen (height)).bot;
1611 1576
1612 // do not prefer big monsters just because they are big. 1577 // must be head: do not prefer big monsters just because they are big.
1613 if (pick && pick->is_head ()) 1578 if (pick && pick->is_head ())
1614 return pick->head_ (); 1579 return pick;
1615 } 1580 }
1616 1581
1617 // instead of crashing in the unlikely(?) case, try to return *something* 1582 // instead of crashing in the unlikely(?) case, try to return *something*
1618 return archetype::find ("bug"); 1583 return archetype::find (shstr_bug);
1619} 1584}
1585
1586//-GPL
1620 1587
1621void 1588void
1622maptile::play_sound (faceidx sound, int x, int y) const 1589maptile::play_sound (faceidx sound, int x, int y) const
1623{ 1590{
1624 if (!sound) 1591 if (!sound)
1625 return; 1592 return;
1626 1593
1594 for_all_players_on_map (pl, this)
1595 if (client *ns = pl->ns)
1596 {
1597 int dx = x - pl->ob->x;
1598 int dy = y - pl->ob->y;
1599
1600 int distance = idistance (dx, dy);
1601
1602 if (distance <= MAX_SOUND_DISTANCE)
1603 ns->play_sound (sound, dx, dy);
1604 }
1605}
1606
1607void
1608maptile::say_msg (const char *msg, int x, int y) const
1609{
1627 for_all_players (pl) 1610 for_all_players (pl)
1628 if (pl->ob->map == this)
1629 if (client *ns = pl->ns) 1611 if (client *ns = pl->ns)
1630 { 1612 {
1631 int dx = x - pl->ob->x; 1613 int dx = x - pl->ob->x;
1632 int dy = y - pl->ob->y; 1614 int dy = y - pl->ob->y;
1633 1615
1634 int distance = idistance (dx, dy); 1616 int distance = idistance (dx, dy);
1635 1617
1636 if (distance <= MAX_SOUND_DISTANCE) 1618 if (distance <= MAX_SOUND_DISTANCE)
1637 ns->play_sound (sound, dx, dy); 1619 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1638 } 1620 }
1639} 1621}
1640 1622
1623dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1624
1625static void
1626split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1627{
1628 // clip to map to the left
1629 if (x0 < 0)
1630 {
1631 if (maptile *tile = m->tile_available (TILE_LEFT, 1))
1632 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1633
1634 if (x1 < 0) // entirely to the left
1635 return;
1636
1637 x0 = 0;
1638 }
1639
1640 // clip to map to the right
1641 if (x1 > m->width)
1642 {
1643 if (maptile *tile = m->tile_available (TILE_RIGHT, 1))
1644 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1645
1646 if (x0 > m->width) // entirely to the right
1647 return;
1648
1649 x1 = m->width;
1650 }
1651
1652 // clip to map above
1653 if (y0 < 0)
1654 {
1655 if (maptile *tile = m->tile_available (TILE_UP, 1))
1656 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1657
1658 if (y1 < 0) // entirely above
1659 return;
1660
1661 y0 = 0;
1662 }
1663
1664 // clip to map below
1665 if (y1 > m->height)
1666 {
1667 if (maptile *tile = m->tile_available (TILE_DOWN, 1))
1668 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1669
1670 if (y0 > m->height) // entirely below
1671 return;
1672
1673 y1 = m->height;
1674 }
1675
1676 // if we get here, the rect is within the current map
1677 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1678
1679 r->m = m;
1680 r->x0 = x0;
1681 r->y0 = y0;
1682 r->x1 = x1;
1683 r->y1 = y1;
1684 r->dx = dx;
1685 r->dy = dy;
1686}
1687
1688maprect *
1689maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1690{
1691 buf.clear ();
1692
1693 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1694
1695 // add end marker
1696 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1697 r->m = 0;
1698
1699 return (maprect *)buf.linearise ();
1700}
1701

Diff Legend

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