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.147 by root, Mon Sep 29 10:20:48 2008 UTC vs.
Revision 1.195 by root, Wed Apr 21 06:42:33 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 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#include "loader.h"
28#include "path.h" 28#include "path.h"
29
30//+GPL
31
32sint8 maptile::outdoor_darkness;
29 33
30/* This rolls up wall, blocks_magic, blocks_view, etc, all into 34/* This rolls up wall, blocks_magic, blocks_view, etc, all into
31 * one function that just returns a P_.. value (see map.h) 35 * one function that just returns a P_.. value (see map.h)
32 * it will also do map translation for tiled maps, returning 36 * it will also do map translation for tiled maps, returning
33 * 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
… …
68 * by the caller. 72 * by the caller.
69 */ 73 */
70int 74int
71blocked_link (object *ob, maptile *m, int sx, int sy) 75blocked_link (object *ob, maptile *m, int sx, int sy)
72{ 76{
73 object *tmp;
74 int mflags, blocked;
75
76 /* 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
77 * have already checked this. 78 * have already checked this.
78 */ 79 */
79 if (OUT_OF_REAL_MAP (m, sx, sy)) 80 if (OUT_OF_REAL_MAP (m, sx, sy))
80 { 81 {
81 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");
82 return 1; 83 return 1;
83 } 84 }
84 85
85 /* Save some cycles - instead of calling get_map_flags(), just get the value 86 mapspace &ms = m->at (sx, sy);
86 * directly.
87 */
88 mflags = m->at (sx, sy).flags ();
89 87
90 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 88 int mflags = ms.flags ();
89 int blocked = ms.move_block;
91 90
92 /* If space is currently not blocked by anything, no need to 91 /* If space is currently not blocked by anything, no need to
93 * go further. Not true for players - all sorts of special 92 * go further. Not true for players - all sorts of special
94 * things we need to do for players. 93 * things we need to do for players.
95 */ 94 */
96 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 95 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
97 return 0; 96 return 0;
98 97
99 /* 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
100 * 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
101 * 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
102 * or another. Likewise, only if something is blocking us do we 101 * or another. Likewise, only if something is blocking us do we
103 * need to investigate if there is a special circumstance that would 102 * need to investigate if there is a special circumstance that would
104 * let the player through (inventory checkers for example) 103 * let the player through (inventory checkers for example)
… …
111 /* 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
112 * 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
113 * true. If we get through the entire stack, that must mean 112 * true. If we get through the entire stack, that must mean
114 * ob is blocking it, so return 0. 113 * ob is blocking it, so return 0.
115 */ 114 */
116 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 115 for (object *tmp = ms.top; tmp; tmp = tmp->below)
117 { 116 {
118 117 if (OB_MOVE_BLOCK (ob, tmp))
119 /* This must be before the checks below. Code for inventory checkers. */
120 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
121 { 118 {
122 /* If last_sp is set, the player/monster needs an object, 119 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
123 * so we check for it. If they don't have it, they can't 120 if (RESULT_INT (0))
124 * pass through this space. 121 return 1;
125 */ 122 else
126 if (tmp->last_sp) 123 continue;
124
125 if (tmp->type == CHECK_INV)
127 { 126 {
128 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))
129 return 1; 131 return 1;
130 else 132 }
131 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;
132 } 142 }
133 else 143 else
134 { 144 return 1; // unconditional block
135 /* In this case, the player must not have the object - 145
136 * if they do, they can't pass through.
137 */
138 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
139 return 1;
140 else
141 continue;
142 }
143 } /* if check_inv */
144 else 146 } else {
145 { 147 // space does not block the ob, directly, but
146 /* Broke apart a big nasty if into several here to make 148 // anything alive that is not a door still
147 * this more readable. first check - if the space blocks 149 // blocks anything
148 * movement, can't move here.
149 * second - if a monster, can't move there, unless it is a
150 * hidden dm
151 */
152 if (OB_MOVE_BLOCK (ob, tmp))
153 return 1;
154 150
155 if (tmp->flag [FLAG_ALIVE] 151 if (tmp->flag [FLAG_ALIVE]
156 && tmp->head_ () != ob
157 && tmp != ob
158 && tmp->type != DOOR 152 && tmp->type != DOOR
159 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden)) 153 && tmp->head_ () != ob) //TODO: maybe move these check up?
160 return 1; 154 return 1;
161 } 155 }
162
163 } 156 }
157
164 return 0; 158 return 0;
165} 159}
166 160
167/* 161/*
168 * 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
169 * 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,
170 * just calling get_map_blocked and checking that against movement type 164 * just calling get_map_blocked and checking that against movement type
171 * 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
172 * object and makes sure they can be inserted. 166 * object and makes sure they can be inserted.
173 * 167 *
… …
220 } 214 }
221 215
222 return 0; 216 return 0;
223} 217}
224 218
225/* When the map is loaded, load_object does not actually insert objects 219//-GPL
226 * into inventory, but just links them. What this does is go through
227 * and insert them properly.
228 * The object 'container' is the object that contains the inventory.
229 * This is needed so that we can update the containers weight.
230 */
231void
232fix_container (object *container)
233{
234 object *tmp = container->inv, *next;
235
236 container->inv = 0;
237 while (tmp)
238 {
239 next = tmp->below;
240 if (tmp->inv)
241 fix_container (tmp);
242
243 insert_ob_in_ob (tmp, container);
244 tmp = next;
245 }
246
247 // go through and calculate what all the containers are carrying.
248 //TODO: remove
249 container->update_weight ();
250}
251 220
252void 221void
253maptile::set_object_flag (int flag, int value) 222maptile::set_object_flag (int flag, int value)
254{ 223{
255 if (!spaces) 224 if (!spaces)
… …
270 239
271 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 240 for (mapspace *ms = spaces + size (); ms-- > spaces; )
272 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 241 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
273 INVOKE_OBJECT (RESET, tmp); 242 INVOKE_OBJECT (RESET, tmp);
274} 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
275 259
276/* 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
277 * 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
278 * 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
279 * they are saved). 263 * they are saved).
… …
307 op = op->above; 291 op = op->above;
308 } 292 }
309 } 293 }
310} 294}
311 295
296//-GPL
297
312/* 298/*
313 * 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
314 * file pointer. 300 * file pointer.
315 */ 301 */
316bool 302bool
… …
332 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))
333 { 319 {
334 // we insert manually because 320 // we insert manually because
335 // a) its way faster 321 // a) its way faster
336 // 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
337 // c) its correct 323 // c) it's correct
338 mapspace &ms = at (op->x, op->y); 324 mapspace &ms = at (op->x, op->y);
339 325
340 op->flag [FLAG_REMOVED] = false; 326 op->flag [FLAG_REMOVED] = false;
341 327
342 op->above = 0; 328 op->above = 0;
343 op->below = ms.top; 329 op->below = ms.top;
344 330
345 if (ms.top)
346 ms.top->above = op; 331 *(ms.top ? &ms.top->above : &ms.bot) = op;
347 else
348 ms.bot = op;
349 332
350 ms.top = op; 333 ms.top = op;
351 ms.flags_ = 0; 334 ms.flags_ = 0;
352 } 335 }
353 else 336 else
354 { 337 {
355 f.parse_warn (format ("object %s out of range", op->debug_desc ())); 338 f.parse_warn (format ("object %s out of range", op->debug_desc ()));
356 op->destroy_inv (false); // be explicit about dropping
357 op->destroy (true); 339 op->destroy ();
358 } 340 }
359 } 341 }
360 342
361 continue; 343 continue;
362 344
… …
439 return false; 421 return false;
440 422
441 return freezer.save (path); 423 return freezer.save (path);
442} 424}
443 425
444maptile::maptile () 426void
427maptile::init ()
445{ 428{
446 in_memory = MAP_SWAPPED; 429 in_memory = MAP_SWAPPED;
447 430
448 /* 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
449 * map archetype. Mimic that behaviour. 432 * map archetype. Mimic that behaviour.
450 */ 433 */
451 width = 16; 434 width = 16;
452 height = 16; 435 height = 16;
453 timeout = 300; 436 timeout = 300;
454 max_nrof = 1000; // 1000 items of anything 437 max_items = MAX_ITEM_PER_ACTION;
455 max_volume = 2000000; // 2m³ 438 max_volume = 2000000; // 2m³
456}
457
458maptile::maptile (int w, int h)
459{
460 in_memory = MAP_SWAPPED;
461
462 width = w;
463 height = h;
464 reset_timeout = 0; 439 reset_timeout = 0;
465 timeout = 300;
466 enter_x = 0; 440 enter_x = 0;
467 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;
468 455
469 alloc (); 456 alloc ();
470} 457}
471 458
472/* 459/*
… …
480 if (spaces) 467 if (spaces)
481 return; 468 return;
482 469
483 spaces = salloc0<mapspace> (size ()); 470 spaces = salloc0<mapspace> (size ());
484} 471}
472
473//+GPL
485 474
486/* 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
487 * 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
488 * at a later date. 477 * at a later date.
489 * Called by parse_map_headers below. 478 * Called by parse_map_headers below.
… …
566 return items; 555 return items;
567} 556}
568 557
569/* 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
570 * the map (or something equivilent) into output_string. */ 559 * the map (or something equivilent) into output_string. */
571static void 560static const char *
572print_shop_string (maptile *m, char *output_string) 561print_shop_string (maptile *m)
573{ 562{
574 int i; 563 static dynbuf_text buf; buf.clear ();
575 char tmp[MAX_BUF];
576 564
577 strcpy (output_string, "");
578 for (i = 0; i < m->shopitems[0].index; i++) 565 for (int i = 0; i < m->shopitems[0].index; i++)
579 { 566 {
580 if (m->shopitems[i].typenum) 567 if (m->shopitems[i].typenum)
581 { 568 {
582 if (m->shopitems[i].strength) 569 if (m->shopitems[i].strength)
583 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);
584 else 571 else
585 sprintf (tmp, "%s;", m->shopitems[i].name); 572 buf.printf ("%s;", m->shopitems[i].name);
586 } 573 }
587 else 574 else
588 { 575 {
589 if (m->shopitems[i].strength) 576 if (m->shopitems[i].strength)
590 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 577 buf.printf ("*:%d;", m->shopitems[i].strength);
591 else 578 else
592 sprintf (tmp, "*"); 579 buf.printf ("*");
593 } 580 }
594
595 strcat (output_string, tmp);
596 } 581 }
582
583 return buf;
597} 584}
585
586//-GPL
598 587
599/* This loads the header information of the map. The header 588/* This loads the header information of the map. The header
600 * contains things like difficulty, size, timeout, etc. 589 * contains things like difficulty, size, timeout, etc.
601 * 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
602 * addition of tiling, fields beyond that easily named in an 591 * addition of tiling, fields beyond that easily named in an
… …
643 case KW_shopgreed: thawer.get (shopgreed); break; 632 case KW_shopgreed: thawer.get (shopgreed); break;
644 case KW_shopmin: thawer.get (shopmin); break; 633 case KW_shopmin: thawer.get (shopmin); break;
645 case KW_shopmax: thawer.get (shopmax); break; 634 case KW_shopmax: thawer.get (shopmax); break;
646 case KW_shoprace: thawer.get (shoprace); break; 635 case KW_shoprace: thawer.get (shoprace); break;
647 case KW_outdoor: thawer.get (outdoor); break; 636 case KW_outdoor: thawer.get (outdoor); break;
648 case KW_temp: thawer.get (temp); break;
649 case KW_pressure: thawer.get (pressure); break;
650 case KW_humid: thawer.get (humid); break;
651 case KW_windspeed: thawer.get (windspeed); break;
652 case KW_winddir: thawer.get (winddir); break;
653 case KW_sky: thawer.get (sky); break;
654 637
655 case KW_per_player: thawer.get (per_player); break; 638 case KW_per_player: thawer.get (per_player); break;
656 case KW_per_party: thawer.get (per_party); break; 639 case KW_per_party: thawer.get (per_party); break;
657 case KW_no_reset: thawer.get (no_reset); break; 640 case KW_no_reset: thawer.get (no_reset); break;
658 case KW_no_drop: thawer.get (no_drop); break; 641 case KW_no_drop: thawer.get (no_drop); break;
… …
683 case KW_end: 666 case KW_end:
684 thawer.next (); 667 thawer.next ();
685 return true; 668 return true;
686 669
687 default: 670 default:
688 if (!thawer.parse_error ("map", 0)) 671 if (!thawer.parse_error ("map"))
689 return false; 672 return false;
690 break; 673 break;
691 } 674 }
692 675
693 thawer.next (); 676 thawer.next ();
694 } 677 }
695 678
696 abort (); 679 abort ();
697} 680}
681
682//+GPL
698 683
699/****************************************************************************** 684/******************************************************************************
700 * This is the start of unique map handling code 685 * This is the start of unique map handling code
701 *****************************************************************************/ 686 *****************************************************************************/
702 687
… …
709 int unique = 0; 694 int unique = 0;
710 for (object *op = spaces [i].bot; op; ) 695 for (object *op = spaces [i].bot; op; )
711 { 696 {
712 object *above = op->above; 697 object *above = op->above;
713 698
714 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 699 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
715 unique = 1; 700 unique = 1;
716 701
717 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 702 if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
718 {
719 op->destroy_inv (false);
720 op->destroy (true); 703 op->destroy ();
721 }
722 704
723 op = above; 705 op = above;
724 } 706 }
725 } 707 }
726} 708}
727 709
710//-GPL
711
728bool 712bool
729maptile::_save_header (object_freezer &freezer) 713maptile::_save_header (object_freezer &freezer)
730{ 714{
731#define MAP_OUT(k) freezer.put (KW_ ## k, k) 715#define MAP_OUT(k) freezer.put (KW(k), k)
732#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 716#define MAP_OUT2(k,v) freezer.put (KW(k), v)
733 717
734 MAP_OUT2 (arch, "map"); 718 MAP_OUT2 (arch, CS(map));
735 719
736 if (name) MAP_OUT (name); 720 if (name) MAP_OUT (name);
737 MAP_OUT (swap_time); 721 MAP_OUT (swap_time);
738 MAP_OUT (reset_time); 722 MAP_OUT (reset_time);
739 MAP_OUT (reset_timeout); 723 MAP_OUT (reset_timeout);
740 MAP_OUT (fixed_resettime); 724 MAP_OUT (fixed_resettime);
741 MAP_OUT (no_reset); 725 MAP_OUT (no_reset);
742 MAP_OUT (no_drop); 726 MAP_OUT (no_drop);
743 MAP_OUT (difficulty); 727 MAP_OUT (difficulty);
744
745 if (default_region) MAP_OUT2 (region, default_region->name); 728 if (default_region) MAP_OUT2 (region, default_region->name);
746 729
747 if (shopitems) 730 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
748 {
749 char shop[MAX_BUF];
750 print_shop_string (this, shop);
751 MAP_OUT2 (shopitems, shop);
752 }
753
754 MAP_OUT (shopgreed); 731 MAP_OUT (shopgreed);
755 MAP_OUT (shopmin); 732 MAP_OUT (shopmin);
756 MAP_OUT (shopmax); 733 MAP_OUT (shopmax);
757 if (shoprace) MAP_OUT (shoprace); 734 if (shoprace) MAP_OUT (shoprace);
758 MAP_OUT (darkness); 735
759 MAP_OUT (width); 736 MAP_OUT (width);
760 MAP_OUT (height); 737 MAP_OUT (height);
761 MAP_OUT (enter_x); 738 MAP_OUT (enter_x);
762 MAP_OUT (enter_y); 739 MAP_OUT (enter_y);
763 740 MAP_OUT (darkness);
764 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
765 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
766
767 MAP_OUT (outdoor); 741 MAP_OUT (outdoor);
768 MAP_OUT (temp); 742
769 MAP_OUT (pressure); 743 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
770 MAP_OUT (humid); 744 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
771 MAP_OUT (windspeed);
772 MAP_OUT (winddir);
773 MAP_OUT (sky);
774 745
775 MAP_OUT (per_player); 746 MAP_OUT (per_player);
776 MAP_OUT (per_party); 747 MAP_OUT (per_party);
777 748
778 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]);
779 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]);
780 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]);
781 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]);
782 753
783 freezer.put (this); 754 freezer.put (this);
784 freezer.put (KW_end); 755 freezer.put (KW(end));
785 756
786 return true; 757 return true;
787} 758}
788 759
789bool 760bool
… …
794 if (!_save_header (freezer)) 765 if (!_save_header (freezer))
795 return false; 766 return false;
796 767
797 return freezer.save (path); 768 return freezer.save (path);
798} 769}
770
771//+GPL
799 772
800/* 773/*
801 * Remove and free all objects in the given map. 774 * Remove and free all objects in the given map.
802 */ 775 */
803void 776void
… …
814 787
815 op->flag [FLAG_REMOVED] = true; 788 op->flag [FLAG_REMOVED] = true;
816 789
817 object *head = op->head_ (); 790 object *head = op->head_ ();
818 if (op == head) 791 if (op == head)
819 {
820 op->destroy_inv (false);
821 op->destroy (true); 792 op->destroy ();
822 }
823 else if (head->map != op->map) 793 else if (head->map != op->map)
824 { 794 {
825 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 ());
826 head->destroy (true); 796 head->destroy ();
827 } 797 }
828 } 798 }
829 799
830 sfree0 (spaces, size ()); 800 sfree0 (spaces, size ());
831 } 801 }
… …
875 845
876 clear (); 846 clear ();
877} 847}
878 848
879/* 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?
880void 851void
881maptile::do_decay_objects () 852maptile::do_decay_objects ()
882{ 853{
883 if (!spaces) 854 if (!spaces)
884 return; 855 return;
… …
886 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 857 for (mapspace *ms = spaces + size (); ms-- > spaces; )
887 for (object *above, *op = ms->bot; op; op = above) 858 for (object *above, *op = ms->bot; op; op = above)
888 { 859 {
889 above = op->above; 860 above = op->above;
890 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
891 bool destroy = 0; 866 bool destroy = 0;
892 867
893 // do not decay anything above unique floor tiles (yet :) 868 if (op->flag [FLAG_IS_FLOOR]
894 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 869 || op->flag [FLAG_OBJ_ORIGINAL]
895 break; 870 || op->flag [FLAG_UNIQUE]
896 871 || op->flag [FLAG_OVERLAY_FLOOR]
897 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 872 || op->flag [FLAG_UNPAID]
898 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
899 || QUERY_FLAG (op, FLAG_UNIQUE)
900 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
901 || QUERY_FLAG (op, FLAG_UNPAID)
902 || op->is_alive ()) 873 || op->is_alive ())
903 ; // do not decay 874 ; // do not decay
904 else if (op->is_weapon ()) 875 else if (op->is_weapon ())
905 { 876 {
906 op->stats.dam--; 877 op->stats.dam--;
… …
931 || mat & M_LIQUID 902 || mat & M_LIQUID
932 || (mat & M_IRON && rndm (1, 5) == 1) 903 || (mat & M_IRON && rndm (1, 5) == 1)
933 || (mat & M_GLASS && rndm (1, 2) == 1) 904 || (mat & M_GLASS && rndm (1, 2) == 1)
934 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 905 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
935 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 906 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
936 || (mat & M_ICE && temp > 32)) 907 //|| (mat & M_ICE && temp > 32)
908 )
937 destroy = 1; 909 destroy = 1;
938 } 910 }
939 911
940 /* adjust overall chance below */ 912 /* adjust overall chance below */
941 if (destroy && rndm (0, 1)) 913 if (destroy && rndm (0, 1))
942 op->destroy (true); 914 op->destroy ();
943 }
944}
945
946/*
947 * Updates every button on the map (by calling update_button() for them).
948 */
949void
950maptile::update_buttons ()
951{
952 for (oblinkpt *obp = buttons; obp; obp = obp->next)
953 for (objectlink *ol = obp->link; ol; ol = ol->next)
954 {
955 if (!ol->ob)
956 {
957 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
958 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
959 continue;
960 }
961
962 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
963 {
964 update_button (ol->ob);
965 break;
966 }
967 } 915 }
968} 916}
969 917
970/* 918/*
971 * 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.
972 * difficulty does not have a lot to do with character level, 920 * difficulty does not have a lot to do with character level,
973 * 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.
974 * 922 *
975 * 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
976 * 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
977 * have a difficulty set than using this function - human calculation 925 * have a difficulty set rather than using this function - human calculation
978 * is much better than this functions guesswork. 926 * is much better than this function's guesswork.
979 */ 927 */
980int 928int
981maptile::estimate_difficulty () const 929maptile::estimate_difficulty () const
982{ 930{
983 long monster_cnt = 0; 931 long monster_cnt = 0;
… …
985 sint64 total_exp = 0; 933 sint64 total_exp = 0;
986 934
987 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 935 for (mapspace *ms = spaces + size (); ms-- > spaces; )
988 for (object *op = ms->bot; op; op = op->above) 936 for (object *op = ms->bot; op; op = op->above)
989 { 937 {
990 if (QUERY_FLAG (op, FLAG_MONSTER)) 938 if (op->flag [FLAG_MONSTER])
991 { 939 {
992 total_exp += op->stats.exp; 940 total_exp += op->stats.exp;
993 monster_cnt++; 941 monster_cnt++;
994 } 942 }
995 943
996 if (QUERY_FLAG (op, FLAG_GENERATOR)) 944 if (op->flag [FLAG_GENERATOR])
997 { 945 {
998 total_exp += op->stats.exp; 946 total_exp += op->stats.exp;
999 947
1000 if (archetype *at = op->other_arch) 948 if (archetype *at = op->other_arch)
1001 { 949 {
… …
1028 * postive values make it darker, negative make it brighter 976 * postive values make it darker, negative make it brighter
1029 */ 977 */
1030int 978int
1031maptile::change_map_light (int change) 979maptile::change_map_light (int change)
1032{ 980{
1033 int new_level = darkness + change;
1034
1035 /* Nothing to do */ 981 /* Nothing to do */
1036 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 982 if (!change)
1037 return 0; 983 return 0;
1038 984
1039 /* inform all players on the map */ 985 /* inform all players on the map */
1040 if (change > 0) 986 if (change > 0)
1041 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 987 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1042 else 988 else
1043 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 989 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1044 990
1045 /* Do extra checking. since darkness is a unsigned value, 991 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1046 * we need to be extra careful about negative values.
1047 * In general, the checks below are only needed if change
1048 * is not +/-1
1049 */
1050 if (new_level < 0)
1051 darkness = 0;
1052 else if (new_level >= MAX_DARKNESS)
1053 darkness = MAX_DARKNESS;
1054 else
1055 darkness = new_level;
1056 992
1057 /* All clients need to get re-updated for the change */ 993 /* All clients need to get re-updated for the change */
1058 update_all_map_los (this); 994 update_all_map_los (this);
1059 995
1060 return 1; 996 return 1;
… …
1068 */ 1004 */
1069void 1005void
1070mapspace::update_ () 1006mapspace::update_ ()
1071{ 1007{
1072 object *last = 0; 1008 object *last = 0;
1073 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1009 uint8 flags = P_UPTODATE;
1010 sint8 light = 0;
1074 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;
1075 1016
1076 //object *middle = 0; 1017 //object *middle = 0;
1077 //object *top = 0; 1018 //object *top = 0;
1078 //object *floor = 0; 1019 //object *floor = 0;
1079 // this seems to generate better code than using locals, above 1020 // this seems to generate better code than using locals, above
1080 object *&top = faces_obj[0] = 0; 1021 object *&top = faces_obj[0] = 0;
1081 object *&middle = faces_obj[1] = 0; 1022 object *&middle = faces_obj[1] = 0;
1082 object *&floor = faces_obj[2] = 0; 1023 object *&floor = faces_obj[2] = 0;
1083 1024
1025 object::flags_t allflags; // all flags of all objects or'ed together
1026
1084 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above) 1027 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1085 { 1028 {
1086 /* This could be made additive I guess (two lights better than 1029 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1087 * one). But if so, it shouldn't be a simple additive - 2
1088 * light bulbs do not illuminate twice as far as once since
1089 * it is a dissapation factor that is cubed.
1090 */
1091 light = max (light, tmp->glow_radius); 1030 light += tmp->glow_radius;
1092 1031
1093 /* This call is needed in order to update objects the player 1032 /* This call is needed in order to update objects the player
1094 * is standing in that have animations (ie, grass, fire, etc). 1033 * is standing in that have animations (ie, grass, fire, etc).
1095 * However, it also causes the look window to be re-drawn 1034 * However, it also causes the look window to be re-drawn
1096 * 3 times each time the player moves, because many of the 1035 * 3 times each time the player moves, because many of the
1097 * functions the move_player calls eventualy call this. 1036 * functions the move_player calls eventualy call this.
1098 * 1037 *
1099 * Always put the player down for drawing. 1038 * Always put the player down for drawing.
1100 */ 1039 */
1101 if (!tmp->invisible) 1040 if (expect_true (!tmp->invisible))
1102 { 1041 {
1103 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1042 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1104 top = tmp; 1043 top = tmp;
1105 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1044 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1106 { 1045 {
1107 /* 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,
1108 * so should not be visible, so we clear them. 1047 * so should not be visible, so we clear them.
1109 */ 1048 */
1110 middle = 0; 1049 middle = 0;
1111 top = 0; 1050 top = 0;
1112 floor = tmp; 1051 floor = tmp;
1052 volume = 0;
1053 items = 0;
1113 } 1054 }
1114 /* Flag anywhere have high priority */ 1055 else
1115 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1116 { 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;
1117 middle = tmp; 1074 middle = tmp;
1118 anywhere = 1; 1075 }
1119 } 1076 }
1120
1121 /* Find the highest visible face around. If equal
1122 * visibilities, we still want the one nearer to the
1123 * top
1124 */
1125 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1126 middle = tmp;
1127 }
1128
1129 if (tmp == tmp->above)
1130 {
1131 LOG (llevError, "Error in structure of map\n");
1132 exit (-1);
1133 } 1077 }
1134 1078
1135 move_slow |= tmp->move_slow; 1079 move_slow |= tmp->move_slow;
1136 move_block |= tmp->move_block; 1080 move_block |= tmp->move_block;
1137 move_on |= tmp->move_on; 1081 move_on |= tmp->move_on;
1138 move_off |= tmp->move_off; 1082 move_off |= tmp->move_off;
1139 move_allow |= tmp->move_allow; 1083 move_allow |= tmp->move_allow;
1140 1084
1141 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1085 allflags |= tmp->flag;
1142 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1086
1143 if (tmp->type == PLAYER) flags |= P_PLAYER; 1087 if (tmp->type == PLAYER) flags |= P_PLAYER;
1144 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1088 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1145 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1146 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1147 } 1089 }
1148 1090
1149 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);
1150 this->flags_ = flags; 1102 this->flags_ = flags;
1151 this->move_block = move_block & ~move_allow; 1103 this->move_block = move_block & ~move_allow;
1152 this->move_on = move_on; 1104 this->move_on = move_on;
1153 this->move_off = move_off; 1105 this->move_off = move_off;
1154 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
1155 1109
1156 /* 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),
1157 * 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
1158 * this point. 1112 * this point.
1159 * middle contains the highest visibility face. 1113 * middle contains the highest visibility face.
… …
1177 */ 1131 */
1178 1132
1179 for (object *tmp = last; tmp; tmp = tmp->below) 1133 for (object *tmp = last; tmp; tmp = tmp->below)
1180 { 1134 {
1181 /* 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 */
1182 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1136 if (tmp->flag [FLAG_IS_FLOOR])
1183 break; 1137 break;
1184 1138
1185 /* If two top faces are already set, quit processing */ 1139 /* If two top faces are already set, quit processing */
1186 if (top && middle) 1140 if (top && middle)
1187 break; 1141 break;
… …
1225 faces_obj [1] = middle; 1179 faces_obj [1] = middle;
1226 faces_obj [2] = floor; 1180 faces_obj [2] = floor;
1227#endif 1181#endif
1228} 1182}
1229 1183
1230uint64 1184maptile *
1231mapspace::volume () const
1232{
1233 uint64 vol = 0;
1234
1235 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1236 vol += op->volume ();
1237
1238 return vol;
1239}
1240
1241bool
1242maptile::tile_available (int dir, bool load) 1185maptile::tile_available (int dir, bool load)
1243{ 1186{
1244 if (!tile_path[dir]) 1187 if (tile_path[dir])
1245 return 0; 1188 {
1246
1247 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1189 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1248 return 1; 1190 return tile_map[dir];
1249 1191
1250 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1192 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1251 return 1; 1193 return tile_map[dir];
1194 }
1252 1195
1253 return 0; 1196 return 0;
1254} 1197}
1255 1198
1256/* this returns TRUE if the coordinates (x,y) are out of 1199/* this returns TRUE if the coordinates (x,y) are out of
… …
1481 * 1424 *
1482 * currently, the only flag supported (0x1) is don't translate for 1425 * currently, the only flag supported (0x1) is don't translate for
1483 * closest body part of 'op1' 1426 * closest body part of 'op1'
1484 */ 1427 */
1485void 1428void
1486get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1429get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1487{ 1430{
1488 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))
1489 { 1432 {
1490 /* be conservative and fill in _some_ data */ 1433 /* be conservative and fill in _some_ data */
1491 retval->distance = 10000; 1434 retval->distance = 10000;
1492 retval->distance_x = 10000; 1435 retval->distance_x = 10000;
1493 retval->distance_y = 10000; 1436 retval->distance_y = 10000;
1494 retval->direction = 0; 1437 retval->direction = 0;
1495 retval->part = 0; 1438 retval->part = 0;
1496 } 1439 }
1497 else 1440 else
1498 { 1441 {
1499 object *best;
1500
1501 retval->distance_x += op2->x - op1->x; 1442 retval->distance_x += op2->x - op1->x;
1502 retval->distance_y += op2->y - op1->y; 1443 retval->distance_y += op2->y - op1->y;
1503 1444
1504 best = op1; 1445 object *best = op1;
1446
1505 /* If this is multipart, find the closest part now */ 1447 /* If this is multipart, find the closest part now */
1506 if (!(flags & 0x1) && op1->more) 1448 if (!(flags & 1) && op1->more)
1507 { 1449 {
1508 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);
1509 1451
1510 /* 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
1511 * distance instead of doing all that work above again 1453 * distance instead of doing all that work above again
1512 * since the distance fields we set above are positive in the 1454 * since the distance fields we set above are positive in the
1513 * same axis as is used for multipart objects, the simply arithmetic 1455 * same axis as is used for multipart objects, the simply arithmetic
1514 * below works. 1456 * below works.
1515 */ 1457 */
1516 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1458 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1517 { 1459 {
1518 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);
1519 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1461
1520 if (tmpi < best_distance) 1462 if (tmpi < best_distance)
1521 { 1463 {
1522 best_distance = tmpi; 1464 best_distance = tmpi;
1523 best = tmp; 1465 best = tmp;
1524 } 1466 }
1525 } 1467 }
1526 1468
1527 if (best != op1) 1469 if (best != op1)
1528 { 1470 {
1529 retval->distance_x += op1->x - best->x; 1471 retval->distance_x += op1->x - best->x;
1530 retval->distance_y += op1->y - best->y; 1472 retval->distance_y += op1->y - best->y;
1531 } 1473 }
1532 } 1474 }
1533 1475
1534 retval->part = best; 1476 retval->part = best;
1535 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));
1536 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1478 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1537 } 1479 }
1538} 1480}
1539 1481
1540/* 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
1541 * the first parameter being an object, it instead is the map 1483 * the first parameter being an object, it instead is the map
… …
1551get_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)
1552{ 1494{
1553 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))
1554 { 1496 {
1555 /* be conservative and fill in _some_ data */ 1497 /* be conservative and fill in _some_ data */
1556 retval->distance = 100000; 1498 retval->distance = 100000;
1557 retval->distance_x = 32767; 1499 retval->distance_x = 32767;
1558 retval->distance_y = 32767; 1500 retval->distance_y = 32767;
1559 retval->direction = 0; 1501 retval->direction = 0;
1560 retval->part = 0; 1502 retval->part = 0;
1561 } 1503 }
1562 else 1504 else
1563 { 1505 {
1564 retval->distance_x += op2->x - x; 1506 retval->distance_x += op2->x - x;
1565 retval->distance_y += op2->y - y; 1507 retval->distance_y += op2->y - y;
1566 1508
1567 retval->part = NULL; 1509 retval->part = 0;
1568 retval->distance = idistance (retval->distance_x, retval->distance_y); 1510 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1569 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1511 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1570 } 1512 }
1571} 1513}
1572 1514
1573/* 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
1574 * (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
… …
1584 int dx, dy; 1526 int dx, dy;
1585 1527
1586 return adjacent_map (op1->map, op2->map, &dx, &dy); 1528 return adjacent_map (op1->map, op2->map, &dx, &dy);
1587} 1529}
1588 1530
1531//-GPL
1532
1589object * 1533object *
1590maptile::insert (object *op, int x, int y, object *originator, int flags) 1534maptile::insert (object *op, int x, int y, object *originator, int flags)
1591{ 1535{
1592 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);
1593} 1537}
… …
1604 if (default_region) 1548 if (default_region)
1605 return default_region; 1549 return default_region;
1606 1550
1607 return ::region::default_region (); 1551 return ::region::default_region ();
1608} 1552}
1553
1554//+GPL
1609 1555
1610/* picks a random object from a style map. 1556/* picks a random object from a style map.
1611 */ 1557 */
1612object * 1558object *
1613maptile::pick_random_object (rand_gen &gen) const 1559maptile::pick_random_object (rand_gen &gen) const
… …
1620 */ 1566 */
1621 for (int i = 1000; --i;) 1567 for (int i = 1000; --i;)
1622 { 1568 {
1623 object *pick = at (gen (width), gen (height)).bot; 1569 object *pick = at (gen (width), gen (height)).bot;
1624 1570
1625 // do not prefer big monsters just because they are big. 1571 // must be head: do not prefer big monsters just because they are big.
1626 if (pick && pick->is_head ()) 1572 if (pick && pick->is_head ())
1627 return pick->head_ (); 1573 return pick;
1628 } 1574 }
1629 1575
1630 // instead of crashing in the unlikely(?) case, try to return *something* 1576 // instead of crashing in the unlikely(?) case, try to return *something*
1631 return archetype::find ("bug"); 1577 return archetype::find (shstr_bug);
1632} 1578}
1579
1580//-GPL
1633 1581
1634void 1582void
1635maptile::play_sound (faceidx sound, int x, int y) const 1583maptile::play_sound (faceidx sound, int x, int y) const
1636{ 1584{
1637 if (!sound) 1585 if (!sound)
1638 return; 1586 return;
1639 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{
1640 for_all_players (pl) 1604 for_all_players (pl)
1641 if (pl->ob->map == this)
1642 if (client *ns = pl->ns) 1605 if (client *ns = pl->ns)
1643 { 1606 {
1644 int dx = x - pl->ob->x; 1607 int dx = x - pl->ob->x;
1645 int dy = y - pl->ob->y; 1608 int dy = y - pl->ob->y;
1646 1609
1647 int distance = idistance (dx, dy); 1610 int distance = idistance (dx, dy);
1648 1611
1649 if (distance <= MAX_SOUND_DISTANCE) 1612 if (distance <= MAX_SOUND_DISTANCE)
1650 ns->play_sound (sound, dx, dy); 1613 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1651 } 1614 }
1652} 1615}
1653 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