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.60 by root, Sun Dec 31 10:28:35 2006 UTC vs.
Revision 1.98 by root, Sat Mar 17 22:11:22 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
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.
… …
296 229
297 } 230 }
298 return 0; 231 return 0;
299} 232}
300 233
301
302/* 234/*
303 * Returns true if the given object can't fit in the given spot. 235 * 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, 236 * This is meant for multi space objects - for single space objecs,
305 * just calling get_map_blocked and checking that against movement type 237 * just calling get_map_blocked and checking that against movement type
306 * of object. This function goes through all the parts of the 238 * of object. This function goes through all the parts of the
… …
398 * carrying. 330 * carrying.
399 */ 331 */
400 sum_weight (container); 332 sum_weight (container);
401} 333}
402 334
335void
336maptile::set_object_flag (int flag, int value)
337{
338 if (!spaces)
339 return;
340
341 for (mapspace *ms = spaces + size (); ms-- > spaces; )
342 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
343 tmp->flag [flag] = value;
344}
345
403/* link_multipart_objects go through all the objects on the map looking 346/* 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 347 * 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 348 * 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 349 * they are saved). We do have to look for the old maps that did save
407 * the more sections and not re-add sections for them. 350 * the more sections and not re-add sections for them.
… …
411{ 354{
412 if (!spaces) 355 if (!spaces)
413 return; 356 return;
414 357
415 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 358 for (mapspace *ms = spaces + size (); ms-- > spaces; )
416 for (object *tmp = ms->bot; tmp; ) 359 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
417 { 360 {
418 object *above = tmp->above;
419
420 /* already multipart - don't do anything more */ 361 /* already multipart - don't do anything more */
421 if (!tmp->head && !tmp->more) 362 if (!tmp->head && !tmp->more)
422 { 363 {
423 /* If there is nothing more to this object, this for loop 364 /* If there is nothing more to this object, this for loop
424 * won't do anything. 365 * won't do anything.
… …
446 * the coding is simpler to just to it here with each part. 387 * the coding is simpler to just to it here with each part.
447 */ 388 */
448 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 389 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
449 } 390 }
450 } 391 }
451
452 tmp = above;
453 } 392 }
454} 393}
455 394
456/* 395/*
457 * Loads (ands parses) the objects into a given map from the specified 396 * Loads (ands parses) the objects into a given map from the specified
458 * file pointer. 397 * file pointer.
459 * mapflags is the same as we get with load_original_map
460 */ 398 */
461bool 399bool
462maptile::load_objects (object_thawer &thawer) 400maptile::_load_objects (object_thawer &f)
463{ 401{
464 int unique; 402 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 { 403 {
472 /* if the archetype for the object is null, means that we 404 coroapi::cede_every (1000); // cede once in a while
473 * got an invalid object. Don't do anything with it - the game 405
474 * or editor will not be able to do anything with it either. 406 switch (f.kw)
475 */
476 if (op->arch == NULL)
477 { 407 {
478 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 408 case KW_arch:
479 continue; 409 if (object *op = object::read (f, this))
480 }
481
482 switch (i)
483 { 410 {
484 case LL_NORMAL: 411 if (op->inv)
412 sum_weight (op);
413
485 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 414 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
415 }
486 416
487 if (op->inv) 417 continue;
488 sum_weight (op);
489 418
490 prev = op, last_more = op;
491 break;
492
493 case LL_MORE: 419 case KW_EOF:
494 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 420 return true;
495 op->head = prev, last_more->more = op, last_more = op; 421
422 default:
423 if (!f.parse_error ("map file"))
424 return false;
496 break; 425 break;
497 } 426 }
498 427
499 op = object::create (); 428 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 } 429 }
520#endif
521 430
522 return true; 431 return true;
523} 432}
524 433
525void 434void
… …
528 if (!spaces) 437 if (!spaces)
529 return; 438 return;
530 439
531 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 440 for (mapspace *ms = spaces + size (); ms-- > spaces; )
532 for (object *op = ms->bot; op; op = op->above) 441 for (object *op = ms->bot; op; op = op->above)
533 op->activate (1); 442 op->activate_recursive ();
534} 443}
535 444
536void 445void
537maptile::deactivate () 446maptile::deactivate ()
538{ 447{
539 if (!spaces) 448 if (!spaces)
540 return; 449 return;
541 450
542 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 451 for (mapspace *ms = spaces + size (); ms-- > spaces; )
543 for (object *op = ms->bot; op; op = op->above) 452 for (object *op = ms->bot; op; op = op->above)
544 op->deactivate (1); 453 op->deactivate_recursive ();
545} 454}
546 455
547bool 456bool
548maptile::save_objects (object_freezer &freezer, int flags) 457maptile::_save_objects (object_freezer &f, int flags)
549{ 458{
459 coroapi::cede ();
460
550 if (flags & IO_HEADER) 461 if (flags & IO_HEADER)
551 save_header (freezer); 462 _save_header (f);
552 463
553 if (!spaces) 464 if (!spaces)
554 return false; 465 return false;
555 466
556 for (int i = 0; i < size (); ++i) 467 for (int i = 0; i < size (); ++i)
557 { 468 {
469#if 0 // disabled, there still seem to be races somewhere
470 static int cede_count = 0;
471
472 if (cede_count >= 500)
473 {
474 cede_count = 0;
475 coroapi::cede ();
476 }
477#endif
478
558 int unique = 0; 479 int unique = 0;
559 for (object *op = spaces [i].bot; op; op = op->above) 480 for (object *op = spaces [i].bot; op; op = op->above)
560 { 481 {
482#if 0
483 // count per-object, but cede only when modification-safe
484 cede_count++;
485#endif
486
561 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 487 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
562 unique = 1; 488 unique = 1;
563 489
564 if (!op->can_map_save ()) 490 if (!op->can_map_save ())
565 continue; 491 continue;
566 492
567 if (unique || op->flag [FLAG_UNIQUE]) 493 if (unique || op->flag [FLAG_UNIQUE])
568 { 494 {
569 if (flags & IO_UNIQUES) 495 if (flags & IO_UNIQUES)
570 save_object (freezer, op, 1); 496 op->write (f);
571 } 497 }
572 else if (flags & IO_OBJECTS) 498 else if (flags & IO_OBJECTS)
573 save_object (freezer, op, 1); 499 op->write (f);
574 } 500 }
575 } 501 }
576 502
503 coroapi::cede ();
504
577 return true; 505 return true;
578} 506}
579 507
580bool 508bool
581maptile::load_objects (const char *path, bool skip_header) 509maptile::_load_objects (const char *path, bool skip_header)
582{ 510{
583 object_thawer thawer (path); 511 object_thawer f (path);
584 512
585 if (!thawer) 513 if (!f)
586 return false; 514 return false;
515
516 f.next ();
587 517
588 if (skip_header) 518 if (skip_header)
589 for (;;) 519 for (;;)
590 { 520 {
591 keyword kw = thawer.get_kv (); 521 keyword kw = f.kw;
592 522 f.skip ();
593 if (kw == KW_end) 523 if (kw == KW_end)
594 break; 524 break;
595
596 thawer.skip_kv (kw);
597 } 525 }
598 526
599 return load_objects (thawer); 527 return _load_objects (f);
600} 528}
601 529
602bool 530bool
603maptile::save_objects (const char *path, int flags) 531maptile::_save_objects (const char *path, int flags)
604{ 532{
605 object_freezer freezer; 533 object_freezer freezer;
606 534
607 if (!save_objects (freezer, flags)) 535 if (!_save_objects (freezer, flags))
608 return false; 536 return false;
609 537
610 return freezer.save (path); 538 return freezer.save (path);
611} 539}
612 540
613maptile::maptile () 541maptile::maptile ()
614{ 542{
615 in_memory = MAP_SWAPPED; 543 in_memory = MAP_SWAPPED;
616 544
617 /* The maps used to pick up default x and y values from the 545 /* The maps used to pick up default x and y values from the
618 * map archetype. Mimic that behaviour. 546 * map archetype. Mimic that behaviour.
619 */ 547 */
620 width = 16; 548 width = 16;
621 height = 16; 549 height = 16;
622 reset_timeout = 0;
623 timeout = 300; 550 timeout = 300;
624 enter_x = 0; 551 max_nrof = 1000; // 1000 items of anything
625 enter_y = 0; 552 max_volume = 2000000; // 2m³
626} 553}
627 554
628maptile::maptile (int w, int h) 555maptile::maptile (int w, int h)
629{ 556{
630 in_memory = MAP_SWAPPED; 557 in_memory = MAP_SWAPPED;
… …
776 * This could be done in lex (like the object loader), but I think 703 * 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. 704 * currently, there are few enough fields this is not a big deal.
778 * MSW 2001-07-01 705 * MSW 2001-07-01
779 */ 706 */
780bool 707bool
781maptile::load_header (object_thawer &thawer) 708maptile::_load_header (object_thawer &thawer)
782{ 709{
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 (;;) 710 for (;;)
788 { 711 {
789 keyword kw = thawer.get_kv (); 712 keyword kw = thawer.get_kv ();
790 713
791 switch (kw) 714 switch (kw)
792 { 715 {
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: 716 case KW_msg:
801 thawer.get_ml (KW_endmsg, msg); 717 thawer.get_ml (KW_endmsg, msg);
802 break; 718 break;
803 719
804 case KW_lore: // CF+ extension 720 case KW_lore: // CF+ extension
… …
836 case KW_sky: thawer.get (sky); break; 752 case KW_sky: thawer.get (sky); break;
837 753
838 case KW_per_player: thawer.get (per_player); break; 754 case KW_per_player: thawer.get (per_player); break;
839 case KW_per_party: thawer.get (per_party); break; 755 case KW_per_party: thawer.get (per_party); break;
840 756
841 case KW_region: get_region_by_name (thawer.get_str ()); break; 757 case KW_region: default_region = region::find (thawer.get_str ()); break;
842 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 758 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
843 759
844 // old names new names 760 // old names new names
845 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 761 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; 762 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
855 case KW_tile_path_1: thawer.get (tile_path [0]); break; 771 case KW_tile_path_1: thawer.get (tile_path [0]); break;
856 case KW_tile_path_2: thawer.get (tile_path [1]); break; 772 case KW_tile_path_2: thawer.get (tile_path [1]); break;
857 case KW_tile_path_3: thawer.get (tile_path [2]); break; 773 case KW_tile_path_3: thawer.get (tile_path [2]); break;
858 case KW_tile_path_4: thawer.get (tile_path [3]); break; 774 case KW_tile_path_4: thawer.get (tile_path [3]); break;
859 775
776 case KW_end:
777 return true;
778
860 default: 779 default:
861 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]); 780 if (!thawer.parse_error ("map", 0))
781 return false;
862 break; 782 break;
863 } 783 }
864 } 784 }
865 785
866 abort (); 786 abort ();
867} 787}
868 788
869bool 789bool
870maptile::load_header (const char *path) 790maptile::_load_header (const char *path)
871{ 791{
872 object_thawer thawer (path); 792 object_thawer thawer (path);
873 793
874 if (!thawer) 794 if (!thawer)
875 return false; 795 return false;
876 796
877 return load_header (thawer); 797 return _load_header (thawer);
878} 798}
879 799
880/****************************************************************************** 800/******************************************************************************
881 * This is the start of unique map handling code 801 * This is the start of unique map handling code
882 *****************************************************************************/ 802 *****************************************************************************/
… …
905 } 825 }
906 } 826 }
907} 827}
908 828
909bool 829bool
910maptile::save_header (object_freezer &freezer) 830maptile::_save_header (object_freezer &freezer)
911{ 831{
912#define MAP_OUT(k) freezer.put (KW_ ## k, k) 832#define MAP_OUT(k) freezer.put (KW_ ## k, k)
913#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 833#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
914 834
915 MAP_OUT2 (arch, "map"); 835 MAP_OUT2 (arch, "map");
… …
919 MAP_OUT (reset_time); 839 MAP_OUT (reset_time);
920 MAP_OUT (reset_timeout); 840 MAP_OUT (reset_timeout);
921 MAP_OUT (fixed_resettime); 841 MAP_OUT (fixed_resettime);
922 MAP_OUT (difficulty); 842 MAP_OUT (difficulty);
923 843
924 if (region) MAP_OUT2 (region, region->name); 844 if (default_region) MAP_OUT2 (region, default_region->name);
925 845
926 if (shopitems) 846 if (shopitems)
927 { 847 {
928 char shop[MAX_BUF]; 848 char shop[MAX_BUF];
929 print_shop_string (this, shop); 849 print_shop_string (this, shop);
… …
957 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 877 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]); 878 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]); 879 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]); 880 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
961 881
962 MAP_OUT2 (end, 0); 882 freezer.put (this);
883 freezer.put (KW_end);
963 884
964 return true; 885 return true;
965} 886}
966 887
967bool 888bool
968maptile::save_header (const char *path) 889maptile::_save_header (const char *path)
969{ 890{
970 object_freezer freezer; 891 object_freezer freezer;
971 892
972 if (!save_header (freezer)) 893 if (!_save_header (freezer))
973 return false; 894 return false;
974 895
975 return freezer.save (path); 896 return freezer.save (path);
976} 897}
977 898
… …
979 * Remove and free all objects in the given map. 900 * Remove and free all objects in the given map.
980 */ 901 */
981void 902void
982maptile::clear () 903maptile::clear ()
983{ 904{
905 sfree (regions, size ()), regions = 0;
906 free (regionmap), regionmap = 0;
907
984 if (!spaces) 908 if (spaces)
985 return; 909 {
986
987 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 910 for (mapspace *ms = spaces + size (); ms-- > spaces; )
988 while (object *op = ms->bot) 911 while (object *op = ms->bot)
989 { 912 {
990 if (op->head) 913 if (op->head)
991 op = op->head; 914 op = op->head;
992 915
993 op->destroy_inv (false); 916 op->destroy_inv (false);
994 op->destroy (); 917 op->destroy ();
995 } 918 }
996 919
997 sfree (spaces, size ()), spaces = 0; 920 sfree (spaces, size ()), spaces = 0;
921 }
998 922
999 if (buttons) 923 if (buttons)
1000 free_objectlinkpt (buttons), buttons = 0; 924 free_objectlinkpt (buttons), buttons = 0;
1001} 925}
1002 926
… …
1156 */ 1080 */
1157void 1081void
1158mapspace::update_ () 1082mapspace::update_ ()
1159{ 1083{
1160 object *tmp, *last = 0; 1084 object *tmp, *last = 0;
1161 uint8 flags = 0, light = 0, anywhere = 0; 1085 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; 1086 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1165 1087
1166 middle = blank_face; 1088 //object *middle = 0;
1167 top = blank_face; 1089 //object *top = 0;
1168 floor = blank_face; 1090 //object *floor = 0;
1169 1091 // this seems to generate better code than using locals, above
1170 middle_obj = 0; 1092 object *&top = faces_obj[0] = 0;
1171 top_obj = 0; 1093 object *&middle = faces_obj[1] = 0;
1172 floor_obj = 0; 1094 object *&floor = faces_obj[2] = 0;
1173 1095
1174 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1096 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1175 { 1097 {
1176 /* This could be made additive I guess (two lights better than 1098 /* This could be made additive I guess (two lights better than
1177 * one). But if so, it shouldn't be a simple additive - 2 1099 * one). But if so, it shouldn't be a simple additive - 2
… …
1190 * Always put the player down for drawing. 1112 * Always put the player down for drawing.
1191 */ 1113 */
1192 if (!tmp->invisible) 1114 if (!tmp->invisible)
1193 { 1115 {
1194 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1116 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1195 {
1196 top = tmp->face;
1197 top_obj = tmp; 1117 top = tmp;
1198 }
1199 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1118 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1200 { 1119 {
1201 /* If we got a floor, that means middle and top were below it, 1120 /* If we got a floor, that means middle and top were below it,
1202 * so should not be visible, so we clear them. 1121 * so should not be visible, so we clear them.
1203 */ 1122 */
1204 middle = blank_face; 1123 middle = 0;
1205 top = blank_face; 1124 top = 0;
1206 floor = tmp->face;
1207 floor_obj = tmp; 1125 floor = tmp;
1208 } 1126 }
1209 /* Flag anywhere have high priority */ 1127 /* Flag anywhere have high priority */
1210 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1128 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1211 { 1129 {
1212 middle = tmp->face;
1213
1214 middle_obj = tmp; 1130 middle = tmp;
1215 anywhere = 1; 1131 anywhere = 1;
1216 } 1132 }
1217 /* Find the highest visible face around. If equal 1133 /* Find the highest visible face around. If equal
1218 * visibilities, we still want the one nearer to the 1134 * visibilities, we still want the one nearer to the
1219 * top 1135 * top
1220 */ 1136 */
1221 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1137 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1222 {
1223 middle = tmp->face;
1224 middle_obj = tmp; 1138 middle = tmp;
1225 }
1226 } 1139 }
1227 1140
1228 if (tmp == tmp->above) 1141 if (tmp == tmp->above)
1229 { 1142 {
1230 LOG (llevError, "Error in structure of map\n"); 1143 LOG (llevError, "Error in structure of map\n");
… …
1265 * middle face. This should not happen, as we already have the 1178 * middle face. This should not happen, as we already have the
1266 * else statement above so middle should not get set. OTOH, it 1179 * else statement above so middle should not get set. OTOH, it
1267 * may be possible for the faces to match but be different objects. 1180 * may be possible for the faces to match but be different objects.
1268 */ 1181 */
1269 if (top == middle) 1182 if (top == middle)
1270 middle = blank_face; 1183 middle = 0;
1271 1184
1272 /* There are three posibilities at this point: 1185 /* There are three posibilities at this point:
1273 * 1) top face is set, need middle to be set. 1186 * 1) top face is set, need middle to be set.
1274 * 2) middle is set, need to set top. 1187 * 2) middle is set, need to set top.
1275 * 3) neither middle or top is set - need to set both. 1188 * 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 */ 1193 /* Once we get to a floor, stop, since we already have a floor object */
1281 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1194 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1282 break; 1195 break;
1283 1196
1284 /* If two top faces are already set, quit processing */ 1197 /* If two top faces are already set, quit processing */
1285 if ((top != blank_face) && (middle != blank_face)) 1198 if (top && middle)
1286 break; 1199 break;
1287 1200
1288 /* Only show visible faces, unless its the editor - show all */ 1201 /* Only show visible faces */
1289 if (!tmp->invisible || editor) 1202 if (!tmp->invisible)
1290 { 1203 {
1291 /* Fill in top if needed */ 1204 /* Fill in top if needed */
1292 if (top == blank_face) 1205 if (!top)
1293 { 1206 {
1294 top = tmp->face;
1295 top_obj = tmp; 1207 top = tmp;
1296 if (top == middle) 1208 if (top == middle)
1297 middle = blank_face; 1209 middle = 0;
1298 } 1210 }
1299 else 1211 else
1300 { 1212 {
1301 /* top is already set - we should only get here if 1213 /* top is already set - we should only get here if
1302 * middle is not set 1214 * middle is not set
1303 * 1215 *
1304 * Set the middle face and break out, since there is nothing 1216 * Set the middle face and break out, since there is nothing
1305 * more to fill in. We don't check visiblity here, since 1217 * more to fill in. We don't check visiblity here, since
1306 * 1218 *
1307 */ 1219 */
1308 if (tmp->face != top) 1220 if (tmp != top)
1309 { 1221 {
1310 middle = tmp->face;
1311 middle_obj = tmp; 1222 middle = tmp;
1312 break; 1223 break;
1313 } 1224 }
1314 } 1225 }
1315 } 1226 }
1316 } 1227 }
1317 1228
1318 if (middle == floor) 1229 if (middle == floor)
1319 middle = blank_face; 1230 middle = 0;
1320 1231
1321 if (top == middle) 1232 if (top == middle)
1322 middle = blank_face; 1233 middle = 0;
1323 1234
1324 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1235#if 0
1325 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1236 faces_obj [0] = top;
1326 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1237 faces_obj [1] = middle;
1238 faces_obj [2] = floor;
1239#endif
1327} 1240}
1328 1241
1242uint64
1243mapspace::volume () const
1244{
1245 uint64 vol = 0;
1246
1247 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1248 vol += op->volume ();
1249
1250 return vol;
1251}
1252
1329/* this updates the orig_map->tile_map[tile_num] value after loading 1253/* 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 1254 * 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 1255 * 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 1256 * the value of orig_map->tile_map[tile_num].
1333 * so that it is easier for calling functions to verify success.
1334 */ 1257 */
1335static maptile * 1258static inline maptile *
1336load_and_link_tiled_map (maptile *orig_map, int tile_num) 1259find_and_link (maptile *orig_map, int tile_num)
1337{ 1260{
1261 maptile *mp = orig_map->tile_map [tile_num];
1262
1263 if (!mp)
1264 {
1338 maptile *mp = orig_map->load_map_sync (orig_map->tile_path [tile_num], orig_map); 1265 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1339 1266
1340 if (!mp || mp->in_memory != MAP_IN_MEMORY) 1267 if (!mp)
1341 { 1268 {
1342 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine 1269 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1343 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n", 1270 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1344 &orig_map->tile_path[tile_num], &orig_map->path); 1271 &orig_map->tile_path[tile_num], &orig_map->path);
1345 mp = new maptile (1, 1); 1272 mp = new maptile (1, 1);
1346 mp->alloc (); 1273 mp->alloc ();
1347 mp->in_memory = MAP_IN_MEMORY; 1274 mp->in_memory = MAP_IN_MEMORY;
1275 }
1348 } 1276 }
1349 1277
1350 int dest_tile = (tile_num + 2) % 4; 1278 int dest_tile = (tile_num + 2) % 4;
1351 1279
1352 orig_map->tile_map[tile_num] = mp; 1280 orig_map->tile_map [tile_num] = mp;
1353 1281
1354 // optimisation: back-link map to origin map if euclidean 1282 // optimisation: back-link map to origin map if euclidean
1355 //TODO: non-euclidean maps MUST GO 1283 //TODO: non-euclidean maps MUST GO
1356 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) 1284 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1357 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1285 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1358 1286
1359 return mp; 1287 return mp;
1288}
1289
1290static inline void
1291load_and_link (maptile *orig_map, int tile_num)
1292{
1293 find_and_link (orig_map, tile_num)->load_sync ();
1360} 1294}
1361 1295
1362/* this returns TRUE if the coordinates (x,y) are out of 1296/* this returns TRUE if the coordinates (x,y) are out of
1363 * map m. This function also takes into account any 1297 * map m. This function also takes into account any
1364 * tiling considerations, loading adjacant maps as needed. 1298 * tiling considerations, loading adjacant maps as needed.
… …
1381 { 1315 {
1382 if (!m->tile_path[3]) 1316 if (!m->tile_path[3])
1383 return 1; 1317 return 1;
1384 1318
1385 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1319 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1386 load_and_link_tiled_map (m, 3); 1320 find_and_link (m, 3);
1387 1321
1388 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1322 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1389 } 1323 }
1390 1324
1391 if (x >= m->width) 1325 if (x >= m->width)
1392 { 1326 {
1393 if (!m->tile_path[1]) 1327 if (!m->tile_path[1])
1394 return 1; 1328 return 1;
1395 1329
1396 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1330 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1397 load_and_link_tiled_map (m, 1); 1331 find_and_link (m, 1);
1398 1332
1399 return out_of_map (m->tile_map[1], x - m->width, y); 1333 return out_of_map (m->tile_map[1], x - m->width, y);
1400 } 1334 }
1401 1335
1402 if (y < 0) 1336 if (y < 0)
1403 { 1337 {
1404 if (!m->tile_path[0]) 1338 if (!m->tile_path[0])
1405 return 1; 1339 return 1;
1406 1340
1407 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1341 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1408 load_and_link_tiled_map (m, 0); 1342 find_and_link (m, 0);
1409 1343
1410 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1344 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1411 } 1345 }
1412 1346
1413 if (y >= m->height) 1347 if (y >= m->height)
1414 { 1348 {
1415 if (!m->tile_path[2]) 1349 if (!m->tile_path[2])
1416 return 1; 1350 return 1;
1417 1351
1418 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1352 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1419 load_and_link_tiled_map (m, 2); 1353 find_and_link (m, 2);
1420 1354
1421 return out_of_map (m->tile_map[2], x, y - m->height); 1355 return out_of_map (m->tile_map[2], x, y - m->height);
1422 } 1356 }
1423 1357
1424 /* Simple case - coordinates are within this local 1358 /* Simple case - coordinates are within this local
… …
1429 1363
1430/* This is basically the same as out_of_map above, but 1364/* This is basically the same as out_of_map above, but
1431 * instead we return NULL if no map is valid (coordinates 1365 * instead we return NULL if no map is valid (coordinates
1432 * out of bounds and no tiled map), otherwise it returns 1366 * out of bounds and no tiled map), otherwise it returns
1433 * the map as that the coordinates are really on, and 1367 * the map as that the coordinates are really on, and
1434 * updates x and y to be the localized coordinates. 1368 * updates x and y to be the localised coordinates.
1435 * Using this is more efficient of calling out_of_map 1369 * Using this is more efficient of calling out_of_map
1436 * and then figuring out what the real map is 1370 * and then figuring out what the real map is
1437 */ 1371 */
1438maptile * 1372maptile *
1439get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1373maptile::xy_find (sint16 &x, sint16 &y)
1440{ 1374{
1441 if (*x < 0) 1375 if (x < 0)
1442 { 1376 {
1443 if (!m->tile_path[3]) 1377 if (!tile_path[3])
1444 return 0; 1378 return 0;
1445 1379
1446 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1380 find_and_link (this, 3);
1447 load_and_link_tiled_map (m, 3);
1448
1449 *x += m->tile_map[3]->width; 1381 x += tile_map[3]->width;
1450 return (get_map_from_coord (m->tile_map[3], x, y)); 1382 return tile_map[3]->xy_find (x, y);
1451 } 1383 }
1452 1384
1453 if (*x >= m->width) 1385 if (x >= width)
1454 { 1386 {
1455 if (!m->tile_path[1]) 1387 if (!tile_path[1])
1456 return 0; 1388 return 0;
1457 1389
1458 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1390 find_and_link (this, 1);
1459 load_and_link_tiled_map (m, 1);
1460
1461 *x -= m->width; 1391 x -= width;
1462 return (get_map_from_coord (m->tile_map[1], x, y)); 1392 return tile_map[1]->xy_find (x, y);
1463 } 1393 }
1464 1394
1465 if (*y < 0) 1395 if (y < 0)
1466 { 1396 {
1467 if (!m->tile_path[0]) 1397 if (!tile_path[0])
1468 return 0; 1398 return 0;
1469 1399
1470 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1400 find_and_link (this, 0);
1471 load_and_link_tiled_map (m, 0);
1472
1473 *y += m->tile_map[0]->height; 1401 y += tile_map[0]->height;
1474 return (get_map_from_coord (m->tile_map[0], x, y)); 1402 return tile_map[0]->xy_find (x, y);
1475 } 1403 }
1476 1404
1477 if (*y >= m->height) 1405 if (y >= height)
1478 { 1406 {
1479 if (!m->tile_path[2]) 1407 if (!tile_path[2])
1480 return 0; 1408 return 0;
1481 1409
1482 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1410 find_and_link (this, 2);
1483 load_and_link_tiled_map (m, 2);
1484
1485 *y -= m->height; 1411 y -= height;
1486 return (get_map_from_coord (m->tile_map[2], x, y)); 1412 return tile_map[2]->xy_find (x, y);
1487 } 1413 }
1488 1414
1489 /* Simple case - coordinates are within this local 1415 /* Simple case - coordinates are within this local
1490 * map. 1416 * map.
1491 */ 1417 */
1492 return m; 1418 return this;
1493} 1419}
1494 1420
1495/** 1421/**
1496 * Return whether map2 is adjacent to map1. If so, store the distance from 1422 * Return whether map2 is adjacent to map1. If so, store the distance from
1497 * map1 to map2 in dx/dy. 1423 * map1 to map2 in dx/dy.
1498 */ 1424 */
1499static int 1425int
1500adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1426adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1501{ 1427{
1502 if (!map1 || !map2) 1428 if (!map1 || !map2)
1503 return 0; 1429 return 0;
1504 1430
1431 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1432 //fix: compare paths instead (this is likely faster, too!)
1505 if (map1 == map2) 1433 if (map1 == map2)
1506 { 1434 {
1507 *dx = 0; 1435 *dx = 0;
1508 *dy = 0; 1436 *dy = 0;
1509 } 1437 }
… …
1569 } 1497 }
1570 else 1498 else
1571 return 0; 1499 return 0;
1572 1500
1573 return 1; 1501 return 1;
1502}
1503
1504maptile *
1505maptile::xy_load (sint16 &x, sint16 &y)
1506{
1507 maptile *map = xy_find (x, y);
1508
1509 if (map)
1510 map->load_sync ();
1511
1512 return map;
1513}
1514
1515maptile *
1516get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1517{
1518 return m->xy_load (*x, *y);
1574} 1519}
1575 1520
1576/* From map.c 1521/* From map.c
1577 * This is used by get_player to determine where the other 1522 * This is used by get_player to determine where the other
1578 * creature is. get_rangevector takes into account map tiling, 1523 * creature is. get_rangevector takes into account map tiling,
1579 * so you just can not look the the map coordinates and get the 1524 * so you just can not look the the map coordinates and get the
1580 * righte value. distance_x/y are distance away, which 1525 * righte value. distance_x/y are distance away, which
1581 * can be negativbe. direction is the crossfire direction scheme 1526 * can be negative. direction is the crossfire direction scheme
1582 * that the creature should head. part is the part of the 1527 * that the creature should head. part is the part of the
1583 * monster that is closest. 1528 * monster that is closest.
1584 * 1529 *
1585 * get_rangevector looks at op1 and op2, and fills in the 1530 * get_rangevector looks at op1 and op2, and fills in the
1586 * structure for op1 to get to op2. 1531 * structure for op1 to get to op2.
… …
1597get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1542get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1598{ 1543{
1599 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1544 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1600 { 1545 {
1601 /* be conservative and fill in _some_ data */ 1546 /* be conservative and fill in _some_ data */
1602 retval->distance = 100000; 1547 retval->distance = 10000;
1603 retval->distance_x = 32767; 1548 retval->distance_x = 10000;
1604 retval->distance_y = 32767; 1549 retval->distance_y = 10000;
1605 retval->direction = 0; 1550 retval->direction = 0;
1606 retval->part = 0; 1551 retval->part = 0;
1607 } 1552 }
1608 else 1553 else
1609 { 1554 {
… …
1614 1559
1615 best = op1; 1560 best = op1;
1616 /* If this is multipart, find the closest part now */ 1561 /* If this is multipart, find the closest part now */
1617 if (!(flags & 0x1) && op1->more) 1562 if (!(flags & 0x1) && op1->more)
1618 { 1563 {
1619 object *tmp;
1620 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1564 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1621 1565
1622 /* we just take the offset of the piece to head to figure 1566 /* we just take the offset of the piece to head to figure
1623 * distance instead of doing all that work above again 1567 * distance instead of doing all that work above again
1624 * since the distance fields we set above are positive in the 1568 * since the distance fields we set above are positive in the
1625 * same axis as is used for multipart objects, the simply arithmetic 1569 * same axis as is used for multipart objects, the simply arithmetic
1626 * below works. 1570 * below works.
1627 */ 1571 */
1628 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1572 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1629 { 1573 {
1630 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1574 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1631 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1575 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1632 if (tmpi < best_distance) 1576 if (tmpi < best_distance)
1633 { 1577 {
1634 best_distance = tmpi; 1578 best_distance = tmpi;
1635 best = tmp; 1579 best = tmp;
1636 } 1580 }
1637 } 1581 }
1582
1638 if (best != op1) 1583 if (best != op1)
1639 { 1584 {
1640 retval->distance_x += op1->x - best->x; 1585 retval->distance_x += op1->x - best->x;
1641 retval->distance_y += op1->y - best->y; 1586 retval->distance_y += op1->y - best->y;
1642 } 1587 }
1643 } 1588 }
1589
1644 retval->part = best; 1590 retval->part = best;
1645 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1591 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1646 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1592 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1647 } 1593 }
1648} 1594}
1649 1595
1650/* this is basically the same as get_rangevector above, but instead of 1596/* this is basically the same as get_rangevector above, but instead of
… …
1655 * flags has no meaning for this function at this time - I kept it in to 1601 * flags has no meaning for this function at this time - I kept it in to
1656 * be more consistant with the above function and also in case they are needed 1602 * be more consistant with the above function and also in case they are needed
1657 * for something in the future. Also, since no object is pasted, the best 1603 * for something in the future. Also, since no object is pasted, the best
1658 * field of the rv_vector is set to NULL. 1604 * field of the rv_vector is set to NULL.
1659 */ 1605 */
1660
1661void 1606void
1662get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1607get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1663{ 1608{
1664 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1609 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1665 { 1610 {
1666 /* be conservative and fill in _some_ data */ 1611 /* be conservative and fill in _some_ data */
1667 retval->distance = 100000; 1612 retval->distance = 100000;
… …
1674 { 1619 {
1675 retval->distance_x += op2->x - x; 1620 retval->distance_x += op2->x - x;
1676 retval->distance_y += op2->y - y; 1621 retval->distance_y += op2->y - y;
1677 1622
1678 retval->part = NULL; 1623 retval->part = NULL;
1679 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1624 retval->distance = idistance (retval->distance_x, retval->distance_y);
1680 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1625 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1681 } 1626 }
1682} 1627}
1683 1628
1684/* Returns true of op1 and op2 are effectively on the same map 1629/* Returns true of op1 and op2 are effectively on the same map
… …
1704 op->remove (); 1649 op->remove ();
1705 1650
1706 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1651 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1707} 1652}
1708 1653
1654region *
1655maptile::region (int x, int y) const
1656{
1657 if (regions
1658 && regionmap
1659 && !OUT_OF_REAL_MAP (this, x, y))
1660 if (struct region *reg = regionmap [regions [y * width + x]])
1661 return reg;
1662
1663 if (default_region)
1664 return default_region;
1665
1666 return ::region::default_region ();
1667}
1668
1669/* picks a random object from a style map.
1670 * Redone by MSW so it should be faster and not use static
1671 * variables to generate tables.
1672 */
1673object *
1674maptile::pick_random_object () const
1675{
1676 /* while returning a null object will result in a crash, that
1677 * is actually preferable to an infinite loop. That is because
1678 * most servers will automatically restart in case of crash.
1679 * Change the logic on getting the random space - shouldn't make
1680 * any difference, but this seems clearer to me.
1681 */
1682 for (int i = 1000; --i;)
1683 {
1684 object *pick = at (rndm (width), rndm (height)).bot;
1685
1686 // do not prefer big monsters just because they are big.
1687 if (pick && pick->head_ () == pick)
1688 return pick->head_ ();
1689 }
1690
1691 // instead of crashing in the unlikely(?) case, try to return *something*
1692 return get_archetype ("blocked");
1693}
1694

Diff Legend

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