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 <global.h> |
25 | #include <funcpoint.h> |
26 | #include <funcpoint.h> |
26 | |
27 | |
27 | #include <loader.h> |
28 | #include <loader.h> |
… | |
… | |
227 | |
228 | |
228 | } |
229 | } |
229 | return 0; |
230 | return 0; |
230 | } |
231 | } |
231 | |
232 | |
232 | |
|
|
233 | /* |
233 | /* |
234 | * Returns true if the given object can't fit in the given spot. |
234 | * 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, |
235 | * This is meant for multi space objects - for single space objecs, |
236 | * just calling get_map_blocked and checking that against movement type |
236 | * just calling get_map_blocked and checking that against movement type |
237 | * of object. This function goes through all the parts of the |
237 | * of object. This function goes through all the parts of the |
… | |
… | |
399 | * Loads (ands parses) the objects into a given map from the specified |
399 | * Loads (ands parses) the objects into a given map from the specified |
400 | * file pointer. |
400 | * file pointer. |
401 | * mapflags is the same as we get with load_original_map |
401 | * mapflags is the same as we get with load_original_map |
402 | */ |
402 | */ |
403 | bool |
403 | bool |
404 | maptile::load_objects (object_thawer &thawer) |
404 | maptile::_load_objects (object_thawer &thawer) |
405 | { |
405 | { |
406 | int unique; |
406 | int unique; |
407 | object *op, *prev = NULL, *last_more = NULL, *otmp; |
407 | object *op, *prev = NULL, *last_more = NULL, *otmp; |
408 | |
408 | |
409 | op = object::create (); |
409 | op = object::create (); |
… | |
… | |
485 | for (object *op = ms->bot; op; op = op->above) |
485 | for (object *op = ms->bot; op; op = op->above) |
486 | op->deactivate_recursive (); |
486 | op->deactivate_recursive (); |
487 | } |
487 | } |
488 | |
488 | |
489 | bool |
489 | bool |
490 | maptile::save_objects (object_freezer &freezer, int flags) |
490 | maptile::_save_objects (object_freezer &freezer, int flags) |
491 | { |
491 | { |
492 | static int cede_count = 0; |
492 | static int cede_count = 0; |
493 | |
493 | |
494 | if (flags & IO_HEADER) |
494 | if (flags & IO_HEADER) |
495 | save_header (freezer); |
495 | _save_header (freezer); |
496 | |
496 | |
497 | if (!spaces) |
497 | if (!spaces) |
498 | return false; |
498 | return false; |
499 | |
499 | |
500 | for (int i = 0; i < size (); ++i) |
500 | for (int i = 0; i < size (); ++i) |
501 | { |
501 | { |
|
|
502 | #if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D |
502 | if (cede_count >= 500) |
503 | if (cede_count >= 500) |
503 | { |
504 | { |
504 | cede_count = 0; |
505 | cede_count = 0; |
505 | coroapi::cede (); |
506 | coroapi::cede (); |
506 | } |
507 | } |
|
|
508 | #endif |
507 | |
509 | |
508 | int unique = 0; |
510 | int unique = 0; |
509 | for (object *op = spaces [i].bot; op; op = op->above) |
511 | for (object *op = spaces [i].bot; op; op = op->above) |
510 | { |
512 | { |
511 | // count per-object, but cede only when modification-safe |
513 | // count per-object, but cede only when modification-safe |
… | |
… | |
529 | |
531 | |
530 | return true; |
532 | return true; |
531 | } |
533 | } |
532 | |
534 | |
533 | bool |
535 | bool |
534 | maptile::load_objects (const char *path, bool skip_header) |
536 | maptile::_load_objects (const char *path, bool skip_header) |
535 | { |
537 | { |
536 | object_thawer thawer (path); |
538 | object_thawer thawer (path); |
537 | |
539 | |
538 | if (!thawer) |
540 | if (!thawer) |
539 | return false; |
541 | return false; |
… | |
… | |
547 | break; |
549 | break; |
548 | |
550 | |
549 | thawer.skip_kv (kw); |
551 | thawer.skip_kv (kw); |
550 | } |
552 | } |
551 | |
553 | |
552 | return load_objects (thawer); |
554 | return _load_objects (thawer); |
553 | } |
555 | } |
554 | |
556 | |
555 | bool |
557 | bool |
556 | maptile::save_objects (const char *path, int flags) |
558 | maptile::_save_objects (const char *path, int flags) |
557 | { |
559 | { |
558 | object_freezer freezer; |
560 | object_freezer freezer; |
559 | |
561 | |
560 | if (!save_objects (freezer, flags)) |
562 | if (!_save_objects (freezer, flags)) |
561 | return false; |
563 | return false; |
562 | |
564 | |
563 | return freezer.save (path); |
565 | return freezer.save (path); |
564 | } |
566 | } |
565 | |
567 | |
… | |
… | |
729 | * 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 |
730 | * 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. |
731 | * MSW 2001-07-01 |
733 | * MSW 2001-07-01 |
732 | */ |
734 | */ |
733 | bool |
735 | bool |
734 | maptile::load_header (object_thawer &thawer) |
736 | maptile::_load_header (object_thawer &thawer) |
735 | { |
737 | { |
736 | char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end; |
|
|
737 | int msgpos = 0; |
|
|
738 | int maplorepos = 0; |
|
|
739 | |
|
|
740 | for (;;) |
738 | for (;;) |
741 | { |
739 | { |
742 | keyword kw = thawer.get_kv (); |
740 | keyword kw = thawer.get_kv (); |
743 | |
741 | |
744 | switch (kw) |
742 | switch (kw) |
… | |
… | |
747 | LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path); |
745 | LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path); |
748 | return false; |
746 | return false; |
749 | |
747 | |
750 | case KW_end: |
748 | case KW_end: |
751 | return true; |
749 | return true; |
|
|
750 | |
|
|
751 | default: |
|
|
752 | case KW_ERROR: |
|
|
753 | LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword); |
|
|
754 | break; |
752 | |
755 | |
753 | case KW_msg: |
756 | case KW_msg: |
754 | thawer.get_ml (KW_endmsg, msg); |
757 | thawer.get_ml (KW_endmsg, msg); |
755 | break; |
758 | break; |
756 | |
759 | |
… | |
… | |
789 | case KW_sky: thawer.get (sky); break; |
792 | case KW_sky: thawer.get (sky); break; |
790 | |
793 | |
791 | case KW_per_player: thawer.get (per_player); break; |
794 | case KW_per_player: thawer.get (per_player); break; |
792 | case KW_per_party: thawer.get (per_party); break; |
795 | case KW_per_party: thawer.get (per_party); break; |
793 | |
796 | |
794 | case KW_region: get_region_by_name (thawer.get_str ()); break; |
797 | case KW_region: default_region = region::find (thawer.get_str ()); break; |
795 | case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; |
798 | case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; |
796 | |
799 | |
797 | // old names new names |
800 | // old names new names |
798 | case KW_hp: case KW_enter_x: thawer.get (enter_x); break; |
801 | case KW_hp: case KW_enter_x: thawer.get (enter_x); break; |
799 | case KW_sp: case KW_enter_y: thawer.get (enter_y); break; |
802 | case KW_sp: case KW_enter_y: thawer.get (enter_y); break; |
… | |
… | |
807 | |
810 | |
808 | case KW_tile_path_1: thawer.get (tile_path [0]); break; |
811 | case KW_tile_path_1: thawer.get (tile_path [0]); break; |
809 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
812 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
810 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
813 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
811 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
814 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
812 | |
|
|
813 | default: |
|
|
814 | LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]); |
|
|
815 | break; |
|
|
816 | } |
815 | } |
817 | } |
816 | } |
818 | |
817 | |
819 | abort (); |
818 | abort (); |
820 | } |
819 | } |
821 | |
820 | |
822 | bool |
821 | bool |
823 | maptile::load_header (const char *path) |
822 | maptile::_load_header (const char *path) |
824 | { |
823 | { |
825 | object_thawer thawer (path); |
824 | object_thawer thawer (path); |
826 | |
825 | |
827 | if (!thawer) |
826 | if (!thawer) |
828 | return false; |
827 | return false; |
829 | |
828 | |
830 | return load_header (thawer); |
829 | return _load_header (thawer); |
831 | } |
830 | } |
832 | |
831 | |
833 | /****************************************************************************** |
832 | /****************************************************************************** |
834 | * This is the start of unique map handling code |
833 | * This is the start of unique map handling code |
835 | *****************************************************************************/ |
834 | *****************************************************************************/ |
… | |
… | |
858 | } |
857 | } |
859 | } |
858 | } |
860 | } |
859 | } |
861 | |
860 | |
862 | bool |
861 | bool |
863 | maptile::save_header (object_freezer &freezer) |
862 | maptile::_save_header (object_freezer &freezer) |
864 | { |
863 | { |
865 | #define MAP_OUT(k) freezer.put (KW_ ## k, k) |
864 | #define MAP_OUT(k) freezer.put (KW_ ## k, k) |
866 | #define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) |
865 | #define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) |
867 | |
866 | |
868 | MAP_OUT2 (arch, "map"); |
867 | MAP_OUT2 (arch, "map"); |
… | |
… | |
872 | MAP_OUT (reset_time); |
871 | MAP_OUT (reset_time); |
873 | MAP_OUT (reset_timeout); |
872 | MAP_OUT (reset_timeout); |
874 | MAP_OUT (fixed_resettime); |
873 | MAP_OUT (fixed_resettime); |
875 | MAP_OUT (difficulty); |
874 | MAP_OUT (difficulty); |
876 | |
875 | |
877 | if (region) MAP_OUT2 (region, region->name); |
876 | if (default_region) MAP_OUT2 (region, default_region->name); |
878 | |
877 | |
879 | if (shopitems) |
878 | if (shopitems) |
880 | { |
879 | { |
881 | char shop[MAX_BUF]; |
880 | char shop[MAX_BUF]; |
882 | print_shop_string (this, shop); |
881 | print_shop_string (this, shop); |
… | |
… | |
917 | |
916 | |
918 | return true; |
917 | return true; |
919 | } |
918 | } |
920 | |
919 | |
921 | bool |
920 | bool |
922 | maptile::save_header (const char *path) |
921 | maptile::_save_header (const char *path) |
923 | { |
922 | { |
924 | object_freezer freezer; |
923 | object_freezer freezer; |
925 | |
924 | |
926 | if (!save_header (freezer)) |
925 | if (!_save_header (freezer)) |
927 | return false; |
926 | return false; |
928 | |
927 | |
929 | return freezer.save (path); |
928 | return freezer.save (path); |
930 | } |
929 | } |
931 | |
930 | |
… | |
… | |
933 | * Remove and free all objects in the given map. |
932 | * Remove and free all objects in the given map. |
934 | */ |
933 | */ |
935 | void |
934 | void |
936 | maptile::clear () |
935 | maptile::clear () |
937 | { |
936 | { |
|
|
937 | sfree (regions, size ()), regions = 0; |
|
|
938 | free (regionmap), regionmap = 0; |
|
|
939 | |
938 | if (!spaces) |
940 | if (spaces) |
939 | return; |
941 | { |
940 | |
|
|
941 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
942 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
942 | while (object *op = ms->bot) |
943 | while (object *op = ms->bot) |
943 | { |
944 | { |
944 | if (op->head) |
945 | if (op->head) |
945 | op = op->head; |
946 | op = op->head; |
946 | |
947 | |
947 | op->destroy_inv (false); |
948 | op->destroy_inv (false); |
948 | op->destroy (); |
949 | op->destroy (); |
949 | } |
950 | } |
950 | |
951 | |
951 | sfree (spaces, size ()), spaces = 0; |
952 | sfree (spaces, size ()), spaces = 0; |
|
|
953 | } |
952 | |
954 | |
953 | if (buttons) |
955 | if (buttons) |
954 | free_objectlinkpt (buttons), buttons = 0; |
956 | free_objectlinkpt (buttons), buttons = 0; |
955 | } |
957 | } |
956 | |
958 | |
… | |
… | |
1110 | */ |
1112 | */ |
1111 | void |
1113 | void |
1112 | mapspace::update_ () |
1114 | mapspace::update_ () |
1113 | { |
1115 | { |
1114 | object *tmp, *last = 0; |
1116 | object *tmp, *last = 0; |
1115 | uint8 flags = 0, light = 0, anywhere = 0; |
1117 | uint8 flags = P_UPTODATE, light = 0, anywhere = 0; |
1116 | New_Face *top, *floor, *middle; |
1118 | facetile *top, *floor, *middle; |
1117 | object *top_obj, *floor_obj, *middle_obj; |
1119 | object *top_obj, *floor_obj, *middle_obj; |
1118 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1120 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1119 | |
1121 | |
1120 | middle = blank_face; |
1122 | middle = blank_face; |
1121 | top = blank_face; |
1123 | top = blank_face; |
… | |
… | |
1286 | * the value of orig_map->tile_map[tile_num]. |
1288 | * the value of orig_map->tile_map[tile_num]. |
1287 | */ |
1289 | */ |
1288 | static inline maptile * |
1290 | static inline maptile * |
1289 | find_and_link (maptile *orig_map, int tile_num) |
1291 | find_and_link (maptile *orig_map, int tile_num) |
1290 | { |
1292 | { |
1291 | maptile *mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map); |
1293 | maptile *mp = orig_map->tile_map [tile_num]; |
1292 | |
1294 | |
1293 | if (!mp) |
1295 | if (!mp) |
1294 | { |
1296 | { |
|
|
1297 | mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map); |
|
|
1298 | |
|
|
1299 | if (!mp) |
|
|
1300 | { |
1295 | // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine |
1301 | // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine |
1296 | LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n", |
1302 | LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n", |
1297 | &orig_map->tile_path[tile_num], &orig_map->path); |
1303 | &orig_map->tile_path[tile_num], &orig_map->path); |
1298 | mp = new maptile (1, 1); |
1304 | mp = new maptile (1, 1); |
1299 | mp->alloc (); |
1305 | mp->alloc (); |
1300 | mp->in_memory = MAP_IN_MEMORY; |
1306 | mp->in_memory = MAP_IN_MEMORY; |
|
|
1307 | } |
1301 | } |
1308 | } |
1302 | |
1309 | |
1303 | int dest_tile = (tile_num + 2) % 4; |
1310 | int dest_tile = (tile_num + 2) % 4; |
1304 | |
1311 | |
1305 | orig_map->tile_map[tile_num] = mp; |
1312 | orig_map->tile_map [tile_num] = mp; |
1306 | |
1313 | |
1307 | // optimisation: back-link map to origin map if euclidean |
1314 | // optimisation: back-link map to origin map if euclidean |
1308 | //TODO: non-euclidean maps MUST GO |
1315 | //TODO: non-euclidean maps MUST GO |
1309 | if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) |
1316 | if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) |
1310 | orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; |
1317 | orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; |
… | |
… | |
1445 | |
1452 | |
1446 | /** |
1453 | /** |
1447 | * Return whether map2 is adjacent to map1. If so, store the distance from |
1454 | * Return whether map2 is adjacent to map1. If so, store the distance from |
1448 | * map1 to map2 in dx/dy. |
1455 | * map1 to map2 in dx/dy. |
1449 | */ |
1456 | */ |
1450 | static int |
1457 | int |
1451 | adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) |
1458 | adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) |
1452 | { |
1459 | { |
1453 | if (!map1 || !map2) |
1460 | if (!map1 || !map2) |
1454 | return 0; |
1461 | return 0; |
1455 | |
1462 | |
… | |
… | |
1546 | /* From map.c |
1553 | /* From map.c |
1547 | * This is used by get_player to determine where the other |
1554 | * This is used by get_player to determine where the other |
1548 | * creature is. get_rangevector takes into account map tiling, |
1555 | * creature is. get_rangevector takes into account map tiling, |
1549 | * so you just can not look the the map coordinates and get the |
1556 | * so you just can not look the the map coordinates and get the |
1550 | * righte value. distance_x/y are distance away, which |
1557 | * righte value. distance_x/y are distance away, which |
1551 | * can be negativbe. direction is the crossfire direction scheme |
1558 | * can be negative. direction is the crossfire direction scheme |
1552 | * that the creature should head. part is the part of the |
1559 | * that the creature should head. part is the part of the |
1553 | * monster that is closest. |
1560 | * monster that is closest. |
1554 | * |
1561 | * |
1555 | * get_rangevector looks at op1 and op2, and fills in the |
1562 | * get_rangevector looks at op1 and op2, and fills in the |
1556 | * structure for op1 to get to op2. |
1563 | * structure for op1 to get to op2. |
… | |
… | |
1603 | { |
1610 | { |
1604 | best_distance = tmpi; |
1611 | best_distance = tmpi; |
1605 | best = tmp; |
1612 | best = tmp; |
1606 | } |
1613 | } |
1607 | } |
1614 | } |
|
|
1615 | |
1608 | if (best != op1) |
1616 | if (best != op1) |
1609 | { |
1617 | { |
1610 | retval->distance_x += op1->x - best->x; |
1618 | retval->distance_x += op1->x - best->x; |
1611 | retval->distance_y += op1->y - best->y; |
1619 | retval->distance_y += op1->y - best->y; |
1612 | } |
1620 | } |
1613 | } |
1621 | } |
|
|
1622 | |
1614 | retval->part = best; |
1623 | retval->part = best; |
1615 | 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); |
1616 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
1625 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
1617 | } |
1626 | } |
1618 | } |
1627 | } |
1619 | |
1628 | |
1620 | /* this is basically the same as get_rangevector above, but instead of |
1629 | /* this is basically the same as get_rangevector above, but instead of |
… | |
… | |
1625 | * flags has no meaning for this function at this time - I kept it in to |
1634 | * flags has no meaning for this function at this time - I kept it in to |
1626 | * be more consistant with the above function and also in case they are needed |
1635 | * be more consistant with the above function and also in case they are needed |
1627 | * for something in the future. Also, since no object is pasted, the best |
1636 | * for something in the future. Also, since no object is pasted, the best |
1628 | * field of the rv_vector is set to NULL. |
1637 | * field of the rv_vector is set to NULL. |
1629 | */ |
1638 | */ |
1630 | |
|
|
1631 | void |
1639 | void |
1632 | get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) |
1640 | get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) |
1633 | { |
1641 | { |
1634 | if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) |
1642 | if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) |
1635 | { |
1643 | { |
1636 | /* be conservative and fill in _some_ data */ |
1644 | /* be conservative and fill in _some_ data */ |
1637 | retval->distance = 100000; |
1645 | retval->distance = 100000; |
… | |
… | |
1644 | { |
1652 | { |
1645 | retval->distance_x += op2->x - x; |
1653 | retval->distance_x += op2->x - x; |
1646 | retval->distance_y += op2->y - y; |
1654 | retval->distance_y += op2->y - y; |
1647 | |
1655 | |
1648 | retval->part = NULL; |
1656 | retval->part = NULL; |
1649 | retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); |
1657 | retval->distance = idistance (retval->distance_x, retval->distance_y); |
1650 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
1658 | retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); |
1651 | } |
1659 | } |
1652 | } |
1660 | } |
1653 | |
1661 | |
1654 | /* Returns true of op1 and op2 are effectively on the same map |
1662 | /* Returns true of op1 and op2 are effectively on the same map |
… | |
… | |
1674 | op->remove (); |
1682 | op->remove (); |
1675 | |
1683 | |
1676 | return insert_ob_in_map_at (op, this, originator, flags, x, y); |
1684 | return insert_ob_in_map_at (op, this, originator, flags, x, y); |
1677 | } |
1685 | } |
1678 | |
1686 | |
|
|
1687 | region * |
|
|
1688 | maptile::region (int x, int y) const |
|
|
1689 | { |
|
|
1690 | if (regions |
|
|
1691 | && regionmap |
|
|
1692 | && !OUT_OF_REAL_MAP (this, x, y)) |
|
|
1693 | if (struct region *reg = regionmap [regions [y * width + x]]) |
|
|
1694 | return reg; |
|
|
1695 | |
|
|
1696 | if (default_region) |
|
|
1697 | return default_region; |
|
|
1698 | |
|
|
1699 | return ::region::default_region (); |
|
|
1700 | } |
|
|
1701 | |