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

Diff Legend

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