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 |
… | |
… | |
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 | */ |
403 | bool |
404 | bool |
404 | maptile::load_objects (object_thawer &thawer) |
405 | maptile::_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 | |
489 | bool |
490 | bool |
490 | maptile::save_objects (object_freezer &freezer, int flags) |
491 | maptile::_save_objects (object_freezer &freezer, int flags) |
491 | { |
492 | { |
|
|
493 | static int cede_count = 0; |
|
|
494 | |
492 | if (flags & IO_HEADER) |
495 | if (flags & IO_HEADER) |
493 | save_header (freezer); |
496 | _save_header (freezer); |
494 | |
497 | |
495 | if (!spaces) |
498 | if (!spaces) |
496 | return false; |
499 | return false; |
497 | |
500 | |
498 | for (int i = 0; i < size (); ++i) |
501 | for (int i = 0; i < size (); ++i) |
499 | { |
502 | { |
|
|
503 | #if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D |
|
|
504 | if (cede_count >= 500) |
|
|
505 | { |
|
|
506 | cede_count = 0; |
|
|
507 | coroapi::cede (); |
|
|
508 | } |
|
|
509 | #endif |
|
|
510 | |
500 | int unique = 0; |
511 | int unique = 0; |
501 | for (object *op = spaces [i].bot; op; op = op->above) |
512 | for (object *op = spaces [i].bot; op; op = op->above) |
502 | { |
513 | { |
|
|
514 | // count per-object, but cede only when modification-safe |
|
|
515 | cede_count++; |
|
|
516 | |
503 | if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) |
517 | if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) |
504 | unique = 1; |
518 | unique = 1; |
505 | |
519 | |
506 | if (!op->can_map_save ()) |
520 | if (!op->can_map_save ()) |
507 | continue; |
521 | continue; |
… | |
… | |
518 | |
532 | |
519 | return true; |
533 | return true; |
520 | } |
534 | } |
521 | |
535 | |
522 | bool |
536 | bool |
523 | maptile::load_objects (const char *path, bool skip_header) |
537 | maptile::_load_objects (const char *path, bool skip_header) |
524 | { |
538 | { |
525 | object_thawer thawer (path); |
539 | object_thawer thawer (path); |
526 | |
540 | |
527 | if (!thawer) |
541 | if (!thawer) |
528 | return false; |
542 | return false; |
… | |
… | |
536 | break; |
550 | break; |
537 | |
551 | |
538 | thawer.skip_kv (kw); |
552 | thawer.skip_kv (kw); |
539 | } |
553 | } |
540 | |
554 | |
541 | return load_objects (thawer); |
555 | return _load_objects (thawer); |
542 | } |
556 | } |
543 | |
557 | |
544 | bool |
558 | bool |
545 | maptile::save_objects (const char *path, int flags) |
559 | maptile::_save_objects (const char *path, int flags) |
546 | { |
560 | { |
547 | object_freezer freezer; |
561 | object_freezer freezer; |
548 | |
562 | |
549 | if (!save_objects (freezer, flags)) |
563 | if (!_save_objects (freezer, flags)) |
550 | return false; |
564 | return false; |
551 | |
565 | |
552 | return freezer.save (path); |
566 | return freezer.save (path); |
553 | } |
567 | } |
554 | |
568 | |
… | |
… | |
718 | * This could be done in lex (like the object loader), but I think |
732 | * This could be done in lex (like the object loader), but I think |
719 | * currently, there are few enough fields this is not a big deal. |
733 | * currently, there are few enough fields this is not a big deal. |
720 | * MSW 2001-07-01 |
734 | * MSW 2001-07-01 |
721 | */ |
735 | */ |
722 | bool |
736 | bool |
723 | maptile::load_header (object_thawer &thawer) |
737 | maptile::_load_header (object_thawer &thawer) |
724 | { |
738 | { |
725 | char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end; |
|
|
726 | int msgpos = 0; |
|
|
727 | int maplorepos = 0; |
|
|
728 | |
|
|
729 | for (;;) |
739 | for (;;) |
730 | { |
740 | { |
731 | keyword kw = thawer.get_kv (); |
741 | keyword kw = thawer.get_kv (); |
732 | |
742 | |
733 | switch (kw) |
743 | switch (kw) |
… | |
… | |
736 | LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path); |
746 | LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path); |
737 | return false; |
747 | return false; |
738 | |
748 | |
739 | case KW_end: |
749 | case KW_end: |
740 | return true; |
750 | return true; |
|
|
751 | |
|
|
752 | default: |
|
|
753 | case KW_ERROR: |
|
|
754 | LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword); |
|
|
755 | break; |
741 | |
756 | |
742 | case KW_msg: |
757 | case KW_msg: |
743 | thawer.get_ml (KW_endmsg, msg); |
758 | thawer.get_ml (KW_endmsg, msg); |
744 | break; |
759 | break; |
745 | |
760 | |
… | |
… | |
796 | |
811 | |
797 | case KW_tile_path_1: thawer.get (tile_path [0]); break; |
812 | case KW_tile_path_1: thawer.get (tile_path [0]); break; |
798 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
813 | case KW_tile_path_2: thawer.get (tile_path [1]); break; |
799 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
814 | case KW_tile_path_3: thawer.get (tile_path [2]); break; |
800 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
815 | case KW_tile_path_4: thawer.get (tile_path [3]); break; |
801 | |
|
|
802 | default: |
|
|
803 | LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]); |
|
|
804 | break; |
|
|
805 | } |
816 | } |
806 | } |
817 | } |
807 | |
818 | |
808 | abort (); |
819 | abort (); |
809 | } |
820 | } |
810 | |
821 | |
811 | bool |
822 | bool |
812 | maptile::load_header (const char *path) |
823 | maptile::_load_header (const char *path) |
813 | { |
824 | { |
814 | object_thawer thawer (path); |
825 | object_thawer thawer (path); |
815 | |
826 | |
816 | if (!thawer) |
827 | if (!thawer) |
817 | return false; |
828 | return false; |
818 | |
829 | |
819 | return load_header (thawer); |
830 | return _load_header (thawer); |
820 | } |
831 | } |
821 | |
832 | |
822 | /****************************************************************************** |
833 | /****************************************************************************** |
823 | * This is the start of unique map handling code |
834 | * This is the start of unique map handling code |
824 | *****************************************************************************/ |
835 | *****************************************************************************/ |
… | |
… | |
847 | } |
858 | } |
848 | } |
859 | } |
849 | } |
860 | } |
850 | |
861 | |
851 | bool |
862 | bool |
852 | maptile::save_header (object_freezer &freezer) |
863 | maptile::_save_header (object_freezer &freezer) |
853 | { |
864 | { |
854 | #define MAP_OUT(k) freezer.put (KW_ ## k, k) |
865 | #define MAP_OUT(k) freezer.put (KW_ ## k, k) |
855 | #define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) |
866 | #define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) |
856 | |
867 | |
857 | MAP_OUT2 (arch, "map"); |
868 | MAP_OUT2 (arch, "map"); |
… | |
… | |
906 | |
917 | |
907 | return true; |
918 | return true; |
908 | } |
919 | } |
909 | |
920 | |
910 | bool |
921 | bool |
911 | maptile::save_header (const char *path) |
922 | maptile::_save_header (const char *path) |
912 | { |
923 | { |
913 | object_freezer freezer; |
924 | object_freezer freezer; |
914 | |
925 | |
915 | if (!save_header (freezer)) |
926 | if (!_save_header (freezer)) |
916 | return false; |
927 | return false; |
917 | |
928 | |
918 | return freezer.save (path); |
929 | return freezer.save (path); |
919 | } |
930 | } |
920 | |
931 | |
… | |
… | |
1099 | */ |
1110 | */ |
1100 | void |
1111 | void |
1101 | mapspace::update_ () |
1112 | mapspace::update_ () |
1102 | { |
1113 | { |
1103 | object *tmp, *last = 0; |
1114 | object *tmp, *last = 0; |
1104 | uint8 flags = 0, light = 0, anywhere = 0; |
1115 | uint8 flags = P_UPTODATE, light = 0, anywhere = 0; |
1105 | New_Face *top, *floor, *middle; |
1116 | New_Face *top, *floor, *middle; |
1106 | object *top_obj, *floor_obj, *middle_obj; |
1117 | object *top_obj, *floor_obj, *middle_obj; |
1107 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1118 | MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; |
1108 | |
1119 | |
1109 | middle = blank_face; |
1120 | middle = blank_face; |
… | |
… | |
1226 | |
1237 | |
1227 | /* If two top faces are already set, quit processing */ |
1238 | /* If two top faces are already set, quit processing */ |
1228 | if ((top != blank_face) && (middle != blank_face)) |
1239 | if ((top != blank_face) && (middle != blank_face)) |
1229 | break; |
1240 | break; |
1230 | |
1241 | |
1231 | /* Only show visible faces, unless its the editor - show all */ |
1242 | /* Only show visible faces */ |
1232 | if (!tmp->invisible || editor) |
1243 | if (!tmp->invisible) |
1233 | { |
1244 | { |
1234 | /* Fill in top if needed */ |
1245 | /* Fill in top if needed */ |
1235 | if (top == blank_face) |
1246 | if (top == blank_face) |
1236 | { |
1247 | { |
1237 | top = tmp->face; |
1248 | top = tmp->face; |
… | |
… | |
1267 | faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; |
1278 | faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; |
1268 | faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; |
1279 | faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; |
1269 | faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; |
1280 | faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; |
1270 | } |
1281 | } |
1271 | |
1282 | |
1272 | /* this updates the orig_map->tile_map[tile_num] value after loading |
1283 | /* this updates the orig_map->tile_map[tile_num] value after finding |
1273 | * the map. It also takes care of linking back the freshly loaded |
1284 | * the map. It also takes care of linking back the freshly found |
1274 | * maps tile_map values if it tiles back to this one. It returns |
1285 | * maps tile_map values if it tiles back to this one. It returns |
1275 | * the value of orig_map->tile_map[tile_num]. It really only does this |
1286 | * the value of orig_map->tile_map[tile_num]. |
1276 | * so that it is easier for calling functions to verify success. |
|
|
1277 | */ |
1287 | */ |
1278 | static maptile * |
1288 | static inline maptile * |
1279 | load_and_link_tiled_map (maptile *orig_map, int tile_num) |
1289 | find_and_link (maptile *orig_map, int tile_num) |
1280 | { |
1290 | { |
|
|
1291 | maptile *mp = orig_map->tile_map [tile_num]; |
|
|
1292 | |
|
|
1293 | if (!mp) |
|
|
1294 | { |
1281 | maptile *mp = orig_map->load_map_sync (orig_map->tile_path [tile_num], orig_map); |
1295 | mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map); |
1282 | |
1296 | |
1283 | if (!mp || mp->in_memory != MAP_IN_MEMORY) |
1297 | if (!mp) |
1284 | { |
1298 | { |
1285 | // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine |
1299 | // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine |
1286 | LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n", |
1300 | LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n", |
1287 | &orig_map->tile_path[tile_num], &orig_map->path); |
1301 | &orig_map->tile_path[tile_num], &orig_map->path); |
1288 | mp = new maptile (1, 1); |
1302 | mp = new maptile (1, 1); |
1289 | mp->alloc (); |
1303 | mp->alloc (); |
1290 | mp->in_memory = MAP_IN_MEMORY; |
1304 | mp->in_memory = MAP_IN_MEMORY; |
|
|
1305 | } |
1291 | } |
1306 | } |
1292 | |
1307 | |
1293 | int dest_tile = (tile_num + 2) % 4; |
1308 | int dest_tile = (tile_num + 2) % 4; |
1294 | |
1309 | |
1295 | orig_map->tile_map[tile_num] = mp; |
1310 | orig_map->tile_map [tile_num] = mp; |
1296 | |
1311 | |
1297 | // optimisation: back-link map to origin map if euclidean |
1312 | // optimisation: back-link map to origin map if euclidean |
1298 | //TODO: non-euclidean maps MUST GO |
1313 | //TODO: non-euclidean maps MUST GO |
1299 | if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) |
1314 | if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) |
1300 | orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; |
1315 | orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; |
1301 | |
1316 | |
1302 | return mp; |
1317 | return mp; |
|
|
1318 | } |
|
|
1319 | |
|
|
1320 | static inline void |
|
|
1321 | load_and_link (maptile *orig_map, int tile_num) |
|
|
1322 | { |
|
|
1323 | find_and_link (orig_map, tile_num)->load_sync (); |
1303 | } |
1324 | } |
1304 | |
1325 | |
1305 | /* this returns TRUE if the coordinates (x,y) are out of |
1326 | /* this returns TRUE if the coordinates (x,y) are out of |
1306 | * map m. This function also takes into account any |
1327 | * map m. This function also takes into account any |
1307 | * tiling considerations, loading adjacant maps as needed. |
1328 | * tiling considerations, loading adjacant maps as needed. |
… | |
… | |
1324 | { |
1345 | { |
1325 | if (!m->tile_path[3]) |
1346 | if (!m->tile_path[3]) |
1326 | return 1; |
1347 | return 1; |
1327 | |
1348 | |
1328 | if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) |
1349 | if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) |
1329 | load_and_link_tiled_map (m, 3); |
1350 | find_and_link (m, 3); |
1330 | |
1351 | |
1331 | return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); |
1352 | return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); |
1332 | } |
1353 | } |
1333 | |
1354 | |
1334 | if (x >= m->width) |
1355 | if (x >= m->width) |
1335 | { |
1356 | { |
1336 | if (!m->tile_path[1]) |
1357 | if (!m->tile_path[1]) |
1337 | return 1; |
1358 | return 1; |
1338 | |
1359 | |
1339 | if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) |
1360 | if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) |
1340 | load_and_link_tiled_map (m, 1); |
1361 | find_and_link (m, 1); |
1341 | |
1362 | |
1342 | return out_of_map (m->tile_map[1], x - m->width, y); |
1363 | return out_of_map (m->tile_map[1], x - m->width, y); |
1343 | } |
1364 | } |
1344 | |
1365 | |
1345 | if (y < 0) |
1366 | if (y < 0) |
1346 | { |
1367 | { |
1347 | if (!m->tile_path[0]) |
1368 | if (!m->tile_path[0]) |
1348 | return 1; |
1369 | return 1; |
1349 | |
1370 | |
1350 | if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) |
1371 | if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) |
1351 | load_and_link_tiled_map (m, 0); |
1372 | find_and_link (m, 0); |
1352 | |
1373 | |
1353 | return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); |
1374 | return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); |
1354 | } |
1375 | } |
1355 | |
1376 | |
1356 | if (y >= m->height) |
1377 | if (y >= m->height) |
1357 | { |
1378 | { |
1358 | if (!m->tile_path[2]) |
1379 | if (!m->tile_path[2]) |
1359 | return 1; |
1380 | return 1; |
1360 | |
1381 | |
1361 | if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) |
1382 | if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) |
1362 | load_and_link_tiled_map (m, 2); |
1383 | find_and_link (m, 2); |
1363 | |
1384 | |
1364 | return out_of_map (m->tile_map[2], x, y - m->height); |
1385 | return out_of_map (m->tile_map[2], x, y - m->height); |
1365 | } |
1386 | } |
1366 | |
1387 | |
1367 | /* Simple case - coordinates are within this local |
1388 | /* Simple case - coordinates are within this local |
… | |
… | |
1372 | |
1393 | |
1373 | /* This is basically the same as out_of_map above, but |
1394 | /* This is basically the same as out_of_map above, but |
1374 | * instead we return NULL if no map is valid (coordinates |
1395 | * instead we return NULL if no map is valid (coordinates |
1375 | * out of bounds and no tiled map), otherwise it returns |
1396 | * out of bounds and no tiled map), otherwise it returns |
1376 | * the map as that the coordinates are really on, and |
1397 | * the map as that the coordinates are really on, and |
1377 | * updates x and y to be the localized coordinates. |
1398 | * updates x and y to be the localised coordinates. |
1378 | * Using this is more efficient of calling out_of_map |
1399 | * Using this is more efficient of calling out_of_map |
1379 | * and then figuring out what the real map is |
1400 | * and then figuring out what the real map is |
1380 | */ |
1401 | */ |
1381 | maptile * |
1402 | maptile * |
1382 | get_map_from_coord (maptile *m, sint16 *x, sint16 *y) |
1403 | maptile::xy_find (sint16 &x, sint16 &y) |
1383 | { |
1404 | { |
1384 | if (*x < 0) |
1405 | if (x < 0) |
1385 | { |
1406 | { |
1386 | if (!m->tile_path[3]) |
1407 | if (!tile_path[3]) |
1387 | return 0; |
1408 | return 0; |
1388 | |
1409 | |
1389 | if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) |
1410 | find_and_link (this, 3); |
1390 | load_and_link_tiled_map (m, 3); |
|
|
1391 | |
|
|
1392 | *x += m->tile_map[3]->width; |
1411 | x += tile_map[3]->width; |
1393 | return (get_map_from_coord (m->tile_map[3], x, y)); |
1412 | return tile_map[3]->xy_find (x, y); |
1394 | } |
1413 | } |
1395 | |
1414 | |
1396 | if (*x >= m->width) |
1415 | if (x >= width) |
1397 | { |
1416 | { |
1398 | if (!m->tile_path[1]) |
1417 | if (!tile_path[1]) |
1399 | return 0; |
1418 | return 0; |
1400 | |
1419 | |
1401 | if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) |
1420 | find_and_link (this, 1); |
1402 | load_and_link_tiled_map (m, 1); |
|
|
1403 | |
|
|
1404 | *x -= m->width; |
1421 | x -= width; |
1405 | return (get_map_from_coord (m->tile_map[1], x, y)); |
1422 | return tile_map[1]->xy_find (x, y); |
1406 | } |
1423 | } |
1407 | |
1424 | |
1408 | if (*y < 0) |
1425 | if (y < 0) |
1409 | { |
1426 | { |
1410 | if (!m->tile_path[0]) |
1427 | if (!tile_path[0]) |
1411 | return 0; |
1428 | return 0; |
1412 | |
1429 | |
1413 | if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) |
1430 | find_and_link (this, 0); |
1414 | load_and_link_tiled_map (m, 0); |
|
|
1415 | |
|
|
1416 | *y += m->tile_map[0]->height; |
1431 | y += tile_map[0]->height; |
1417 | return (get_map_from_coord (m->tile_map[0], x, y)); |
1432 | return tile_map[0]->xy_find (x, y); |
1418 | } |
1433 | } |
1419 | |
1434 | |
1420 | if (*y >= m->height) |
1435 | if (y >= height) |
1421 | { |
1436 | { |
1422 | if (!m->tile_path[2]) |
1437 | if (!tile_path[2]) |
1423 | return 0; |
1438 | return 0; |
1424 | |
1439 | |
1425 | if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) |
1440 | find_and_link (this, 2); |
1426 | load_and_link_tiled_map (m, 2); |
|
|
1427 | |
|
|
1428 | *y -= m->height; |
1441 | y -= height; |
1429 | return (get_map_from_coord (m->tile_map[2], x, y)); |
1442 | return tile_map[2]->xy_find (x, y); |
1430 | } |
1443 | } |
1431 | |
1444 | |
1432 | /* Simple case - coordinates are within this local |
1445 | /* Simple case - coordinates are within this local |
1433 | * map. |
1446 | * map. |
1434 | */ |
1447 | */ |
1435 | return m; |
1448 | return this; |
1436 | } |
1449 | } |
1437 | |
1450 | |
1438 | /** |
1451 | /** |
1439 | * Return whether map2 is adjacent to map1. If so, store the distance from |
1452 | * Return whether map2 is adjacent to map1. If so, store the distance from |
1440 | * map1 to map2 in dx/dy. |
1453 | * map1 to map2 in dx/dy. |
… | |
… | |
1443 | adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) |
1456 | adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) |
1444 | { |
1457 | { |
1445 | if (!map1 || !map2) |
1458 | if (!map1 || !map2) |
1446 | return 0; |
1459 | return 0; |
1447 | |
1460 | |
|
|
1461 | //TODO: this doesn't actually check corretcly when intermediate maps are not loaded |
|
|
1462 | //fix: compare paths instead (this is likely faster, too!) |
1448 | if (map1 == map2) |
1463 | if (map1 == map2) |
1449 | { |
1464 | { |
1450 | *dx = 0; |
1465 | *dx = 0; |
1451 | *dy = 0; |
1466 | *dy = 0; |
1452 | } |
1467 | } |
… | |
… | |
1512 | } |
1527 | } |
1513 | else |
1528 | else |
1514 | return 0; |
1529 | return 0; |
1515 | |
1530 | |
1516 | return 1; |
1531 | return 1; |
|
|
1532 | } |
|
|
1533 | |
|
|
1534 | maptile * |
|
|
1535 | maptile::xy_load (sint16 &x, sint16 &y) |
|
|
1536 | { |
|
|
1537 | maptile *map = xy_find (x, y); |
|
|
1538 | |
|
|
1539 | if (map) |
|
|
1540 | map->load_sync (); |
|
|
1541 | |
|
|
1542 | return map; |
|
|
1543 | } |
|
|
1544 | |
|
|
1545 | maptile * |
|
|
1546 | get_map_from_coord (maptile *m, sint16 *x, sint16 *y) |
|
|
1547 | { |
|
|
1548 | return m->xy_load (*x, *y); |
1517 | } |
1549 | } |
1518 | |
1550 | |
1519 | /* From map.c |
1551 | /* From map.c |
1520 | * This is used by get_player to determine where the other |
1552 | * This is used by get_player to determine where the other |
1521 | * creature is. get_rangevector takes into account map tiling, |
1553 | * creature is. get_rangevector takes into account map tiling, |