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.90 by root, Fri Feb 16 22:21:46 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
… …
353{ 354{
354 if (!spaces) 355 if (!spaces)
355 return; 356 return;
356 357
357 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 358 for (mapspace *ms = spaces + size (); ms-- > spaces; )
358 for (object *tmp = ms->bot; tmp; ) 359 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
359 { 360 {
360 object *above = tmp->above;
361
362 /* already multipart - don't do anything more */ 361 /* already multipart - don't do anything more */
363 if (!tmp->head && !tmp->more) 362 if (!tmp->head && !tmp->more)
364 { 363 {
365 /* If there is nothing more to this object, this for loop 364 /* If there is nothing more to this object, this for loop
366 * won't do anything. 365 * won't do anything.
… …
388 * 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.
389 */ 388 */
390 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);
391 } 390 }
392 } 391 }
393
394 tmp = above;
395 } 392 }
396} 393}
397 394
398/* 395/*
399 * 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
400 * file pointer. 397 * file pointer.
401 * mapflags is the same as we get with load_original_map
402 */ 398 */
403bool 399bool
404maptile::load_objects (object_thawer &thawer) 400maptile::_load_objects (object_thawer &f)
405{ 401{
406 int unique; 402 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 { 403 {
414 /* if the archetype for the object is null, means that we 404 coroapi::cede_every (1000); // cede once in a while
415 * got an invalid object. Don't do anything with it - the game 405
416 * or editor will not be able to do anything with it either. 406 switch (f.kw)
417 */
418 if (op->arch == NULL)
419 { 407 {
420 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 408 case KW_arch:
421 continue; 409 if (object *op = object::read (f, this))
422 }
423
424 switch (i)
425 { 410 {
426 case LL_NORMAL: 411 if (op->inv)
412 sum_weight (op);
413
427 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 }
428 416
429 if (op->inv) 417 continue;
430 sum_weight (op);
431 418
432 prev = op, last_more = op;
433 break;
434
435 case LL_MORE: 419 case KW_EOF:
436 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 420 return true;
437 op->head = prev, last_more->more = op, last_more = op; 421
422 default:
423 if (!f.parse_error ("map file"))
424 return false;
438 break; 425 break;
439 } 426 }
440 427
441 op = object::create (); 428 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 } 429 }
462#endif
463 430
464 return true; 431 return true;
465} 432}
466 433
467void 434void
… …
485 for (object *op = ms->bot; op; op = op->above) 452 for (object *op = ms->bot; op; op = op->above)
486 op->deactivate_recursive (); 453 op->deactivate_recursive ();
487} 454}
488 455
489bool 456bool
490maptile::save_objects (object_freezer &freezer, int flags) 457maptile::_save_objects (object_freezer &f, int flags)
491{ 458{
492 static int cede_count = 0; 459 static int cede_count = 0;
493 460
494 if (flags & IO_HEADER) 461 if (flags & IO_HEADER)
495 save_header (freezer); 462 _save_header (f);
496 463
497 if (!spaces) 464 if (!spaces)
498 return false; 465 return false;
499 466
500 for (int i = 0; i < size (); ++i) 467 for (int i = 0; i < size (); ++i)
501 { 468 {
469#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
502 if (cede_count >= 500) 470 if (cede_count >= 500)
503 { 471 {
504 cede_count = 0; 472 cede_count = 0;
505 coroapi::cede (); 473 coroapi::cede ();
506 } 474 }
475#endif
507 476
508 int unique = 0; 477 int unique = 0;
509 for (object *op = spaces [i].bot; op; op = op->above) 478 for (object *op = spaces [i].bot; op; op = op->above)
510 { 479 {
511 // count per-object, but cede only when modification-safe 480 // count per-object, but cede only when modification-safe
… …
518 continue; 487 continue;
519 488
520 if (unique || op->flag [FLAG_UNIQUE]) 489 if (unique || op->flag [FLAG_UNIQUE])
521 { 490 {
522 if (flags & IO_UNIQUES) 491 if (flags & IO_UNIQUES)
523 save_object (freezer, op, 1); 492 op->write (f);
524 } 493 }
525 else if (flags & IO_OBJECTS) 494 else if (flags & IO_OBJECTS)
526 save_object (freezer, op, 1); 495 op->write (f);
527 } 496 }
528 } 497 }
529 498
530 return true; 499 return true;
531} 500}
532 501
533bool 502bool
534maptile::load_objects (const char *path, bool skip_header) 503maptile::_load_objects (const char *path, bool skip_header)
535{ 504{
536 object_thawer thawer (path); 505 object_thawer f (path);
537 506
538 if (!thawer) 507 if (!f)
539 return false; 508 return false;
509
510 f.next ();
540 511
541 if (skip_header) 512 if (skip_header)
542 for (;;) 513 for (;;)
543 { 514 {
544 keyword kw = thawer.get_kv (); 515 keyword kw = f.kw;
545 516 f.skip ();
546 if (kw == KW_end) 517 if (kw == KW_end)
547 break; 518 break;
548
549 thawer.skip_kv (kw);
550 } 519 }
551 520
552 return load_objects (thawer); 521 return _load_objects (f);
553} 522}
554 523
555bool 524bool
556maptile::save_objects (const char *path, int flags) 525maptile::_save_objects (const char *path, int flags)
557{ 526{
558 object_freezer freezer; 527 object_freezer freezer;
559 528
560 if (!save_objects (freezer, flags)) 529 if (!_save_objects (freezer, flags))
561 return false; 530 return false;
562 531
563 return freezer.save (path); 532 return freezer.save (path);
564} 533}
565 534
566maptile::maptile () 535maptile::maptile ()
567{ 536{
568 in_memory = MAP_SWAPPED; 537 in_memory = MAP_SWAPPED;
569 538
570 /* The maps used to pick up default x and y values from the 539 /* The maps used to pick up default x and y values from the
571 * map archetype. Mimic that behaviour. 540 * map archetype. Mimic that behaviour.
572 */ 541 */
573 width = 16; 542 width = 16;
574 height = 16; 543 height = 16;
575 reset_timeout = 0;
576 timeout = 300; 544 timeout = 300;
577 enter_x = 0; 545 max_nrof = 1000; // 1000 items of anything
578 enter_y = 0; 546 max_volume = 2000000; // 2m³
579} 547}
580 548
581maptile::maptile (int w, int h) 549maptile::maptile (int w, int h)
582{ 550{
583 in_memory = MAP_SWAPPED; 551 in_memory = MAP_SWAPPED;
… …
729 * This could be done in lex (like the object loader), but I think 697 * 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. 698 * currently, there are few enough fields this is not a big deal.
731 * MSW 2001-07-01 699 * MSW 2001-07-01
732 */ 700 */
733bool 701bool
734maptile::load_header (object_thawer &thawer) 702maptile::_load_header (object_thawer &thawer)
735{ 703{
736 for (;;) 704 for (;;)
737 { 705 {
738 keyword kw = thawer.get_kv (); 706 keyword kw = thawer.get_kv ();
739 707
740 switch (kw) 708 switch (kw)
741 { 709 {
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: 710 case KW_msg:
755 thawer.get_ml (KW_endmsg, msg); 711 thawer.get_ml (KW_endmsg, msg);
756 break; 712 break;
757 713
758 case KW_lore: // CF+ extension 714 case KW_lore: // CF+ extension
… …
790 case KW_sky: thawer.get (sky); break; 746 case KW_sky: thawer.get (sky); break;
791 747
792 case KW_per_player: thawer.get (per_player); break; 748 case KW_per_player: thawer.get (per_player); break;
793 case KW_per_party: thawer.get (per_party); break; 749 case KW_per_party: thawer.get (per_party); break;
794 750
795 case KW_region: get_region_by_name (thawer.get_str ()); break; 751 case KW_region: default_region = region::find (thawer.get_str ()); break;
796 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 752 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
797 753
798 // old names new names 754 // old names new names
799 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 755 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; 756 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
808 764
809 case KW_tile_path_1: thawer.get (tile_path [0]); break; 765 case KW_tile_path_1: thawer.get (tile_path [0]); break;
810 case KW_tile_path_2: thawer.get (tile_path [1]); break; 766 case KW_tile_path_2: thawer.get (tile_path [1]); break;
811 case KW_tile_path_3: thawer.get (tile_path [2]); break; 767 case KW_tile_path_3: thawer.get (tile_path [2]); break;
812 case KW_tile_path_4: thawer.get (tile_path [3]); break; 768 case KW_tile_path_4: thawer.get (tile_path [3]); break;
769
770 case KW_end:
771 return true;
772
773 default:
774 if (!thawer.parse_error ("map", 0))
775 return false;
776 break;
813 } 777 }
814 } 778 }
815 779
816 abort (); 780 abort ();
817} 781}
818 782
819bool 783bool
820maptile::load_header (const char *path) 784maptile::_load_header (const char *path)
821{ 785{
822 object_thawer thawer (path); 786 object_thawer thawer (path);
823 787
824 if (!thawer) 788 if (!thawer)
825 return false; 789 return false;
826 790
827 return load_header (thawer); 791 return _load_header (thawer);
828} 792}
829 793
830/****************************************************************************** 794/******************************************************************************
831 * This is the start of unique map handling code 795 * This is the start of unique map handling code
832 *****************************************************************************/ 796 *****************************************************************************/
… …
855 } 819 }
856 } 820 }
857} 821}
858 822
859bool 823bool
860maptile::save_header (object_freezer &freezer) 824maptile::_save_header (object_freezer &freezer)
861{ 825{
862#define MAP_OUT(k) freezer.put (KW_ ## k, k) 826#define MAP_OUT(k) freezer.put (KW_ ## k, k)
863#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 827#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
864 828
865 MAP_OUT2 (arch, "map"); 829 MAP_OUT2 (arch, "map");
… …
869 MAP_OUT (reset_time); 833 MAP_OUT (reset_time);
870 MAP_OUT (reset_timeout); 834 MAP_OUT (reset_timeout);
871 MAP_OUT (fixed_resettime); 835 MAP_OUT (fixed_resettime);
872 MAP_OUT (difficulty); 836 MAP_OUT (difficulty);
873 837
874 if (region) MAP_OUT2 (region, region->name); 838 if (default_region) MAP_OUT2 (region, default_region->name);
875 839
876 if (shopitems) 840 if (shopitems)
877 { 841 {
878 char shop[MAX_BUF]; 842 char shop[MAX_BUF];
879 print_shop_string (this, shop); 843 print_shop_string (this, shop);
… …
914 878
915 return true; 879 return true;
916} 880}
917 881
918bool 882bool
919maptile::save_header (const char *path) 883maptile::_save_header (const char *path)
920{ 884{
921 object_freezer freezer; 885 object_freezer freezer;
922 886
923 if (!save_header (freezer)) 887 if (!_save_header (freezer))
924 return false; 888 return false;
925 889
926 return freezer.save (path); 890 return freezer.save (path);
927} 891}
928 892
… …
930 * Remove and free all objects in the given map. 894 * Remove and free all objects in the given map.
931 */ 895 */
932void 896void
933maptile::clear () 897maptile::clear ()
934{ 898{
899 sfree (regions, size ()), regions = 0;
900 free (regionmap), regionmap = 0;
901
935 if (!spaces) 902 if (spaces)
936 return; 903 {
937
938 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 904 for (mapspace *ms = spaces + size (); ms-- > spaces; )
939 while (object *op = ms->bot) 905 while (object *op = ms->bot)
940 { 906 {
941 if (op->head) 907 if (op->head)
942 op = op->head; 908 op = op->head;
943 909
944 op->destroy_inv (false); 910 op->destroy_inv (false);
945 op->destroy (); 911 op->destroy ();
946 } 912 }
947 913
948 sfree (spaces, size ()), spaces = 0; 914 sfree (spaces, size ()), spaces = 0;
915 }
949 916
950 if (buttons) 917 if (buttons)
951 free_objectlinkpt (buttons), buttons = 0; 918 free_objectlinkpt (buttons), buttons = 0;
952} 919}
953 920
… …
1107 */ 1074 */
1108void 1075void
1109mapspace::update_ () 1076mapspace::update_ ()
1110{ 1077{
1111 object *tmp, *last = 0; 1078 object *tmp, *last = 0;
1112 uint8 flags = 0, light = 0, anywhere = 0; 1079 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1113 New_Face *top, *floor, *middle; 1080 facetile *top, *floor, *middle;
1114 object *top_obj, *floor_obj, *middle_obj; 1081 object *top_obj, *floor_obj, *middle_obj;
1115 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1082 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1116 1083
1117 middle = blank_face; 1084 middle = blank_face;
1118 top = blank_face; 1085 top = blank_face;
… …
1275 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1242 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; 1243 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; 1244 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1278} 1245}
1279 1246
1247uint64
1248mapspace::volume () const
1249{
1250 uint64 vol = 0;
1251
1252 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1253 vol += op->volume ();
1254
1255 return vol;
1256}
1257
1280/* this updates the orig_map->tile_map[tile_num] value after finding 1258/* 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 1259 * 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 1260 * maps tile_map values if it tiles back to this one. It returns
1283 * the value of orig_map->tile_map[tile_num]. 1261 * the value of orig_map->tile_map[tile_num].
1284 */ 1262 */
… …
1447 1425
1448/** 1426/**
1449 * Return whether map2 is adjacent to map1. If so, store the distance from 1427 * Return whether map2 is adjacent to map1. If so, store the distance from
1450 * map1 to map2 in dx/dy. 1428 * map1 to map2 in dx/dy.
1451 */ 1429 */
1452static int 1430int
1453adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1431adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1454{ 1432{
1455 if (!map1 || !map2) 1433 if (!map1 || !map2)
1456 return 0; 1434 return 0;
1457 1435
… …
1548/* From map.c 1526/* From map.c
1549 * This is used by get_player to determine where the other 1527 * This is used by get_player to determine where the other
1550 * creature is. get_rangevector takes into account map tiling, 1528 * creature is. get_rangevector takes into account map tiling,
1551 * so you just can not look the the map coordinates and get the 1529 * so you just can not look the the map coordinates and get the
1552 * righte value. distance_x/y are distance away, which 1530 * righte value. distance_x/y are distance away, which
1553 * can be negativbe. direction is the crossfire direction scheme 1531 * can be negative. direction is the crossfire direction scheme
1554 * that the creature should head. part is the part of the 1532 * that the creature should head. part is the part of the
1555 * monster that is closest. 1533 * monster that is closest.
1556 * 1534 *
1557 * get_rangevector looks at op1 and op2, and fills in the 1535 * get_rangevector looks at op1 and op2, and fills in the
1558 * structure for op1 to get to op2. 1536 * structure for op1 to get to op2.
… …
1569get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1547get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1570{ 1548{
1571 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1549 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1572 { 1550 {
1573 /* be conservative and fill in _some_ data */ 1551 /* be conservative and fill in _some_ data */
1574 retval->distance = 100000; 1552 retval->distance = 10000;
1575 retval->distance_x = 32767; 1553 retval->distance_x = 10000;
1576 retval->distance_y = 32767; 1554 retval->distance_y = 10000;
1577 retval->direction = 0; 1555 retval->direction = 0;
1578 retval->part = 0; 1556 retval->part = 0;
1579 } 1557 }
1580 else 1558 else
1581 { 1559 {
… …
1586 1564
1587 best = op1; 1565 best = op1;
1588 /* If this is multipart, find the closest part now */ 1566 /* If this is multipart, find the closest part now */
1589 if (!(flags & 0x1) && op1->more) 1567 if (!(flags & 0x1) && op1->more)
1590 { 1568 {
1591 object *tmp;
1592 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1569 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1593 1570
1594 /* we just take the offset of the piece to head to figure 1571 /* we just take the offset of the piece to head to figure
1595 * distance instead of doing all that work above again 1572 * distance instead of doing all that work above again
1596 * since the distance fields we set above are positive in the 1573 * since the distance fields we set above are positive in the
1597 * same axis as is used for multipart objects, the simply arithmetic 1574 * same axis as is used for multipart objects, the simply arithmetic
1598 * below works. 1575 * below works.
1599 */ 1576 */
1600 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1577 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1601 { 1578 {
1602 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1579 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); 1580 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1604 if (tmpi < best_distance) 1581 if (tmpi < best_distance)
1605 { 1582 {
1606 best_distance = tmpi; 1583 best_distance = tmpi;
1607 best = tmp; 1584 best = tmp;
1608 } 1585 }
1609 } 1586 }
1587
1610 if (best != op1) 1588 if (best != op1)
1611 { 1589 {
1612 retval->distance_x += op1->x - best->x; 1590 retval->distance_x += op1->x - best->x;
1613 retval->distance_y += op1->y - best->y; 1591 retval->distance_y += op1->y - best->y;
1614 } 1592 }
1615 } 1593 }
1594
1616 retval->part = best; 1595 retval->part = best;
1617 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1596 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1618 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1597 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1619 } 1598 }
1620} 1599}
1621 1600
1622/* this is basically the same as get_rangevector above, but instead of 1601/* 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 1606 * 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 1607 * 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 1608 * for something in the future. Also, since no object is pasted, the best
1630 * field of the rv_vector is set to NULL. 1609 * field of the rv_vector is set to NULL.
1631 */ 1610 */
1632
1633void 1611void
1634get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1612get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1635{ 1613{
1636 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1614 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1637 { 1615 {
1638 /* be conservative and fill in _some_ data */ 1616 /* be conservative and fill in _some_ data */
1639 retval->distance = 100000; 1617 retval->distance = 100000;
… …
1646 { 1624 {
1647 retval->distance_x += op2->x - x; 1625 retval->distance_x += op2->x - x;
1648 retval->distance_y += op2->y - y; 1626 retval->distance_y += op2->y - y;
1649 1627
1650 retval->part = NULL; 1628 retval->part = NULL;
1651 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1629 retval->distance = idistance (retval->distance_x, retval->distance_y);
1652 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1630 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1653 } 1631 }
1654} 1632}
1655 1633
1656/* Returns true of op1 and op2 are effectively on the same map 1634/* Returns true of op1 and op2 are effectively on the same map
… …
1676 op->remove (); 1654 op->remove ();
1677 1655
1678 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1656 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1679} 1657}
1680 1658
1659region *
1660maptile::region (int x, int y) const
1661{
1662 if (regions
1663 && regionmap
1664 && !OUT_OF_REAL_MAP (this, x, y))
1665 if (struct region *reg = regionmap [regions [y * width + x]])
1666 return reg;
1667
1668 if (default_region)
1669 return default_region;
1670
1671 return ::region::default_region ();
1672}
1673
1674

Diff Legend

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