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.66 by pippijn, Wed Jan 3 00:21:35 2007 UTC vs.
Revision 1.87 by root, Thu Feb 15 21:07:48 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
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 * mapflags is the same as we get with load_original_map
402 */ 403 */
403bool 404bool
404maptile::load_objects (object_thawer &thawer) 405maptile::_load_objects (object_thawer &thawer)
405{ 406{
406 int unique; 407 int unique;
407 object *op, *prev = NULL, *last_more = NULL, *otmp; 408 object *op, *prev = NULL, *last_more = NULL, *otmp;
408 409
409 op = object::create (); 410 op = object::create ();
485 for (object *op = ms->bot; op; op = op->above) 486 for (object *op = ms->bot; op; op = op->above)
486 op->deactivate_recursive (); 487 op->deactivate_recursive ();
487} 488}
488 489
489bool 490bool
490maptile::save_objects (object_freezer &freezer, int flags) 491maptile::_save_objects (object_freezer &freezer, int flags)
491{ 492{
492 static int cede_count = 0; 493 static int cede_count = 0;
493 494
494 if (flags & IO_HEADER) 495 if (flags & IO_HEADER)
495 save_header (freezer); 496 _save_header (freezer);
496 497
497 if (!spaces) 498 if (!spaces)
498 return false; 499 return false;
499 500
500 for (int i = 0; i < size (); ++i) 501 for (int i = 0; i < size (); ++i)
501 { 502 {
503#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
502 if (cede_count >= 500) 504 if (cede_count >= 500)
503 { 505 {
504 cede_count = 0; 506 cede_count = 0;
505 coroapi::cede (); 507 coroapi::cede ();
506 } 508 }
509#endif
507 510
508 int unique = 0; 511 int unique = 0;
509 for (object *op = spaces [i].bot; op; op = op->above) 512 for (object *op = spaces [i].bot; op; op = op->above)
510 { 513 {
511 // count per-object, but cede only when modification-safe 514 // count per-object, but cede only when modification-safe
529 532
530 return true; 533 return true;
531} 534}
532 535
533bool 536bool
534maptile::load_objects (const char *path, bool skip_header) 537maptile::_load_objects (const char *path, bool skip_header)
535{ 538{
536 object_thawer thawer (path); 539 object_thawer thawer (path);
537 540
538 if (!thawer) 541 if (!thawer)
539 return false; 542 return false;
540 543
541 if (skip_header) 544 if (skip_header)
542 for (;;) 545 for (;;)
543 { 546 {
544 keyword kw = thawer.get_kv ();
545
546 if (kw == KW_end) 547 if (thawer.kw == KW_end)
547 break; 548 break;
548 549
549 thawer.skip_kv (kw); 550 thawer.skip_kv ();
550 } 551 }
551 552
552 return load_objects (thawer); 553 return _load_objects (thawer);
553} 554}
554 555
555bool 556bool
556maptile::save_objects (const char *path, int flags) 557maptile::_save_objects (const char *path, int flags)
557{ 558{
558 object_freezer freezer; 559 object_freezer freezer;
559 560
560 if (!save_objects (freezer, flags)) 561 if (!_save_objects (freezer, flags))
561 return false; 562 return false;
562 563
563 return freezer.save (path); 564 return freezer.save (path);
564} 565}
565 566
566maptile::maptile () 567maptile::maptile ()
567{ 568{
568 in_memory = MAP_SWAPPED; 569 in_memory = MAP_SWAPPED;
569 570
570 /* The maps used to pick up default x and y values from the 571 /* The maps used to pick up default x and y values from the
571 * map archetype. Mimic that behaviour. 572 * map archetype. Mimic that behaviour.
572 */ 573 */
573 width = 16; 574 width = 16;
574 height = 16; 575 height = 16;
575 reset_timeout = 0;
576 timeout = 300; 576 timeout = 300;
577 enter_x = 0; 577 max_nrof = 1000; // 1000 items of anything
578 enter_y = 0; 578 max_volume = 2000000; // 2m³
579} 579}
580 580
581maptile::maptile (int w, int h) 581maptile::maptile (int w, int h)
582{ 582{
583 in_memory = MAP_SWAPPED; 583 in_memory = MAP_SWAPPED;
729 * This could be done in lex (like the object loader), but I think 729 * 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. 730 * currently, there are few enough fields this is not a big deal.
731 * MSW 2001-07-01 731 * MSW 2001-07-01
732 */ 732 */
733bool 733bool
734maptile::load_header (object_thawer &thawer) 734maptile::_load_header (object_thawer &thawer)
735{ 735{
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 (;;) 736 for (;;)
741 { 737 {
742 keyword kw = thawer.get_kv (); 738 keyword kw = thawer.get_kv ();
743 739
744 switch (kw) 740 switch (kw)
745 { 741 {
746 case KW_EOF:
747 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
748 return false;
749
750 case KW_end:
751 return true;
752
753 case KW_msg: 742 case KW_msg:
754 thawer.get_ml (KW_endmsg, msg); 743 thawer.get_ml (KW_endmsg, msg);
755 break; 744 break;
756 745
757 case KW_lore: // CF+ extension 746 case KW_lore: // CF+ extension
789 case KW_sky: thawer.get (sky); break; 778 case KW_sky: thawer.get (sky); break;
790 779
791 case KW_per_player: thawer.get (per_player); break; 780 case KW_per_player: thawer.get (per_player); break;
792 case KW_per_party: thawer.get (per_party); break; 781 case KW_per_party: thawer.get (per_party); break;
793 782
794 case KW_region: get_region_by_name (thawer.get_str ()); break; 783 case KW_region: default_region = region::find (thawer.get_str ()); break;
795 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 784 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
796 785
797 // old names new names 786 // old names new names
798 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 787 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; 788 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
808 case KW_tile_path_1: thawer.get (tile_path [0]); break; 797 case KW_tile_path_1: thawer.get (tile_path [0]); break;
809 case KW_tile_path_2: thawer.get (tile_path [1]); break; 798 case KW_tile_path_2: thawer.get (tile_path [1]); break;
810 case KW_tile_path_3: thawer.get (tile_path [2]); break; 799 case KW_tile_path_3: thawer.get (tile_path [2]); break;
811 case KW_tile_path_4: thawer.get (tile_path [3]); break; 800 case KW_tile_path_4: thawer.get (tile_path [3]); break;
812 801
802 case KW_end:
803 return true;
804
813 default: 805 default:
814 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]); 806 if (!thawer.parse_error ("map", 0))
807 return false;
815 break; 808 break;
816 } 809 }
817 } 810 }
818 811
819 abort (); 812 abort ();
820} 813}
821 814
822bool 815bool
823maptile::load_header (const char *path) 816maptile::_load_header (const char *path)
824{ 817{
825 object_thawer thawer (path); 818 object_thawer thawer (path);
826 819
827 if (!thawer) 820 if (!thawer)
828 return false; 821 return false;
829 822
830 return load_header (thawer); 823 return _load_header (thawer);
831} 824}
832 825
833/****************************************************************************** 826/******************************************************************************
834 * This is the start of unique map handling code 827 * This is the start of unique map handling code
835 *****************************************************************************/ 828 *****************************************************************************/
858 } 851 }
859 } 852 }
860} 853}
861 854
862bool 855bool
863maptile::save_header (object_freezer &freezer) 856maptile::_save_header (object_freezer &freezer)
864{ 857{
865#define MAP_OUT(k) freezer.put (KW_ ## k, k) 858#define MAP_OUT(k) freezer.put (KW_ ## k, k)
866#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 859#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
867 860
868 MAP_OUT2 (arch, "map"); 861 MAP_OUT2 (arch, "map");
872 MAP_OUT (reset_time); 865 MAP_OUT (reset_time);
873 MAP_OUT (reset_timeout); 866 MAP_OUT (reset_timeout);
874 MAP_OUT (fixed_resettime); 867 MAP_OUT (fixed_resettime);
875 MAP_OUT (difficulty); 868 MAP_OUT (difficulty);
876 869
877 if (region) MAP_OUT2 (region, region->name); 870 if (default_region) MAP_OUT2 (region, default_region->name);
878 871
879 if (shopitems) 872 if (shopitems)
880 { 873 {
881 char shop[MAX_BUF]; 874 char shop[MAX_BUF];
882 print_shop_string (this, shop); 875 print_shop_string (this, shop);
917 910
918 return true; 911 return true;
919} 912}
920 913
921bool 914bool
922maptile::save_header (const char *path) 915maptile::_save_header (const char *path)
923{ 916{
924 object_freezer freezer; 917 object_freezer freezer;
925 918
926 if (!save_header (freezer)) 919 if (!_save_header (freezer))
927 return false; 920 return false;
928 921
929 return freezer.save (path); 922 return freezer.save (path);
930} 923}
931 924
933 * Remove and free all objects in the given map. 926 * Remove and free all objects in the given map.
934 */ 927 */
935void 928void
936maptile::clear () 929maptile::clear ()
937{ 930{
931 sfree (regions, size ()), regions = 0;
932 free (regionmap), regionmap = 0;
933
938 if (!spaces) 934 if (spaces)
939 return; 935 {
940
941 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 936 for (mapspace *ms = spaces + size (); ms-- > spaces; )
942 while (object *op = ms->bot) 937 while (object *op = ms->bot)
943 { 938 {
944 if (op->head) 939 if (op->head)
945 op = op->head; 940 op = op->head;
946 941
947 op->destroy_inv (false); 942 op->destroy_inv (false);
948 op->destroy (); 943 op->destroy ();
949 } 944 }
950 945
951 sfree (spaces, size ()), spaces = 0; 946 sfree (spaces, size ()), spaces = 0;
947 }
952 948
953 if (buttons) 949 if (buttons)
954 free_objectlinkpt (buttons), buttons = 0; 950 free_objectlinkpt (buttons), buttons = 0;
955} 951}
956 952
1110 */ 1106 */
1111void 1107void
1112mapspace::update_ () 1108mapspace::update_ ()
1113{ 1109{
1114 object *tmp, *last = 0; 1110 object *tmp, *last = 0;
1115 uint8 flags = 0, light = 0, anywhere = 0; 1111 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1116 New_Face *top, *floor, *middle; 1112 facetile *top, *floor, *middle;
1117 object *top_obj, *floor_obj, *middle_obj; 1113 object *top_obj, *floor_obj, *middle_obj;
1118 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1114 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1119 1115
1120 middle = blank_face; 1116 middle = blank_face;
1121 top = blank_face; 1117 top = blank_face;
1237 1233
1238 /* If two top faces are already set, quit processing */ 1234 /* If two top faces are already set, quit processing */
1239 if ((top != blank_face) && (middle != blank_face)) 1235 if ((top != blank_face) && (middle != blank_face))
1240 break; 1236 break;
1241 1237
1242 /* Only show visible faces, unless its the editor - show all */ 1238 /* Only show visible faces */
1243 if (!tmp->invisible || editor) 1239 if (!tmp->invisible)
1244 { 1240 {
1245 /* Fill in top if needed */ 1241 /* Fill in top if needed */
1246 if (top == blank_face) 1242 if (top == blank_face)
1247 { 1243 {
1248 top = tmp->face; 1244 top = tmp->face;
1278 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1274 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1279 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1275 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1280 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1276 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1281} 1277}
1282 1278
1279uint64
1280mapspace::volume () const
1281{
1282 uint64 vol = 0;
1283
1284 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1285 vol += op->volume ();
1286
1287 return vol;
1288}
1289
1283/* this updates the orig_map->tile_map[tile_num] value after loading 1290/* this updates the orig_map->tile_map[tile_num] value after finding
1284 * the map. It also takes care of linking back the freshly loaded 1291 * the map. It also takes care of linking back the freshly found
1285 * maps tile_map values if it tiles back to this one. It returns 1292 * maps tile_map values if it tiles back to this one. It returns
1286 * the value of orig_map->tile_map[tile_num]. It really only does this 1293 * the value of orig_map->tile_map[tile_num].
1287 * so that it is easier for calling functions to verify success.
1288 */ 1294 */
1289static maptile * 1295static inline maptile *
1290load_and_link_tiled_map (maptile *orig_map, int tile_num) 1296find_and_link (maptile *orig_map, int tile_num)
1291{ 1297{
1298 maptile *mp = orig_map->tile_map [tile_num];
1299
1300 if (!mp)
1301 {
1292 maptile *mp = orig_map->load_map_sync (orig_map->tile_path [tile_num], orig_map); 1302 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1293 1303
1294 if (!mp || mp->in_memory != MAP_IN_MEMORY) 1304 if (!mp)
1295 { 1305 {
1296 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine 1306 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1297 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n", 1307 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1298 &orig_map->tile_path[tile_num], &orig_map->path); 1308 &orig_map->tile_path[tile_num], &orig_map->path);
1299 mp = new maptile (1, 1); 1309 mp = new maptile (1, 1);
1300 mp->alloc (); 1310 mp->alloc ();
1301 mp->in_memory = MAP_IN_MEMORY; 1311 mp->in_memory = MAP_IN_MEMORY;
1312 }
1302 } 1313 }
1303 1314
1304 int dest_tile = (tile_num + 2) % 4; 1315 int dest_tile = (tile_num + 2) % 4;
1305 1316
1306 orig_map->tile_map[tile_num] = mp; 1317 orig_map->tile_map [tile_num] = mp;
1307 1318
1308 // optimisation: back-link map to origin map if euclidean 1319 // optimisation: back-link map to origin map if euclidean
1309 //TODO: non-euclidean maps MUST GO 1320 //TODO: non-euclidean maps MUST GO
1310 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) 1321 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1311 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1322 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1312 1323
1313 return mp; 1324 return mp;
1325}
1326
1327static inline void
1328load_and_link (maptile *orig_map, int tile_num)
1329{
1330 find_and_link (orig_map, tile_num)->load_sync ();
1314} 1331}
1315 1332
1316/* this returns TRUE if the coordinates (x,y) are out of 1333/* this returns TRUE if the coordinates (x,y) are out of
1317 * map m. This function also takes into account any 1334 * map m. This function also takes into account any
1318 * tiling considerations, loading adjacant maps as needed. 1335 * tiling considerations, loading adjacant maps as needed.
1335 { 1352 {
1336 if (!m->tile_path[3]) 1353 if (!m->tile_path[3])
1337 return 1; 1354 return 1;
1338 1355
1339 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1356 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1340 load_and_link_tiled_map (m, 3); 1357 find_and_link (m, 3);
1341 1358
1342 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1359 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1343 } 1360 }
1344 1361
1345 if (x >= m->width) 1362 if (x >= m->width)
1346 { 1363 {
1347 if (!m->tile_path[1]) 1364 if (!m->tile_path[1])
1348 return 1; 1365 return 1;
1349 1366
1350 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1367 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1351 load_and_link_tiled_map (m, 1); 1368 find_and_link (m, 1);
1352 1369
1353 return out_of_map (m->tile_map[1], x - m->width, y); 1370 return out_of_map (m->tile_map[1], x - m->width, y);
1354 } 1371 }
1355 1372
1356 if (y < 0) 1373 if (y < 0)
1357 { 1374 {
1358 if (!m->tile_path[0]) 1375 if (!m->tile_path[0])
1359 return 1; 1376 return 1;
1360 1377
1361 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1378 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1362 load_and_link_tiled_map (m, 0); 1379 find_and_link (m, 0);
1363 1380
1364 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1381 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1365 } 1382 }
1366 1383
1367 if (y >= m->height) 1384 if (y >= m->height)
1368 { 1385 {
1369 if (!m->tile_path[2]) 1386 if (!m->tile_path[2])
1370 return 1; 1387 return 1;
1371 1388
1372 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1389 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1373 load_and_link_tiled_map (m, 2); 1390 find_and_link (m, 2);
1374 1391
1375 return out_of_map (m->tile_map[2], x, y - m->height); 1392 return out_of_map (m->tile_map[2], x, y - m->height);
1376 } 1393 }
1377 1394
1378 /* Simple case - coordinates are within this local 1395 /* Simple case - coordinates are within this local
1388 * updates x and y to be the localised coordinates. 1405 * updates x and y to be the localised coordinates.
1389 * Using this is more efficient of calling out_of_map 1406 * Using this is more efficient of calling out_of_map
1390 * and then figuring out what the real map is 1407 * and then figuring out what the real map is
1391 */ 1408 */
1392maptile * 1409maptile *
1393get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1410maptile::xy_find (sint16 &x, sint16 &y)
1394{ 1411{
1395 if (*x < 0) 1412 if (x < 0)
1396 { 1413 {
1397 if (!m->tile_path[3]) 1414 if (!tile_path[3])
1398 return 0; 1415 return 0;
1399 1416
1400 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1417 find_and_link (this, 3);
1401 load_and_link_tiled_map (m, 3);
1402
1403 *x += m->tile_map[3]->width; 1418 x += tile_map[3]->width;
1404 return (get_map_from_coord (m->tile_map[3], x, y)); 1419 return tile_map[3]->xy_find (x, y);
1405 } 1420 }
1406 1421
1407 if (*x >= m->width) 1422 if (x >= width)
1408 { 1423 {
1409 if (!m->tile_path[1]) 1424 if (!tile_path[1])
1410 return 0; 1425 return 0;
1411 1426
1412 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1427 find_and_link (this, 1);
1413 load_and_link_tiled_map (m, 1);
1414
1415 *x -= m->width; 1428 x -= width;
1416 return (get_map_from_coord (m->tile_map[1], x, y)); 1429 return tile_map[1]->xy_find (x, y);
1417 } 1430 }
1418 1431
1419 if (*y < 0) 1432 if (y < 0)
1420 { 1433 {
1421 if (!m->tile_path[0]) 1434 if (!tile_path[0])
1422 return 0; 1435 return 0;
1423 1436
1424 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1437 find_and_link (this, 0);
1425 load_and_link_tiled_map (m, 0);
1426
1427 *y += m->tile_map[0]->height; 1438 y += tile_map[0]->height;
1428 return (get_map_from_coord (m->tile_map[0], x, y)); 1439 return tile_map[0]->xy_find (x, y);
1429 } 1440 }
1430 1441
1431 if (*y >= m->height) 1442 if (y >= height)
1432 { 1443 {
1433 if (!m->tile_path[2]) 1444 if (!tile_path[2])
1434 return 0; 1445 return 0;
1435 1446
1436 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1447 find_and_link (this, 2);
1437 load_and_link_tiled_map (m, 2);
1438
1439 *y -= m->height; 1448 y -= height;
1440 return (get_map_from_coord (m->tile_map[2], x, y)); 1449 return tile_map[2]->xy_find (x, y);
1441 } 1450 }
1442 1451
1443 /* Simple case - coordinates are within this local 1452 /* Simple case - coordinates are within this local
1444 * map. 1453 * map.
1445 */ 1454 */
1446 return m; 1455 return this;
1447} 1456}
1448 1457
1449/** 1458/**
1450 * Return whether map2 is adjacent to map1. If so, store the distance from 1459 * Return whether map2 is adjacent to map1. If so, store the distance from
1451 * map1 to map2 in dx/dy. 1460 * map1 to map2 in dx/dy.
1452 */ 1461 */
1453static int 1462int
1454adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1463adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1455{ 1464{
1456 if (!map1 || !map2) 1465 if (!map1 || !map2)
1457 return 0; 1466 return 0;
1458 1467
1468 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1469 //fix: compare paths instead (this is likely faster, too!)
1459 if (map1 == map2) 1470 if (map1 == map2)
1460 { 1471 {
1461 *dx = 0; 1472 *dx = 0;
1462 *dy = 0; 1473 *dy = 0;
1463 } 1474 }
1523 } 1534 }
1524 else 1535 else
1525 return 0; 1536 return 0;
1526 1537
1527 return 1; 1538 return 1;
1539}
1540
1541maptile *
1542maptile::xy_load (sint16 &x, sint16 &y)
1543{
1544 maptile *map = xy_find (x, y);
1545
1546 if (map)
1547 map->load_sync ();
1548
1549 return map;
1550}
1551
1552maptile *
1553get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1554{
1555 return m->xy_load (*x, *y);
1528} 1556}
1529 1557
1530/* From map.c 1558/* From map.c
1531 * This is used by get_player to determine where the other 1559 * This is used by get_player to determine where the other
1532 * creature is. get_rangevector takes into account map tiling, 1560 * creature is. get_rangevector takes into account map tiling,
1533 * so you just can not look the the map coordinates and get the 1561 * so you just can not look the the map coordinates and get the
1534 * righte value. distance_x/y are distance away, which 1562 * righte value. distance_x/y are distance away, which
1535 * can be negativbe. direction is the crossfire direction scheme 1563 * can be negative. direction is the crossfire direction scheme
1536 * that the creature should head. part is the part of the 1564 * that the creature should head. part is the part of the
1537 * monster that is closest. 1565 * monster that is closest.
1538 * 1566 *
1539 * get_rangevector looks at op1 and op2, and fills in the 1567 * get_rangevector looks at op1 and op2, and fills in the
1540 * structure for op1 to get to op2. 1568 * structure for op1 to get to op2.
1551get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1579get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1552{ 1580{
1553 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1581 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1554 { 1582 {
1555 /* be conservative and fill in _some_ data */ 1583 /* be conservative and fill in _some_ data */
1556 retval->distance = 100000; 1584 retval->distance = 10000;
1557 retval->distance_x = 32767; 1585 retval->distance_x = 10000;
1558 retval->distance_y = 32767; 1586 retval->distance_y = 10000;
1559 retval->direction = 0; 1587 retval->direction = 0;
1560 retval->part = 0; 1588 retval->part = 0;
1561 } 1589 }
1562 else 1590 else
1563 { 1591 {
1568 1596
1569 best = op1; 1597 best = op1;
1570 /* If this is multipart, find the closest part now */ 1598 /* If this is multipart, find the closest part now */
1571 if (!(flags & 0x1) && op1->more) 1599 if (!(flags & 0x1) && op1->more)
1572 { 1600 {
1573 object *tmp;
1574 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1601 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1575 1602
1576 /* we just take the offset of the piece to head to figure 1603 /* we just take the offset of the piece to head to figure
1577 * distance instead of doing all that work above again 1604 * distance instead of doing all that work above again
1578 * since the distance fields we set above are positive in the 1605 * since the distance fields we set above are positive in the
1579 * same axis as is used for multipart objects, the simply arithmetic 1606 * same axis as is used for multipart objects, the simply arithmetic
1580 * below works. 1607 * below works.
1581 */ 1608 */
1582 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1609 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1583 { 1610 {
1584 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1611 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1585 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1612 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1586 if (tmpi < best_distance) 1613 if (tmpi < best_distance)
1587 { 1614 {
1588 best_distance = tmpi; 1615 best_distance = tmpi;
1589 best = tmp; 1616 best = tmp;
1590 } 1617 }
1591 } 1618 }
1619
1592 if (best != op1) 1620 if (best != op1)
1593 { 1621 {
1594 retval->distance_x += op1->x - best->x; 1622 retval->distance_x += op1->x - best->x;
1595 retval->distance_y += op1->y - best->y; 1623 retval->distance_y += op1->y - best->y;
1596 } 1624 }
1597 } 1625 }
1626
1598 retval->part = best; 1627 retval->part = best;
1599 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1628 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1600 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1629 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1601 } 1630 }
1602} 1631}
1603 1632
1604/* this is basically the same as get_rangevector above, but instead of 1633/* this is basically the same as get_rangevector above, but instead of
1609 * flags has no meaning for this function at this time - I kept it in to 1638 * flags has no meaning for this function at this time - I kept it in to
1610 * be more consistant with the above function and also in case they are needed 1639 * be more consistant with the above function and also in case they are needed
1611 * for something in the future. Also, since no object is pasted, the best 1640 * for something in the future. Also, since no object is pasted, the best
1612 * field of the rv_vector is set to NULL. 1641 * field of the rv_vector is set to NULL.
1613 */ 1642 */
1614
1615void 1643void
1616get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1644get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1617{ 1645{
1618 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1646 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1619 { 1647 {
1620 /* be conservative and fill in _some_ data */ 1648 /* be conservative and fill in _some_ data */
1621 retval->distance = 100000; 1649 retval->distance = 100000;
1628 { 1656 {
1629 retval->distance_x += op2->x - x; 1657 retval->distance_x += op2->x - x;
1630 retval->distance_y += op2->y - y; 1658 retval->distance_y += op2->y - y;
1631 1659
1632 retval->part = NULL; 1660 retval->part = NULL;
1633 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1661 retval->distance = idistance (retval->distance_x, retval->distance_y);
1634 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1662 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1635 } 1663 }
1636} 1664}
1637 1665
1638/* Returns true of op1 and op2 are effectively on the same map 1666/* Returns true of op1 and op2 are effectively on the same map
1658 op->remove (); 1686 op->remove ();
1659 1687
1660 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1688 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1661} 1689}
1662 1690
1691region *
1692maptile::region (int x, int y) const
1693{
1694 if (regions
1695 && regionmap
1696 && !OUT_OF_REAL_MAP (this, x, y))
1697 if (struct region *reg = regionmap [regions [y * width + x]])
1698 return reg;
1699
1700 if (default_region)
1701 return default_region;
1702
1703 return ::region::default_region ();
1704}
1705
1706

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines