| 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) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
| 5 | Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team |
| 6 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
| 7 | |
7 | * |
| 8 | 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 |
| 9 | 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 |
| 10 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
| 11 | (at your option) any later version. |
11 | * (at your option) any later version. |
| 12 | |
12 | * |
| 13 | 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, |
| 14 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 16 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
| 17 | |
17 | * |
| 18 | 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 |
| 19 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
| 20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 21 | |
21 | * |
| 22 | 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> |
| 23 | */ |
23 | */ |
| 24 | |
24 | |
| 25 | #include <global.h> |
|
|
| 26 | #include <funcpoint.h> |
|
|
| 27 | |
|
|
| 28 | #include <loader.h> |
|
|
| 29 | #include <unistd.h> |
25 | #include <unistd.h> |
|
|
26 | |
|
|
27 | #include "global.h" |
|
|
28 | #include "funcpoint.h" |
|
|
29 | |
|
|
30 | #include "loader.h" |
| 30 | |
31 | |
| 31 | #include "path.h" |
32 | #include "path.h" |
| 32 | |
33 | |
| 33 | /* |
34 | /* |
| 34 | * This makes a path absolute outside the world of Crossfire. |
35 | * This makes a path absolute outside the world of Crossfire. |
| … | |
… | |
| 67 | char *endbuf; |
68 | char *endbuf; |
| 68 | struct stat statbuf; |
69 | struct stat statbuf; |
| 69 | int mode = 0; |
70 | int mode = 0; |
| 70 | |
71 | |
| 71 | if (prepend_dir) |
72 | if (prepend_dir) |
| 72 | strcpy (buf, create_pathname (name)); |
73 | assign (buf, create_pathname (name)); |
| 73 | else |
74 | else |
| 74 | strcpy (buf, name); |
75 | assign (buf, name); |
| 75 | |
76 | |
| 76 | /* old method (strchr(buf, '\0')) seemd very odd to me - |
77 | /* old method (strchr(buf, '\0')) seemd very odd to me - |
| 77 | * this method should be equivalant and is clearer. |
78 | * this method should be equivalant and is clearer. |
| 78 | * Can not use strcat because we need to cycle through |
79 | * Can not use strcat because we need to cycle through |
| 79 | * all the names. |
80 | * all the names. |
| … | |
… | |
| 228 | |
229 | |
| 229 | } |
230 | } |
| 230 | return 0; |
231 | return 0; |
| 231 | } |
232 | } |
| 232 | |
233 | |
| 233 | |
|
|
| 234 | /* |
234 | /* |
| 235 | * 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. |
| 236 | * This is meant for multi space objects - for single space objecs, |
236 | * This is meant for multi space objects - for single space objecs, |
| 237 | * just calling get_map_blocked and checking that against movement type |
237 | * just calling get_map_blocked and checking that against movement type |
| 238 | * of object. This function goes through all the parts of the |
238 | * of object. This function goes through all the parts of the |
| … | |
… | |
| 400 | * 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 |
| 401 | * file pointer. |
401 | * file pointer. |
| 402 | * mapflags is the same as we get with load_original_map |
402 | * mapflags is the same as we get with load_original_map |
| 403 | */ |
403 | */ |
| 404 | bool |
404 | bool |
| 405 | maptile::load_objects (object_thawer &thawer) |
405 | maptile::_load_objects (object_thawer &thawer) |
| 406 | { |
406 | { |
| 407 | int unique; |
407 | int unique; |
| 408 | object *op, *prev = NULL, *last_more = NULL, *otmp; |
408 | object *op, *prev = NULL, *last_more = NULL, *otmp; |
| 409 | |
409 | |
| 410 | op = object::create (); |
410 | op = object::create (); |
| … | |
… | |
| 486 | for (object *op = ms->bot; op; op = op->above) |
486 | for (object *op = ms->bot; op; op = op->above) |
| 487 | op->deactivate_recursive (); |
487 | op->deactivate_recursive (); |
| 488 | } |
488 | } |
| 489 | |
489 | |
| 490 | bool |
490 | bool |
| 491 | maptile::save_objects (object_freezer &freezer, int flags) |
491 | maptile::_save_objects (object_freezer &freezer, int flags) |
| 492 | { |
492 | { |
| 493 | static int cede_count = 0; |
493 | static int cede_count = 0; |
| 494 | |
494 | |
| 495 | if (flags & IO_HEADER) |
495 | if (flags & IO_HEADER) |
| 496 | save_header (freezer); |
496 | _save_header (freezer); |
| 497 | |
497 | |
| 498 | if (!spaces) |
498 | if (!spaces) |
| 499 | return false; |
499 | return false; |
| 500 | |
500 | |
| 501 | for (int i = 0; i < size (); ++i) |
501 | for (int i = 0; i < size (); ++i) |
| 502 | { |
502 | { |
|
|
503 | #if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D |
| 503 | if (cede_count >= 500) |
504 | if (cede_count >= 500) |
| 504 | { |
505 | { |
| 505 | cede_count = 0; |
506 | cede_count = 0; |
| 506 | coroapi::cede (); |
507 | coroapi::cede (); |
| 507 | } |
508 | } |
|
|
509 | #endif |
| 508 | |
510 | |
| 509 | int unique = 0; |
511 | int unique = 0; |
| 510 | for (object *op = spaces [i].bot; op; op = op->above) |
512 | for (object *op = spaces [i].bot; op; op = op->above) |
| 511 | { |
513 | { |
| 512 | // count per-object, but cede only when modification-safe |
514 | // count per-object, but cede only when modification-safe |
| … | |
… | |
| 530 | |
532 | |
| 531 | return true; |
533 | return true; |
| 532 | } |
534 | } |
| 533 | |
535 | |
| 534 | bool |
536 | bool |
| 535 | maptile::load_objects (const char *path, bool skip_header) |
537 | maptile::_load_objects (const char *path, bool skip_header) |
| 536 | { |
538 | { |
| 537 | object_thawer thawer (path); |
539 | object_thawer thawer (path); |
| 538 | |
540 | |
| 539 | if (!thawer) |
541 | if (!thawer) |
| 540 | return false; |
542 | return false; |
| … | |
… | |
| 548 | break; |
550 | break; |
| 549 | |
551 | |
| 550 | thawer.skip_kv (kw); |
552 | thawer.skip_kv (kw); |
| 551 | } |
553 | } |
| 552 | |
554 | |
| 553 | return load_objects (thawer); |
555 | return _load_objects (thawer); |
| 554 | } |
556 | } |
| 555 | |
557 | |
| 556 | bool |
558 | bool |
| 557 | maptile::save_objects (const char *path, int flags) |
559 | maptile::_save_objects (const char *path, int flags) |
| 558 | { |
560 | { |
| 559 | object_freezer freezer; |
561 | object_freezer freezer; |
| 560 | |
562 | |
| 561 | if (!save_objects (freezer, flags)) |
563 | if (!_save_objects (freezer, flags)) |
| 562 | return false; |
564 | return false; |
| 563 | |
565 | |
| 564 | return freezer.save (path); |
566 | return freezer.save (path); |
| 565 | } |
567 | } |
| 566 | |
568 | |
| 567 | maptile::maptile () |
569 | maptile::maptile () |
| 568 | { |
570 | { |
| 569 | in_memory = MAP_SWAPPED; |
571 | in_memory = MAP_SWAPPED; |
| 570 | |
572 | |
| 571 | /* The maps used to pick up default x and y values from the |
573 | /* The maps used to pick up default x and y values from the |
| 572 | * map archetype. Mimic that behaviour. |
574 | * map archetype. Mimic that behaviour. |
| 573 | */ |
575 | */ |
| 574 | width = 16; |
576 | width = 16; |
| 575 | height = 16; |
577 | height = 16; |
| 576 | reset_timeout = 0; |
|
|
| 577 | timeout = 300; |
578 | timeout = 300; |
| 578 | enter_x = 0; |
579 | max_nrof = 1000; // 1000 items of anything |
| 579 | enter_y = 0; |
580 | max_volume = 2000000; // 2m³ |
| 580 | } |
581 | } |
| 581 | |
582 | |
| 582 | maptile::maptile (int w, int h) |
583 | maptile::maptile (int w, int h) |
| 583 | { |
584 | { |
| 584 | in_memory = MAP_SWAPPED; |
585 | in_memory = MAP_SWAPPED; |
| … | |
… | |
| 730 | * This could be done in lex (like the object loader), but I think |
731 | * This could be done in lex (like the object loader), but I think |
| 731 | * currently, there are few enough fields this is not a big deal. |
732 | * currently, there are few enough fields this is not a big deal. |
| 732 | * MSW 2001-07-01 |
733 | * MSW 2001-07-01 |
| 733 | */ |
734 | */ |
| 734 | bool |
735 | bool |
| 735 | maptile::load_header (object_thawer &thawer) |
736 | maptile::_load_header (object_thawer &thawer) |
| 736 | { |
737 | { |
| 737 | for (;;) |
738 | for (;;) |
| 738 | { |
739 | { |
| 739 | keyword kw = thawer.get_kv (); |
740 | keyword kw = thawer.get_kv (); |
| 740 | |
741 | |
| 741 | switch (kw) |
742 | switch (kw) |
| 742 | { |
743 | { |
| 743 | case KW_EOF: |
|
|
| 744 | LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path); |
|
|
| 745 | return false; |
|
|
| 746 | |
|
|
| 747 | case KW_end: |
|
|
| 748 | return true; |
|
|
| 749 | |
|
|
| 750 | default: |
|
|
| 751 | case KW_ERROR: |
|
|
| 752 | LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword); |
|
|
| 753 | break; |
|
|
| 754 | |
|
|
| 755 | case KW_msg: |
744 | case KW_msg: |
| 756 | thawer.get_ml (KW_endmsg, msg); |
745 | thawer.get_ml (KW_endmsg, msg); |
| 757 | break; |
746 | break; |
| 758 | |
747 | |
| 759 | case KW_lore: // CF+ extension |
748 | case KW_lore: // CF+ extension |
| … | |
… | |
| 791 | case KW_sky: thawer.get (sky); break; |
780 | case KW_sky: thawer.get (sky); break; |
| 792 | |
781 | |
| 793 | case KW_per_player: thawer.get (per_player); break; |
782 | case KW_per_player: thawer.get (per_player); break; |
| 794 | case KW_per_party: thawer.get (per_party); break; |
783 | case KW_per_party: thawer.get (per_party); break; |
| 795 | |
784 | |
| 796 | case KW_region: get_region_by_name (thawer.get_str ()); break; |
785 | case KW_region: default_region = region::find (thawer.get_str ()); break; |
| 797 | case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; |
786 | case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; |
| 798 | |
787 | |
| 799 | // old names new names |
788 | // old names new names |
| 800 | case KW_hp: case KW_enter_x: thawer.get (enter_x); break; |
789 | case KW_hp: case KW_enter_x: thawer.get (enter_x); break; |
| 801 | case KW_sp: case KW_enter_y: thawer.get (enter_y); break; |
790 | case KW_sp: case KW_enter_y: thawer.get (enter_y); break; |
| … | |
… | |
| 809 | |
798 | |
| 810 | case KW_tile_path_1: thawer.get (tile_path [0]); break; |
799 | case KW_tile_path_1: thawer.get (tile_path [0]); break; |
| 811 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
800 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
| 812 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
801 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
| 813 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
802 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
|
|
803 | |
|
|
804 | case KW_end: |
|
|
805 | return true; |
|
|
806 | |
|
|
807 | default: |
|
|
808 | if (!thawer.parse_error (kw, "map", 0)) |
|
|
809 | return false; |
|
|
810 | break; |
| 814 | } |
811 | } |
| 815 | } |
812 | } |
| 816 | |
813 | |
| 817 | abort (); |
814 | abort (); |
| 818 | } |
815 | } |
| 819 | |
816 | |
| 820 | bool |
817 | bool |
| 821 | maptile::load_header (const char *path) |
818 | maptile::_load_header (const char *path) |
| 822 | { |
819 | { |
| 823 | object_thawer thawer (path); |
820 | object_thawer thawer (path); |
| 824 | |
821 | |
| 825 | if (!thawer) |
822 | if (!thawer) |
| 826 | return false; |
823 | return false; |
| 827 | |
824 | |
| 828 | return load_header (thawer); |
825 | return _load_header (thawer); |
| 829 | } |
826 | } |
| 830 | |
827 | |
| 831 | /****************************************************************************** |
828 | /****************************************************************************** |
| 832 | * This is the start of unique map handling code |
829 | * This is the start of unique map handling code |
| 833 | *****************************************************************************/ |
830 | *****************************************************************************/ |
| … | |
… | |
| 856 | } |
853 | } |
| 857 | } |
854 | } |
| 858 | } |
855 | } |
| 859 | |
856 | |
| 860 | bool |
857 | bool |
| 861 | maptile::save_header (object_freezer &freezer) |
858 | maptile::_save_header (object_freezer &freezer) |
| 862 | { |
859 | { |
| 863 | #define MAP_OUT(k) freezer.put (KW_ ## k, k) |
860 | #define MAP_OUT(k) freezer.put (KW_ ## k, k) |
| 864 | #define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) |
861 | #define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) |
| 865 | |
862 | |
| 866 | MAP_OUT2 (arch, "map"); |
863 | MAP_OUT2 (arch, "map"); |
| … | |
… | |
| 870 | MAP_OUT (reset_time); |
867 | MAP_OUT (reset_time); |
| 871 | MAP_OUT (reset_timeout); |
868 | MAP_OUT (reset_timeout); |
| 872 | MAP_OUT (fixed_resettime); |
869 | MAP_OUT (fixed_resettime); |
| 873 | MAP_OUT (difficulty); |
870 | MAP_OUT (difficulty); |
| 874 | |
871 | |
| 875 | if (region) MAP_OUT2 (region, region->name); |
872 | if (default_region) MAP_OUT2 (region, default_region->name); |
| 876 | |
873 | |
| 877 | if (shopitems) |
874 | if (shopitems) |
| 878 | { |
875 | { |
| 879 | char shop[MAX_BUF]; |
876 | char shop[MAX_BUF]; |
| 880 | print_shop_string (this, shop); |
877 | print_shop_string (this, shop); |
| … | |
… | |
| 915 | |
912 | |
| 916 | return true; |
913 | return true; |
| 917 | } |
914 | } |
| 918 | |
915 | |
| 919 | bool |
916 | bool |
| 920 | maptile::save_header (const char *path) |
917 | maptile::_save_header (const char *path) |
| 921 | { |
918 | { |
| 922 | object_freezer freezer; |
919 | object_freezer freezer; |
| 923 | |
920 | |
| 924 | if (!save_header (freezer)) |
921 | if (!_save_header (freezer)) |
| 925 | return false; |
922 | return false; |
| 926 | |
923 | |
| 927 | return freezer.save (path); |
924 | return freezer.save (path); |
| 928 | } |
925 | } |
| 929 | |
926 | |
| … | |
… | |
| 931 | * Remove and free all objects in the given map. |
928 | * Remove and free all objects in the given map. |
| 932 | */ |
929 | */ |
| 933 | void |
930 | void |
| 934 | maptile::clear () |
931 | maptile::clear () |
| 935 | { |
932 | { |
|
|
933 | sfree (regions, size ()), regions = 0; |
|
|
934 | free (regionmap), regionmap = 0; |
|
|
935 | |
| 936 | if (!spaces) |
936 | if (spaces) |
| 937 | return; |
937 | { |
| 938 | |
|
|
| 939 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
938 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
| 940 | while (object *op = ms->bot) |
939 | while (object *op = ms->bot) |
| 941 | { |
940 | { |
| 942 | if (op->head) |
941 | if (op->head) |
| 943 | op = op->head; |
942 | op = op->head; |
| 944 | |
943 | |
| 945 | op->destroy_inv (false); |
944 | op->destroy_inv (false); |
| 946 | op->destroy (); |
945 | op->destroy (); |
| 947 | } |
946 | } |
| 948 | |
947 | |
| 949 | sfree (spaces, size ()), spaces = 0; |
948 | sfree (spaces, size ()), spaces = 0; |
|
|
949 | } |
| 950 | |
950 | |
| 951 | if (buttons) |
951 | if (buttons) |
| 952 | free_objectlinkpt (buttons), buttons = 0; |
952 | free_objectlinkpt (buttons), buttons = 0; |
| 953 | } |
953 | } |
| 954 | |
954 | |
| … | |
… | |
| 1108 | */ |
1108 | */ |
| 1109 | void |
1109 | void |
| 1110 | mapspace::update_ () |
1110 | mapspace::update_ () |
| 1111 | { |
1111 | { |
| 1112 | object *tmp, *last = 0; |
1112 | object *tmp, *last = 0; |
| 1113 | uint8 flags = 0, light = 0, anywhere = 0; |
1113 | uint8 flags = P_UPTODATE, light = 0, anywhere = 0; |
| 1114 | New_Face *top, *floor, *middle; |
1114 | facetile *top, *floor, *middle; |
| 1115 | object *top_obj, *floor_obj, *middle_obj; |
1115 | object *top_obj, *floor_obj, *middle_obj; |
| 1116 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1116 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
| 1117 | |
1117 | |
| 1118 | middle = blank_face; |
1118 | middle = blank_face; |
| 1119 | top = blank_face; |
1119 | top = blank_face; |
| … | |
… | |
| 1276 | faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; |
1276 | faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; |
| 1277 | faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; |
1277 | faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; |
| 1278 | faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; |
1278 | faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; |
| 1279 | } |
1279 | } |
| 1280 | |
1280 | |
|
|
1281 | uint64 |
|
|
1282 | mapspace::volume () const |
|
|
1283 | { |
|
|
1284 | uint64 vol = 0; |
|
|
1285 | |
|
|
1286 | for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below) |
|
|
1287 | vol += op->volume (); |
|
|
1288 | |
|
|
1289 | return vol; |
|
|
1290 | } |
|
|
1291 | |
| 1281 | /* this updates the orig_map->tile_map[tile_num] value after finding |
1292 | /* this updates the orig_map->tile_map[tile_num] value after finding |
| 1282 | * the map. It also takes care of linking back the freshly found |
1293 | * the map. It also takes care of linking back the freshly found |
| 1283 | * maps tile_map values if it tiles back to this one. It returns |
1294 | * maps tile_map values if it tiles back to this one. It returns |
| 1284 | * the value of orig_map->tile_map[tile_num]. |
1295 | * the value of orig_map->tile_map[tile_num]. |
| 1285 | */ |
1296 | */ |
| … | |
… | |
| 1448 | |
1459 | |
| 1449 | /** |
1460 | /** |
| 1450 | * Return whether map2 is adjacent to map1. If so, store the distance from |
1461 | * Return whether map2 is adjacent to map1. If so, store the distance from |
| 1451 | * map1 to map2 in dx/dy. |
1462 | * map1 to map2 in dx/dy. |
| 1452 | */ |
1463 | */ |
| 1453 | static int |
1464 | int |
| 1454 | adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) |
1465 | adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) |
| 1455 | { |
1466 | { |
| 1456 | if (!map1 || !map2) |
1467 | if (!map1 || !map2) |
| 1457 | return 0; |
1468 | return 0; |
| 1458 | |
1469 | |
| … | |
… | |
| 1549 | /* From map.c |
1560 | /* From map.c |
| 1550 | * This is used by get_player to determine where the other |
1561 | * This is used by get_player to determine where the other |
| 1551 | * creature is. get_rangevector takes into account map tiling, |
1562 | * creature is. get_rangevector takes into account map tiling, |
| 1552 | * so you just can not look the the map coordinates and get the |
1563 | * so you just can not look the the map coordinates and get the |
| 1553 | * righte value. distance_x/y are distance away, which |
1564 | * righte value. distance_x/y are distance away, which |
| 1554 | * can be negativbe. direction is the crossfire direction scheme |
1565 | * can be negative. direction is the crossfire direction scheme |
| 1555 | * that the creature should head. part is the part of the |
1566 | * that the creature should head. part is the part of the |
| 1556 | * monster that is closest. |
1567 | * monster that is closest. |
| 1557 | * |
1568 | * |
| 1558 | * get_rangevector looks at op1 and op2, and fills in the |
1569 | * get_rangevector looks at op1 and op2, and fills in the |
| 1559 | * structure for op1 to get to op2. |
1570 | * structure for op1 to get to op2. |
| … | |
… | |
| 1606 | { |
1617 | { |
| 1607 | best_distance = tmpi; |
1618 | best_distance = tmpi; |
| 1608 | best = tmp; |
1619 | best = tmp; |
| 1609 | } |
1620 | } |
| 1610 | } |
1621 | } |
|
|
1622 | |
| 1611 | if (best != op1) |
1623 | if (best != op1) |
| 1612 | { |
1624 | { |
| 1613 | retval->distance_x += op1->x - best->x; |
1625 | retval->distance_x += op1->x - best->x; |
| 1614 | retval->distance_y += op1->y - best->y; |
1626 | retval->distance_y += op1->y - best->y; |
| 1615 | } |
1627 | } |
| 1616 | } |
1628 | } |
|
|
1629 | |
| 1617 | retval->part = best; |
1630 | retval->part = best; |
| 1618 | retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); |
1631 | retval->distance = idistance (retval->distance_x, retval->distance_y); |
| 1619 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
1632 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
| 1620 | } |
1633 | } |
| 1621 | } |
1634 | } |
| 1622 | |
1635 | |
| 1623 | /* this is basically the same as get_rangevector above, but instead of |
1636 | /* this is basically the same as get_rangevector above, but instead of |
| … | |
… | |
| 1628 | * flags has no meaning for this function at this time - I kept it in to |
1641 | * flags has no meaning for this function at this time - I kept it in to |
| 1629 | * be more consistant with the above function and also in case they are needed |
1642 | * be more consistant with the above function and also in case they are needed |
| 1630 | * for something in the future. Also, since no object is pasted, the best |
1643 | * for something in the future. Also, since no object is pasted, the best |
| 1631 | * field of the rv_vector is set to NULL. |
1644 | * field of the rv_vector is set to NULL. |
| 1632 | */ |
1645 | */ |
| 1633 | |
|
|
| 1634 | void |
1646 | void |
| 1635 | get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) |
1647 | get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) |
| 1636 | { |
1648 | { |
| 1637 | if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) |
1649 | if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) |
| 1638 | { |
1650 | { |
| 1639 | /* be conservative and fill in _some_ data */ |
1651 | /* be conservative and fill in _some_ data */ |
| 1640 | retval->distance = 100000; |
1652 | retval->distance = 100000; |
| … | |
… | |
| 1647 | { |
1659 | { |
| 1648 | retval->distance_x += op2->x - x; |
1660 | retval->distance_x += op2->x - x; |
| 1649 | retval->distance_y += op2->y - y; |
1661 | retval->distance_y += op2->y - y; |
| 1650 | |
1662 | |
| 1651 | retval->part = NULL; |
1663 | retval->part = NULL; |
| 1652 | retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); |
1664 | retval->distance = idistance (retval->distance_x, retval->distance_y); |
| 1653 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
1665 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
| 1654 | } |
1666 | } |
| 1655 | } |
1667 | } |
| 1656 | |
1668 | |
| 1657 | /* Returns true of op1 and op2 are effectively on the same map |
1669 | /* Returns true of op1 and op2 are effectively on the same map |
| … | |
… | |
| 1677 | op->remove (); |
1689 | op->remove (); |
| 1678 | |
1690 | |
| 1679 | return insert_ob_in_map_at (op, this, originator, flags, x, y); |
1691 | return insert_ob_in_map_at (op, this, originator, flags, x, y); |
| 1680 | } |
1692 | } |
| 1681 | |
1693 | |
|
|
1694 | region * |
|
|
1695 | maptile::region (int x, int y) const |
|
|
1696 | { |
|
|
1697 | if (regions |
|
|
1698 | && regionmap |
|
|
1699 | && !OUT_OF_REAL_MAP (this, x, y)) |
|
|
1700 | if (struct region *reg = regionmap [regions [y * width + x]]) |
|
|
1701 | return reg; |
|
|
1702 | |
|
|
1703 | if (default_region) |
|
|
1704 | return default_region; |
|
|
1705 | |
|
|
1706 | return ::region::default_region (); |
|
|
1707 | } |
|
|
1708 | |
|
|
1709 | |
