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.159 by root, Tue May 5 04:51:56 2009 UTC vs.
Revision 1.220 by root, Sun Jan 29 02:47:04 2017 UTC

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

Diff Legend

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