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.140 by root, Sun May 4 20:40:52 2008 UTC vs.
Revision 1.222 by root, Sat Dec 1 20:22:12 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify 9 * 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 10 * 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 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the GNU General Public License 19 * 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/>. 20 * and the GNU General Public License along with this program. If not, see
21 * <http://www.gnu.org/licenses/>.
20 * 22 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 24 */
23 25
24#include <unistd.h> 26#include <unistd.h>
25 27
26#include "global.h" 28#include "global.h"
27
28#include "loader.h"
29
30#include "path.h" 29#include "path.h"
30
31//+GPL
32
33sint8 maptile::outdoor_darkness;
31 34
32/* This rolls up wall, blocks_magic, blocks_view, etc, all into 35/* This rolls up wall, blocks_magic, blocks_view, etc, all into
33 * one function that just returns a P_.. value (see map.h) 36 * one function that just returns a P_.. value (see map.h)
34 * it will also do map translation for tiled maps, returning 37 * it will also do map translation for tiled maps, returning
35 * new values into newmap, nx, and ny. Any and all of those 38 * new values into newmap, nx, and ny. Any and all of those
57 return mp->at (newx, newy).flags () | (mp != oldmap ? P_NEW_MAP : 0); 60 return mp->at (newx, newy).flags () | (mp != oldmap ? P_NEW_MAP : 0);
58} 61}
59 62
60/* 63/*
61 * Returns true if the given coordinate is blocked except by the 64 * Returns true if the given coordinate is blocked except by the
62 * object passed is not blocking. This is used with 65 * object passed is not blocking. This is used with
63 * multipart monsters - if we want to see if a 2x2 monster 66 * multipart monsters - if we want to see if a 2x2 monster
64 * can move 1 space to the left, we don't want its own area 67 * can move 1 space to the left, we don't want its own area
65 * to block it from moving there. 68 * to block it from moving there.
66 * Returns TRUE if the space is blocked by something other than the 69 * Returns TRUE if the space is blocked by something other than the
67 * monster. 70 * monster.
70 * by the caller. 73 * by the caller.
71 */ 74 */
72int 75int
73blocked_link (object *ob, maptile *m, int sx, int sy) 76blocked_link (object *ob, maptile *m, int sx, int sy)
74{ 77{
75 object *tmp;
76 int mflags, blocked;
77
78 /* Make sure the coordinates are valid - they should be, as caller should 78 /* Make sure the coordinates are valid - they should be, as caller should
79 * have already checked this. 79 * have already checked this.
80 */ 80 */
81 if (OUT_OF_REAL_MAP (m, sx, sy)) 81 if (OUT_OF_REAL_MAP (m, sx, sy))
82 { 82 {
83 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 83 LOG (llevError | logBacktrace, "blocked_link: Passed map, x, y coordinates outside of map\n");
84 return 1; 84 return 1;
85 } 85 }
86 86
87 /* Save some cycles - instead of calling get_map_flags(), just get the value 87 mapspace &ms = m->at (sx, sy);
88 * directly.
89 */
90 mflags = m->at (sx, sy).flags ();
91 88
92 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 89 int mflags = ms.flags ();
90 int blocked = ms.move_block;
93 91
94 /* If space is currently not blocked by anything, no need to 92 /* If space is currently not blocked by anything, no need to
95 * go further. Not true for players - all sorts of special 93 * go further. Not true for players - all sorts of special
96 * things we need to do for players. 94 * things we need to do for players.
97 */ 95 */
98 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 96 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
99 return 0; 97 return 0;
100 98
101 /* if there isn't anytyhing alive on this space, and this space isn't 99 /* if there isn't anything alive on this space, and this space isn't
102 * otherwise blocked, we can return now. Only if there is a living 100 * otherwise blocked, we can return now. Only if there is a living
103 * creature do we need to investigate if it is part of this creature 101 * creature do we need to investigate if it is part of this creature
104 * or another. Likewise, only if something is blocking us do we 102 * or another. Likewise, only if something is blocking us do we
105 * need to investigate if there is a special circumstance that would 103 * need to investigate if there is a special circumstance that would
106 * let the player through (inventory checkers for example) 104 * let the player through (inventory checkers for example)
113 /* We basically go through the stack of objects, and if there is 111 /* We basically go through the stack of objects, and if there is
114 * some other object that has NO_PASS or FLAG_ALIVE set, return 112 * some other object that has NO_PASS or FLAG_ALIVE set, return
115 * true. If we get through the entire stack, that must mean 113 * true. If we get through the entire stack, that must mean
116 * ob is blocking it, so return 0. 114 * ob is blocking it, so return 0.
117 */ 115 */
118 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 116 for (object *tmp = ms.top; tmp; tmp = tmp->below)
119 { 117 {
120 118 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 { 119 {
124 /* If last_sp is set, the player/monster needs an object, 120 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
125 * so we check for it. If they don't have it, they can't 121 if (RESULT_INT (0))
126 * pass through this space. 122 return 1;
127 */ 123 else
128 if (tmp->last_sp) 124 continue;
125
126 if (tmp->type == CHECK_INV)
129 { 127 {
130 if (check_inv_recursive (ob, tmp) == NULL) 128 bool have = check_inv_recursive (ob, tmp);
129
130 // last_sp set means we block if we don't have.
131 if (logical_xor (have, tmp->last_sp))
131 return 1; 132 return 1;
132 else 133 }
133 continue; 134 else if (tmp->type == T_MATCH)
135 {
136 // T_MATCH allows "entrance" iff the match is true
137 // == blocks if the match fails
138
139 // we could have used an INVOKE_OBJECT, but decided against it, as we
140 // assume that T_MATCH is relatively common.
141 if (!match (tmp->slaying, ob, tmp, ob))
142 return 1;
134 } 143 }
135 else 144 else
136 { 145 return 1; // unconditional block
137 /* In this case, the player must not have the object - 146
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 147 } else {
147 { 148 // space does not block the ob, directly, but
148 /* Broke apart a big nasty if into several here to make 149 // anything alive that is not a door still
149 * this more readable. first check - if the space blocks 150 // 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 151
157 if (tmp->flag [FLAG_ALIVE] 152 if (tmp->flag [FLAG_ALIVE]
158 && tmp->head_ () != ob
159 && tmp != ob
160 && tmp->type != DOOR 153 && tmp->type != DOOR
161 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden)) 154 && tmp->head_ () != ob) //TODO: maybe move these check up?
162 return 1; 155 return 1;
163 } 156 }
164
165 } 157 }
158
166 return 0; 159 return 0;
167} 160}
168 161
169/* 162/*
170 * Returns qthe blocking object if the given object can't fit in the given 163 * 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, 164 * spot. This is meant for multi space objects - for single space objecs,
172 * just calling get_map_blocked and checking that against movement type 165 * just calling get_map_blocked and checking that against movement type
173 * of object. This function goes through all the parts of the multipart 166 * of object. This function goes through all the parts of the multipart
174 * object and makes sure they can be inserted. 167 * object and makes sure they can be inserted.
175 * 168 *
222 } 215 }
223 216
224 return 0; 217 return 0;
225} 218}
226 219
227/* When the map is loaded, load_object does not actually insert objects 220//-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 221
254void 222void
255maptile::set_object_flag (int flag, int value) 223maptile::set_object_flag (int flag, int value)
256{ 224{
257 if (!spaces) 225 if (!spaces)
259 227
260 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 228 for (mapspace *ms = spaces + size (); ms-- > spaces; )
261 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 229 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
262 tmp->flag [flag] = value; 230 tmp->flag [flag] = value;
263} 231}
232
233void
234maptile::post_load_original ()
235{
236 if (!spaces)
237 return;
238
239 set_object_flag (FLAG_OBJ_ORIGINAL);
240
241 for (mapspace *ms = spaces + size (); ms-- > spaces; )
242 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
243 INVOKE_OBJECT (RESET, tmp);
244}
245
246void
247maptile::post_load ()
248{
249#if 0
250 if (!spaces)
251 return;
252
253 for (mapspace *ms = spaces + size (); ms-- > spaces; )
254 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
255 ; // nop
256#endif
257}
258
259//+GPL
264 260
265/* link_multipart_objects go through all the objects on the map looking 261/* 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 262 * 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 263 * info we have, they only have the head (as would be expected when
268 * they are saved). 264 * they are saved).
296 op = op->above; 292 op = op->above;
297 } 293 }
298 } 294 }
299} 295}
300 296
297//-GPL
298
301/* 299/*
302 * Loads (ands parses) the objects into a given map from the specified 300 * Loads (ands parses) the objects into a given map from the specified
303 * file pointer. 301 * file pointer.
304 */ 302 */
305bool 303bool
314 case KW_arch: 312 case KW_arch:
315 if (object *op = object::read (f, this)) 313 if (object *op = object::read (f, this))
316 { 314 {
317 // TODO: why? 315 // TODO: why?
318 if (op->inv) 316 if (op->inv)
317 {
318 op->carrying = 0;
319 op->update_weight (); 319 op->update_weight ();
320 }
320 321
321 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) 322 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
322 { 323 {
323 // we insert manually because 324 // we insert manually because
324 // a) its way faster 325 // a) its way faster
325 // b) we remove manually, too, and there are good reasons for that 326 // b) we remove manually, too, and there are good reasons for that
326 // c) its correct 327 // c) it's correct
327 mapspace &ms = at (op->x, op->y); 328 mapspace &ms = at (op->x, op->y);
328 329
329 op->flag [FLAG_REMOVED] = false; 330 op->flag [FLAG_REMOVED] = false;
330 331
331 op->above = 0; 332 op->above = 0;
332 op->below = ms.top; 333 op->below = ms.top;
333 334
334 if (ms.top)
335 ms.top->above = op; 335 *(ms.top ? &ms.top->above : &ms.bot) = op;
336 else
337 ms.bot = op;
338 336
339 ms.top = op; 337 ms.top = op;
340 ms.flags_ = 0; 338 ms.flags_ = 0;
341 } 339 }
342 else 340 else
364} 362}
365 363
366void 364void
367maptile::activate () 365maptile::activate ()
368{ 366{
369 if (spaces) 367 if (state != MAP_INACTIVE)
368 return;
369
370 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
371 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
372 op->activate_recursive (); 372 op->activate_recursive ();
373
374 state = MAP_ACTIVE;
375
376 activate_physics ();
373} 377}
374 378
375void 379void
376maptile::deactivate () 380maptile::deactivate ()
377{ 381{
378 if (spaces) 382 if (state != MAP_ACTIVE)
383 return;
384
379 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 385 for (mapspace *ms = spaces + size (); ms-- > spaces; )
380 for (object *op = ms->bot; op; op = op->above) 386 for (object *op = ms->bot; op; op = op->above)
381 op->deactivate_recursive (); 387 op->deactivate_recursive ();
388
389 state = MAP_INACTIVE;
382} 390}
383 391
384bool 392bool
385maptile::_save_objects (object_freezer &f, int flags) 393maptile::_save_objects (object_freezer &f, int flags)
386{ 394{
427 return false; 435 return false;
428 436
429 return freezer.save (path); 437 return freezer.save (path);
430} 438}
431 439
432maptile::maptile () 440void
441maptile::init ()
433{ 442{
434 in_memory = MAP_SWAPPED; 443 state = MAP_SWAPPED;
435 444
436 /* The maps used to pick up default x and y values from the 445 /* The maps used to pick up default x and y values from the
437 * map archetype. Mimic that behaviour. 446 * map archetype. Mimic that behaviour.
438 */ 447 */
439 width = 16; 448 width = 16;
440 height = 16; 449 height = 16;
441 timeout = 300; 450 timeout = 300;
442 max_nrof = 1000; // 1000 items of anything 451 max_items = MAX_ITEM_PER_ACTION;
443 max_volume = 2000000; // 2m³ 452 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; 453 reset_timeout = 0;
453 timeout = 300;
454 enter_x = 0; 454 enter_x = 0;
455 enter_y = 0; 455 enter_y = 0;
456}
457
458maptile::maptile ()
459{
460 init ();
461}
462
463maptile::maptile (int w, int h)
464{
465 init ();
466
467 width = w;
468 height = h;
456 469
457 alloc (); 470 alloc ();
458} 471}
459 472
460/* 473/*
469 return; 482 return;
470 483
471 spaces = salloc0<mapspace> (size ()); 484 spaces = salloc0<mapspace> (size ());
472} 485}
473 486
487//+GPL
488
474/* Takes a string from a map definition and outputs a pointer to the array of shopitems 489/* 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 490 * corresponding to that string. Memory is allocated for this, it must be freed
476 * at a later date. 491 * at a later date.
477 * Called by parse_map_headers below. 492 * Called by parse_map_headers below.
478 */ 493 */
479static shopitems * 494static shopitems *
480parse_shop_string (const char *input_string) 495parse_shop_string (const char *input_string)
529 *q = '\0'; 544 *q = '\0';
530 545
531 current_type = get_typedata_by_name (p); 546 current_type = get_typedata_by_name (p);
532 if (current_type) 547 if (current_type)
533 { 548 {
534 items[i].name = current_type->name; 549 items[i].name = current_type->name;
535 items[i].typenum = current_type->number; 550 items[i].typenum = current_type->number;
536 items[i].name_pl = current_type->name_pl; 551 items[i].name_pl = current_type->name_pl;
537 } 552 }
538 else 553 else
539 { /* oh uh, something's wrong, let's free up this one, and try 554 { /* oh uh, something's wrong, let's free up this one, and try
540 * the next entry while we're at it, better print a warning 555 * the next entry while we're at it, better print a warning
541 */ 556 */
542 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string); 557 LOG (llevError, "invalid type %s defined in shopitems in string %s\n", p, input_string);
543 } 558 }
544 } 559 }
545 560
554 return items; 569 return items;
555} 570}
556 571
557/* opposite of parse string, this puts the string that was originally fed in to 572/* opposite of parse string, this puts the string that was originally fed in to
558 * the map (or something equivilent) into output_string. */ 573 * the map (or something equivilent) into output_string. */
559static void 574static const char *
560print_shop_string (maptile *m, char *output_string) 575print_shop_string (maptile *m)
561{ 576{
562 int i; 577 static dynbuf_text buf; buf.clear ();
563 char tmp[MAX_BUF]; 578 bool first = true;
564 579
565 strcpy (output_string, "");
566 for (i = 0; i < m->shopitems[0].index; i++) 580 for (int i = 0; i < m->shopitems[0].index; i++)
567 { 581 {
582 if (!first)
583 buf << ';';
584
585 first = false;
586
568 if (m->shopitems[i].typenum) 587 if (m->shopitems[i].typenum)
569 { 588 {
570 if (m->shopitems[i].strength) 589 if (m->shopitems[i].strength)
571 sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 590 buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
572 else 591 else
573 sprintf (tmp, "%s;", m->shopitems[i].name); 592 buf.printf ("%s", m->shopitems[i].name);
574 } 593 }
575 else 594 else
576 { 595 {
577 if (m->shopitems[i].strength) 596 if (m->shopitems[i].strength)
578 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 597 buf.printf ("*:%d", m->shopitems[i].strength);
579 else 598 else
580 sprintf (tmp, "*"); 599 buf.printf ("*");
581 } 600 }
582
583 strcat (output_string, tmp);
584 } 601 }
602
603 return buf;
585} 604}
605
606//-GPL
586 607
587/* This loads the header information of the map. The header 608/* This loads the header information of the map. The header
588 * contains things like difficulty, size, timeout, etc. 609 * contains things like difficulty, size, timeout, etc.
589 * this used to be stored in the map object, but with the 610 * this used to be stored in the map object, but with the
590 * addition of tiling, fields beyond that easily named in an 611 * addition of tiling, fields beyond that easily named in an
604 { 625 {
605 case KW_msg: 626 case KW_msg:
606 thawer.get_ml (KW_endmsg, msg); 627 thawer.get_ml (KW_endmsg, msg);
607 break; 628 break;
608 629
609 case KW_lore: // CF+ extension 630 case KW_lore: // deliantra extension
610 thawer.get_ml (KW_endlore, maplore); 631 thawer.get_ml (KW_endlore, maplore);
611 break; 632 break;
612 633
613 case KW_maplore: 634 case KW_maplore:
614 thawer.get_ml (KW_endmaplore, maplore); 635 thawer.get_ml (KW_endmaplore, maplore);
631 case KW_shopgreed: thawer.get (shopgreed); break; 652 case KW_shopgreed: thawer.get (shopgreed); break;
632 case KW_shopmin: thawer.get (shopmin); break; 653 case KW_shopmin: thawer.get (shopmin); break;
633 case KW_shopmax: thawer.get (shopmax); break; 654 case KW_shopmax: thawer.get (shopmax); break;
634 case KW_shoprace: thawer.get (shoprace); break; 655 case KW_shoprace: thawer.get (shoprace); break;
635 case KW_outdoor: thawer.get (outdoor); break; 656 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 657
643 case KW_per_player: thawer.get (per_player); break; 658 case KW_per_player: thawer.get (per_player); break;
644 case KW_per_party: thawer.get (per_party); break; 659 case KW_per_party: thawer.get (per_party); break;
645 case KW_no_reset: thawer.get (no_reset); break; 660 case KW_no_reset: thawer.get (no_reset); break;
661 case KW_no_drop: thawer.get (no_drop); break;
646 662
647 case KW_region: default_region = region::find (thawer.get_str ()); break; 663 case KW_region: thawer.get (default_region); break;
648 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 664 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
649 665
650 // old names new names 666 // old names new names
651 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 667 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
652 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 668 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
656 case KW_value: case KW_swap_time: thawer.get (timeout); break; 672 case KW_value: case KW_swap_time: thawer.get (timeout); break;
657 case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break; 673 case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
658 case KW_invisible: case KW_darkness: thawer.get (darkness); break; 674 case KW_invisible: case KW_darkness: thawer.get (darkness); break;
659 case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break; 675 case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break;
660 676
661 case KW_tile_path_1: thawer.get (tile_path [0]); break; 677 case KW_tile_path_1: thawer.get (tile_path [TILE_NORTH]); break;
662 case KW_tile_path_2: thawer.get (tile_path [1]); break; 678 case KW_tile_path_2: thawer.get (tile_path [TILE_EAST ]); break;
663 case KW_tile_path_3: thawer.get (tile_path [2]); break; 679 case KW_tile_path_3: thawer.get (tile_path [TILE_SOUTH]); break;
664 case KW_tile_path_4: thawer.get (tile_path [3]); break; 680 case KW_tile_path_4: thawer.get (tile_path [TILE_WEST ]); break;
681 case KW_tile_path_5: thawer.get (tile_path [TILE_UP ]); break;
682 case KW_tile_path_6: thawer.get (tile_path [TILE_DOWN ]); break;
665 683
666 case KW_ERROR: 684 case KW_ERROR:
667 set_key_text (thawer.kw_str, thawer.value); 685 set_key_text (thawer.kw_str, thawer.value);
668 break; 686 break;
669 687
670 case KW_end: 688 case KW_end:
671 thawer.next (); 689 thawer.next ();
672 return true; 690 return true;
673 691
674 default: 692 default:
675 if (!thawer.parse_error ("map", 0)) 693 if (!thawer.parse_error ("map"))
676 return false; 694 return false;
677 break; 695 break;
678 } 696 }
679 697
680 thawer.next (); 698 thawer.next ();
681 } 699 }
682 700
683 abort (); 701 abort ();
684} 702}
703
704//+GPL
685 705
686/****************************************************************************** 706/******************************************************************************
687 * This is the start of unique map handling code 707 * This is the start of unique map handling code
688 *****************************************************************************/ 708 *****************************************************************************/
689 709
696 int unique = 0; 716 int unique = 0;
697 for (object *op = spaces [i].bot; op; ) 717 for (object *op = spaces [i].bot; op; )
698 { 718 {
699 object *above = op->above; 719 object *above = op->above;
700 720
701 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 721 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
702 unique = 1; 722 unique = 1;
703 723
704 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 724 if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
705 {
706 op->destroy_inv (false);
707 op->destroy (); 725 op->destroy ();
708 }
709 726
710 op = above; 727 op = above;
711 } 728 }
712 } 729 }
713} 730}
714 731
732//-GPL
733
715bool 734bool
716maptile::_save_header (object_freezer &freezer) 735maptile::_save_header (object_freezer &freezer)
717{ 736{
718#define MAP_OUT(k) freezer.put (KW_ ## k, k) 737#define MAP_OUT(k) freezer.put (KW(k), k)
719#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 738#define MAP_OUT2(k,v) freezer.put (KW(k), v)
720 739
721 MAP_OUT2 (arch, "map"); 740 MAP_OUT2 (arch, CS(map));
722 741
723 if (name) MAP_OUT (name); 742 if (name) MAP_OUT (name);
724 MAP_OUT (swap_time); 743 MAP_OUT (swap_time);
725 MAP_OUT (reset_time); 744 MAP_OUT (reset_time);
726 MAP_OUT (reset_timeout); 745 MAP_OUT (reset_timeout);
727 MAP_OUT (fixed_resettime); 746 MAP_OUT (fixed_resettime);
728 MAP_OUT (no_reset); 747 MAP_OUT (no_reset);
748 MAP_OUT (no_drop);
729 MAP_OUT (difficulty); 749 MAP_OUT (difficulty);
730
731 if (default_region) MAP_OUT2 (region, default_region->name); 750 if (default_region) MAP_OUT2 (region, default_region->name);
732 751
733 if (shopitems) 752 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
734 {
735 char shop[MAX_BUF];
736 print_shop_string (this, shop);
737 MAP_OUT2 (shopitems, shop);
738 }
739
740 MAP_OUT (shopgreed); 753 MAP_OUT (shopgreed);
741 MAP_OUT (shopmin); 754 MAP_OUT (shopmin);
742 MAP_OUT (shopmax); 755 MAP_OUT (shopmax);
743 if (shoprace) MAP_OUT (shoprace); 756 if (shoprace) MAP_OUT (shoprace);
744 MAP_OUT (darkness); 757
745 MAP_OUT (width); 758 MAP_OUT (width);
746 MAP_OUT (height); 759 MAP_OUT (height);
747 MAP_OUT (enter_x); 760 MAP_OUT (enter_x);
748 MAP_OUT (enter_y); 761 MAP_OUT (enter_y);
749 762 MAP_OUT (darkness);
750 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
751 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
752
753 MAP_OUT (outdoor); 763 MAP_OUT (outdoor);
754 MAP_OUT (temp); 764
755 MAP_OUT (pressure); 765 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
756 MAP_OUT (humid); 766 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
757 MAP_OUT (windspeed);
758 MAP_OUT (winddir);
759 MAP_OUT (sky);
760 767
761 MAP_OUT (per_player); 768 MAP_OUT (per_player);
762 MAP_OUT (per_party); 769 MAP_OUT (per_party);
763 770
764 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 771 if (tile_path [TILE_NORTH]) MAP_OUT2 (tile_path_1, tile_path [TILE_NORTH]);
765 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 772 if (tile_path [TILE_EAST ]) MAP_OUT2 (tile_path_2, tile_path [TILE_EAST ]);
766 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 773 if (tile_path [TILE_SOUTH]) MAP_OUT2 (tile_path_3, tile_path [TILE_SOUTH]);
767 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 774 if (tile_path [TILE_WEST ]) MAP_OUT2 (tile_path_4, tile_path [TILE_WEST ]);
775 if (tile_path [TILE_UP ]) MAP_OUT2 (tile_path_5, tile_path [TILE_UP ]);
776 if (tile_path [TILE_DOWN ]) MAP_OUT2 (tile_path_6, tile_path [TILE_DOWN ]);
768 777
769 freezer.put (this); 778 freezer.put (this);
770 freezer.put (KW_end); 779 freezer.put (KW(end));
771 780
772 return true; 781 return true;
773} 782}
774 783
775bool 784bool
780 if (!_save_header (freezer)) 789 if (!_save_header (freezer))
781 return false; 790 return false;
782 791
783 return freezer.save (path); 792 return freezer.save (path);
784} 793}
794
795//+GPL
785 796
786/* 797/*
787 * Remove and free all objects in the given map. 798 * Remove and free all objects in the given map.
788 */ 799 */
789void 800void
800 811
801 op->flag [FLAG_REMOVED] = true; 812 op->flag [FLAG_REMOVED] = true;
802 813
803 object *head = op->head_ (); 814 object *head = op->head_ ();
804 if (op == head) 815 if (op == head)
805 {
806 op->destroy_inv (false);
807 op->destroy (); 816 op->destroy ();
808 }
809 else if (head->map != op->map) 817 else if (head->map != op->map)
810 { 818 {
811 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ()); 819 LOG (llevDebug, "bad luck for object crossing map borders: %s", head->debug_desc ());
812 head->destroy (); 820 head->destroy ();
813 } 821 }
830 msg = 0; 838 msg = 0;
831 maplore = 0; 839 maplore = 0;
832 shoprace = 0; 840 shoprace = 0;
833 delete [] shopitems, shopitems = 0; 841 delete [] shopitems, shopitems = 0;
834 842
835 for (int i = 0; i < 4; i++) 843 for (int i = 0; i < ecb_array_length (tile_path); i++)
836 tile_path [i] = 0; 844 tile_path [i] = 0;
837} 845}
838 846
839maptile::~maptile () 847maptile::~maptile ()
840{ 848{
847 /* We need to look through all the maps and see if any maps 855 /* We need to look through all the maps and see if any maps
848 * are pointing at this one for tiling information. Since 856 * are pointing at this one for tiling information. Since
849 * tiling can be asymetric, we just can not look to see which 857 * tiling can be asymetric, we just can not look to see which
850 * maps this map tiles with and clears those. 858 * maps this map tiles with and clears those.
851 */ 859 */
852 for (int i = 0; i < 4; i++) 860 for (int i = 0; i < ecb_array_length (tile_path); i++)
853 if (tile_map[i] == m) 861 if (tile_map[i] == m)
854 tile_map[i] = 0; 862 tile_map[i] = 0;
855} 863}
856 864
857void 865void
861 869
862 clear (); 870 clear ();
863} 871}
864 872
865/* decay and destroy perishable items in a map */ 873/* decay and destroy perishable items in a map */
874// TODO: should be done regularly, not on map load?
866void 875void
867maptile::do_decay_objects () 876maptile::do_decay_objects ()
868{ 877{
869 if (!spaces) 878 if (!spaces)
870 return; 879 return;
872 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 881 for (mapspace *ms = spaces + size (); ms-- > spaces; )
873 for (object *above, *op = ms->bot; op; op = above) 882 for (object *above, *op = ms->bot; op; op = above)
874 { 883 {
875 above = op->above; 884 above = op->above;
876 885
886 // do not decay anything above unique floor tiles (yet :)
887 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
888 break;
889
877 bool destroy = 0; 890 bool destroy = 0;
878 891
879 // do not decay anything above unique floor tiles (yet :) 892 if (op->flag [FLAG_IS_FLOOR]
880 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 893 || op->flag [FLAG_OBJ_ORIGINAL]
881 break; 894 || op->flag [FLAG_UNIQUE]
882 895 || op->flag [FLAG_OVERLAY_FLOOR]
883 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 896 || op->flag [FLAG_UNPAID]
884 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
885 || QUERY_FLAG (op, FLAG_UNIQUE)
886 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
887 || QUERY_FLAG (op, FLAG_UNPAID)
888 || op->is_alive ()) 897 || op->is_alive ())
889 ; // do not decay 898 ; // do not decay
890 else if (op->is_weapon ()) 899 else if (op->is_weapon ())
891 { 900 {
892 op->stats.dam--; 901 op->stats.dam--;
917 || mat & M_LIQUID 926 || mat & M_LIQUID
918 || (mat & M_IRON && rndm (1, 5) == 1) 927 || (mat & M_IRON && rndm (1, 5) == 1)
919 || (mat & M_GLASS && rndm (1, 2) == 1) 928 || (mat & M_GLASS && rndm (1, 2) == 1)
920 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 929 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
921 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 930 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
922 || (mat & M_ICE && temp > 32)) 931 //|| (mat & M_ICE && temp > 32)
932 )
923 destroy = 1; 933 destroy = 1;
924 } 934 }
925 935
926 /* adjust overall chance below */ 936 /* adjust overall chance below */
927 if (destroy && rndm (0, 1)) 937 if (destroy && rndm (0, 1))
928 op->destroy (); 938 op->destroy ();
929 }
930}
931
932/*
933 * Updates every button on the map (by calling update_button() for them).
934 */
935void
936maptile::update_buttons ()
937{
938 for (oblinkpt *obp = buttons; obp; obp = obp->next)
939 for (objectlink *ol = obp->link; ol; ol = ol->next)
940 {
941 if (!ol->ob)
942 {
943 LOG (llevError, "Internal error in update_button (%s (%dx%d), connected %ld).\n",
944 ol->ob ? (const char *) ol->ob->name : "null", ol->ob ? ol->ob->x : -1, ol->ob ? ol->ob->y : -1, obp->value);
945 continue;
946 }
947
948 if (ol->ob->type == BUTTON || ol->ob->type == PEDESTAL)
949 {
950 update_button (ol->ob);
951 break;
952 }
953 } 939 }
954} 940}
955 941
956/* 942/*
957 * This routine is supposed to find out the difficulty of the map. 943 * This routine is supposed to find out the difficulty of the map.
958 * difficulty does not have a lot to do with character level, 944 * difficulty does not have a lot to do with character level,
959 * but does have a lot to do with treasure on the map. 945 * but does have a lot to do with treasure on the map.
960 * 946 *
961 * Difficulty can now be set by the map creature. If the value stored 947 * Difficulty can now be set by the map creator. If the value stored
962 * in the map is zero, then use this routine. Maps should really 948 * in the map is zero, then use this routine. Maps should really
963 * have a difficulty set than using this function - human calculation 949 * have a difficulty set rather than using this function - human calculation
964 * is much better than this functions guesswork. 950 * is much better than this function's guesswork.
965 */ 951 */
966int 952int
967maptile::estimate_difficulty () const 953maptile::estimate_difficulty () const
968{ 954{
969 long monster_cnt = 0; 955 long monster_cnt = 0;
971 sint64 total_exp = 0; 957 sint64 total_exp = 0;
972 958
973 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 959 for (mapspace *ms = spaces + size (); ms-- > spaces; )
974 for (object *op = ms->bot; op; op = op->above) 960 for (object *op = ms->bot; op; op = op->above)
975 { 961 {
976 if (QUERY_FLAG (op, FLAG_MONSTER)) 962 if (op->flag [FLAG_MONSTER])
977 { 963 {
978 total_exp += op->stats.exp; 964 total_exp += op->stats.exp;
979 monster_cnt++; 965 monster_cnt++;
980 } 966 }
981 967
982 if (QUERY_FLAG (op, FLAG_GENERATOR)) 968 if (op->flag [FLAG_GENERATOR])
983 { 969 {
984 total_exp += op->stats.exp; 970 total_exp += op->stats.exp;
985 971
986 if (archetype *at = op->other_arch) 972 if (archetype *at = op->other_arch)
987 { 973 {
1014 * postive values make it darker, negative make it brighter 1000 * postive values make it darker, negative make it brighter
1015 */ 1001 */
1016int 1002int
1017maptile::change_map_light (int change) 1003maptile::change_map_light (int change)
1018{ 1004{
1019 int new_level = darkness + change;
1020
1021 /* Nothing to do */ 1005 /* Nothing to do */
1022 if (!change || (new_level <= 0 && darkness == 0) || (new_level >= MAX_DARKNESS && darkness >= MAX_DARKNESS)) 1006 if (!change)
1023 return 0; 1007 return 0;
1024 1008
1025 /* inform all players on the map */ 1009 /* inform all players on the map */
1026 if (change > 0) 1010 if (change > 0)
1027 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker."); 1011 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes darker.");
1028 else 1012 else
1029 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter."); 1013 new_info_map (NDI_BLACK | NDI_UNIQUE, this, "It becomes brighter.");
1030 1014
1031 /* Do extra checking. since darkness is a unsigned value, 1015 darkness = clamp (darkness + change, -MAX_DARKNESS, MAX_DARKNESS);
1032 * we need to be extra careful about negative values.
1033 * In general, the checks below are only needed if change
1034 * is not +/-1
1035 */
1036 if (new_level < 0)
1037 darkness = 0;
1038 else if (new_level >= MAX_DARKNESS)
1039 darkness = MAX_DARKNESS;
1040 else
1041 darkness = new_level;
1042 1016
1043 /* All clients need to get re-updated for the change */ 1017 /* All clients need to get re-updated for the change */
1044 update_all_map_los (this); 1018 update_all_map_los (this);
1019
1045 return 1; 1020 return 1;
1046} 1021}
1047 1022
1048/* 1023/*
1049 * This function updates various attributes about a specific space 1024 * This function updates various attributes about a specific space
1050 * on the map (what it looks like, whether it blocks magic, 1025 * on the map (what it looks like, whether it blocks magic,
1051 * has a living creatures, prevents people from passing 1026 * has a living creatures, prevents people from passing
1052 * through, etc) 1027 * through, etc)
1053 */ 1028 */
1054void 1029void
1055mapspace::update_ () 1030mapspace::update_ ()
1056{ 1031{
1057 object *tmp, *last = 0; 1032 object *last = 0;
1058 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1033 uint8 flags = P_UPTODATE;
1034 sint8 light = 0;
1059 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1035 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1036 uint64_t volume = 0;
1037 uint32_t items = 0;
1038 object *anywhere = 0;
1039 uint8_t middle_visibility = 0;
1060 1040
1061 //object *middle = 0; 1041 //object *middle = 0;
1062 //object *top = 0; 1042 //object *top = 0;
1063 //object *floor = 0; 1043 //object *floor = 0;
1064 // this seems to generate better code than using locals, above 1044 // this seems to generate better code than using locals, above
1065 object *&top = faces_obj[0] = 0; 1045 object *&top = faces_obj[0] = 0;
1066 object *&middle = faces_obj[1] = 0; 1046 object *&middle = faces_obj[1] = 0;
1067 object *&floor = faces_obj[2] = 0; 1047 object *&floor = faces_obj[2] = 0;
1068 1048
1049 object::flags_t allflags; // all flags of all objects or'ed together
1050
1069 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1051 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1070 { 1052 {
1071 /* This could be made additive I guess (two lights better than 1053 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1072 * one). But if so, it shouldn't be a simple additive - 2
1073 * light bulbs do not illuminate twice as far as once since
1074 * it is a dissapation factor that is cubed.
1075 */
1076 light = max (light, tmp->glow_radius); 1054 light += tmp->glow_radius;
1077 1055
1078 /* This call is needed in order to update objects the player 1056 /* This call is needed in order to update objects the player
1079 * is standing in that have animations (ie, grass, fire, etc). 1057 * is standing in that have animations (ie, grass, fire, etc).
1080 * However, it also causes the look window to be re-drawn 1058 * However, it also causes the look window to be re-drawn
1081 * 3 times each time the player moves, because many of the 1059 * 3 times each time the player moves, because many of the
1082 * functions the move_player calls eventualy call this. 1060 * functions the move_player calls eventualy call this.
1083 * 1061 *
1084 * Always put the player down for drawing. 1062 * Always put the player down for drawing.
1085 */ 1063 */
1086 if (!tmp->invisible) 1064 if (expect_true (!tmp->invisible))
1087 { 1065 {
1088 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1066 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1089 top = tmp; 1067 top = tmp;
1090 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1068 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1091 { 1069 {
1092 /* If we got a floor, that means middle and top were below it, 1070 /* If we got a floor, that means middle and top were below it,
1093 * so should not be visible, so we clear them. 1071 * so should not be visible, so we clear them.
1094 */ 1072 */
1095 middle = 0; 1073 middle = 0;
1096 top = 0; 1074 top = 0;
1097 floor = tmp; 1075 floor = tmp;
1076 volume = 0;
1077 items = 0;
1098 } 1078 }
1099 /* Flag anywhere have high priority */ 1079 else
1100 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1101 { 1080 {
1081 if (expect_true (!tmp->flag [FLAG_NO_PICK]))
1082 {
1083 ++items;
1084 volume += tmp->volume ();
1085 }
1086
1087 /* Flag anywhere have high priority */
1088 if (expect_false (tmp->flag [FLAG_SEE_ANYWHERE]))
1089 anywhere = tmp;
1090
1091 /* Find the highest visible face around. If equal
1092 * visibilities, we still want the one nearer to the
1093 * top
1094 */
1095 if (expect_false (::faces [tmp->face].visibility >= middle_visibility))
1096 {
1097 middle_visibility = ::faces [tmp->face].visibility;
1102 middle = tmp; 1098 middle = tmp;
1103 anywhere = 1; 1099 }
1104 } 1100 }
1105 /* Find the highest visible face around. If equal
1106 * visibilities, we still want the one nearer to the
1107 * top
1108 */
1109 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1110 middle = tmp;
1111 }
1112
1113 if (tmp == tmp->above)
1114 {
1115 LOG (llevError, "Error in structure of map\n");
1116 exit (-1);
1117 } 1101 }
1118 1102
1119 move_slow |= tmp->move_slow; 1103 move_slow |= tmp->move_slow;
1120 move_block |= tmp->move_block; 1104 move_block |= tmp->move_block;
1121 move_on |= tmp->move_on; 1105 move_on |= tmp->move_on;
1122 move_off |= tmp->move_off; 1106 move_off |= tmp->move_off;
1123 move_allow |= tmp->move_allow; 1107 move_allow |= tmp->move_allow;
1124 1108
1125 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1109 allflags |= tmp->flag;
1126 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1110
1127 if (tmp->type == PLAYER) flags |= P_PLAYER; 1111 if (tmp->type == PLAYER) flags |= P_PLAYER;
1128 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1112 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1129 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1130 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1131 } 1113 }
1132 1114
1133 this->light = light; 1115 // FLAG_SEE_ANYWHERE takes precedence
1116 if (anywhere)
1117 middle = anywhere;
1118
1119 // ORing all flags together and checking them here is much faster
1120 if (allflags [FLAG_BLOCKSVIEW]) flags |= P_BLOCKSVIEW;
1121 if (allflags [FLAG_NO_MAGIC] ) flags |= P_NO_MAGIC;
1122 if (allflags [FLAG_ALIVE] ) flags |= P_IS_ALIVE;
1123 if (allflags [FLAG_DAMNED] ) flags |= P_NO_CLERIC;
1124
1125 this->light = min (light, MAX_LIGHT_RADIUS);
1134 this->flags_ = flags; 1126 this->flags_ = flags;
1135 this->move_block = move_block & ~move_allow; 1127 this->move_block = move_block & ~move_allow;
1136 this->move_on = move_on; 1128 this->move_on = move_on;
1137 this->move_off = move_off; 1129 this->move_off = move_off;
1138 this->move_slow = move_slow; 1130 this->move_slow = move_slow;
1131 this->volume_ = (volume + 1023) / 1024;
1132 this->items_ = upos_min (items, 65535); // assume nrof <= 2**31
1139 1133
1140 /* At this point, we have a floor face (if there is a floor), 1134 /* At this point, we have a floor face (if there is a floor),
1141 * and the floor is set - we are not going to touch it at 1135 * and the floor is set - we are not going to touch it at
1142 * this point. 1136 * this point.
1143 * middle contains the highest visibility face. 1137 * middle contains the highest visibility face.
1144 * top contains a player/monster face, if there is one. 1138 * top contains a player/monster face, if there is one.
1145 * 1139 *
1146 * We now need to fill in top.face and/or middle.face. 1140 * We now need to fill in top.face and/or middle.face.
1147 */ 1141 */
1148 1142
1149 /* If the top face also happens to be high visibility, re-do our 1143 /* If the top face also happens to be high visibility, re-do our
1150 * middle face. This should not happen, as we already have the 1144 * middle face. This should not happen, as we already have the
1151 * else statement above so middle should not get set. OTOH, it 1145 * else statement above so middle should not get set. OTOH, it
1152 * may be possible for the faces to match but be different objects. 1146 * may be possible for the faces to match but be different objects.
1153 */ 1147 */
1154 if (top == middle) 1148 if (top == middle)
1155 middle = 0; 1149 middle = 0;
1156 1150
1158 * 1) top face is set, need middle to be set. 1152 * 1) top face is set, need middle to be set.
1159 * 2) middle is set, need to set top. 1153 * 2) middle is set, need to set top.
1160 * 3) neither middle or top is set - need to set both. 1154 * 3) neither middle or top is set - need to set both.
1161 */ 1155 */
1162 1156
1163 for (tmp = last; tmp; tmp = tmp->below) 1157 for (object *tmp = last; tmp; tmp = tmp->below)
1164 { 1158 {
1165 /* Once we get to a floor, stop, since we already have a floor object */ 1159 /* Once we get to a floor, stop, since we already have a floor object */
1166 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1160 if (tmp->flag [FLAG_IS_FLOOR])
1167 break; 1161 break;
1168 1162
1169 /* If two top faces are already set, quit processing */ 1163 /* If two top faces are already set, quit processing */
1170 if (top && middle) 1164 if (top && middle)
1171 break; 1165 break;
1185 /* top is already set - we should only get here if 1179 /* top is already set - we should only get here if
1186 * middle is not set 1180 * middle is not set
1187 * 1181 *
1188 * Set the middle face and break out, since there is nothing 1182 * Set the middle face and break out, since there is nothing
1189 * more to fill in. We don't check visiblity here, since 1183 * more to fill in. We don't check visiblity here, since
1190 * 1184 *
1191 */ 1185 */
1192 if (tmp != top) 1186 if (tmp != top)
1193 { 1187 {
1194 middle = tmp; 1188 middle = tmp;
1195 break; 1189 break;
1202 middle = 0; 1196 middle = 0;
1203 1197
1204 if (top == middle) 1198 if (top == middle)
1205 middle = 0; 1199 middle = 0;
1206 1200
1201 // set lower map transparent floor flag if applicable
1202 if (floor && floor->flag [FLAG_IS_TRANSPARENT_FLOOR] && !middle && !top)
1203 {
1204 floor->set_anim_frame (0);
1205
1206 if (maptile *m = floor->map->tile_map [TILE_DOWN])
1207 {
1208 mapspace &ms = m->at (floor->x, floor->y);
1209 ms.update ();
1210
1211 if (object *floor2 = ms.faces_obj [2])
1212 if (!floor2->flag [FLAG_IS_TRANSPARENT_FLOOR])
1213 {
1214 floor->set_anim_frame (1);
1215 top = floor;
1216 middle = ms.faces_obj [0];
1217 floor = floor2;
1218 }
1219
1220 ms.pflags |= PF_VIS_UP;
1221 }
1222 }
1223
1207#if 0 1224#if 0
1208 faces_obj [0] = top; 1225 faces_obj [0] = top;
1209 faces_obj [1] = middle; 1226 faces_obj [1] = middle;
1210 faces_obj [2] = floor; 1227 faces_obj [2] = floor;
1211#endif 1228#endif
1212} 1229}
1213 1230
1214uint64 1231void
1215mapspace::volume () const 1232mapspace::update_up ()
1216{ 1233{
1217 uint64 vol = 0; 1234 // invalidate up
1218 1235 if (!(pflags & PF_VIS_UP))
1219 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1220 vol += op->volume ();
1221
1222 return vol; 1236 return;
1223}
1224 1237
1225bool 1238 pflags &= ~PF_VIS_UP;
1239
1240 if (bot)
1241 if (maptile *m = bot->map->tile_map [TILE_UP])
1242 m->at (bot->x, bot->y).invalidate ();
1243}
1244
1245maptile *
1226maptile::tile_available (int dir, bool load) 1246maptile::tile_available (int dir, bool load)
1227{ 1247{
1248 // map is there and we don't need to load it OR it's loaded => return what we have
1249 if (tile_map [dir] && (!load || tile_map [dir]->linkable ()))
1250 return tile_map [dir];
1251
1228 if (!tile_path[dir]) 1252 if (tile_path [dir])
1229 return 0; 1253 {
1230 1254 // well, try to locate it then, if possible - maybe it's there already
1231 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1255 // this is the ONLY place in the server that links maps with each other,
1232 return 1; 1256 // so any kind of inter-map stuff has to be initiated here.
1233
1234 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1257 if (maptile *m = find_async (tile_path [dir], this, load))
1235 return 1; 1258 {
1259 bool mismatch = false;
1260
1261 if (dir == TILE_NORTH || dir == TILE_SOUTH || dir == TILE_UP || dir == TILE_DOWN)
1262 if (width != m->width)
1263 mismatch = true;
1264
1265 if (dir == TILE_EAST || dir == TILE_WEST || dir == TILE_UP || dir == TILE_DOWN)
1266 if (height != m->height)
1267 mismatch = true;
1268
1269 if (mismatch)
1270 {
1271 LOG (llevError, "tile dimension mismatch for direction %d from %s to %s\n",
1272 dir, &path, &m->path);
1273 m = 0;
1274 }
1275 else if (0)//D
1276 {
1277 // as an optimisation, link us against the other map if the other map
1278 // has us as neighbour, which is very common, but not guaranteed.
1279 int dir2 = REVERSE_TILE_DIR (dir);
1280
1281 if (m->tile_path [dir2] == path)
1282 m->tile_map [dir2] = this;
1283 }
1284
1285
1286 return tile_map [dir] = m;
1287 }
1288 }
1236 1289
1237 return 0; 1290 return 0;
1238} 1291}
1239 1292
1240/* this returns TRUE if the coordinates (x,y) are out of 1293/* this returns TRUE if the coordinates (x,y) are out of
1241 * map m. This function also takes into account any 1294 * map m. This function also takes into account any
1242 * tiling considerations, loading adjacant maps as needed. 1295 * tiling considerations, loading adjacant maps as needed.
1243 * This is the function should always be used when it 1296 * This is the function should always be used when it
1244 * necessary to check for valid coordinates. 1297 * necessary to check for valid coordinates.
1245 * This function will recursively call itself for the 1298 * This function will recursively call itself for the
1246 * tiled maps. 1299 * tiled maps.
1247 */ 1300 */
1248int 1301int
1249out_of_map (maptile *m, int x, int y) 1302out_of_map (maptile *m, int x, int y)
1250{ 1303{
1255 if (!m) 1308 if (!m)
1256 return 0; 1309 return 0;
1257 1310
1258 if (x < 0) 1311 if (x < 0)
1259 { 1312 {
1260 if (!m->tile_available (3)) 1313 if (!m->tile_available (TILE_WEST))
1261 return 1; 1314 return 1;
1262 1315
1263 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1316 return out_of_map (m->tile_map [TILE_WEST], x + m->tile_map [TILE_WEST]->width, y);
1264 } 1317 }
1265 1318
1266 if (x >= m->width) 1319 if (x >= m->width)
1267 { 1320 {
1268 if (!m->tile_available (1)) 1321 if (!m->tile_available (TILE_EAST))
1269 return 1; 1322 return 1;
1270 1323
1271 return out_of_map (m->tile_map[1], x - m->width, y); 1324 return out_of_map (m->tile_map [TILE_EAST], x - m->width, y);
1272 } 1325 }
1273 1326
1274 if (y < 0) 1327 if (y < 0)
1275 { 1328 {
1276 if (!m->tile_available (0)) 1329 if (!m->tile_available (TILE_NORTH))
1277 return 1; 1330 return 1;
1278 1331
1279 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1332 return out_of_map (m->tile_map [TILE_NORTH], x, y + m->tile_map [TILE_NORTH]->height);
1280 } 1333 }
1281 1334
1282 if (y >= m->height) 1335 if (y >= m->height)
1283 { 1336 {
1284 if (!m->tile_available (2)) 1337 if (!m->tile_available (TILE_SOUTH))
1285 return 1; 1338 return 1;
1286 1339
1287 return out_of_map (m->tile_map[2], x, y - m->height); 1340 return out_of_map (m->tile_map [TILE_SOUTH], x, y - m->height);
1288 } 1341 }
1289 1342
1290 /* Simple case - coordinates are within this local 1343 /* Simple case - coordinates are within this local
1291 * map. 1344 * map.
1292 */ 1345 */
1294} 1347}
1295 1348
1296/* This is basically the same as out_of_map above, but 1349/* This is basically the same as out_of_map above, but
1297 * instead we return NULL if no map is valid (coordinates 1350 * instead we return NULL if no map is valid (coordinates
1298 * out of bounds and no tiled map), otherwise it returns 1351 * out of bounds and no tiled map), otherwise it returns
1299 * the map as that the coordinates are really on, and 1352 * the map as that the coordinates are really on, and
1300 * updates x and y to be the localised coordinates. 1353 * updates x and y to be the localised coordinates.
1301 * Using this is more efficient of calling out_of_map 1354 * Using this is more efficient of calling out_of_map
1302 * and then figuring out what the real map is 1355 * and then figuring out what the real map is
1303 */ 1356 */
1304maptile * 1357maptile *
1305maptile::xy_find (sint16 &x, sint16 &y) 1358maptile::xy_find (sint16 &x, sint16 &y)
1306{ 1359{
1307 if (x < 0) 1360 if (x < 0)
1308 { 1361 {
1309 if (!tile_available (3)) 1362 if (!tile_available (TILE_WEST))
1310 return 0; 1363 return 0;
1311 1364
1312 x += tile_map[3]->width; 1365 x += tile_map [TILE_WEST]->width;
1313 return tile_map[3]->xy_find (x, y); 1366 return tile_map [TILE_WEST]->xy_find (x, y);
1314 } 1367 }
1315 1368
1316 if (x >= width) 1369 if (x >= width)
1317 { 1370 {
1318 if (!tile_available (1)) 1371 if (!tile_available (TILE_EAST))
1319 return 0; 1372 return 0;
1320 1373
1321 x -= width; 1374 x -= width;
1322 return tile_map[1]->xy_find (x, y); 1375 return tile_map [TILE_EAST]->xy_find (x, y);
1323 } 1376 }
1324 1377
1325 if (y < 0) 1378 if (y < 0)
1326 { 1379 {
1327 if (!tile_available (0)) 1380 if (!tile_available (TILE_NORTH))
1328 return 0; 1381 return 0;
1329 1382
1330 y += tile_map[0]->height; 1383 y += tile_map [TILE_NORTH]->height;
1331 return tile_map[0]->xy_find (x, y); 1384 return tile_map [TILE_NORTH]->xy_find (x, y);
1332 } 1385 }
1333 1386
1334 if (y >= height) 1387 if (y >= height)
1335 { 1388 {
1336 if (!tile_available (2)) 1389 if (!tile_available (TILE_SOUTH))
1337 return 0; 1390 return 0;
1338 1391
1339 y -= height; 1392 y -= height;
1340 return tile_map[2]->xy_find (x, y); 1393 return tile_map [TILE_SOUTH]->xy_find (x, y);
1341 } 1394 }
1342 1395
1343 /* Simple case - coordinates are within this local 1396 /* Simple case - coordinates are within this local
1344 * map. 1397 * map.
1345 */ 1398 */
1349/** 1402/**
1350 * Return whether map2 is adjacent to map1. If so, store the distance from 1403 * Return whether map2 is adjacent to map1. If so, store the distance from
1351 * map1 to map2 in dx/dy. 1404 * map1 to map2 in dx/dy.
1352 */ 1405 */
1353int 1406int
1354adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1407adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy)
1355{ 1408{
1356 if (!map1 || !map2) 1409 if (!map1 || !map2)
1357 return 0; 1410 return 0;
1358 1411
1359 //TODO: this doesn't actually check correctly when intermediate maps are not loaded 1412 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
1361 if (map1 == map2) 1414 if (map1 == map2)
1362 { 1415 {
1363 *dx = 0; 1416 *dx = 0;
1364 *dy = 0; 1417 *dy = 0;
1365 } 1418 }
1366 else if (map1->tile_map[0] == map2) 1419 else if (map1->tile_available (TILE_NORTH, false) == map2)
1367 { /* up */ 1420 {
1368 *dx = 0; 1421 *dx = 0;
1369 *dy = -map2->height; 1422 *dy = -map2->height;
1370 } 1423 }
1371 else if (map1->tile_map[1] == map2) 1424 else if (map1->tile_available (TILE_EAST , false) == map2)
1372 { /* right */ 1425 {
1373 *dx = map1->width; 1426 *dx = map1->width;
1374 *dy = 0; 1427 *dy = 0;
1375 } 1428 }
1376 else if (map1->tile_map[2] == map2) 1429 else if (map1->tile_available (TILE_SOUTH, false) == map2)
1377 { /* down */ 1430 {
1378 *dx = 0; 1431 *dx = 0;
1379 *dy = map1->height; 1432 *dy = map1->height;
1380 } 1433 }
1381 else if (map1->tile_map[3] == map2) 1434 else if (map1->tile_available (TILE_WEST , false) == map2)
1382 { /* left */ 1435 {
1383 *dx = -map2->width; 1436 *dx = -map2->width;
1384 *dy = 0; 1437 *dy = 0;
1385 } 1438 }
1386 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1439 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1387 { /* up right */ 1440 { /* up right */
1388 *dx = map1->tile_map[0]->width; 1441 *dx = +map1->tile_map[TILE_NORTH]->width;
1389 *dy = -map1->tile_map[0]->height; 1442 *dy = -map1->tile_map[TILE_NORTH]->height;
1390 } 1443 }
1391 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 1444 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1392 { /* up left */ 1445 { /* up left */
1393 *dx = -map2->width; 1446 *dx = -map2->width;
1394 *dy = -map1->tile_map[0]->height; 1447 *dy = -map1->tile_map[TILE_NORTH]->height;
1395 } 1448 }
1396 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 1449 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1397 { /* right up */ 1450 { /* right up */
1398 *dx = map1->width; 1451 *dx = +map1->width;
1399 *dy = -map2->height; 1452 *dy = -map2->height;
1400 } 1453 }
1401 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 1454 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1402 { /* right down */ 1455 { /* right down */
1403 *dx = map1->width; 1456 *dx = +map1->width;
1404 *dy = map1->tile_map[1]->height; 1457 *dy = +map1->tile_map[TILE_EAST]->height;
1405 } 1458 }
1406 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 1459 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1407 { /* down right */ 1460 { /* down right */
1408 *dx = map1->tile_map[2]->width; 1461 *dx = +map1->tile_map[TILE_SOUTH]->width;
1409 *dy = map1->height; 1462 *dy = +map1->height;
1410 } 1463 }
1411 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 1464 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1412 { /* down left */ 1465 { /* down left */
1413 *dx = -map2->width; 1466 *dx = -map2->width;
1414 *dy = map1->height; 1467 *dy = +map1->height;
1415 } 1468 }
1416 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 1469 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1417 { /* left up */ 1470 { /* left up */
1418 *dx = -map1->tile_map[3]->width; 1471 *dx = -map1->tile_map[TILE_WEST]->width;
1419 *dy = -map2->height; 1472 *dy = -map2->height;
1420 } 1473 }
1421 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1474 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1422 { /* left down */ 1475 { /* left down */
1423 *dx = -map1->tile_map[3]->width; 1476 *dx = -map1->tile_map[TILE_WEST]->width;
1424 *dy = map1->tile_map[3]->height; 1477 *dy = +map1->tile_map[TILE_WEST]->height;
1425 } 1478 }
1426 else 1479 else
1427 return 0; 1480 return 0;
1428 1481
1429 return 1; 1482 return 1;
1452 * so you just can not look the the map coordinates and get the 1505 * so you just can not look the the map coordinates and get the
1453 * righte value. distance_x/y are distance away, which 1506 * righte value. distance_x/y are distance away, which
1454 * can be negative. direction is the crossfire direction scheme 1507 * can be negative. direction is the crossfire direction scheme
1455 * that the creature should head. part is the part of the 1508 * that the creature should head. part is the part of the
1456 * monster that is closest. 1509 * monster that is closest.
1457 * 1510 *
1458 * get_rangevector looks at op1 and op2, and fills in the 1511 * get_rangevector looks at op1 and op2, and fills in the
1459 * structure for op1 to get to op2. 1512 * structure for op1 to get to op2.
1460 * We already trust that the caller has verified that the 1513 * We already trust that the caller has verified that the
1461 * two objects are at least on adjacent maps. If not, 1514 * two objects are at least on adjacent maps. If not,
1462 * results are not likely to be what is desired. 1515 * results are not likely to be what is desired.
1465 * 1518 *
1466 * currently, the only flag supported (0x1) is don't translate for 1519 * currently, the only flag supported (0x1) is don't translate for
1467 * closest body part of 'op1' 1520 * closest body part of 'op1'
1468 */ 1521 */
1469void 1522void
1470get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1523get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1471{ 1524{
1472 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1525 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1473 { 1526 {
1474 /* be conservative and fill in _some_ data */ 1527 /* be conservative and fill in _some_ data */
1475 retval->distance = 10000; 1528 retval->distance = 10000;
1476 retval->distance_x = 10000; 1529 retval->distance_x = 10000;
1477 retval->distance_y = 10000; 1530 retval->distance_y = 10000;
1478 retval->direction = 0; 1531 retval->direction = 0;
1479 retval->part = 0; 1532 retval->part = 0;
1480 } 1533 }
1481 else 1534 else
1482 { 1535 {
1483 object *best;
1484
1485 retval->distance_x += op2->x - op1->x; 1536 retval->distance_x += op2->x - op1->x;
1486 retval->distance_y += op2->y - op1->y; 1537 retval->distance_y += op2->y - op1->y;
1487 1538
1488 best = op1; 1539 object *best = op1;
1540
1489 /* If this is multipart, find the closest part now */ 1541 /* If this is multipart, find the closest part now */
1490 if (!(flags & 0x1) && op1->more) 1542 if (!(flags & 1) && op1->more)
1491 { 1543 {
1492 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1544 int best_distance = idistance (retval->distance_x, retval->distance_y);
1493 1545
1494 /* we just take the offset of the piece to head to figure 1546 /* we just take the offset of the piece to head to figure
1495 * distance instead of doing all that work above again 1547 * distance instead of doing all that work above again
1496 * since the distance fields we set above are positive in the 1548 * since the distance fields we set above are positive in the
1497 * same axis as is used for multipart objects, the simply arithmetic 1549 * same axis as is used for multipart objects, the simply arithmetic
1498 * below works. 1550 * below works.
1499 */ 1551 */
1500 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1552 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1501 { 1553 {
1502 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1554 int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1503 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1555
1504 if (tmpi < best_distance) 1556 if (tmpi < best_distance)
1505 { 1557 {
1506 best_distance = tmpi; 1558 best_distance = tmpi;
1507 best = tmp; 1559 best = tmp;
1508 } 1560 }
1509 } 1561 }
1510 1562
1511 if (best != op1) 1563 if (best != op1)
1512 { 1564 {
1513 retval->distance_x += op1->x - best->x; 1565 retval->distance_x += op1->x - best->x;
1514 retval->distance_y += op1->y - best->y; 1566 retval->distance_y += op1->y - best->y;
1515 } 1567 }
1516 } 1568 }
1517 1569
1518 retval->part = best; 1570 retval->part = best;
1519 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1571 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1520 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1572 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1521 } 1573 }
1522} 1574}
1523 1575
1524/* this is basically the same as get_rangevector above, but instead of 1576/* this is basically the same as get_rangevector above, but instead of
1525 * the first parameter being an object, it instead is the map 1577 * the first parameter being an object, it instead is the map
1526 * and x,y coordinates - this is used for path to player - 1578 * and x,y coordinates - this is used for path to player -
1527 * since the object is not infact moving but we are trying to traverse 1579 * since the object is not infact moving but we are trying to traverse
1528 * the path, we need this. 1580 * the path, we need this.
1529 * flags has no meaning for this function at this time - I kept it in to 1581 * flags has no meaning for this function at this time - I kept it in to
1530 * be more consistant with the above function and also in case they are needed 1582 * be more consistant with the above function and also in case they are needed
1531 * for something in the future. Also, since no object is pasted, the best 1583 * for something in the future. Also, since no object is pasted, the best
1532 * field of the rv_vector is set to NULL. 1584 * field of the rv_vector is set to NULL.
1533 */ 1585 */
1534void 1586void
1535get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1587get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1536{ 1588{
1537 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1589 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1538 { 1590 {
1539 /* be conservative and fill in _some_ data */ 1591 /* be conservative and fill in _some_ data */
1540 retval->distance = 100000; 1592 retval->distance = 100000;
1541 retval->distance_x = 32767; 1593 retval->distance_x = 32767;
1542 retval->distance_y = 32767; 1594 retval->distance_y = 32767;
1543 retval->direction = 0; 1595 retval->direction = 0;
1544 retval->part = 0; 1596 retval->part = 0;
1545 } 1597 }
1546 else 1598 else
1547 { 1599 {
1548 retval->distance_x += op2->x - x; 1600 retval->distance_x += op2->x - x;
1549 retval->distance_y += op2->y - y; 1601 retval->distance_y += op2->y - y;
1550 1602
1551 retval->part = NULL; 1603 retval->part = 0;
1552 retval->distance = idistance (retval->distance_x, retval->distance_y); 1604 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1553 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1605 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1554 } 1606 }
1555} 1607}
1556 1608
1557/* Returns true of op1 and op2 are effectively on the same map 1609/* Returns true of op1 and op2 are effectively on the same map
1558 * (as related to map tiling). Note that this looks for a path from 1610 * (as related to map tiling). Note that this looks for a path from
1568 int dx, dy; 1620 int dx, dy;
1569 1621
1570 return adjacent_map (op1->map, op2->map, &dx, &dy); 1622 return adjacent_map (op1->map, op2->map, &dx, &dy);
1571} 1623}
1572 1624
1625//-GPL
1626
1573object * 1627object *
1574maptile::insert (object *op, int x, int y, object *originator, int flags) 1628maptile::insert (object *op, int x, int y, object *originator, int flags)
1575{ 1629{
1576 if (!op->flag [FLAG_REMOVED])
1577 op->remove ();
1578
1579 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1630 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1580} 1631}
1581 1632
1582region * 1633region *
1583maptile::region (int x, int y) const 1634maptile::region (int x, int y) const
1591 if (default_region) 1642 if (default_region)
1592 return default_region; 1643 return default_region;
1593 1644
1594 return ::region::default_region (); 1645 return ::region::default_region ();
1595} 1646}
1647
1648//+GPL
1596 1649
1597/* picks a random object from a style map. 1650/* picks a random object from a style map.
1598 */ 1651 */
1599object * 1652object *
1600maptile::pick_random_object (rand_gen &gen) const 1653maptile::pick_random_object (rand_gen &gen) const
1607 */ 1660 */
1608 for (int i = 1000; --i;) 1661 for (int i = 1000; --i;)
1609 { 1662 {
1610 object *pick = at (gen (width), gen (height)).bot; 1663 object *pick = at (gen (width), gen (height)).bot;
1611 1664
1612 // do not prefer big monsters just because they are big. 1665 // must be head: do not prefer big monsters just because they are big.
1613 if (pick && pick->is_head ()) 1666 if (pick && pick->is_head ())
1614 return pick->head_ (); 1667 return pick;
1615 } 1668 }
1616 1669
1617 // instead of crashing in the unlikely(?) case, try to return *something* 1670 // instead of crashing in the unlikely(?) case, try to return *something*
1618 return archetype::find ("bug"); 1671 return archetype::find (shstr_bug);
1619} 1672}
1673
1674//-GPL
1620 1675
1621void 1676void
1622maptile::play_sound (faceidx sound, int x, int y) const 1677maptile::play_sound (faceidx sound, int x, int y) const
1623{ 1678{
1624 if (!sound) 1679 if (!sound)
1625 return; 1680 return;
1626 1681
1682 for_all_players_on_map (pl, this)
1683 if (client *ns = pl->ns)
1684 {
1685 int dx = x - pl->ob->x;
1686 int dy = y - pl->ob->y;
1687
1688 int distance = idistance (dx, dy);
1689
1690 if (distance <= MAX_SOUND_DISTANCE)
1691 ns->play_sound (sound, dx, dy);
1692 }
1693}
1694
1695void
1696maptile::say_msg (const char *msg, int x, int y) const
1697{
1627 for_all_players (pl) 1698 for_all_players (pl)
1628 if (pl->ob->map == this)
1629 if (client *ns = pl->ns) 1699 if (client *ns = pl->ns)
1630 { 1700 {
1631 int dx = x - pl->ob->x; 1701 int dx = x - pl->ob->x;
1632 int dy = y - pl->ob->y; 1702 int dy = y - pl->ob->y;
1633 1703
1634 int distance = idistance (dx, dy); 1704 int distance = idistance (dx, dy);
1635 1705
1636 if (distance <= MAX_SOUND_DISTANCE) 1706 if (distance <= MAX_SOUND_DISTANCE)
1637 ns->play_sound (sound, dx, dy); 1707 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1638 } 1708 }
1639} 1709}
1640 1710
1711dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1712
1713static void
1714split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1715{
1716 // clip to map to the left
1717 if (x0 < 0)
1718 {
1719 if (maptile *tile = m->tile_available (TILE_WEST, 1))
1720 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1721
1722 if (x1 < 0) // entirely to the left
1723 return;
1724
1725 x0 = 0;
1726 }
1727
1728 // clip to map to the right
1729 if (x1 > m->width)
1730 {
1731 if (maptile *tile = m->tile_available (TILE_EAST, 1))
1732 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1733
1734 if (x0 >= m->width) // entirely to the right
1735 return;
1736
1737 x1 = m->width;
1738 }
1739
1740 // clip to map to the north
1741 if (y0 < 0)
1742 {
1743 if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1744 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1745
1746 if (y1 < 0) // entirely to the north
1747 return;
1748
1749 y0 = 0;
1750 }
1751
1752 // clip to map to the south
1753 if (y1 > m->height)
1754 {
1755 if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1756 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1757
1758 if (y0 >= m->height) // entirely to the south
1759 return;
1760
1761 y1 = m->height;
1762 }
1763
1764 // if we get here, the rect is within the current map
1765 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1766
1767 r->m = m;
1768 r->x0 = x0;
1769 r->y0 = y0;
1770 r->x1 = x1;
1771 r->y1 = y1;
1772 r->dx = dx;
1773 r->dy = dy;
1774}
1775
1776maprect *
1777maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1778{
1779 buf.clear ();
1780
1781 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1782
1783 // add end marker
1784 maprect *r = (maprect *)buf.alloc (sizeof (maprect));
1785 r->m = 0;
1786
1787 return (maprect *)buf.linearise ();
1788}
1789

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines