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.160 by root, Mon Oct 12 14:00:57 2009 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 it under 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 10 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * 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 Affero GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 20 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * 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>
23 */ 24 */
24 25
25#include <unistd.h> 26#include <unistd.h>
26 27
27#include "global.h" 28#include "global.h"
28#include "loader.h"
29#include "path.h" 29#include "path.h"
30
31//+GPL
30 32
31sint8 maptile::outdoor_darkness; 33sint8 maptile::outdoor_darkness;
32 34
33/* This rolls up wall, blocks_magic, blocks_view, etc, all into 35/* This rolls up wall, blocks_magic, blocks_view, etc, all into
34 * one function that just returns a P_.. value (see map.h) 36 * one function that just returns a P_.. value (see map.h)
… …
58 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);
59} 61}
60 62
61/* 63/*
62 * Returns true if the given coordinate is blocked except by the 64 * Returns true if the given coordinate is blocked except by the
63 * object passed is not blocking. This is used with 65 * object passed is not blocking. This is used with
64 * multipart monsters - if we want to see if a 2x2 monster 66 * multipart monsters - if we want to see if a 2x2 monster
65 * 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
66 * to block it from moving there. 68 * to block it from moving there.
67 * 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
68 * monster. 70 * monster.
… …
71 * by the caller. 73 * by the caller.
72 */ 74 */
73int 75int
74blocked_link (object *ob, maptile *m, int sx, int sy) 76blocked_link (object *ob, maptile *m, int sx, int sy)
75{ 77{
76 object *tmp;
77 int mflags, blocked;
78
79 /* Make sure the coordinates are valid - they should be, as caller should 78 /* Make sure the coordinates are valid - they should be, as caller should
80 * have already checked this. 79 * have already checked this.
81 */ 80 */
82 if (OUT_OF_REAL_MAP (m, sx, sy)) 81 if (OUT_OF_REAL_MAP (m, sx, sy))
83 { 82 {
84 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 83 LOG (llevError | logBacktrace, "blocked_link: Passed map, x, y coordinates outside of map\n");
85 return 1; 84 return 1;
86 } 85 }
87 86
88 /* Save some cycles - instead of calling get_map_flags(), just get the value 87 mapspace &ms = m->at (sx, sy);
89 * directly.
90 */
91 mflags = m->at (sx, sy).flags ();
92 88
93 blocked = GET_MAP_MOVE_BLOCK (m, sx, sy); 89 int mflags = ms.flags ();
90 int blocked = ms.move_block;
94 91
95 /* If space is currently not blocked by anything, no need to 92 /* If space is currently not blocked by anything, no need to
96 * go further. Not true for players - all sorts of special 93 * go further. Not true for players - all sorts of special
97 * things we need to do for players. 94 * things we need to do for players.
98 */ 95 */
99 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 96 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
100 return 0; 97 return 0;
101 98
102 /* if there isn't anytyhing alive on this space, and this space isn't 99 /* if there isn't anything alive on this space, and this space isn't
103 * otherwise blocked, we can return now. Only if there is a living 100 * otherwise blocked, we can return now. Only if there is a living
104 * creature do we need to investigate if it is part of this creature 101 * creature do we need to investigate if it is part of this creature
105 * or another. Likewise, only if something is blocking us do we 102 * or another. Likewise, only if something is blocking us do we
106 * need to investigate if there is a special circumstance that would 103 * need to investigate if there is a special circumstance that would
107 * let the player through (inventory checkers for example) 104 * let the player through (inventory checkers for example)
… …
114 /* We basically go through the stack of objects, and if there is 111 /* We basically go through the stack of objects, and if there is
115 * some other object that has NO_PASS or FLAG_ALIVE set, return 112 * some other object that has NO_PASS or FLAG_ALIVE set, return
116 * true. If we get through the entire stack, that must mean 113 * true. If we get through the entire stack, that must mean
117 * ob is blocking it, so return 0. 114 * ob is blocking it, so return 0.
118 */ 115 */
119 for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above) 116 for (object *tmp = ms.top; tmp; tmp = tmp->below)
120 { 117 {
121 118 if (OB_MOVE_BLOCK (ob, tmp))
122 /* This must be before the checks below. Code for inventory checkers. */
123 if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
124 { 119 {
125 /* If last_sp is set, the player/monster needs an object, 120 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
126 * so we check for it. If they don't have it, they can't 121 if (RESULT_INT (0))
127 * pass through this space. 122 return 1;
128 */ 123 else
129 if (tmp->last_sp) 124 continue;
125
126 if (tmp->type == CHECK_INV)
130 { 127 {
131 if (check_inv_recursive (ob, tmp) == NULL) 128 bool have = check_inv_recursive (ob, tmp);
129
130 // last_sp set means we block if we don't have.
131 if (logical_xor (have, tmp->last_sp))
132 return 1; 132 return 1;
133 else 133 }
134 continue; 134 else if (tmp->type == T_MATCH)
135 {
136 // T_MATCH allows "entrance" iff the match is true
137 // == blocks if the match fails
138
139 // we could have used an INVOKE_OBJECT, but decided against it, as we
140 // assume that T_MATCH is relatively common.
141 if (!match (tmp->slaying, ob, tmp, ob))
142 return 1;
135 } 143 }
136 else 144 else
137 { 145 return 1; // unconditional block
138 /* In this case, the player must not have the object - 146
139 * if they do, they can't pass through.
140 */
141 if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
142 return 1;
143 else
144 continue;
145 }
146 } /* if check_inv */
147 else 147 } else {
148 { 148 // space does not block the ob, directly, but
149 /* Broke apart a big nasty if into several here to make 149 // anything alive that is not a door still
150 * this more readable. first check - if the space blocks 150 // blocks anything
151 * movement, can't move here.
152 * second - if a monster, can't move there, unless it is a
153 * hidden dm
154 */
155 if (OB_MOVE_BLOCK (ob, tmp))
156 return 1;
157 151
158 if (tmp->flag [FLAG_ALIVE] 152 if (tmp->flag [FLAG_ALIVE]
159 && tmp->head_ () != ob
160 && tmp != ob
161 && tmp->type != DOOR 153 && tmp->type != DOOR
162 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden)) 154 && tmp->head_ () != ob) //TODO: maybe move these check up?
163 return 1; 155 return 1;
164 } 156 }
165
166 } 157 }
158
167 return 0; 159 return 0;
168} 160}
169 161
170/* 162/*
171 * 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
172 * 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,
173 * just calling get_map_blocked and checking that against movement type 165 * just calling get_map_blocked and checking that against movement type
174 * 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
175 * object and makes sure they can be inserted. 167 * object and makes sure they can be inserted.
176 * 168 *
… …
223 } 215 }
224 216
225 return 0; 217 return 0;
226} 218}
227 219
228/* When the map is loaded, load_object does not actually insert objects 220//-GPL
229 * into inventory, but just links them. What this does is go through
230 * and insert them properly.
231 * The object 'container' is the object that contains the inventory.
232 * This is needed so that we can update the containers weight.
233 */
234void
235fix_container (object *container)
236{
237 object *tmp = container->inv, *next;
238
239 container->inv = 0;
240 while (tmp)
241 {
242 next = tmp->below;
243 if (tmp->inv)
244 fix_container (tmp);
245
246 insert_ob_in_ob (tmp, container);
247 tmp = next;
248 }
249
250 // go through and calculate what all the containers are carrying.
251 //TODO: remove
252 container->update_weight ();
253}
254 221
255void 222void
256maptile::set_object_flag (int flag, int value) 223maptile::set_object_flag (int flag, int value)
257{ 224{
258 if (!spaces) 225 if (!spaces)
… …
273 240
274 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 241 for (mapspace *ms = spaces + size (); ms-- > spaces; )
275 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 242 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
276 INVOKE_OBJECT (RESET, tmp); 243 INVOKE_OBJECT (RESET, tmp);
277} 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
278 260
279/* 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
280 * 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
281 * 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
282 * they are saved). 264 * they are saved).
… …
310 op = op->above; 292 op = op->above;
311 } 293 }
312 } 294 }
313} 295}
314 296
297//-GPL
298
315/* 299/*
316 * 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
317 * file pointer. 301 * file pointer.
318 */ 302 */
319bool 303bool
… …
328 case KW_arch: 312 case KW_arch:
329 if (object *op = object::read (f, this)) 313 if (object *op = object::read (f, this))
330 { 314 {
331 // TODO: why? 315 // TODO: why?
332 if (op->inv) 316 if (op->inv)
317 {
318 op->carrying = 0;
333 op->update_weight (); 319 op->update_weight ();
320 }
334 321
335 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))
336 { 323 {
337 // we insert manually because 324 // we insert manually because
338 // a) its way faster 325 // a) its way faster
… …
375} 362}
376 363
377void 364void
378maptile::activate () 365maptile::activate ()
379{ 366{
380 if (spaces) 367 if (state != MAP_INACTIVE)
368 return;
369
381 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 370 for (mapspace *ms = spaces + size (); ms-- > spaces; )
382 for (object *op = ms->bot; op; op = op->above) 371 for (object *op = ms->bot; op; op = op->above)
383 op->activate_recursive (); 372 op->activate_recursive ();
373
374 state = MAP_ACTIVE;
375
376 activate_physics ();
384} 377}
385 378
386void 379void
387maptile::deactivate () 380maptile::deactivate ()
388{ 381{
389 if (spaces) 382 if (state != MAP_ACTIVE)
383 return;
384
390 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 385 for (mapspace *ms = spaces + size (); ms-- > spaces; )
391 for (object *op = ms->bot; op; op = op->above) 386 for (object *op = ms->bot; op; op = op->above)
392 op->deactivate_recursive (); 387 op->deactivate_recursive ();
388
389 state = MAP_INACTIVE;
393} 390}
394 391
395bool 392bool
396maptile::_save_objects (object_freezer &f, int flags) 393maptile::_save_objects (object_freezer &f, int flags)
397{ 394{
… …
438 return false; 435 return false;
439 436
440 return freezer.save (path); 437 return freezer.save (path);
441} 438}
442 439
443maptile::maptile () 440void
441maptile::init ()
444{ 442{
445 in_memory = MAP_SWAPPED; 443 state = MAP_SWAPPED;
446 444
447 /* 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
448 * map archetype. Mimic that behaviour. 446 * map archetype. Mimic that behaviour.
449 */ 447 */
450 width = 16; 448 width = 16;
451 height = 16; 449 height = 16;
452 timeout = 300; 450 timeout = 300;
453 max_nrof = 1000; // 1000 items of anything 451 max_items = MAX_ITEM_PER_ACTION;
454 max_volume = 2000000; // 2m³ 452 max_volume = 2000000; // 2m³
455}
456
457maptile::maptile (int w, int h)
458{
459 in_memory = MAP_SWAPPED;
460
461 width = w;
462 height = h;
463 reset_timeout = 0; 453 reset_timeout = 0;
464 timeout = 300;
465 enter_x = 0; 454 enter_x = 0;
466 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;
467 469
468 alloc (); 470 alloc ();
469} 471}
470 472
471/* 473/*
… …
480 return; 482 return;
481 483
482 spaces = salloc0<mapspace> (size ()); 484 spaces = salloc0<mapspace> (size ());
483} 485}
484 486
487//+GPL
488
485/* 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
486 * 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
487 * at a later date. 491 * at a later date.
488 * Called by parse_map_headers below. 492 * Called by parse_map_headers below.
489 */ 493 */
490static shopitems * 494static shopitems *
491parse_shop_string (const char *input_string) 495parse_shop_string (const char *input_string)
… …
540 *q = '\0'; 544 *q = '\0';
541 545
542 current_type = get_typedata_by_name (p); 546 current_type = get_typedata_by_name (p);
543 if (current_type) 547 if (current_type)
544 { 548 {
545 items[i].name = current_type->name; 549 items[i].name = current_type->name;
546 items[i].typenum = current_type->number; 550 items[i].typenum = current_type->number;
547 items[i].name_pl = current_type->name_pl; 551 items[i].name_pl = current_type->name_pl;
548 } 552 }
549 else 553 else
550 { /* 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
551 * 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
552 */ 556 */
553 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);
554 } 558 }
555 } 559 }
556 560
… …
565 return items; 569 return items;
566} 570}
567 571
568/* 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
569 * the map (or something equivilent) into output_string. */ 573 * the map (or something equivilent) into output_string. */
570static void 574static const char *
571print_shop_string (maptile *m, char *output_string) 575print_shop_string (maptile *m)
572{ 576{
573 int i; 577 static dynbuf_text buf; buf.clear ();
574 char tmp[MAX_BUF]; 578 bool first = true;
575 579
576 strcpy (output_string, "");
577 for (i = 0; i < m->shopitems[0].index; i++) 580 for (int i = 0; i < m->shopitems[0].index; i++)
578 { 581 {
582 if (!first)
583 buf << ';';
584
585 first = false;
586
579 if (m->shopitems[i].typenum) 587 if (m->shopitems[i].typenum)
580 { 588 {
581 if (m->shopitems[i].strength) 589 if (m->shopitems[i].strength)
582 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);
583 else 591 else
584 sprintf (tmp, "%s;", m->shopitems[i].name); 592 buf.printf ("%s", m->shopitems[i].name);
585 } 593 }
586 else 594 else
587 { 595 {
588 if (m->shopitems[i].strength) 596 if (m->shopitems[i].strength)
589 sprintf (tmp, "*:%d;", m->shopitems[i].strength); 597 buf.printf ("*:%d", m->shopitems[i].strength);
590 else 598 else
591 sprintf (tmp, "*"); 599 buf.printf ("*");
592 } 600 }
593
594 strcat (output_string, tmp);
595 } 601 }
602
603 return buf;
596} 604}
605
606//-GPL
597 607
598/* This loads the header information of the map. The header 608/* This loads the header information of the map. The header
599 * contains things like difficulty, size, timeout, etc. 609 * contains things like difficulty, size, timeout, etc.
600 * 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
601 * addition of tiling, fields beyond that easily named in an 611 * addition of tiling, fields beyond that easily named in an
… …
615 { 625 {
616 case KW_msg: 626 case KW_msg:
617 thawer.get_ml (KW_endmsg, msg); 627 thawer.get_ml (KW_endmsg, msg);
618 break; 628 break;
619 629
620 case KW_lore: // CF+ extension 630 case KW_lore: // deliantra extension
621 thawer.get_ml (KW_endlore, maplore); 631 thawer.get_ml (KW_endlore, maplore);
622 break; 632 break;
623 633
624 case KW_maplore: 634 case KW_maplore:
625 thawer.get_ml (KW_endmaplore, maplore); 635 thawer.get_ml (KW_endmaplore, maplore);
… …
642 case KW_shopgreed: thawer.get (shopgreed); break; 652 case KW_shopgreed: thawer.get (shopgreed); break;
643 case KW_shopmin: thawer.get (shopmin); break; 653 case KW_shopmin: thawer.get (shopmin); break;
644 case KW_shopmax: thawer.get (shopmax); break; 654 case KW_shopmax: thawer.get (shopmax); break;
645 case KW_shoprace: thawer.get (shoprace); break; 655 case KW_shoprace: thawer.get (shoprace); break;
646 case KW_outdoor: thawer.get (outdoor); break; 656 case KW_outdoor: thawer.get (outdoor); break;
647 case KW_temp: thawer.get (temp); break;
648 case KW_pressure: thawer.get (pressure); break;
649 case KW_humid: thawer.get (humid); break;
650 case KW_windspeed: thawer.get (windspeed); break;
651 case KW_winddir: thawer.get (winddir); break;
652 case KW_sky: thawer.get (sky); break;
653 657
654 case KW_per_player: thawer.get (per_player); break; 658 case KW_per_player: thawer.get (per_player); break;
655 case KW_per_party: thawer.get (per_party); break; 659 case KW_per_party: thawer.get (per_party); break;
656 case KW_no_reset: thawer.get (no_reset); break; 660 case KW_no_reset: thawer.get (no_reset); break;
657 case KW_no_drop: thawer.get (no_drop); break; 661 case KW_no_drop: thawer.get (no_drop); break;
658 662
659 case KW_region: default_region = region::find (thawer.get_str ()); break; 663 case KW_region: thawer.get (default_region); break;
660 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 664 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
661 665
662 // old names new names 666 // old names new names
663 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;
664 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;
… …
668 case KW_value: case KW_swap_time: thawer.get (timeout); break; 672 case KW_value: case KW_swap_time: thawer.get (timeout); break;
669 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;
670 case KW_invisible: case KW_darkness: thawer.get (darkness); break; 674 case KW_invisible: case KW_darkness: thawer.get (darkness); break;
671 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;
672 676
673 case KW_tile_path_1: thawer.get (tile_path [0]); break; 677 case KW_tile_path_1: thawer.get (tile_path [TILE_NORTH]); break;
674 case KW_tile_path_2: thawer.get (tile_path [1]); break; 678 case KW_tile_path_2: thawer.get (tile_path [TILE_EAST ]); break;
675 case KW_tile_path_3: thawer.get (tile_path [2]); break; 679 case KW_tile_path_3: thawer.get (tile_path [TILE_SOUTH]); break;
676 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;
677 683
678 case KW_ERROR: 684 case KW_ERROR:
679 set_key_text (thawer.kw_str, thawer.value); 685 set_key_text (thawer.kw_str, thawer.value);
680 break; 686 break;
681 687
682 case KW_end: 688 case KW_end:
683 thawer.next (); 689 thawer.next ();
684 return true; 690 return true;
685 691
686 default: 692 default:
687 if (!thawer.parse_error ("map", 0)) 693 if (!thawer.parse_error ("map"))
688 return false; 694 return false;
689 break; 695 break;
690 } 696 }
691 697
692 thawer.next (); 698 thawer.next ();
693 } 699 }
694 700
695 abort (); 701 abort ();
696} 702}
703
704//+GPL
697 705
698/****************************************************************************** 706/******************************************************************************
699 * This is the start of unique map handling code 707 * This is the start of unique map handling code
700 *****************************************************************************/ 708 *****************************************************************************/
701 709
… …
708 int unique = 0; 716 int unique = 0;
709 for (object *op = spaces [i].bot; op; ) 717 for (object *op = spaces [i].bot; op; )
710 { 718 {
711 object *above = op->above; 719 object *above = op->above;
712 720
713 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 721 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
714 unique = 1; 722 unique = 1;
715 723
716 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 724 if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
717 op->destroy (); 725 op->destroy ();
718 726
719 op = above; 727 op = above;
720 } 728 }
721 } 729 }
722} 730}
723 731
732//-GPL
733
724bool 734bool
725maptile::_save_header (object_freezer &freezer) 735maptile::_save_header (object_freezer &freezer)
726{ 736{
727#define MAP_OUT(k) freezer.put (KW_ ## k, k) 737#define MAP_OUT(k) freezer.put (KW(k), k)
728#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 738#define MAP_OUT2(k,v) freezer.put (KW(k), v)
729 739
730 MAP_OUT2 (arch, "map"); 740 MAP_OUT2 (arch, CS(map));
731 741
732 if (name) MAP_OUT (name); 742 if (name) MAP_OUT (name);
733 MAP_OUT (swap_time); 743 MAP_OUT (swap_time);
734 MAP_OUT (reset_time); 744 MAP_OUT (reset_time);
735 MAP_OUT (reset_timeout); 745 MAP_OUT (reset_timeout);
736 MAP_OUT (fixed_resettime); 746 MAP_OUT (fixed_resettime);
737 MAP_OUT (no_reset); 747 MAP_OUT (no_reset);
738 MAP_OUT (no_drop); 748 MAP_OUT (no_drop);
739 MAP_OUT (difficulty); 749 MAP_OUT (difficulty);
740
741 if (default_region) MAP_OUT2 (region, default_region->name); 750 if (default_region) MAP_OUT2 (region, default_region->name);
742 751
743 if (shopitems) 752 if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
744 {
745 char shop[MAX_BUF];
746 print_shop_string (this, shop);
747 MAP_OUT2 (shopitems, shop);
748 }
749
750 MAP_OUT (shopgreed); 753 MAP_OUT (shopgreed);
751 MAP_OUT (shopmin); 754 MAP_OUT (shopmin);
752 MAP_OUT (shopmax); 755 MAP_OUT (shopmax);
753 if (shoprace) MAP_OUT (shoprace); 756 if (shoprace) MAP_OUT (shoprace);
754 MAP_OUT (darkness); 757
755 MAP_OUT (width); 758 MAP_OUT (width);
756 MAP_OUT (height); 759 MAP_OUT (height);
757 MAP_OUT (enter_x); 760 MAP_OUT (enter_x);
758 MAP_OUT (enter_y); 761 MAP_OUT (enter_y);
759 762 MAP_OUT (darkness);
760 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
761 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
762
763 MAP_OUT (outdoor); 763 MAP_OUT (outdoor);
764 MAP_OUT (temp); 764
765 MAP_OUT (pressure); 765 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
766 MAP_OUT (humid); 766 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
767 MAP_OUT (windspeed);
768 MAP_OUT (winddir);
769 MAP_OUT (sky);
770 767
771 MAP_OUT (per_player); 768 MAP_OUT (per_player);
772 MAP_OUT (per_party); 769 MAP_OUT (per_party);
773 770
774 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]);
775 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 ]);
776 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]);
777 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 ]);
778 777
779 freezer.put (this); 778 freezer.put (this);
780 freezer.put (KW_end); 779 freezer.put (KW(end));
781 780
782 return true; 781 return true;
783} 782}
784 783
785bool 784bool
… …
790 if (!_save_header (freezer)) 789 if (!_save_header (freezer))
791 return false; 790 return false;
792 791
793 return freezer.save (path); 792 return freezer.save (path);
794} 793}
794
795//+GPL
795 796
796/* 797/*
797 * Remove and free all objects in the given map. 798 * Remove and free all objects in the given map.
798 */ 799 */
799void 800void
… …
837 msg = 0; 838 msg = 0;
838 maplore = 0; 839 maplore = 0;
839 shoprace = 0; 840 shoprace = 0;
840 delete [] shopitems, shopitems = 0; 841 delete [] shopitems, shopitems = 0;
841 842
842 for (int i = 0; i < 4; i++) 843 for (int i = 0; i < ecb_array_length (tile_path); i++)
843 tile_path [i] = 0; 844 tile_path [i] = 0;
844} 845}
845 846
846maptile::~maptile () 847maptile::~maptile ()
847{ 848{
… …
854 /* 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
855 * are pointing at this one for tiling information. Since 856 * are pointing at this one for tiling information. Since
856 * 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
857 * maps this map tiles with and clears those. 858 * maps this map tiles with and clears those.
858 */ 859 */
859 for (int i = 0; i < 4; i++) 860 for (int i = 0; i < ecb_array_length (tile_path); i++)
860 if (tile_map[i] == m) 861 if (tile_map[i] == m)
861 tile_map[i] = 0; 862 tile_map[i] = 0;
862} 863}
863 864
864void 865void
… …
868 869
869 clear (); 870 clear ();
870} 871}
871 872
872/* 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?
873void 875void
874maptile::do_decay_objects () 876maptile::do_decay_objects ()
875{ 877{
876 if (!spaces) 878 if (!spaces)
877 return; 879 return;
… …
879 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 881 for (mapspace *ms = spaces + size (); ms-- > spaces; )
880 for (object *above, *op = ms->bot; op; op = above) 882 for (object *above, *op = ms->bot; op; op = above)
881 { 883 {
882 above = op->above; 884 above = op->above;
883 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
884 bool destroy = 0; 890 bool destroy = 0;
885 891
886 // do not decay anything above unique floor tiles (yet :) 892 if (op->flag [FLAG_IS_FLOOR]
887 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 893 || op->flag [FLAG_OBJ_ORIGINAL]
888 break; 894 || op->flag [FLAG_UNIQUE]
889 895 || op->flag [FLAG_OVERLAY_FLOOR]
890 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 896 || op->flag [FLAG_UNPAID]
891 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
892 || QUERY_FLAG (op, FLAG_UNIQUE)
893 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
894 || QUERY_FLAG (op, FLAG_UNPAID)
895 || op->is_alive ()) 897 || op->is_alive ())
896 ; // do not decay 898 ; // do not decay
897 else if (op->is_weapon ()) 899 else if (op->is_weapon ())
898 { 900 {
899 op->stats.dam--; 901 op->stats.dam--;
… …
924 || mat & M_LIQUID 926 || mat & M_LIQUID
925 || (mat & M_IRON && rndm (1, 5) == 1) 927 || (mat & M_IRON && rndm (1, 5) == 1)
926 || (mat & M_GLASS && rndm (1, 2) == 1) 928 || (mat & M_GLASS && rndm (1, 2) == 1)
927 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 929 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
928 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 930 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
929 || (mat & M_ICE && temp > 32)) 931 //|| (mat & M_ICE && temp > 32)
932 )
930 destroy = 1; 933 destroy = 1;
931 } 934 }
932 935
933 /* adjust overall chance below */ 936 /* adjust overall chance below */
934 if (destroy && rndm (0, 1)) 937 if (destroy && rndm (0, 1))
… …
954 sint64 total_exp = 0; 957 sint64 total_exp = 0;
955 958
956 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 959 for (mapspace *ms = spaces + size (); ms-- > spaces; )
957 for (object *op = ms->bot; op; op = op->above) 960 for (object *op = ms->bot; op; op = op->above)
958 { 961 {
959 if (QUERY_FLAG (op, FLAG_MONSTER)) 962 if (op->flag [FLAG_MONSTER])
960 { 963 {
961 total_exp += op->stats.exp; 964 total_exp += op->stats.exp;
962 monster_cnt++; 965 monster_cnt++;
963 } 966 }
964 967
965 if (QUERY_FLAG (op, FLAG_GENERATOR)) 968 if (op->flag [FLAG_GENERATOR])
966 { 969 {
967 total_exp += op->stats.exp; 970 total_exp += op->stats.exp;
968 971
969 if (archetype *at = op->other_arch) 972 if (archetype *at = op->other_arch)
970 { 973 {
… …
1015 update_all_map_los (this); 1018 update_all_map_los (this);
1016 1019
1017 return 1; 1020 return 1;
1018} 1021}
1019 1022
1020/* 1023/*
1021 * This function updates various attributes about a specific space 1024 * This function updates various attributes about a specific space
1022 * on the map (what it looks like, whether it blocks magic, 1025 * on the map (what it looks like, whether it blocks magic,
1023 * has a living creatures, prevents people from passing 1026 * has a living creatures, prevents people from passing
1024 * through, etc) 1027 * through, etc)
1025 */ 1028 */
1026void 1029void
1027mapspace::update_ () 1030mapspace::update_ ()
1028{ 1031{
1029 object *last = 0; 1032 object *last = 0;
1030 uint8 flags = P_UPTODATE, anywhere = 0; 1033 uint8 flags = P_UPTODATE;
1031 sint8 light = 0; 1034 sint8 light = 0;
1032 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;
1033 1040
1034 //object *middle = 0; 1041 //object *middle = 0;
1035 //object *top = 0; 1042 //object *top = 0;
1036 //object *floor = 0; 1043 //object *floor = 0;
1037 // this seems to generate better code than using locals, above 1044 // this seems to generate better code than using locals, above
1038 object *&top = faces_obj[0] = 0; 1045 object *&top = faces_obj[0] = 0;
1039 object *&middle = faces_obj[1] = 0; 1046 object *&middle = faces_obj[1] = 0;
1040 object *&floor = faces_obj[2] = 0; 1047 object *&floor = faces_obj[2] = 0;
1048
1049 object::flags_t allflags; // all flags of all objects or'ed together
1041 1050
1042 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above) 1051 for (object *tmp = bot; tmp; last = tmp, tmp = tmp->above)
1043 { 1052 {
1044 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C) 1053 // Lights are additive, up to MAX_LIGHT_RADIUS, see los.C)
1045 light += tmp->glow_radius; 1054 light += tmp->glow_radius;
… …
1050 * 3 times each time the player moves, because many of the 1059 * 3 times each time the player moves, because many of the
1051 * functions the move_player calls eventualy call this. 1060 * functions the move_player calls eventualy call this.
1052 * 1061 *
1053 * Always put the player down for drawing. 1062 * Always put the player down for drawing.
1054 */ 1063 */
1055 if (!tmp->invisible) 1064 if (expect_true (!tmp->invisible))
1056 { 1065 {
1057 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1066 if (expect_false (tmp->type == PLAYER || tmp->flag [FLAG_MONSTER]))
1058 top = tmp; 1067 top = tmp;
1059 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1068 else if (expect_false (tmp->flag [FLAG_IS_FLOOR]))
1060 { 1069 {
1061 /* 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,
1062 * so should not be visible, so we clear them. 1071 * so should not be visible, so we clear them.
1063 */ 1072 */
1064 middle = 0; 1073 middle = 0;
1065 top = 0; 1074 top = 0;
1066 floor = tmp; 1075 floor = tmp;
1076 volume = 0;
1077 items = 0;
1067 } 1078 }
1068 /* Flag anywhere have high priority */ 1079 else
1069 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1070 { 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;
1071 middle = tmp; 1098 middle = tmp;
1072 anywhere = 1; 1099 }
1073 } 1100 }
1074
1075 /* Find the highest visible face around. If equal
1076 * visibilities, we still want the one nearer to the
1077 * top
1078 */
1079 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1080 middle = tmp;
1081 }
1082
1083 if (tmp == tmp->above)
1084 {
1085 LOG (llevError, "Error in structure of map\n");
1086 exit (-1);
1087 } 1101 }
1088 1102
1089 move_slow |= tmp->move_slow; 1103 move_slow |= tmp->move_slow;
1090 move_block |= tmp->move_block; 1104 move_block |= tmp->move_block;
1091 move_on |= tmp->move_on; 1105 move_on |= tmp->move_on;
1092 move_off |= tmp->move_off; 1106 move_off |= tmp->move_off;
1093 move_allow |= tmp->move_allow; 1107 move_allow |= tmp->move_allow;
1094 1108
1095 if (QUERY_FLAG (tmp, FLAG_BLOCKSVIEW)) flags |= P_BLOCKSVIEW; 1109 allflags |= tmp->flag;
1096 if (QUERY_FLAG (tmp, FLAG_NO_MAGIC)) flags |= P_NO_MAGIC; 1110
1097 if (tmp->type == PLAYER) flags |= P_PLAYER; 1111 if (tmp->type == PLAYER) flags |= P_PLAYER;
1098 if (tmp->type == SAFE_GROUND) flags |= P_SAFE; 1112 if (tmp->type == SAFE_GROUND) flags |= P_SAFE;
1099 if (QUERY_FLAG (tmp, FLAG_ALIVE)) flags |= P_IS_ALIVE;
1100 if (QUERY_FLAG (tmp, FLAG_DAMNED)) flags |= P_NO_CLERIC;
1101 } 1113 }
1114
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;
1102 1124
1103 this->light = min (light, MAX_LIGHT_RADIUS); 1125 this->light = min (light, MAX_LIGHT_RADIUS);
1104 this->flags_ = flags; 1126 this->flags_ = flags;
1105 this->move_block = move_block & ~move_allow; 1127 this->move_block = move_block & ~move_allow;
1106 this->move_on = move_on; 1128 this->move_on = move_on;
1107 this->move_off = move_off; 1129 this->move_off = move_off;
1108 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
1109 1133
1110 /* 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),
1111 * 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
1112 * this point. 1136 * this point.
1113 * middle contains the highest visibility face. 1137 * middle contains the highest visibility face.
1114 * top contains a player/monster face, if there is one. 1138 * top contains a player/monster face, if there is one.
1115 * 1139 *
1116 * 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.
1117 */ 1141 */
1118 1142
1119 /* 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
1120 * middle face. This should not happen, as we already have the 1144 * middle face. This should not happen, as we already have the
1121 * else statement above so middle should not get set. OTOH, it 1145 * else statement above so middle should not get set. OTOH, it
1122 * 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.
1123 */ 1147 */
1124 if (top == middle) 1148 if (top == middle)
1125 middle = 0; 1149 middle = 0;
1126 1150
… …
1131 */ 1155 */
1132 1156
1133 for (object *tmp = last; tmp; tmp = tmp->below) 1157 for (object *tmp = last; tmp; tmp = tmp->below)
1134 { 1158 {
1135 /* 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 */
1136 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1160 if (tmp->flag [FLAG_IS_FLOOR])
1137 break; 1161 break;
1138 1162
1139 /* If two top faces are already set, quit processing */ 1163 /* If two top faces are already set, quit processing */
1140 if (top && middle) 1164 if (top && middle)
1141 break; 1165 break;
… …
1155 /* top is already set - we should only get here if 1179 /* top is already set - we should only get here if
1156 * middle is not set 1180 * middle is not set
1157 * 1181 *
1158 * Set the middle face and break out, since there is nothing 1182 * Set the middle face and break out, since there is nothing
1159 * more to fill in. We don't check visiblity here, since 1183 * more to fill in. We don't check visiblity here, since
1160 * 1184 *
1161 */ 1185 */
1162 if (tmp != top) 1186 if (tmp != top)
1163 { 1187 {
1164 middle = tmp; 1188 middle = tmp;
1165 break; 1189 break;
… …
1172 middle = 0; 1196 middle = 0;
1173 1197
1174 if (top == middle) 1198 if (top == middle)
1175 middle = 0; 1199 middle = 0;
1176 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
1177#if 0 1224#if 0
1178 faces_obj [0] = top; 1225 faces_obj [0] = top;
1179 faces_obj [1] = middle; 1226 faces_obj [1] = middle;
1180 faces_obj [2] = floor; 1227 faces_obj [2] = floor;
1181#endif 1228#endif
1182} 1229}
1183 1230
1184uint64 1231void
1185mapspace::volume () const 1232mapspace::update_up ()
1186{ 1233{
1187 uint64 vol = 0; 1234 // invalidate up
1188 1235 if (!(pflags & PF_VIS_UP))
1189 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1190 vol += op->volume ();
1191
1192 return vol; 1236 return;
1237
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 ();
1193} 1243}
1194 1244
1195maptile * 1245maptile *
1196maptile::tile_available (int dir, bool load) 1246maptile::tile_available (int dir, bool load)
1197{ 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
1198 if (tile_path[dir]) 1252 if (tile_path [dir])
1199 { 1253 {
1200 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1254 // well, try to locate it then, if possible - maybe it's there already
1255 // this is the ONLY place in the server that links maps with each other,
1256 // so any kind of inter-map stuff has to be initiated here.
1257 if (maptile *m = find_async (tile_path [dir], this, load))
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
1201 return tile_map[dir]; 1286 return tile_map [dir] = m;
1202 1287 }
1203 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1204 return tile_map[dir];
1205 } 1288 }
1206 1289
1207 return 0; 1290 return 0;
1208} 1291}
1209 1292
1210/* this returns TRUE if the coordinates (x,y) are out of 1293/* this returns TRUE if the coordinates (x,y) are out of
1211 * map m. This function also takes into account any 1294 * map m. This function also takes into account any
1212 * tiling considerations, loading adjacant maps as needed. 1295 * tiling considerations, loading adjacant maps as needed.
1213 * This is the function should always be used when it 1296 * This is the function should always be used when it
1214 * necessary to check for valid coordinates. 1297 * necessary to check for valid coordinates.
1215 * This function will recursively call itself for the 1298 * This function will recursively call itself for the
1216 * tiled maps. 1299 * tiled maps.
1217 */ 1300 */
1218int 1301int
1219out_of_map (maptile *m, int x, int y) 1302out_of_map (maptile *m, int x, int y)
1220{ 1303{
… …
1225 if (!m) 1308 if (!m)
1226 return 0; 1309 return 0;
1227 1310
1228 if (x < 0) 1311 if (x < 0)
1229 { 1312 {
1230 if (!m->tile_available (3)) 1313 if (!m->tile_available (TILE_WEST))
1231 return 1; 1314 return 1;
1232 1315
1233 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);
1234 } 1317 }
1235 1318
1236 if (x >= m->width) 1319 if (x >= m->width)
1237 { 1320 {
1238 if (!m->tile_available (1)) 1321 if (!m->tile_available (TILE_EAST))
1239 return 1; 1322 return 1;
1240 1323
1241 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);
1242 } 1325 }
1243 1326
1244 if (y < 0) 1327 if (y < 0)
1245 { 1328 {
1246 if (!m->tile_available (0)) 1329 if (!m->tile_available (TILE_NORTH))
1247 return 1; 1330 return 1;
1248 1331
1249 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);
1250 } 1333 }
1251 1334
1252 if (y >= m->height) 1335 if (y >= m->height)
1253 { 1336 {
1254 if (!m->tile_available (2)) 1337 if (!m->tile_available (TILE_SOUTH))
1255 return 1; 1338 return 1;
1256 1339
1257 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);
1258 } 1341 }
1259 1342
1260 /* Simple case - coordinates are within this local 1343 /* Simple case - coordinates are within this local
1261 * map. 1344 * map.
1262 */ 1345 */
… …
1264} 1347}
1265 1348
1266/* This is basically the same as out_of_map above, but 1349/* This is basically the same as out_of_map above, but
1267 * instead we return NULL if no map is valid (coordinates 1350 * instead we return NULL if no map is valid (coordinates
1268 * out of bounds and no tiled map), otherwise it returns 1351 * out of bounds and no tiled map), otherwise it returns
1269 * the map as that the coordinates are really on, and 1352 * the map as that the coordinates are really on, and
1270 * updates x and y to be the localised coordinates. 1353 * updates x and y to be the localised coordinates.
1271 * Using this is more efficient of calling out_of_map 1354 * Using this is more efficient of calling out_of_map
1272 * and then figuring out what the real map is 1355 * and then figuring out what the real map is
1273 */ 1356 */
1274maptile * 1357maptile *
1275maptile::xy_find (sint16 &x, sint16 &y) 1358maptile::xy_find (sint16 &x, sint16 &y)
1276{ 1359{
1277 if (x < 0) 1360 if (x < 0)
1278 { 1361 {
1279 if (!tile_available (3)) 1362 if (!tile_available (TILE_WEST))
1280 return 0; 1363 return 0;
1281 1364
1282 x += tile_map[3]->width; 1365 x += tile_map [TILE_WEST]->width;
1283 return tile_map[3]->xy_find (x, y); 1366 return tile_map [TILE_WEST]->xy_find (x, y);
1284 } 1367 }
1285 1368
1286 if (x >= width) 1369 if (x >= width)
1287 { 1370 {
1288 if (!tile_available (1)) 1371 if (!tile_available (TILE_EAST))
1289 return 0; 1372 return 0;
1290 1373
1291 x -= width; 1374 x -= width;
1292 return tile_map[1]->xy_find (x, y); 1375 return tile_map [TILE_EAST]->xy_find (x, y);
1293 } 1376 }
1294 1377
1295 if (y < 0) 1378 if (y < 0)
1296 { 1379 {
1297 if (!tile_available (0)) 1380 if (!tile_available (TILE_NORTH))
1298 return 0; 1381 return 0;
1299 1382
1300 y += tile_map[0]->height; 1383 y += tile_map [TILE_NORTH]->height;
1301 return tile_map[0]->xy_find (x, y); 1384 return tile_map [TILE_NORTH]->xy_find (x, y);
1302 } 1385 }
1303 1386
1304 if (y >= height) 1387 if (y >= height)
1305 { 1388 {
1306 if (!tile_available (2)) 1389 if (!tile_available (TILE_SOUTH))
1307 return 0; 1390 return 0;
1308 1391
1309 y -= height; 1392 y -= height;
1310 return tile_map[2]->xy_find (x, y); 1393 return tile_map [TILE_SOUTH]->xy_find (x, y);
1311 } 1394 }
1312 1395
1313 /* Simple case - coordinates are within this local 1396 /* Simple case - coordinates are within this local
1314 * map. 1397 * map.
1315 */ 1398 */
… …
1319/** 1402/**
1320 * 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
1321 * map1 to map2 in dx/dy. 1404 * map1 to map2 in dx/dy.
1322 */ 1405 */
1323int 1406int
1324adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1407adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy)
1325{ 1408{
1326 if (!map1 || !map2) 1409 if (!map1 || !map2)
1327 return 0; 1410 return 0;
1328 1411
1329 //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
… …
1331 if (map1 == map2) 1414 if (map1 == map2)
1332 { 1415 {
1333 *dx = 0; 1416 *dx = 0;
1334 *dy = 0; 1417 *dy = 0;
1335 } 1418 }
1336 else if (map1->tile_map[0] == map2) 1419 else if (map1->tile_available (TILE_NORTH, false) == map2)
1337 { /* up */ 1420 {
1338 *dx = 0; 1421 *dx = 0;
1339 *dy = -map2->height; 1422 *dy = -map2->height;
1340 } 1423 }
1341 else if (map1->tile_map[1] == map2) 1424 else if (map1->tile_available (TILE_EAST , false) == map2)
1342 { /* right */ 1425 {
1343 *dx = map1->width; 1426 *dx = map1->width;
1344 *dy = 0; 1427 *dy = 0;
1345 } 1428 }
1346 else if (map1->tile_map[2] == map2) 1429 else if (map1->tile_available (TILE_SOUTH, false) == map2)
1347 { /* down */ 1430 {
1348 *dx = 0; 1431 *dx = 0;
1349 *dy = map1->height; 1432 *dy = map1->height;
1350 } 1433 }
1351 else if (map1->tile_map[3] == map2) 1434 else if (map1->tile_available (TILE_WEST , false) == map2)
1352 { /* left */ 1435 {
1353 *dx = -map2->width; 1436 *dx = -map2->width;
1354 *dy = 0; 1437 *dy = 0;
1355 } 1438 }
1356 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)
1357 { /* up right */ 1440 { /* up right */
1358 *dx = map1->tile_map[0]->width; 1441 *dx = +map1->tile_map[TILE_NORTH]->width;
1359 *dy = -map1->tile_map[0]->height; 1442 *dy = -map1->tile_map[TILE_NORTH]->height;
1360 } 1443 }
1361 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)
1362 { /* up left */ 1445 { /* up left */
1363 *dx = -map2->width; 1446 *dx = -map2->width;
1364 *dy = -map1->tile_map[0]->height; 1447 *dy = -map1->tile_map[TILE_NORTH]->height;
1365 } 1448 }
1366 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)
1367 { /* right up */ 1450 { /* right up */
1368 *dx = map1->width; 1451 *dx = +map1->width;
1369 *dy = -map2->height; 1452 *dy = -map2->height;
1370 } 1453 }
1371 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)
1372 { /* right down */ 1455 { /* right down */
1373 *dx = map1->width; 1456 *dx = +map1->width;
1374 *dy = map1->tile_map[1]->height; 1457 *dy = +map1->tile_map[TILE_EAST]->height;
1375 } 1458 }
1376 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)
1377 { /* down right */ 1460 { /* down right */
1378 *dx = map1->tile_map[2]->width; 1461 *dx = +map1->tile_map[TILE_SOUTH]->width;
1379 *dy = map1->height; 1462 *dy = +map1->height;
1380 } 1463 }
1381 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)
1382 { /* down left */ 1465 { /* down left */
1383 *dx = -map2->width; 1466 *dx = -map2->width;
1384 *dy = map1->height; 1467 *dy = +map1->height;
1385 } 1468 }
1386 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)
1387 { /* left up */ 1470 { /* left up */
1388 *dx = -map1->tile_map[3]->width; 1471 *dx = -map1->tile_map[TILE_WEST]->width;
1389 *dy = -map2->height; 1472 *dy = -map2->height;
1390 } 1473 }
1391 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)
1392 { /* left down */ 1475 { /* left down */
1393 *dx = -map1->tile_map[3]->width; 1476 *dx = -map1->tile_map[TILE_WEST]->width;
1394 *dy = map1->tile_map[3]->height; 1477 *dy = +map1->tile_map[TILE_WEST]->height;
1395 } 1478 }
1396 else 1479 else
1397 return 0; 1480 return 0;
1398 1481
1399 return 1; 1482 return 1;
… …
1422 * 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
1423 * righte value. distance_x/y are distance away, which 1506 * righte value. distance_x/y are distance away, which
1424 * can be negative. direction is the crossfire direction scheme 1507 * can be negative. direction is the crossfire direction scheme
1425 * that the creature should head. part is the part of the 1508 * that the creature should head. part is the part of the
1426 * monster that is closest. 1509 * monster that is closest.
1427 * 1510 *
1428 * get_rangevector looks at op1 and op2, and fills in the 1511 * get_rangevector looks at op1 and op2, and fills in the
1429 * structure for op1 to get to op2. 1512 * structure for op1 to get to op2.
1430 * We already trust that the caller has verified that the 1513 * We already trust that the caller has verified that the
1431 * two objects are at least on adjacent maps. If not, 1514 * two objects are at least on adjacent maps. If not,
1432 * results are not likely to be what is desired. 1515 * results are not likely to be what is desired.
… …
1435 * 1518 *
1436 * currently, the only flag supported (0x1) is don't translate for 1519 * currently, the only flag supported (0x1) is don't translate for
1437 * closest body part of 'op1' 1520 * closest body part of 'op1'
1438 */ 1521 */
1439void 1522void
1440get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1523get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1441{ 1524{
1442 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))
1443 { 1526 {
1444 /* be conservative and fill in _some_ data */ 1527 /* be conservative and fill in _some_ data */
1445 retval->distance = 10000; 1528 retval->distance = 10000;
1446 retval->distance_x = 10000; 1529 retval->distance_x = 10000;
1447 retval->distance_y = 10000; 1530 retval->distance_y = 10000;
1448 retval->direction = 0; 1531 retval->direction = 0;
1449 retval->part = 0; 1532 retval->part = 0;
1450 } 1533 }
1451 else 1534 else
1452 { 1535 {
1453 object *best;
1454
1455 retval->distance_x += op2->x - op1->x; 1536 retval->distance_x += op2->x - op1->x;
1456 retval->distance_y += op2->y - op1->y; 1537 retval->distance_y += op2->y - op1->y;
1457 1538
1458 best = op1; 1539 object *best = op1;
1540
1459 /* If this is multipart, find the closest part now */ 1541 /* If this is multipart, find the closest part now */
1460 if (!(flags & 0x1) && op1->more) 1542 if (!(flags & 1) && op1->more)
1461 { 1543 {
1462 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);
1463 1545
1464 /* 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
1465 * distance instead of doing all that work above again 1547 * distance instead of doing all that work above again
1466 * since the distance fields we set above are positive in the 1548 * since the distance fields we set above are positive in the
1467 * same axis as is used for multipart objects, the simply arithmetic 1549 * same axis as is used for multipart objects, the simply arithmetic
1468 * below works. 1550 * below works.
1469 */ 1551 */
1470 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1552 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1471 { 1553 {
1472 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);
1473 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1555
1474 if (tmpi < best_distance) 1556 if (tmpi < best_distance)
1475 { 1557 {
1476 best_distance = tmpi; 1558 best_distance = tmpi;
1477 best = tmp; 1559 best = tmp;
1478 } 1560 }
1479 } 1561 }
1480 1562
1481 if (best != op1) 1563 if (best != op1)
1482 { 1564 {
1483 retval->distance_x += op1->x - best->x; 1565 retval->distance_x += op1->x - best->x;
1484 retval->distance_y += op1->y - best->y; 1566 retval->distance_y += op1->y - best->y;
1485 } 1567 }
1486 } 1568 }
1487 1569
1488 retval->part = best; 1570 retval->part = best;
1489 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));
1490 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1572 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1491 } 1573 }
1492} 1574}
1493 1575
1494/* 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
1495 * the first parameter being an object, it instead is the map 1577 * the first parameter being an object, it instead is the map
1496 * and x,y coordinates - this is used for path to player - 1578 * and x,y coordinates - this is used for path to player -
1497 * 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
1498 * the path, we need this. 1580 * the path, we need this.
1499 * 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
1500 * 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
1501 * 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
1502 * field of the rv_vector is set to NULL. 1584 * field of the rv_vector is set to NULL.
1503 */ 1585 */
1504void 1586void
1505get_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)
1506{ 1588{
1507 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))
1508 { 1590 {
1509 /* be conservative and fill in _some_ data */ 1591 /* be conservative and fill in _some_ data */
1510 retval->distance = 100000; 1592 retval->distance = 100000;
1511 retval->distance_x = 32767; 1593 retval->distance_x = 32767;
1512 retval->distance_y = 32767; 1594 retval->distance_y = 32767;
1513 retval->direction = 0; 1595 retval->direction = 0;
1514 retval->part = 0; 1596 retval->part = 0;
1515 } 1597 }
1516 else 1598 else
1517 { 1599 {
1518 retval->distance_x += op2->x - x; 1600 retval->distance_x += op2->x - x;
1519 retval->distance_y += op2->y - y; 1601 retval->distance_y += op2->y - y;
1520 1602
1521 retval->part = 0; 1603 retval->part = 0;
1522 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1604 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1523 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1605 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1524 } 1606 }
1525} 1607}
1526 1608
1527/* 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
1528 * (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
… …
1538 int dx, dy; 1620 int dx, dy;
1539 1621
1540 return adjacent_map (op1->map, op2->map, &dx, &dy); 1622 return adjacent_map (op1->map, op2->map, &dx, &dy);
1541} 1623}
1542 1624
1625//-GPL
1626
1543object * 1627object *
1544maptile::insert (object *op, int x, int y, object *originator, int flags) 1628maptile::insert (object *op, int x, int y, object *originator, int flags)
1545{ 1629{
1546 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);
1547} 1631}
… …
1558 if (default_region) 1642 if (default_region)
1559 return default_region; 1643 return default_region;
1560 1644
1561 return ::region::default_region (); 1645 return ::region::default_region ();
1562} 1646}
1647
1648//+GPL
1563 1649
1564/* picks a random object from a style map. 1650/* picks a random object from a style map.
1565 */ 1651 */
1566object * 1652object *
1567maptile::pick_random_object (rand_gen &gen) const 1653maptile::pick_random_object (rand_gen &gen) const
… …
1574 */ 1660 */
1575 for (int i = 1000; --i;) 1661 for (int i = 1000; --i;)
1576 { 1662 {
1577 object *pick = at (gen (width), gen (height)).bot; 1663 object *pick = at (gen (width), gen (height)).bot;
1578 1664
1579 // do not prefer big monsters just because they are big. 1665 // must be head: do not prefer big monsters just because they are big.
1580 if (pick && pick->is_head ()) 1666 if (pick && pick->is_head ())
1581 return pick->head_ (); 1667 return pick;
1582 } 1668 }
1583 1669
1584 // instead of crashing in the unlikely(?) case, try to return *something* 1670 // instead of crashing in the unlikely(?) case, try to return *something*
1585 return archetype::find ("bug"); 1671 return archetype::find (shstr_bug);
1586} 1672}
1673
1674//-GPL
1587 1675
1588void 1676void
1589maptile::play_sound (faceidx sound, int x, int y) const 1677maptile::play_sound (faceidx sound, int x, int y) const
1590{ 1678{
1591 if (!sound) 1679 if (!sound)
… …
1618 if (distance <= MAX_SOUND_DISTANCE) 1706 if (distance <= MAX_SOUND_DISTANCE)
1619 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg); 1707 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1620 } 1708 }
1621} 1709}
1622 1710
1711dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1712
1623static void 1713static void
1624split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy) 1714split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1625{ 1715{
1626 // clip to map to the left 1716 // clip to map to the left
1627 if (x0 < 0) 1717 if (x0 < 0)
1628 { 1718 {
1629 if (maptile *tile = m->tile_available (TILE_LEFT, 1)) 1719 if (maptile *tile = m->tile_available (TILE_WEST, 1))
1630 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy); 1720 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1631 1721
1632 if (x1 < 0) // entirely to the left 1722 if (x1 < 0) // entirely to the left
1633 return; 1723 return;
1634 1724
… …
1636 } 1726 }
1637 1727
1638 // clip to map to the right 1728 // clip to map to the right
1639 if (x1 > m->width) 1729 if (x1 > m->width)
1640 { 1730 {
1641 if (maptile *tile = m->tile_available (TILE_RIGHT, 1)) 1731 if (maptile *tile = m->tile_available (TILE_EAST, 1))
1642 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy); 1732 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1643 1733
1644 if (x0 > m->width) // entirely to the right 1734 if (x0 >= m->width) // entirely to the right
1645 return; 1735 return;
1646 1736
1647 x1 = m->width; 1737 x1 = m->width;
1648 } 1738 }
1649 1739
1650 // clip to map above 1740 // clip to map to the north
1651 if (y0 < 0) 1741 if (y0 < 0)
1652 { 1742 {
1653 if (maptile *tile = m->tile_available (TILE_UP, 1)) 1743 if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1654 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height); 1744 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1655 1745
1656 if (y1 < 0) // entirely above 1746 if (y1 < 0) // entirely to the north
1657 return; 1747 return;
1658 1748
1659 y0 = 0; 1749 y0 = 0;
1660 } 1750 }
1661 1751
1662 // clip to map below 1752 // clip to map to the south
1663 if (y1 > m->height) 1753 if (y1 > m->height)
1664 { 1754 {
1665 if (maptile *tile = m->tile_available (TILE_DOWN, 1)) 1755 if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1666 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height); 1756 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1667 1757
1668 if (y0 > m->height) // entirely below 1758 if (y0 >= m->height) // entirely to the south
1669 return; 1759 return;
1670 1760
1671 y1 = m->height; 1761 y1 = m->height;
1672 } 1762 }
1673 1763
… …
1682 r->dx = dx; 1772 r->dx = dx;
1683 r->dy = dy; 1773 r->dy = dy;
1684} 1774}
1685 1775
1686maprect * 1776maprect *
1687maptile::split_to_tiles (int x0, int y0, int x1, int y1) 1777maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1688{ 1778{
1689 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1690 buf.clear (); 1779 buf.clear ();
1691 1780
1692 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0); 1781 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1693 1782
1694 // add end marker 1783 // add end marker

Diff Legend

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