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.57 by root, Sat Dec 30 15:07:58 2006 UTC vs.
Revision 1.105 by root, Mon May 28 05:35:51 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h>
25#include <funcpoint.h>
26
27#include <loader.h>
28#include <unistd.h> 25#include <unistd.h>
26
27#include "global.h"
28#include "funcpoint.h"
29
30#include "loader.h"
29 31
30#include "path.h" 32#include "path.h"
31 33
32/* 34/*
33 * This makes a path absolute outside the world of Crossfire. 35 * This makes a path absolute outside the world of Crossfire.
… …
36 * it really should be called create_mapname 38 * it really should be called create_mapname
37 */ 39 */
38const char * 40const char *
39create_pathname (const char *name) 41create_pathname (const char *name)
40{ 42{
41 static char buf[MAX_BUF]; 43 static char buf[8192];
42
43 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
44 * someplace else in the code? msw 2-17-97
45 */
46 if (*name == '/')
47 sprintf (buf, "%s/%s%s", settings.datadir, settings.mapdir, name);
48 else
49 sprintf (buf, "%s/%s/%s", settings.datadir, settings.mapdir, name); 44 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
50 return (buf); 45 return buf;
51}
52
53/*
54 * same as create_pathname, but for the overlay maps.
55 */
56const char *
57create_overlay_pathname (const char *name)
58{
59 static char buf[MAX_BUF];
60
61 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
62 * someplace else in the code? msw 2-17-97
63 */
64 if (*name == '/')
65 sprintf (buf, "%s/%s%s", settings.localdir, settings.mapdir, name);
66 else
67 sprintf (buf, "%s/%s/%s", settings.localdir, settings.mapdir, name);
68 return (buf);
69}
70
71/*
72 * same as create_pathname, but for the template maps.
73 */
74const char *
75create_template_pathname (const char *name)
76{
77 static char buf[MAX_BUF];
78
79 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
80 * someplace else in the code? msw 2-17-97
81 */
82 if (*name == '/')
83 sprintf (buf, "%s/%s%s", settings.localdir, settings.templatedir, name);
84 else
85 sprintf (buf, "%s/%s/%s", settings.localdir, settings.templatedir, name);
86 return (buf);
87}
88
89/*
90 * This makes absolute path to the itemfile where unique objects
91 * will be saved. Converts '/' to '@'. I think it's essier maintain
92 * files than full directory structure, but if this is problem it can
93 * be changed.
94 */
95static const char *
96create_items_path (const char *s)
97{
98 static char buf[MAX_BUF];
99 char *t;
100
101 if (*s == '/')
102 s++;
103
104 sprintf (buf, "%s/%s/", settings.localdir, settings.uniquedir);
105
106 for (t = buf + strlen (buf); *s; s++, t++)
107 if (*s == '/')
108 *t = '@';
109 else
110 *t = *s;
111 *t = 0;
112 return (buf);
113} 46}
114 47
115/* 48/*
116 * This function checks if a file with the given path exists. 49 * This function checks if a file with the given path exists.
117 * -1 is returned if it fails, otherwise the mode of the file 50 * -1 is returned if it fails, otherwise the mode of the file
… …
135 char *endbuf; 68 char *endbuf;
136 struct stat statbuf; 69 struct stat statbuf;
137 int mode = 0; 70 int mode = 0;
138 71
139 if (prepend_dir) 72 if (prepend_dir)
140 strcpy (buf, create_pathname (name)); 73 assign (buf, create_pathname (name));
141 else 74 else
142 strcpy (buf, name); 75 assign (buf, name);
143 76
144 /* old method (strchr(buf, '\0')) seemd very odd to me - 77 /* old method (strchr(buf, '\0')) seemd very odd to me -
145 * this method should be equivalant and is clearer. 78 * this method should be equivalant and is clearer.
146 * Can not use strcat because we need to cycle through 79 * Can not use strcat because we need to cycle through
147 * all the names. 80 * all the names.
… …
241 * let the player through (inventory checkers for example) 174 * let the player through (inventory checkers for example)
242 */ 175 */
243 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked)) 176 if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
244 return 0; 177 return 0;
245 178
246 if (ob->head != NULL)
247 ob = ob->head; 179 ob = ob->head_ ();
248 180
249 /* We basically go through the stack of objects, and if there is 181 /* We basically go through the stack of objects, and if there is
250 * some other object that has NO_PASS or FLAG_ALIVE set, return 182 * some other object that has NO_PASS or FLAG_ALIVE set, return
251 * true. If we get through the entire stack, that must mean 183 * true. If we get through the entire stack, that must mean
252 * ob is blocking it, so return 0. 184 * ob is blocking it, so return 0.
… …
282 else 214 else
283 { 215 {
284 /* Broke apart a big nasty if into several here to make 216 /* Broke apart a big nasty if into several here to make
285 * this more readable. first check - if the space blocks 217 * this more readable. first check - if the space blocks
286 * movement, can't move here. 218 * movement, can't move here.
287 * second - if a monster, can't move there, unles it is a 219 * second - if a monster, can't move there, unless it is a
288 * hidden dm 220 * hidden dm
289 */ 221 */
290 if (OB_MOVE_BLOCK (ob, tmp)) 222 if (OB_MOVE_BLOCK (ob, tmp))
291 return 1; 223 return 1;
292 if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob && 224
293 tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden)) 225 if (tmp->flag [FLAG_ALIVE]
226 && tmp->head_ () != ob
227 && tmp != ob
228 && tmp->type != DOOR
229 && !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
294 return 1; 230 return 1;
295 } 231 }
296 232
297 } 233 }
298 return 0; 234 return 0;
299} 235}
300
301 236
302/* 237/*
303 * Returns true if the given object can't fit in the given spot. 238 * Returns true if the given object can't fit in the given spot.
304 * This is meant for multi space objects - for single space objecs, 239 * This is meant for multi space objects - for single space objecs,
305 * just calling get_map_blocked and checking that against movement type 240 * just calling get_map_blocked and checking that against movement type
… …
331 archetype *tmp; 266 archetype *tmp;
332 int flag; 267 int flag;
333 maptile *m1; 268 maptile *m1;
334 sint16 sx, sy; 269 sint16 sx, sy;
335 270
336 if (ob == NULL) 271 if (!ob)
337 { 272 {
338 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 273 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
339 if (flag & P_OUT_OF_MAP) 274 if (flag & P_OUT_OF_MAP)
340 return P_OUT_OF_MAP; 275 return P_OUT_OF_MAP;
341 276
… …
398 * carrying. 333 * carrying.
399 */ 334 */
400 sum_weight (container); 335 sum_weight (container);
401} 336}
402 337
338void
339maptile::set_object_flag (int flag, int value)
340{
341 if (!spaces)
342 return;
343
344 for (mapspace *ms = spaces + size (); ms-- > spaces; )
345 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
346 tmp->flag [flag] = value;
347}
348
403/* link_multipart_objects go through all the objects on the map looking 349/* link_multipart_objects go through all the objects on the map looking
404 * for objects whose arch says they are multipart yet according to the 350 * for objects whose arch says they are multipart yet according to the
405 * info we have, they only have the head (as would be expected when 351 * info we have, they only have the head (as would be expected when
406 * they are saved). We do have to look for the old maps that did save 352 * they are saved).
407 * the more sections and not re-add sections for them.
408 */ 353 */
409void 354void
410maptile::link_multipart_objects () 355maptile::link_multipart_objects ()
411{ 356{
412 if (!spaces) 357 if (!spaces)
413 return; 358 return;
414 359
415 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 360 for (mapspace *ms = spaces + size (); ms-- > spaces; )
416 for (object *tmp = ms->bot; tmp; ) 361 for (object *op = ms->bot; op; op = op->above)
417 { 362 {
418 object *above = tmp->above;
419
420 /* already multipart - don't do anything more */ 363 /* already multipart - don't do anything more */
421 if (!tmp->head && !tmp->more) 364 if (op->head_ () == op && !op->more && op->arch->more)
422 { 365 {
423 /* If there is nothing more to this object, this for loop 366 op->remove ();
424 * won't do anything. 367 op->expand_tail ();
425 */
426 archetype *at;
427 object *last, *op;
428 for (at = tmp->arch->more, last = tmp;
429 at;
430 at = at->more, last = op)
431 {
432 op = arch_to_object (at);
433
434 /* update x,y coordinates */
435 op->x += tmp->x;
436 op->y += tmp->y;
437 op->head = tmp;
438 op->map = this;
439 last->more = op;
440 op->name = tmp->name;
441 op->title = tmp->title;
442
443 /* we could link all the parts onto tmp, and then just
444 * call insert_ob_in_map once, but the effect is the same,
445 * as insert_ob_in_map will call itself with each part, and
446 * the coding is simpler to just to it here with each part.
447 */
448 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 368 insert (op, op->x, op->y, 0, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
449 }
450 } 369 }
451
452 tmp = above;
453 } 370 }
454} 371}
455 372
456/* 373/*
457 * Loads (ands parses) the objects into a given map from the specified 374 * Loads (ands parses) the objects into a given map from the specified
458 * file pointer. 375 * file pointer.
459 * mapflags is the same as we get with load_original_map
460 */ 376 */
461bool 377bool
462maptile::load_objects (object_thawer &thawer) 378maptile::_load_objects (object_thawer &f)
463{ 379{
464 int unique; 380 for (;;)
465 object *op, *prev = NULL, *last_more = NULL, *otmp;
466
467 op = object::create ();
468 op->map = this; /* To handle buttons correctly */
469
470 while (int i = load_object (thawer, op, 0))
471 { 381 {
472 /* if the archetype for the object is null, means that we 382 coroapi::cede_to_tick_every (100); // cede once in a while
473 * got an invalid object. Don't do anything with it - the game 383
474 * or editor will not be able to do anything with it either. 384 switch (f.kw)
475 */
476 if (op->arch == NULL)
477 { 385 {
478 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 386 case KW_arch:
479 continue; 387 if (object *op = object::read (f, this))
480 }
481
482 switch (i)
483 { 388 {
484 case LL_NORMAL: 389 if (op->inv)
390 sum_weight (op);
391
485 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 392 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
393 }
486 394
487 if (op->inv) 395 continue;
488 sum_weight (op);
489 396
490 prev = op, last_more = op;
491 break;
492
493 case LL_MORE: 397 case KW_EOF:
494 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 398 return true;
495 op->head = prev, last_more->more = op, last_more = op; 399
400 default:
401 if (!f.parse_error ("map file"))
402 return false;
496 break; 403 break;
497 } 404 }
498 405
499 op = object::create (); 406 f.next ();
500 op->map = this;
501 }
502
503 op->destroy ();
504
505#if 0
506 for (i = 0; i < width; i++)
507 for (j = 0; j < height; j++)
508 {
509 unique = 0;
510 /* check for unique items, or unique squares */
511 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
512 {
513 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
514 unique = 1;
515
516 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
517 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
518 }
519 } 407 }
520#endif
521 408
522 return true; 409 return true;
523} 410}
524 411
525void 412void
526maptile::activate () 413maptile::activate ()
527{ 414{
415 active = true;
416
528 if (!spaces) 417 if (spaces)
529 return;
530
531 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 418 for (mapspace *ms = spaces + size (); ms-- > spaces; )
532 for (object *op = ms->bot; op; op = op->above) 419 for (object *op = ms->bot; op; op = op->above)
533 op->activate (1); 420 op->activate_recursive ();
534} 421}
535 422
536void 423void
537maptile::deactivate () 424maptile::deactivate ()
538{ 425{
426 active = false;
427
539 if (!spaces) 428 if (spaces)
540 return;
541
542 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 429 for (mapspace *ms = spaces + size (); ms-- > spaces; )
543 for (object *op = ms->bot; op; op = op->above) 430 for (object *op = ms->bot; op; op = op->above)
544 op->deactivate (1); 431 op->deactivate_recursive ();
545} 432}
546 433
547bool 434bool
548maptile::save_objects (object_freezer &freezer, int flags) 435maptile::_save_objects (object_freezer &f, int flags)
549{ 436{
437 coroapi::cede_to_tick ();
438
550 if (flags & IO_HEADER) 439 if (flags & IO_HEADER)
551 save_header (freezer); 440 _save_header (f);
552 441
553 if (!spaces) 442 if (!spaces)
554 return false; 443 return false;
555 444
556 for (int i = 0; i < size (); ++i) 445 for (int i = 0; i < size (); ++i)
… …
565 continue; 454 continue;
566 455
567 if (unique || op->flag [FLAG_UNIQUE]) 456 if (unique || op->flag [FLAG_UNIQUE])
568 { 457 {
569 if (flags & IO_UNIQUES) 458 if (flags & IO_UNIQUES)
570 save_object (freezer, op, 1); 459 op->write (f);
571 } 460 }
572 else if (flags & IO_OBJECTS) 461 else if (flags & IO_OBJECTS)
573 save_object (freezer, op, 1); 462 op->write (f);
574 } 463 }
575 } 464 }
576 465
466 coroapi::cede_to_tick ();
467
577 return true; 468 return true;
578} 469}
579 470
580bool 471bool
581maptile::load_objects (const char *path, bool skip_header) 472maptile::_load_objects (const char *path, bool skip_header)
582{ 473{
583 object_thawer thawer (path); 474 object_thawer f (path);
584 475
585 if (!thawer) 476 if (!f)
586 return false; 477 return false;
478
479 f.next ();
587 480
588 if (skip_header) 481 if (skip_header)
589 for (;;) 482 for (;;)
590 { 483 {
591 keyword kw = thawer.get_kv (); 484 keyword kw = f.kw;
592 485 f.skip ();
593 if (kw == KW_end) 486 if (kw == KW_end)
594 break; 487 break;
595
596 thawer.skip_kv (kw);
597 } 488 }
598 489
599 return load_objects (thawer); 490 return _load_objects (f);
600} 491}
601 492
602bool 493bool
603maptile::save_objects (const char *path, int flags) 494maptile::_save_objects (const char *path, int flags)
604{ 495{
605 object_freezer freezer; 496 object_freezer freezer;
606 497
607 if (!save_objects (freezer, flags)) 498 if (!_save_objects (freezer, flags))
608 return false; 499 return false;
609 500
610 return freezer.save (path); 501 return freezer.save (path);
611} 502}
612 503
613maptile::maptile () 504maptile::maptile ()
614{ 505{
615 in_memory = MAP_SWAPPED; 506 in_memory = MAP_SWAPPED;
616 507
617 /* The maps used to pick up default x and y values from the 508 /* The maps used to pick up default x and y values from the
618 * map archetype. Mimic that behaviour. 509 * map archetype. Mimic that behaviour.
619 */ 510 */
620 width = 16; 511 width = 16;
621 height = 16; 512 height = 16;
622 reset_timeout = 0;
623 timeout = 300; 513 timeout = 300;
624 enter_x = 0; 514 max_nrof = 1000; // 1000 items of anything
625 enter_y = 0; 515 max_volume = 2000000; // 2m³
626} 516}
627 517
628maptile::maptile (int w, int h) 518maptile::maptile (int w, int h)
629{ 519{
630 in_memory = MAP_SWAPPED; 520 in_memory = MAP_SWAPPED;
… …
776 * This could be done in lex (like the object loader), but I think 666 * This could be done in lex (like the object loader), but I think
777 * currently, there are few enough fields this is not a big deal. 667 * currently, there are few enough fields this is not a big deal.
778 * MSW 2001-07-01 668 * MSW 2001-07-01
779 */ 669 */
780bool 670bool
781maptile::load_header (object_thawer &thawer) 671maptile::_load_header (object_thawer &thawer)
782{ 672{
783 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
784 int msgpos = 0;
785 int maplorepos = 0;
786
787 for (;;) 673 for (;;)
788 { 674 {
789 keyword kw = thawer.get_kv (); 675 thawer.next ();
790 676
791 switch (kw) 677 switch (thawer.kw)
792 { 678 {
793 case KW_EOF:
794 LOG (llevError, "%s: end of file while reading map header, aborting header load.", &path);
795 return false;
796
797 case KW_end:
798 return true;
799
800 case KW_msg: 679 case KW_msg:
801 thawer.get_ml (KW_endmsg, msg); 680 thawer.get_ml (KW_endmsg, msg);
802 break; 681 break;
803 682
804 case KW_lore: // CF+ extension 683 case KW_lore: // CF+ extension
… …
836 case KW_sky: thawer.get (sky); break; 715 case KW_sky: thawer.get (sky); break;
837 716
838 case KW_per_player: thawer.get (per_player); break; 717 case KW_per_player: thawer.get (per_player); break;
839 case KW_per_party: thawer.get (per_party); break; 718 case KW_per_party: thawer.get (per_party); break;
840 719
841 case KW_region: get_region_by_name (thawer.get_str ()); break; 720 case KW_region: default_region = region::find (thawer.get_str ()); break;
842 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 721 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
843 722
844 // old names new names 723 // old names new names
845 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 724 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
846 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 725 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
855 case KW_tile_path_1: thawer.get (tile_path [0]); break; 734 case KW_tile_path_1: thawer.get (tile_path [0]); break;
856 case KW_tile_path_2: thawer.get (tile_path [1]); break; 735 case KW_tile_path_2: thawer.get (tile_path [1]); break;
857 case KW_tile_path_3: thawer.get (tile_path [2]); break; 736 case KW_tile_path_3: thawer.get (tile_path [2]); break;
858 case KW_tile_path_4: thawer.get (tile_path [3]); break; 737 case KW_tile_path_4: thawer.get (tile_path [3]); break;
859 738
739 case KW_end:
740 return true;
741
860 default: 742 default:
861 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]); 743 if (!thawer.parse_error ("map", 0))
744 return false;
862 break; 745 break;
863 } 746 }
864 } 747 }
865 748
866 abort (); 749 abort ();
867} 750}
868 751
869bool 752bool
870maptile::load_header (const char *path) 753maptile::_load_header (const char *path)
871{ 754{
872 object_thawer thawer (path); 755 object_thawer thawer (path);
873 756
874 if (!thawer) 757 if (!thawer)
875 return false; 758 return false;
876 759
877 return load_header (thawer); 760 return _load_header (thawer);
878} 761}
879 762
880/****************************************************************************** 763/******************************************************************************
881 * This is the start of unique map handling code 764 * This is the start of unique map handling code
882 *****************************************************************************/ 765 *****************************************************************************/
… …
893 object *above = op->above; 776 object *above = op->above;
894 777
895 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 778 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
896 unique = 1; 779 unique = 1;
897 780
898 if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 781 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique))
899 { 782 {
900 op->destroy_inv (false); 783 op->destroy_inv (false);
901 op->destroy (); 784 op->destroy ();
902 } 785 }
903 786
… …
905 } 788 }
906 } 789 }
907} 790}
908 791
909bool 792bool
910maptile::save_header (object_freezer &freezer) 793maptile::_save_header (object_freezer &freezer)
911{ 794{
912#define MAP_OUT(k) freezer.put (KW_ ## k, k) 795#define MAP_OUT(k) freezer.put (KW_ ## k, k)
913#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 796#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
914 797
915 MAP_OUT2 (arch, "map"); 798 MAP_OUT2 (arch, "map");
… …
919 MAP_OUT (reset_time); 802 MAP_OUT (reset_time);
920 MAP_OUT (reset_timeout); 803 MAP_OUT (reset_timeout);
921 MAP_OUT (fixed_resettime); 804 MAP_OUT (fixed_resettime);
922 MAP_OUT (difficulty); 805 MAP_OUT (difficulty);
923 806
924 if (region) MAP_OUT2 (region, region->name); 807 if (default_region) MAP_OUT2 (region, default_region->name);
925 808
926 if (shopitems) 809 if (shopitems)
927 { 810 {
928 char shop[MAX_BUF]; 811 char shop[MAX_BUF];
929 print_shop_string (this, shop); 812 print_shop_string (this, shop);
… …
957 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 840 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
958 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 841 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
959 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 842 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
960 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 843 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
961 844
962 MAP_OUT2 (end, 0); 845 freezer.put (this);
846 freezer.put (KW_end);
963 847
964 return true; 848 return true;
965} 849}
966 850
967bool 851bool
968maptile::save_header (const char *path) 852maptile::_save_header (const char *path)
969{ 853{
970 object_freezer freezer; 854 object_freezer freezer;
971 855
972 if (!save_header (freezer)) 856 if (!_save_header (freezer))
973 return false; 857 return false;
974 858
975 return freezer.save (path); 859 return freezer.save (path);
976} 860}
977 861
… …
979 * Remove and free all objects in the given map. 863 * Remove and free all objects in the given map.
980 */ 864 */
981void 865void
982maptile::clear () 866maptile::clear ()
983{ 867{
868 sfree (regions, size ()), regions = 0;
869 free (regionmap), regionmap = 0;
870
984 if (!spaces) 871 if (spaces)
985 return; 872 {
986
987 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 873 for (mapspace *ms = spaces + size (); ms-- > spaces; )
988 while (object *op = ms->bot) 874 while (object *op = ms->bot)
989 { 875 {
990 if (op->head)
991 op = op->head; 876 op = op->head_ ();
992
993 op->destroy_inv (false); 877 op->destroy_inv (false);
994 op->destroy (); 878 op->destroy ();
995 } 879 }
996 880
997 sfree (spaces, size ()), spaces = 0; 881 sfree (spaces, size ()), spaces = 0;
882 }
998 883
999 if (buttons) 884 if (buttons)
1000 free_objectlinkpt (buttons), buttons = 0; 885 free_objectlinkpt (buttons), buttons = 0;
1001} 886}
1002 887
… …
1156 */ 1041 */
1157void 1042void
1158mapspace::update_ () 1043mapspace::update_ ()
1159{ 1044{
1160 object *tmp, *last = 0; 1045 object *tmp, *last = 0;
1161 uint8 flags = 0, light = 0, anywhere = 0; 1046 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1162 New_Face *top, *floor, *middle;
1163 object *top_obj, *floor_obj, *middle_obj;
1164 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1047 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1165 1048
1166 middle = blank_face; 1049 //object *middle = 0;
1167 top = blank_face; 1050 //object *top = 0;
1168 floor = blank_face; 1051 //object *floor = 0;
1169 1052 // this seems to generate better code than using locals, above
1170 middle_obj = 0; 1053 object *&top = faces_obj[0] = 0;
1171 top_obj = 0; 1054 object *&middle = faces_obj[1] = 0;
1172 floor_obj = 0; 1055 object *&floor = faces_obj[2] = 0;
1173 1056
1174 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1057 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1175 { 1058 {
1176 /* This could be made additive I guess (two lights better than 1059 /* This could be made additive I guess (two lights better than
1177 * one). But if so, it shouldn't be a simple additive - 2 1060 * one). But if so, it shouldn't be a simple additive - 2
… …
1190 * Always put the player down for drawing. 1073 * Always put the player down for drawing.
1191 */ 1074 */
1192 if (!tmp->invisible) 1075 if (!tmp->invisible)
1193 { 1076 {
1194 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1077 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1195 {
1196 top = tmp->face;
1197 top_obj = tmp; 1078 top = tmp;
1198 }
1199 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1079 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1200 { 1080 {
1201 /* If we got a floor, that means middle and top were below it, 1081 /* If we got a floor, that means middle and top were below it,
1202 * so should not be visible, so we clear them. 1082 * so should not be visible, so we clear them.
1203 */ 1083 */
1204 middle = blank_face; 1084 middle = 0;
1205 top = blank_face; 1085 top = 0;
1206 floor = tmp->face;
1207 floor_obj = tmp; 1086 floor = tmp;
1208 } 1087 }
1209 /* Flag anywhere have high priority */ 1088 /* Flag anywhere have high priority */
1210 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1089 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1211 { 1090 {
1212 middle = tmp->face;
1213
1214 middle_obj = tmp; 1091 middle = tmp;
1215 anywhere = 1; 1092 anywhere = 1;
1216 } 1093 }
1217 /* Find the highest visible face around. If equal 1094 /* Find the highest visible face around. If equal
1218 * visibilities, we still want the one nearer to the 1095 * visibilities, we still want the one nearer to the
1219 * top 1096 * top
1220 */ 1097 */
1221 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1098 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1222 {
1223 middle = tmp->face;
1224 middle_obj = tmp; 1099 middle = tmp;
1225 }
1226 } 1100 }
1227 1101
1228 if (tmp == tmp->above) 1102 if (tmp == tmp->above)
1229 { 1103 {
1230 LOG (llevError, "Error in structure of map\n"); 1104 LOG (llevError, "Error in structure of map\n");
… …
1265 * middle face. This should not happen, as we already have the 1139 * middle face. This should not happen, as we already have the
1266 * else statement above so middle should not get set. OTOH, it 1140 * else statement above so middle should not get set. OTOH, it
1267 * may be possible for the faces to match but be different objects. 1141 * may be possible for the faces to match but be different objects.
1268 */ 1142 */
1269 if (top == middle) 1143 if (top == middle)
1270 middle = blank_face; 1144 middle = 0;
1271 1145
1272 /* There are three posibilities at this point: 1146 /* There are three posibilities at this point:
1273 * 1) top face is set, need middle to be set. 1147 * 1) top face is set, need middle to be set.
1274 * 2) middle is set, need to set top. 1148 * 2) middle is set, need to set top.
1275 * 3) neither middle or top is set - need to set both. 1149 * 3) neither middle or top is set - need to set both.
… …
1280 /* Once we get to a floor, stop, since we already have a floor object */ 1154 /* Once we get to a floor, stop, since we already have a floor object */
1281 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1155 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1282 break; 1156 break;
1283 1157
1284 /* If two top faces are already set, quit processing */ 1158 /* If two top faces are already set, quit processing */
1285 if ((top != blank_face) && (middle != blank_face)) 1159 if (top && middle)
1286 break; 1160 break;
1287 1161
1288 /* Only show visible faces, unless its the editor - show all */ 1162 /* Only show visible faces */
1289 if (!tmp->invisible || editor) 1163 if (!tmp->invisible)
1290 { 1164 {
1291 /* Fill in top if needed */ 1165 /* Fill in top if needed */
1292 if (top == blank_face) 1166 if (!top)
1293 { 1167 {
1294 top = tmp->face;
1295 top_obj = tmp; 1168 top = tmp;
1296 if (top == middle) 1169 if (top == middle)
1297 middle = blank_face; 1170 middle = 0;
1298 } 1171 }
1299 else 1172 else
1300 { 1173 {
1301 /* top is already set - we should only get here if 1174 /* top is already set - we should only get here if
1302 * middle is not set 1175 * middle is not set
1303 * 1176 *
1304 * Set the middle face and break out, since there is nothing 1177 * Set the middle face and break out, since there is nothing
1305 * more to fill in. We don't check visiblity here, since 1178 * more to fill in. We don't check visiblity here, since
1306 * 1179 *
1307 */ 1180 */
1308 if (tmp->face != top) 1181 if (tmp != top)
1309 { 1182 {
1310 middle = tmp->face;
1311 middle_obj = tmp; 1183 middle = tmp;
1312 break; 1184 break;
1313 } 1185 }
1314 } 1186 }
1315 } 1187 }
1316 } 1188 }
1317 1189
1318 if (middle == floor) 1190 if (middle == floor)
1319 middle = blank_face; 1191 middle = 0;
1320 1192
1321 if (top == middle) 1193 if (top == middle)
1322 middle = blank_face; 1194 middle = 0;
1323 1195
1324 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1196#if 0
1325 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1197 faces_obj [0] = top;
1326 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1198 faces_obj [1] = middle;
1199 faces_obj [2] = floor;
1200#endif
1327} 1201}
1328 1202
1203uint64
1204mapspace::volume () const
1205{
1206 uint64 vol = 0;
1207
1208 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1209 vol += op->volume ();
1210
1211 return vol;
1212}
1213
1329/* this updates the orig_map->tile_map[tile_num] value after loading 1214/* this updates the orig_map->tile_map[tile_num] value after finding
1330 * the map. It also takes care of linking back the freshly loaded 1215 * the map. It also takes care of linking back the freshly found
1331 * maps tile_map values if it tiles back to this one. It returns 1216 * maps tile_map values if it tiles back to this one. It returns
1332 * the value of orig_map->tile_map[tile_num]. It really only does this 1217 * the value of orig_map->tile_map[tile_num].
1333 * so that it is easier for calling functions to verify success.
1334 */ 1218 */
1335static maptile * 1219static inline maptile *
1336load_and_link_tiled_map (maptile *orig_map, int tile_num) 1220find_and_link (maptile *orig_map, int tile_num)
1337{ 1221{
1222 maptile *mp = orig_map->tile_map [tile_num];
1223
1224 if (!mp)
1225 {
1338 maptile *mp = orig_map->find_map (orig_map->tile_path[tile_num]); 1226 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1339 mp->load (); 1227
1228 if (!mp)
1229 {
1230 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1231 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1232 &orig_map->tile_path[tile_num], &orig_map->path);
1233 mp = new maptile (1, 1);
1234 mp->alloc ();
1235 mp->in_memory = MAP_IN_MEMORY;
1236 }
1237 }
1340 1238
1341 int dest_tile = (tile_num + 2) % 4; 1239 int dest_tile = (tile_num + 2) % 4;
1342 1240
1343 orig_map->tile_map[tile_num] = mp; 1241 orig_map->tile_map [tile_num] = mp;
1344 1242
1345 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1243 // optimisation: back-link map to origin map if euclidean
1346 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) 1244 //TODO: non-euclidean maps MUST GO
1245 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1347 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1246 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1348 1247
1349 return mp; 1248 return mp;
1249}
1250
1251static inline void
1252load_and_link (maptile *orig_map, int tile_num)
1253{
1254 find_and_link (orig_map, tile_num)->load_sync ();
1350} 1255}
1351 1256
1352/* this returns TRUE if the coordinates (x,y) are out of 1257/* this returns TRUE if the coordinates (x,y) are out of
1353 * map m. This function also takes into account any 1258 * map m. This function also takes into account any
1354 * tiling considerations, loading adjacant maps as needed. 1259 * tiling considerations, loading adjacant maps as needed.
… …
1371 { 1276 {
1372 if (!m->tile_path[3]) 1277 if (!m->tile_path[3])
1373 return 1; 1278 return 1;
1374 1279
1375 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1280 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1376 load_and_link_tiled_map (m, 3); 1281 find_and_link (m, 3);
1377 1282
1378 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1283 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1379 } 1284 }
1380 1285
1381 if (x >= m->width) 1286 if (x >= m->width)
1382 { 1287 {
1383 if (!m->tile_path[1]) 1288 if (!m->tile_path[1])
1384 return 1; 1289 return 1;
1385 1290
1386 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1291 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1387 load_and_link_tiled_map (m, 1); 1292 find_and_link (m, 1);
1388 1293
1389 return out_of_map (m->tile_map[1], x - m->width, y); 1294 return out_of_map (m->tile_map[1], x - m->width, y);
1390 } 1295 }
1391 1296
1392 if (y < 0) 1297 if (y < 0)
1393 { 1298 {
1394 if (!m->tile_path[0]) 1299 if (!m->tile_path[0])
1395 return 1; 1300 return 1;
1396 1301
1397 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1302 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1398 load_and_link_tiled_map (m, 0); 1303 find_and_link (m, 0);
1399 1304
1400 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1305 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1401 } 1306 }
1402 1307
1403 if (y >= m->height) 1308 if (y >= m->height)
1404 { 1309 {
1405 if (!m->tile_path[2]) 1310 if (!m->tile_path[2])
1406 return 1; 1311 return 1;
1407 1312
1408 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1313 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1409 load_and_link_tiled_map (m, 2); 1314 find_and_link (m, 2);
1410 1315
1411 return out_of_map (m->tile_map[2], x, y - m->height); 1316 return out_of_map (m->tile_map[2], x, y - m->height);
1412 } 1317 }
1413 1318
1414 /* Simple case - coordinates are within this local 1319 /* Simple case - coordinates are within this local
… …
1419 1324
1420/* This is basically the same as out_of_map above, but 1325/* This is basically the same as out_of_map above, but
1421 * instead we return NULL if no map is valid (coordinates 1326 * instead we return NULL if no map is valid (coordinates
1422 * out of bounds and no tiled map), otherwise it returns 1327 * out of bounds and no tiled map), otherwise it returns
1423 * the map as that the coordinates are really on, and 1328 * the map as that the coordinates are really on, and
1424 * updates x and y to be the localized coordinates. 1329 * updates x and y to be the localised coordinates.
1425 * Using this is more efficient of calling out_of_map 1330 * Using this is more efficient of calling out_of_map
1426 * and then figuring out what the real map is 1331 * and then figuring out what the real map is
1427 */ 1332 */
1428maptile * 1333maptile *
1429get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1334maptile::xy_find (sint16 &x, sint16 &y)
1430{ 1335{
1431 if (*x < 0) 1336 if (x < 0)
1432 { 1337 {
1433 if (!m->tile_path[3]) 1338 if (!tile_path[3])
1434 return 0; 1339 return 0;
1435 1340
1436 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1341 find_and_link (this, 3);
1437 load_and_link_tiled_map (m, 3);
1438
1439 *x += m->tile_map[3]->width; 1342 x += tile_map[3]->width;
1440 return (get_map_from_coord (m->tile_map[3], x, y)); 1343 return tile_map[3]->xy_find (x, y);
1441 } 1344 }
1442 1345
1443 if (*x >= m->width) 1346 if (x >= width)
1444 { 1347 {
1445 if (!m->tile_path[1]) 1348 if (!tile_path[1])
1446 return 0; 1349 return 0;
1447 1350
1448 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1351 find_and_link (this, 1);
1449 load_and_link_tiled_map (m, 1);
1450
1451 *x -= m->width; 1352 x -= width;
1452 return (get_map_from_coord (m->tile_map[1], x, y)); 1353 return tile_map[1]->xy_find (x, y);
1453 } 1354 }
1454 1355
1455 if (*y < 0) 1356 if (y < 0)
1456 { 1357 {
1457 if (!m->tile_path[0]) 1358 if (!tile_path[0])
1458 return 0; 1359 return 0;
1459 1360
1460 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1361 find_and_link (this, 0);
1461 load_and_link_tiled_map (m, 0);
1462
1463 *y += m->tile_map[0]->height; 1362 y += tile_map[0]->height;
1464 return (get_map_from_coord (m->tile_map[0], x, y)); 1363 return tile_map[0]->xy_find (x, y);
1465 } 1364 }
1466 1365
1467 if (*y >= m->height) 1366 if (y >= height)
1468 { 1367 {
1469 if (!m->tile_path[2]) 1368 if (!tile_path[2])
1470 return 0; 1369 return 0;
1471 1370
1472 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1371 find_and_link (this, 2);
1473 load_and_link_tiled_map (m, 2);
1474
1475 *y -= m->height; 1372 y -= height;
1476 return (get_map_from_coord (m->tile_map[2], x, y)); 1373 return tile_map[2]->xy_find (x, y);
1477 } 1374 }
1478 1375
1479 /* Simple case - coordinates are within this local 1376 /* Simple case - coordinates are within this local
1480 * map. 1377 * map.
1481 */ 1378 */
1482
1483 m->last_access = runtime;
1484 return m; 1379 return this;
1485} 1380}
1486 1381
1487/** 1382/**
1488 * Return whether map2 is adjacent to map1. If so, store the distance from 1383 * Return whether map2 is adjacent to map1. If so, store the distance from
1489 * map1 to map2 in dx/dy. 1384 * map1 to map2 in dx/dy.
1490 */ 1385 */
1491static int 1386int
1492adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1387adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1493{ 1388{
1494 if (!map1 || !map2) 1389 if (!map1 || !map2)
1495 return 0; 1390 return 0;
1496 1391
1392 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1393 //fix: compare paths instead (this is likely faster, too!)
1497 if (map1 == map2) 1394 if (map1 == map2)
1498 { 1395 {
1499 *dx = 0; 1396 *dx = 0;
1500 *dy = 0; 1397 *dy = 0;
1501 } 1398 }
… …
1561 } 1458 }
1562 else 1459 else
1563 return 0; 1460 return 0;
1564 1461
1565 return 1; 1462 return 1;
1463}
1464
1465maptile *
1466maptile::xy_load (sint16 &x, sint16 &y)
1467{
1468 maptile *map = xy_find (x, y);
1469
1470 if (map)
1471 map->load_sync ();
1472
1473 return map;
1474}
1475
1476maptile *
1477get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1478{
1479 return m->xy_load (*x, *y);
1566} 1480}
1567 1481
1568/* From map.c 1482/* From map.c
1569 * This is used by get_player to determine where the other 1483 * This is used by get_player to determine where the other
1570 * creature is. get_rangevector takes into account map tiling, 1484 * creature is. get_rangevector takes into account map tiling,
1571 * so you just can not look the the map coordinates and get the 1485 * so you just can not look the the map coordinates and get the
1572 * righte value. distance_x/y are distance away, which 1486 * righte value. distance_x/y are distance away, which
1573 * can be negativbe. direction is the crossfire direction scheme 1487 * can be negative. direction is the crossfire direction scheme
1574 * that the creature should head. part is the part of the 1488 * that the creature should head. part is the part of the
1575 * monster that is closest. 1489 * monster that is closest.
1576 * 1490 *
1577 * get_rangevector looks at op1 and op2, and fills in the 1491 * get_rangevector looks at op1 and op2, and fills in the
1578 * structure for op1 to get to op2. 1492 * structure for op1 to get to op2.
… …
1589get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1503get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1590{ 1504{
1591 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1505 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1592 { 1506 {
1593 /* be conservative and fill in _some_ data */ 1507 /* be conservative and fill in _some_ data */
1594 retval->distance = 100000; 1508 retval->distance = 10000;
1595 retval->distance_x = 32767; 1509 retval->distance_x = 10000;
1596 retval->distance_y = 32767; 1510 retval->distance_y = 10000;
1597 retval->direction = 0; 1511 retval->direction = 0;
1598 retval->part = 0; 1512 retval->part = 0;
1599 } 1513 }
1600 else 1514 else
1601 { 1515 {
… …
1606 1520
1607 best = op1; 1521 best = op1;
1608 /* If this is multipart, find the closest part now */ 1522 /* If this is multipart, find the closest part now */
1609 if (!(flags & 0x1) && op1->more) 1523 if (!(flags & 0x1) && op1->more)
1610 { 1524 {
1611 object *tmp;
1612 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1525 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1613 1526
1614 /* we just take the offset of the piece to head to figure 1527 /* we just take the offset of the piece to head to figure
1615 * distance instead of doing all that work above again 1528 * distance instead of doing all that work above again
1616 * since the distance fields we set above are positive in the 1529 * since the distance fields we set above are positive in the
1617 * same axis as is used for multipart objects, the simply arithmetic 1530 * same axis as is used for multipart objects, the simply arithmetic
1618 * below works. 1531 * below works.
1619 */ 1532 */
1620 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1533 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1621 { 1534 {
1622 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1535 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1623 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1536 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1624 if (tmpi < best_distance) 1537 if (tmpi < best_distance)
1625 { 1538 {
1626 best_distance = tmpi; 1539 best_distance = tmpi;
1627 best = tmp; 1540 best = tmp;
1628 } 1541 }
1629 } 1542 }
1543
1630 if (best != op1) 1544 if (best != op1)
1631 { 1545 {
1632 retval->distance_x += op1->x - best->x; 1546 retval->distance_x += op1->x - best->x;
1633 retval->distance_y += op1->y - best->y; 1547 retval->distance_y += op1->y - best->y;
1634 } 1548 }
1635 } 1549 }
1550
1636 retval->part = best; 1551 retval->part = best;
1637 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1552 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1638 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1553 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1639 } 1554 }
1640} 1555}
1641 1556
1642/* this is basically the same as get_rangevector above, but instead of 1557/* this is basically the same as get_rangevector above, but instead of
… …
1647 * flags has no meaning for this function at this time - I kept it in to 1562 * flags has no meaning for this function at this time - I kept it in to
1648 * be more consistant with the above function and also in case they are needed 1563 * be more consistant with the above function and also in case they are needed
1649 * for something in the future. Also, since no object is pasted, the best 1564 * for something in the future. Also, since no object is pasted, the best
1650 * field of the rv_vector is set to NULL. 1565 * field of the rv_vector is set to NULL.
1651 */ 1566 */
1652
1653void 1567void
1654get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1568get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1655{ 1569{
1656 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1570 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1657 { 1571 {
1658 /* be conservative and fill in _some_ data */ 1572 /* be conservative and fill in _some_ data */
1659 retval->distance = 100000; 1573 retval->distance = 100000;
… …
1666 { 1580 {
1667 retval->distance_x += op2->x - x; 1581 retval->distance_x += op2->x - x;
1668 retval->distance_y += op2->y - y; 1582 retval->distance_y += op2->y - y;
1669 1583
1670 retval->part = NULL; 1584 retval->part = NULL;
1671 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1585 retval->distance = idistance (retval->distance_x, retval->distance_y);
1672 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1586 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1673 } 1587 }
1674} 1588}
1675 1589
1676/* Returns true of op1 and op2 are effectively on the same map 1590/* Returns true of op1 and op2 are effectively on the same map
… …
1696 op->remove (); 1610 op->remove ();
1697 1611
1698 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1612 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1699} 1613}
1700 1614
1615region *
1616maptile::region (int x, int y) const
1617{
1618 if (regions
1619 && regionmap
1620 && !OUT_OF_REAL_MAP (this, x, y))
1621 if (struct region *reg = regionmap [regions [y * width + x]])
1622 return reg;
1623
1624 if (default_region)
1625 return default_region;
1626
1627 return ::region::default_region ();
1628}
1629
1630/* picks a random object from a style map.
1631 * Redone by MSW so it should be faster and not use static
1632 * variables to generate tables.
1633 */
1634object *
1635maptile::pick_random_object () const
1636{
1637 /* while returning a null object will result in a crash, that
1638 * is actually preferable to an infinite loop. That is because
1639 * most servers will automatically restart in case of crash.
1640 * Change the logic on getting the random space - shouldn't make
1641 * any difference, but this seems clearer to me.
1642 */
1643 for (int i = 1000; --i;)
1644 {
1645 object *pick = at (rndm (width), rndm (height)).bot;
1646
1647 // do not prefer big monsters just because they are big.
1648 if (pick && pick->head_ () == pick)
1649 return pick->head_ ();
1650 }
1651
1652 // instead of crashing in the unlikely(?) case, try to return *something*
1653 return get_archetype ("blocked");
1654}
1655

Diff Legend

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