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.70 by root, Thu Jan 4 20:29:45 2007 UTC vs.
Revision 1.88 by root, Fri Feb 16 19:43:40 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.
… …
66 char *endbuf; 68 char *endbuf;
67 struct stat statbuf; 69 struct stat statbuf;
68 int mode = 0; 70 int mode = 0;
69 71
70 if (prepend_dir) 72 if (prepend_dir)
71 strcpy (buf, create_pathname (name)); 73 assign (buf, create_pathname (name));
72 else 74 else
73 strcpy (buf, name); 75 assign (buf, name);
74 76
75 /* old method (strchr(buf, '\0')) seemd very odd to me - 77 /* old method (strchr(buf, '\0')) seemd very odd to me -
76 * this method should be equivalant and is clearer. 78 * this method should be equivalant and is clearer.
77 * Can not use strcat because we need to cycle through 79 * Can not use strcat because we need to cycle through
78 * all the names. 80 * all the names.
… …
227 229
228 } 230 }
229 return 0; 231 return 0;
230} 232}
231 233
232
233/* 234/*
234 * 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.
235 * This is meant for multi space objects - for single space objecs, 236 * This is meant for multi space objects - for single space objecs,
236 * just calling get_map_blocked and checking that against movement type 237 * just calling get_map_blocked and checking that against movement type
237 * of object. This function goes through all the parts of the 238 * of object. This function goes through all the parts of the
… …
396} 397}
397 398
398/* 399/*
399 * Loads (ands parses) the objects into a given map from the specified 400 * Loads (ands parses) the objects into a given map from the specified
400 * file pointer. 401 * file pointer.
401 * mapflags is the same as we get with load_original_map
402 */ 402 */
403bool 403bool
404maptile::load_objects (object_thawer &thawer) 404maptile::_load_objects (object_thawer &f)
405{ 405{
406 int unique; 406 for (;;)
407 object *op, *prev = NULL, *last_more = NULL, *otmp;
408
409 op = object::create ();
410 op->map = this; /* To handle buttons correctly */
411
412 while (int i = load_object (thawer, op, 0))
413 { 407 {
414 /* if the archetype for the object is null, means that we 408 coroapi::cede_every (1000); // cede once in a while
415 * got an invalid object. Don't do anything with it - the game 409
416 * or editor will not be able to do anything with it either. 410 switch (f.kw)
417 */
418 if (op->arch == NULL)
419 { 411 {
420 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 412 case KW_arch:
421 continue; 413 if (object *op = object::read (f))
422 }
423
424 switch (i)
425 { 414 {
426 case LL_NORMAL: 415 if (op->inv)
416 sum_weight (op);
417
427 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 418 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
419 }
428 420
429 if (op->inv) 421 continue;
430 sum_weight (op);
431 422
432 prev = op, last_more = op;
433 break;
434
435 case LL_MORE: 423 case KW_EOF:
436 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 424 return true;
437 op->head = prev, last_more->more = op, last_more = op; 425
426 default:
427 if (!f.parse_error ("map file"))
428 return false;
438 break; 429 break;
439 } 430 }
440 431
441 op = object::create (); 432 f.next ();
442 op->map = this;
443 }
444
445 op->destroy ();
446
447#if 0
448 for (i = 0; i < width; i++)
449 for (j = 0; j < height; j++)
450 {
451 unique = 0;
452 /* check for unique items, or unique squares */
453 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
454 {
455 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
456 unique = 1;
457
458 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
459 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
460 }
461 } 433 }
462#endif
463 434
464 return true; 435 return true;
465} 436}
466 437
467void 438void
… …
485 for (object *op = ms->bot; op; op = op->above) 456 for (object *op = ms->bot; op; op = op->above)
486 op->deactivate_recursive (); 457 op->deactivate_recursive ();
487} 458}
488 459
489bool 460bool
490maptile::save_objects (object_freezer &freezer, int flags) 461maptile::_save_objects (object_freezer &f, int flags)
491{ 462{
492 static int cede_count = 0; 463 static int cede_count = 0;
493 464
494 if (flags & IO_HEADER) 465 if (flags & IO_HEADER)
495 save_header (freezer); 466 _save_header (f);
496 467
497 if (!spaces) 468 if (!spaces)
498 return false; 469 return false;
499 470
500 for (int i = 0; i < size (); ++i) 471 for (int i = 0; i < size (); ++i)
501 { 472 {
473#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
502 if (cede_count >= 500) 474 if (cede_count >= 500)
503 { 475 {
504 cede_count = 0; 476 cede_count = 0;
505 coroapi::cede (); 477 coroapi::cede ();
506 } 478 }
479#endif
507 480
508 int unique = 0; 481 int unique = 0;
509 for (object *op = spaces [i].bot; op; op = op->above) 482 for (object *op = spaces [i].bot; op; op = op->above)
510 { 483 {
511 // count per-object, but cede only when modification-safe 484 // count per-object, but cede only when modification-safe
… …
518 continue; 491 continue;
519 492
520 if (unique || op->flag [FLAG_UNIQUE]) 493 if (unique || op->flag [FLAG_UNIQUE])
521 { 494 {
522 if (flags & IO_UNIQUES) 495 if (flags & IO_UNIQUES)
523 save_object (freezer, op, 1); 496 op->write (f);
524 } 497 }
525 else if (flags & IO_OBJECTS) 498 else if (flags & IO_OBJECTS)
526 save_object (freezer, op, 1); 499 op->write (f);
527 } 500 }
528 } 501 }
529 502
530 return true; 503 return true;
531} 504}
532 505
533bool 506bool
534maptile::load_objects (const char *path, bool skip_header) 507maptile::_load_objects (const char *path, bool skip_header)
535{ 508{
536 object_thawer thawer (path); 509 object_thawer f (path);
537 510
538 if (!thawer) 511 if (!f)
539 return false; 512 return false;
513
514 f.next ();
540 515
541 if (skip_header) 516 if (skip_header)
542 for (;;) 517 for (;;)
543 { 518 {
544 keyword kw = thawer.get_kv (); 519 keyword kw = f.kw;
545 520 f.skip ();
546 if (kw == KW_end) 521 if (kw == KW_end)
547 break; 522 break;
548
549 thawer.skip_kv (kw);
550 } 523 }
551 524
552 return load_objects (thawer); 525 return _load_objects (f);
553} 526}
554 527
555bool 528bool
556maptile::save_objects (const char *path, int flags) 529maptile::_save_objects (const char *path, int flags)
557{ 530{
558 object_freezer freezer; 531 object_freezer freezer;
559 532
560 if (!save_objects (freezer, flags)) 533 if (!_save_objects (freezer, flags))
561 return false; 534 return false;
562 535
563 return freezer.save (path); 536 return freezer.save (path);
564} 537}
565 538
566maptile::maptile () 539maptile::maptile ()
567{ 540{
568 in_memory = MAP_SWAPPED; 541 in_memory = MAP_SWAPPED;
569 542
570 /* The maps used to pick up default x and y values from the 543 /* The maps used to pick up default x and y values from the
571 * map archetype. Mimic that behaviour. 544 * map archetype. Mimic that behaviour.
572 */ 545 */
573 width = 16; 546 width = 16;
574 height = 16; 547 height = 16;
575 reset_timeout = 0;
576 timeout = 300; 548 timeout = 300;
577 enter_x = 0; 549 max_nrof = 1000; // 1000 items of anything
578 enter_y = 0; 550 max_volume = 2000000; // 2m³
579} 551}
580 552
581maptile::maptile (int w, int h) 553maptile::maptile (int w, int h)
582{ 554{
583 in_memory = MAP_SWAPPED; 555 in_memory = MAP_SWAPPED;
… …
729 * This could be done in lex (like the object loader), but I think 701 * This could be done in lex (like the object loader), but I think
730 * currently, there are few enough fields this is not a big deal. 702 * currently, there are few enough fields this is not a big deal.
731 * MSW 2001-07-01 703 * MSW 2001-07-01
732 */ 704 */
733bool 705bool
734maptile::load_header (object_thawer &thawer) 706maptile::_load_header (object_thawer &thawer)
735{ 707{
736 for (;;) 708 for (;;)
737 { 709 {
738 keyword kw = thawer.get_kv (); 710 keyword kw = thawer.get_kv ();
739 711
740 switch (kw) 712 switch (kw)
741 { 713 {
742 case KW_EOF:
743 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
744 return false;
745
746 case KW_end:
747 return true;
748
749 default:
750 case KW_ERROR:
751 LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
752 break;
753
754 case KW_msg: 714 case KW_msg:
755 thawer.get_ml (KW_endmsg, msg); 715 thawer.get_ml (KW_endmsg, msg);
756 break; 716 break;
757 717
758 case KW_lore: // CF+ extension 718 case KW_lore: // CF+ extension
… …
790 case KW_sky: thawer.get (sky); break; 750 case KW_sky: thawer.get (sky); break;
791 751
792 case KW_per_player: thawer.get (per_player); break; 752 case KW_per_player: thawer.get (per_player); break;
793 case KW_per_party: thawer.get (per_party); break; 753 case KW_per_party: thawer.get (per_party); break;
794 754
795 case KW_region: get_region_by_name (thawer.get_str ()); break; 755 case KW_region: default_region = region::find (thawer.get_str ()); break;
796 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 756 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
797 757
798 // old names new names 758 // old names new names
799 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 759 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
800 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 760 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
808 768
809 case KW_tile_path_1: thawer.get (tile_path [0]); break; 769 case KW_tile_path_1: thawer.get (tile_path [0]); break;
810 case KW_tile_path_2: thawer.get (tile_path [1]); break; 770 case KW_tile_path_2: thawer.get (tile_path [1]); break;
811 case KW_tile_path_3: thawer.get (tile_path [2]); break; 771 case KW_tile_path_3: thawer.get (tile_path [2]); break;
812 case KW_tile_path_4: thawer.get (tile_path [3]); break; 772 case KW_tile_path_4: thawer.get (tile_path [3]); break;
773
774 case KW_end:
775 return true;
776
777 default:
778 if (!thawer.parse_error ("map", 0))
779 return false;
780 break;
813 } 781 }
814 } 782 }
815 783
816 abort (); 784 abort ();
817} 785}
818 786
819bool 787bool
820maptile::load_header (const char *path) 788maptile::_load_header (const char *path)
821{ 789{
822 object_thawer thawer (path); 790 object_thawer thawer (path);
823 791
824 if (!thawer) 792 if (!thawer)
825 return false; 793 return false;
826 794
827 return load_header (thawer); 795 return _load_header (thawer);
828} 796}
829 797
830/****************************************************************************** 798/******************************************************************************
831 * This is the start of unique map handling code 799 * This is the start of unique map handling code
832 *****************************************************************************/ 800 *****************************************************************************/
… …
855 } 823 }
856 } 824 }
857} 825}
858 826
859bool 827bool
860maptile::save_header (object_freezer &freezer) 828maptile::_save_header (object_freezer &freezer)
861{ 829{
862#define MAP_OUT(k) freezer.put (KW_ ## k, k) 830#define MAP_OUT(k) freezer.put (KW_ ## k, k)
863#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 831#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
864 832
865 MAP_OUT2 (arch, "map"); 833 MAP_OUT2 (arch, "map");
… …
869 MAP_OUT (reset_time); 837 MAP_OUT (reset_time);
870 MAP_OUT (reset_timeout); 838 MAP_OUT (reset_timeout);
871 MAP_OUT (fixed_resettime); 839 MAP_OUT (fixed_resettime);
872 MAP_OUT (difficulty); 840 MAP_OUT (difficulty);
873 841
874 if (region) MAP_OUT2 (region, region->name); 842 if (default_region) MAP_OUT2 (region, default_region->name);
875 843
876 if (shopitems) 844 if (shopitems)
877 { 845 {
878 char shop[MAX_BUF]; 846 char shop[MAX_BUF];
879 print_shop_string (this, shop); 847 print_shop_string (this, shop);
… …
914 882
915 return true; 883 return true;
916} 884}
917 885
918bool 886bool
919maptile::save_header (const char *path) 887maptile::_save_header (const char *path)
920{ 888{
921 object_freezer freezer; 889 object_freezer freezer;
922 890
923 if (!save_header (freezer)) 891 if (!_save_header (freezer))
924 return false; 892 return false;
925 893
926 return freezer.save (path); 894 return freezer.save (path);
927} 895}
928 896
… …
930 * Remove and free all objects in the given map. 898 * Remove and free all objects in the given map.
931 */ 899 */
932void 900void
933maptile::clear () 901maptile::clear ()
934{ 902{
903 sfree (regions, size ()), regions = 0;
904 free (regionmap), regionmap = 0;
905
935 if (!spaces) 906 if (spaces)
936 return; 907 {
937
938 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 908 for (mapspace *ms = spaces + size (); ms-- > spaces; )
939 while (object *op = ms->bot) 909 while (object *op = ms->bot)
940 { 910 {
941 if (op->head) 911 if (op->head)
942 op = op->head; 912 op = op->head;
943 913
944 op->destroy_inv (false); 914 op->destroy_inv (false);
945 op->destroy (); 915 op->destroy ();
946 } 916 }
947 917
948 sfree (spaces, size ()), spaces = 0; 918 sfree (spaces, size ()), spaces = 0;
919 }
949 920
950 if (buttons) 921 if (buttons)
951 free_objectlinkpt (buttons), buttons = 0; 922 free_objectlinkpt (buttons), buttons = 0;
952} 923}
953 924
… …
1107 */ 1078 */
1108void 1079void
1109mapspace::update_ () 1080mapspace::update_ ()
1110{ 1081{
1111 object *tmp, *last = 0; 1082 object *tmp, *last = 0;
1112 uint8 flags = 0, light = 0, anywhere = 0; 1083 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1113 New_Face *top, *floor, *middle; 1084 facetile *top, *floor, *middle;
1114 object *top_obj, *floor_obj, *middle_obj; 1085 object *top_obj, *floor_obj, *middle_obj;
1115 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;
1116 1087
1117 middle = blank_face; 1088 middle = blank_face;
1118 top = blank_face; 1089 top = blank_face;
… …
1275 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1246 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1276 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1247 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1277 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1248 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1278} 1249}
1279 1250
1251uint64
1252mapspace::volume () const
1253{
1254 uint64 vol = 0;
1255
1256 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1257 vol += op->volume ();
1258
1259 return vol;
1260}
1261
1280/* this updates the orig_map->tile_map[tile_num] value after finding 1262/* this updates the orig_map->tile_map[tile_num] value after finding
1281 * the map. It also takes care of linking back the freshly found 1263 * the map. It also takes care of linking back the freshly found
1282 * maps tile_map values if it tiles back to this one. It returns 1264 * maps tile_map values if it tiles back to this one. It returns
1283 * the value of orig_map->tile_map[tile_num]. 1265 * the value of orig_map->tile_map[tile_num].
1284 */ 1266 */
… …
1447 1429
1448/** 1430/**
1449 * Return whether map2 is adjacent to map1. If so, store the distance from 1431 * Return whether map2 is adjacent to map1. If so, store the distance from
1450 * map1 to map2 in dx/dy. 1432 * map1 to map2 in dx/dy.
1451 */ 1433 */
1452static int 1434int
1453adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1435adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1454{ 1436{
1455 if (!map1 || !map2) 1437 if (!map1 || !map2)
1456 return 0; 1438 return 0;
1457 1439
… …
1548/* From map.c 1530/* From map.c
1549 * This is used by get_player to determine where the other 1531 * This is used by get_player to determine where the other
1550 * creature is. get_rangevector takes into account map tiling, 1532 * creature is. get_rangevector takes into account map tiling,
1551 * so you just can not look the the map coordinates and get the 1533 * so you just can not look the the map coordinates and get the
1552 * righte value. distance_x/y are distance away, which 1534 * righte value. distance_x/y are distance away, which
1553 * can be negativbe. direction is the crossfire direction scheme 1535 * can be negative. direction is the crossfire direction scheme
1554 * that the creature should head. part is the part of the 1536 * that the creature should head. part is the part of the
1555 * monster that is closest. 1537 * monster that is closest.
1556 * 1538 *
1557 * get_rangevector looks at op1 and op2, and fills in the 1539 * get_rangevector looks at op1 and op2, and fills in the
1558 * structure for op1 to get to op2. 1540 * structure for op1 to get to op2.
… …
1569get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1551get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1570{ 1552{
1571 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1553 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1572 { 1554 {
1573 /* be conservative and fill in _some_ data */ 1555 /* be conservative and fill in _some_ data */
1574 retval->distance = 100000; 1556 retval->distance = 10000;
1575 retval->distance_x = 32767; 1557 retval->distance_x = 10000;
1576 retval->distance_y = 32767; 1558 retval->distance_y = 10000;
1577 retval->direction = 0; 1559 retval->direction = 0;
1578 retval->part = 0; 1560 retval->part = 0;
1579 } 1561 }
1580 else 1562 else
1581 { 1563 {
… …
1586 1568
1587 best = op1; 1569 best = op1;
1588 /* If this is multipart, find the closest part now */ 1570 /* If this is multipart, find the closest part now */
1589 if (!(flags & 0x1) && op1->more) 1571 if (!(flags & 0x1) && op1->more)
1590 { 1572 {
1591 object *tmp;
1592 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1573 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1593 1574
1594 /* we just take the offset of the piece to head to figure 1575 /* we just take the offset of the piece to head to figure
1595 * distance instead of doing all that work above again 1576 * distance instead of doing all that work above again
1596 * since the distance fields we set above are positive in the 1577 * since the distance fields we set above are positive in the
1597 * same axis as is used for multipart objects, the simply arithmetic 1578 * same axis as is used for multipart objects, the simply arithmetic
1598 * below works. 1579 * below works.
1599 */ 1580 */
1600 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1581 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1601 { 1582 {
1602 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1583 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1603 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1584 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1604 if (tmpi < best_distance) 1585 if (tmpi < best_distance)
1605 { 1586 {
1606 best_distance = tmpi; 1587 best_distance = tmpi;
1607 best = tmp; 1588 best = tmp;
1608 } 1589 }
1609 } 1590 }
1591
1610 if (best != op1) 1592 if (best != op1)
1611 { 1593 {
1612 retval->distance_x += op1->x - best->x; 1594 retval->distance_x += op1->x - best->x;
1613 retval->distance_y += op1->y - best->y; 1595 retval->distance_y += op1->y - best->y;
1614 } 1596 }
1615 } 1597 }
1598
1616 retval->part = best; 1599 retval->part = best;
1617 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1600 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1618 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1601 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1619 } 1602 }
1620} 1603}
1621 1604
1622/* this is basically the same as get_rangevector above, but instead of 1605/* this is basically the same as get_rangevector above, but instead of
… …
1627 * flags has no meaning for this function at this time - I kept it in to 1610 * flags has no meaning for this function at this time - I kept it in to
1628 * be more consistant with the above function and also in case they are needed 1611 * be more consistant with the above function and also in case they are needed
1629 * for something in the future. Also, since no object is pasted, the best 1612 * for something in the future. Also, since no object is pasted, the best
1630 * field of the rv_vector is set to NULL. 1613 * field of the rv_vector is set to NULL.
1631 */ 1614 */
1632
1633void 1615void
1634get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1616get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1635{ 1617{
1636 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1618 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1637 { 1619 {
1638 /* be conservative and fill in _some_ data */ 1620 /* be conservative and fill in _some_ data */
1639 retval->distance = 100000; 1621 retval->distance = 100000;
… …
1646 { 1628 {
1647 retval->distance_x += op2->x - x; 1629 retval->distance_x += op2->x - x;
1648 retval->distance_y += op2->y - y; 1630 retval->distance_y += op2->y - y;
1649 1631
1650 retval->part = NULL; 1632 retval->part = NULL;
1651 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1633 retval->distance = idistance (retval->distance_x, retval->distance_y);
1652 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1634 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1653 } 1635 }
1654} 1636}
1655 1637
1656/* Returns true of op1 and op2 are effectively on the same map 1638/* Returns true of op1 and op2 are effectively on the same map
… …
1676 op->remove (); 1658 op->remove ();
1677 1659
1678 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1660 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1679} 1661}
1680 1662
1663region *
1664maptile::region (int x, int y) const
1665{
1666 if (regions
1667 && regionmap
1668 && !OUT_OF_REAL_MAP (this, x, y))
1669 if (struct region *reg = regionmap [regions [y * width + x]])
1670 return reg;
1671
1672 if (default_region)
1673 return default_region;
1674
1675 return ::region::default_region ();
1676}
1677
1678

Diff Legend

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