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.58 by root, Sat Dec 30 18:45:27 2006 UTC vs.
Revision 1.72 by root, Sat Jan 13 23:06:12 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
… …
36 * it really should be called create_mapname 37 * it really should be called create_mapname
37 */ 38 */
38const char * 39const char *
39create_pathname (const char *name) 40create_pathname (const char *name)
40{ 41{
41 static char buf[MAX_BUF]; 42 static char buf[8192];
42
43 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
44 * someplace else in the code? msw 2-17-97
45 */
46 if (*name == '/')
47 sprintf (buf, "%s/%s%s", settings.datadir, settings.mapdir, name);
48 else
49 sprintf (buf, "%s/%s/%s", settings.datadir, settings.mapdir, name); 43 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
50 return (buf); 44 return buf;
51}
52
53/*
54 * same as create_pathname, but for the overlay maps.
55 */
56const char *
57create_overlay_pathname (const char *name)
58{
59 static char buf[MAX_BUF];
60
61 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
62 * someplace else in the code? msw 2-17-97
63 */
64 if (*name == '/')
65 sprintf (buf, "%s/%s%s", settings.localdir, settings.mapdir, name);
66 else
67 sprintf (buf, "%s/%s/%s", settings.localdir, settings.mapdir, name);
68 return (buf);
69}
70
71/*
72 * same as create_pathname, but for the template maps.
73 */
74const char *
75create_template_pathname (const char *name)
76{
77 static char buf[MAX_BUF];
78
79 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
80 * someplace else in the code? msw 2-17-97
81 */
82 if (*name == '/')
83 sprintf (buf, "%s/%s%s", settings.localdir, settings.templatedir, name);
84 else
85 sprintf (buf, "%s/%s/%s", settings.localdir, settings.templatedir, name);
86 return (buf);
87}
88
89/*
90 * This makes absolute path to the itemfile where unique objects
91 * will be saved. Converts '/' to '@'. I think it's essier maintain
92 * files than full directory structure, but if this is problem it can
93 * be changed.
94 */
95static const char *
96create_items_path (const char *s)
97{
98 static char buf[MAX_BUF];
99 char *t;
100
101 if (*s == '/')
102 s++;
103
104 sprintf (buf, "%s/%s/", settings.localdir, settings.uniquedir);
105
106 for (t = buf + strlen (buf); *s; s++, t++)
107 if (*s == '/')
108 *t = '@';
109 else
110 *t = *s;
111 *t = 0;
112 return (buf);
113} 45}
114 46
115/* 47/*
116 * This function checks if a file with the given path exists. 48 * This function checks if a file with the given path exists.
117 * -1 is returned if it fails, otherwise the mode of the file 49 * -1 is returned if it fails, otherwise the mode of the file
… …
331 archetype *tmp; 263 archetype *tmp;
332 int flag; 264 int flag;
333 maptile *m1; 265 maptile *m1;
334 sint16 sx, sy; 266 sint16 sx, sy;
335 267
336 if (ob == NULL) 268 if (!ob)
337 { 269 {
338 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 270 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
339 if (flag & P_OUT_OF_MAP) 271 if (flag & P_OUT_OF_MAP)
340 return P_OUT_OF_MAP; 272 return P_OUT_OF_MAP;
341 273
… …
396 328
397 /* sum_weight will go through and calculate what all the containers are 329 /* sum_weight will go through and calculate what all the containers are
398 * carrying. 330 * carrying.
399 */ 331 */
400 sum_weight (container); 332 sum_weight (container);
333}
334
335void
336maptile::set_object_flag (int flag, int value)
337{
338 if (!spaces)
339 return;
340
341 for (mapspace *ms = spaces + size (); ms-- > spaces; )
342 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
343 tmp->flag [flag] = value;
401} 344}
402 345
403/* link_multipart_objects go through all the objects on the map looking 346/* link_multipart_objects go through all the objects on the map looking
404 * for objects whose arch says they are multipart yet according to the 347 * for objects whose arch says they are multipart yet according to the
405 * info we have, they only have the head (as would be expected when 348 * info we have, they only have the head (as would be expected when
… …
457 * 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
458 * file pointer. 401 * file pointer.
459 * mapflags is the same as we get with load_original_map 402 * mapflags is the same as we get with load_original_map
460 */ 403 */
461bool 404bool
462maptile::load_objects (object_thawer &thawer) 405maptile::_load_objects (object_thawer &thawer)
463{ 406{
464 int unique; 407 int unique;
465 object *op, *prev = NULL, *last_more = NULL, *otmp; 408 object *op, *prev = NULL, *last_more = NULL, *otmp;
466 409
467 op = object::create (); 410 op = object::create ();
… …
528 if (!spaces) 471 if (!spaces)
529 return; 472 return;
530 473
531 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 474 for (mapspace *ms = spaces + size (); ms-- > spaces; )
532 for (object *op = ms->bot; op; op = op->above) 475 for (object *op = ms->bot; op; op = op->above)
533 op->activate (1); 476 op->activate_recursive ();
534} 477}
535 478
536void 479void
537maptile::deactivate () 480maptile::deactivate ()
538{ 481{
539 if (!spaces) 482 if (!spaces)
540 return; 483 return;
541 484
542 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 485 for (mapspace *ms = spaces + size (); ms-- > spaces; )
543 for (object *op = ms->bot; op; op = op->above) 486 for (object *op = ms->bot; op; op = op->above)
544 op->deactivate (1); 487 op->deactivate_recursive ();
545} 488}
546 489
547bool 490bool
548maptile::save_objects (object_freezer &freezer, int flags) 491maptile::_save_objects (object_freezer &freezer, int flags)
549{ 492{
493 static int cede_count = 0;
494
550 if (flags & IO_HEADER) 495 if (flags & IO_HEADER)
551 save_header (freezer); 496 _save_header (freezer);
552 497
553 if (!spaces) 498 if (!spaces)
554 return false; 499 return false;
555 500
556 for (int i = 0; i < size (); ++i) 501 for (int i = 0; i < size (); ++i)
557 { 502 {
503 if (cede_count >= 500)
504 {
505 cede_count = 0;
506 coroapi::cede ();
507 }
508
558 int unique = 0; 509 int unique = 0;
559 for (object *op = spaces [i].bot; op; op = op->above) 510 for (object *op = spaces [i].bot; op; op = op->above)
560 { 511 {
512 // count per-object, but cede only when modification-safe
513 cede_count++;
514
561 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 515 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
562 unique = 1; 516 unique = 1;
563 517
564 if (!op->can_map_save ()) 518 if (!op->can_map_save ())
565 continue; 519 continue;
… …
576 530
577 return true; 531 return true;
578} 532}
579 533
580bool 534bool
581maptile::load_objects (const char *path, bool skip_header) 535maptile::_load_objects (const char *path, bool skip_header)
582{ 536{
583 object_thawer thawer (path); 537 object_thawer thawer (path);
584 538
585 if (!thawer) 539 if (!thawer)
586 return false; 540 return false;
… …
594 break; 548 break;
595 549
596 thawer.skip_kv (kw); 550 thawer.skip_kv (kw);
597 } 551 }
598 552
599 return load_objects (thawer); 553 return _load_objects (thawer);
600} 554}
601 555
602bool 556bool
603maptile::save_objects (const char *path, int flags) 557maptile::_save_objects (const char *path, int flags)
604{ 558{
605 object_freezer freezer; 559 object_freezer freezer;
606 560
607 if (!save_objects (freezer, flags)) 561 if (!_save_objects (freezer, flags))
608 return false; 562 return false;
609 563
610 return freezer.save (path); 564 return freezer.save (path);
611} 565}
612 566
… …
776 * This could be done in lex (like the object loader), but I think 730 * This could be done in lex (like the object loader), but I think
777 * currently, there are few enough fields this is not a big deal. 731 * currently, there are few enough fields this is not a big deal.
778 * MSW 2001-07-01 732 * MSW 2001-07-01
779 */ 733 */
780bool 734bool
781maptile::load_header (object_thawer &thawer) 735maptile::_load_header (object_thawer &thawer)
782{ 736{
783 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
784 int msgpos = 0;
785 int maplorepos = 0;
786
787 for (;;) 737 for (;;)
788 { 738 {
789 keyword kw = thawer.get_kv (); 739 keyword kw = thawer.get_kv ();
790 740
791 switch (kw) 741 switch (kw)
792 { 742 {
793 case KW_EOF: 743 case KW_EOF:
794 LOG (llevError, "%s: end of file while reading map header, aborting header load.", &path); 744 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
795 return false; 745 return false;
796 746
797 case KW_end: 747 case KW_end:
798 return true; 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;
799 754
800 case KW_msg: 755 case KW_msg:
801 thawer.get_ml (KW_endmsg, msg); 756 thawer.get_ml (KW_endmsg, msg);
802 break; 757 break;
803 758
… …
854 809
855 case KW_tile_path_1: thawer.get (tile_path [0]); break; 810 case KW_tile_path_1: thawer.get (tile_path [0]); break;
856 case KW_tile_path_2: thawer.get (tile_path [1]); break; 811 case KW_tile_path_2: thawer.get (tile_path [1]); break;
857 case KW_tile_path_3: thawer.get (tile_path [2]); break; 812 case KW_tile_path_3: thawer.get (tile_path [2]); break;
858 case KW_tile_path_4: thawer.get (tile_path [3]); break; 813 case KW_tile_path_4: thawer.get (tile_path [3]); break;
859
860 default:
861 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]);
862 break;
863 } 814 }
864 } 815 }
865 816
866 abort (); 817 abort ();
867} 818}
868 819
869bool 820bool
870maptile::load_header (const char *path) 821maptile::_load_header (const char *path)
871{ 822{
872 object_thawer thawer (path); 823 object_thawer thawer (path);
873 824
874 if (!thawer) 825 if (!thawer)
875 return false; 826 return false;
876 827
877 return load_header (thawer); 828 return _load_header (thawer);
878} 829}
879 830
880/****************************************************************************** 831/******************************************************************************
881 * This is the start of unique map handling code 832 * This is the start of unique map handling code
882 *****************************************************************************/ 833 *****************************************************************************/
… …
905 } 856 }
906 } 857 }
907} 858}
908 859
909bool 860bool
910maptile::save_header (object_freezer &freezer) 861maptile::_save_header (object_freezer &freezer)
911{ 862{
912#define MAP_OUT(k) freezer.put (KW_ ## k, k) 863#define MAP_OUT(k) freezer.put (KW_ ## k, k)
913#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 864#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
914 865
915 MAP_OUT2 (arch, "map"); 866 MAP_OUT2 (arch, "map");
… …
957 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 908 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
958 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 909 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
959 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 910 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
960 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 911 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
961 912
962 MAP_OUT2 (end, 0); 913 freezer.put (this);
914 freezer.put (KW_end);
963 915
964 return true; 916 return true;
965} 917}
966 918
967bool 919bool
968maptile::save_header (const char *path) 920maptile::_save_header (const char *path)
969{ 921{
970 object_freezer freezer; 922 object_freezer freezer;
971 923
972 if (!save_header (freezer)) 924 if (!_save_header (freezer))
973 return false; 925 return false;
974 926
975 return freezer.save (path); 927 return freezer.save (path);
976} 928}
977 929
… …
1283 1235
1284 /* If two top faces are already set, quit processing */ 1236 /* If two top faces are already set, quit processing */
1285 if ((top != blank_face) && (middle != blank_face)) 1237 if ((top != blank_face) && (middle != blank_face))
1286 break; 1238 break;
1287 1239
1288 /* Only show visible faces, unless its the editor - show all */ 1240 /* Only show visible faces */
1289 if (!tmp->invisible || editor) 1241 if (!tmp->invisible)
1290 { 1242 {
1291 /* Fill in top if needed */ 1243 /* Fill in top if needed */
1292 if (top == blank_face) 1244 if (top == blank_face)
1293 { 1245 {
1294 top = tmp->face; 1246 top = tmp->face;
… …
1324 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;
1325 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;
1326 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;
1327} 1279}
1328 1280
1329/* this updates the orig_map->tile_map[tile_num] value after loading 1281/* this updates the orig_map->tile_map[tile_num] value after finding
1330 * the map. It also takes care of linking back the freshly loaded 1282 * the map. It also takes care of linking back the freshly found
1331 * maps tile_map values if it tiles back to this one. It returns 1283 * maps tile_map values if it tiles back to this one. It returns
1332 * the value of orig_map->tile_map[tile_num]. It really only does this 1284 * the value of orig_map->tile_map[tile_num].
1333 * so that it is easier for calling functions to verify success.
1334 */ 1285 */
1335static maptile * 1286static inline maptile *
1336load_and_link_tiled_map (maptile *orig_map, int tile_num) 1287find_and_link (maptile *orig_map, int tile_num)
1337{ 1288{
1289 maptile *mp = orig_map->tile_map [tile_num];
1290
1291 if (!mp)
1292 {
1338 maptile *mp = orig_map->find_map (orig_map->tile_path[tile_num]); 1293 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1339 mp->load (); 1294
1295 if (!mp)
1296 {
1297 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1298 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1299 &orig_map->tile_path[tile_num], &orig_map->path);
1300 mp = new maptile (1, 1);
1301 mp->alloc ();
1302 mp->in_memory = MAP_IN_MEMORY;
1303 }
1304 }
1340 1305
1341 int dest_tile = (tile_num + 2) % 4; 1306 int dest_tile = (tile_num + 2) % 4;
1342 1307
1343 orig_map->tile_map[tile_num] = mp; 1308 orig_map->tile_map [tile_num] = mp;
1344 1309
1345 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1310 // optimisation: back-link map to origin map if euclidean
1346 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) 1311 //TODO: non-euclidean maps MUST GO
1312 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1347 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1313 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1348 1314
1349 return mp; 1315 return mp;
1316}
1317
1318static inline void
1319load_and_link (maptile *orig_map, int tile_num)
1320{
1321 find_and_link (orig_map, tile_num)->load_sync ();
1350} 1322}
1351 1323
1352/* this returns TRUE if the coordinates (x,y) are out of 1324/* this returns TRUE if the coordinates (x,y) are out of
1353 * map m. This function also takes into account any 1325 * map m. This function also takes into account any
1354 * tiling considerations, loading adjacant maps as needed. 1326 * tiling considerations, loading adjacant maps as needed.
… …
1371 { 1343 {
1372 if (!m->tile_path[3]) 1344 if (!m->tile_path[3])
1373 return 1; 1345 return 1;
1374 1346
1375 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1347 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1376 load_and_link_tiled_map (m, 3); 1348 find_and_link (m, 3);
1377 1349
1378 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1350 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1379 } 1351 }
1380 1352
1381 if (x >= m->width) 1353 if (x >= m->width)
1382 { 1354 {
1383 if (!m->tile_path[1]) 1355 if (!m->tile_path[1])
1384 return 1; 1356 return 1;
1385 1357
1386 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1358 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1387 load_and_link_tiled_map (m, 1); 1359 find_and_link (m, 1);
1388 1360
1389 return out_of_map (m->tile_map[1], x - m->width, y); 1361 return out_of_map (m->tile_map[1], x - m->width, y);
1390 } 1362 }
1391 1363
1392 if (y < 0) 1364 if (y < 0)
1393 { 1365 {
1394 if (!m->tile_path[0]) 1366 if (!m->tile_path[0])
1395 return 1; 1367 return 1;
1396 1368
1397 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1369 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1398 load_and_link_tiled_map (m, 0); 1370 find_and_link (m, 0);
1399 1371
1400 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1372 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1401 } 1373 }
1402 1374
1403 if (y >= m->height) 1375 if (y >= m->height)
1404 { 1376 {
1405 if (!m->tile_path[2]) 1377 if (!m->tile_path[2])
1406 return 1; 1378 return 1;
1407 1379
1408 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1380 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1409 load_and_link_tiled_map (m, 2); 1381 find_and_link (m, 2);
1410 1382
1411 return out_of_map (m->tile_map[2], x, y - m->height); 1383 return out_of_map (m->tile_map[2], x, y - m->height);
1412 } 1384 }
1413 1385
1414 /* Simple case - coordinates are within this local 1386 /* Simple case - coordinates are within this local
… …
1419 1391
1420/* This is basically the same as out_of_map above, but 1392/* This is basically the same as out_of_map above, but
1421 * instead we return NULL if no map is valid (coordinates 1393 * instead we return NULL if no map is valid (coordinates
1422 * out of bounds and no tiled map), otherwise it returns 1394 * out of bounds and no tiled map), otherwise it returns
1423 * the map as that the coordinates are really on, and 1395 * the map as that the coordinates are really on, and
1424 * updates x and y to be the localized coordinates. 1396 * updates x and y to be the localised coordinates.
1425 * Using this is more efficient of calling out_of_map 1397 * Using this is more efficient of calling out_of_map
1426 * and then figuring out what the real map is 1398 * and then figuring out what the real map is
1427 */ 1399 */
1428maptile * 1400maptile *
1429get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1401maptile::xy_find (sint16 &x, sint16 &y)
1430{ 1402{
1431 if (*x < 0) 1403 if (x < 0)
1432 { 1404 {
1433 if (!m->tile_path[3]) 1405 if (!tile_path[3])
1434 return 0; 1406 return 0;
1435 1407
1436 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1408 find_and_link (this, 3);
1437 load_and_link_tiled_map (m, 3);
1438
1439 *x += m->tile_map[3]->width; 1409 x += tile_map[3]->width;
1440 return (get_map_from_coord (m->tile_map[3], x, y)); 1410 return tile_map[3]->xy_find (x, y);
1441 } 1411 }
1442 1412
1443 if (*x >= m->width) 1413 if (x >= width)
1444 { 1414 {
1445 if (!m->tile_path[1]) 1415 if (!tile_path[1])
1446 return 0; 1416 return 0;
1447 1417
1448 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1418 find_and_link (this, 1);
1449 load_and_link_tiled_map (m, 1);
1450
1451 *x -= m->width; 1419 x -= width;
1452 return (get_map_from_coord (m->tile_map[1], x, y)); 1420 return tile_map[1]->xy_find (x, y);
1453 } 1421 }
1454 1422
1455 if (*y < 0) 1423 if (y < 0)
1456 { 1424 {
1457 if (!m->tile_path[0]) 1425 if (!tile_path[0])
1458 return 0; 1426 return 0;
1459 1427
1460 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1428 find_and_link (this, 0);
1461 load_and_link_tiled_map (m, 0);
1462
1463 *y += m->tile_map[0]->height; 1429 y += tile_map[0]->height;
1464 return (get_map_from_coord (m->tile_map[0], x, y)); 1430 return tile_map[0]->xy_find (x, y);
1465 } 1431 }
1466 1432
1467 if (*y >= m->height) 1433 if (y >= height)
1468 { 1434 {
1469 if (!m->tile_path[2]) 1435 if (!tile_path[2])
1470 return 0; 1436 return 0;
1471 1437
1472 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1438 find_and_link (this, 2);
1473 load_and_link_tiled_map (m, 2);
1474
1475 *y -= m->height; 1439 y -= height;
1476 return (get_map_from_coord (m->tile_map[2], x, y)); 1440 return tile_map[2]->xy_find (x, y);
1477 } 1441 }
1478 1442
1479 /* Simple case - coordinates are within this local 1443 /* Simple case - coordinates are within this local
1480 * map. 1444 * map.
1481 */ 1445 */
1482 return m; 1446 return this;
1483} 1447}
1484 1448
1485/** 1449/**
1486 * Return whether map2 is adjacent to map1. If so, store the distance from 1450 * Return whether map2 is adjacent to map1. If so, store the distance from
1487 * map1 to map2 in dx/dy. 1451 * map1 to map2 in dx/dy.
… …
1490adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1454adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1491{ 1455{
1492 if (!map1 || !map2) 1456 if (!map1 || !map2)
1493 return 0; 1457 return 0;
1494 1458
1459 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1460 //fix: compare paths instead (this is likely faster, too!)
1495 if (map1 == map2) 1461 if (map1 == map2)
1496 { 1462 {
1497 *dx = 0; 1463 *dx = 0;
1498 *dy = 0; 1464 *dy = 0;
1499 } 1465 }
… …
1559 } 1525 }
1560 else 1526 else
1561 return 0; 1527 return 0;
1562 1528
1563 return 1; 1529 return 1;
1530}
1531
1532maptile *
1533maptile::xy_load (sint16 &x, sint16 &y)
1534{
1535 maptile *map = xy_find (x, y);
1536
1537 if (map)
1538 map->load_sync ();
1539
1540 return map;
1541}
1542
1543maptile *
1544get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1545{
1546 return m->xy_load (*x, *y);
1564} 1547}
1565 1548
1566/* From map.c 1549/* From map.c
1567 * This is used by get_player to determine where the other 1550 * This is used by get_player to determine where the other
1568 * creature is. get_rangevector takes into account map tiling, 1551 * creature is. get_rangevector takes into account map tiling,

Diff Legend

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