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.64 by root, Mon Jan 1 12:28:45 2007 UTC vs.
Revision 1.80 by root, Thu Jan 25 03:54:44 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 <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 */
403bool 403bool
404maptile::load_objects (object_thawer &thawer) 404maptile::_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
489bool 489bool
490maptile::save_objects (object_freezer &freezer, int flags) 490maptile::_save_objects (object_freezer &freezer, int flags)
491{ 491{
492 static int cede_count = 0;
493
492 if (flags & IO_HEADER) 494 if (flags & IO_HEADER)
493 save_header (freezer); 495 _save_header (freezer);
494 496
495 if (!spaces) 497 if (!spaces)
496 return false; 498 return false;
497 499
498 for (int i = 0; i < size (); ++i) 500 for (int i = 0; i < size (); ++i)
499 { 501 {
502#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
503 if (cede_count >= 500)
504 {
505 cede_count = 0;
506 coroapi::cede ();
507 }
508#endif
509
500 int unique = 0; 510 int unique = 0;
501 for (object *op = spaces [i].bot; op; op = op->above) 511 for (object *op = spaces [i].bot; op; op = op->above)
502 { 512 {
513 // count per-object, but cede only when modification-safe
514 cede_count++;
515
503 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 516 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
504 unique = 1; 517 unique = 1;
505 518
506 if (!op->can_map_save ()) 519 if (!op->can_map_save ())
507 continue; 520 continue;
… …
518 531
519 return true; 532 return true;
520} 533}
521 534
522bool 535bool
523maptile::load_objects (const char *path, bool skip_header) 536maptile::_load_objects (const char *path, bool skip_header)
524{ 537{
525 object_thawer thawer (path); 538 object_thawer thawer (path);
526 539
527 if (!thawer) 540 if (!thawer)
528 return false; 541 return false;
… …
536 break; 549 break;
537 550
538 thawer.skip_kv (kw); 551 thawer.skip_kv (kw);
539 } 552 }
540 553
541 return load_objects (thawer); 554 return _load_objects (thawer);
542} 555}
543 556
544bool 557bool
545maptile::save_objects (const char *path, int flags) 558maptile::_save_objects (const char *path, int flags)
546{ 559{
547 object_freezer freezer; 560 object_freezer freezer;
548 561
549 if (!save_objects (freezer, flags)) 562 if (!_save_objects (freezer, flags))
550 return false; 563 return false;
551 564
552 return freezer.save (path); 565 return freezer.save (path);
553} 566}
554 567
… …
718 * 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
719 * 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.
720 * MSW 2001-07-01 733 * MSW 2001-07-01
721 */ 734 */
722bool 735bool
723maptile::load_header (object_thawer &thawer) 736maptile::_load_header (object_thawer &thawer)
724{ 737{
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 (;;) 738 for (;;)
730 { 739 {
731 keyword kw = thawer.get_kv (); 740 keyword kw = thawer.get_kv ();
732 741
733 switch (kw) 742 switch (kw)
… …
736 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);
737 return false; 746 return false;
738 747
739 case KW_end: 748 case KW_end:
740 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;
741 755
742 case KW_msg: 756 case KW_msg:
743 thawer.get_ml (KW_endmsg, msg); 757 thawer.get_ml (KW_endmsg, msg);
744 break; 758 break;
745 759
… …
778 case KW_sky: thawer.get (sky); break; 792 case KW_sky: thawer.get (sky); break;
779 793
780 case KW_per_player: thawer.get (per_player); break; 794 case KW_per_player: thawer.get (per_player); break;
781 case KW_per_party: thawer.get (per_party); break; 795 case KW_per_party: thawer.get (per_party); break;
782 796
783 case KW_region: get_region_by_name (thawer.get_str ()); break; 797 case KW_region: default_region = get_region_by_name (thawer.get_str ()); break;
784 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 798 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
785 799
786 // old names new names 800 // old names new names
787 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;
788 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;
… …
796 810
797 case KW_tile_path_1: thawer.get (tile_path [0]); break; 811 case KW_tile_path_1: thawer.get (tile_path [0]); break;
798 case KW_tile_path_2: thawer.get (tile_path [1]); break; 812 case KW_tile_path_2: thawer.get (tile_path [1]); break;
799 case KW_tile_path_3: thawer.get (tile_path [2]); break; 813 case KW_tile_path_3: thawer.get (tile_path [2]); break;
800 case KW_tile_path_4: thawer.get (tile_path [3]); break; 814 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 } 815 }
806 } 816 }
807 817
808 abort (); 818 abort ();
809} 819}
810 820
811bool 821bool
812maptile::load_header (const char *path) 822maptile::_load_header (const char *path)
813{ 823{
814 object_thawer thawer (path); 824 object_thawer thawer (path);
815 825
816 if (!thawer) 826 if (!thawer)
817 return false; 827 return false;
818 828
819 return load_header (thawer); 829 return _load_header (thawer);
820} 830}
821 831
822/****************************************************************************** 832/******************************************************************************
823 * This is the start of unique map handling code 833 * This is the start of unique map handling code
824 *****************************************************************************/ 834 *****************************************************************************/
… …
847 } 857 }
848 } 858 }
849} 859}
850 860
851bool 861bool
852maptile::save_header (object_freezer &freezer) 862maptile::_save_header (object_freezer &freezer)
853{ 863{
854#define MAP_OUT(k) freezer.put (KW_ ## k, k) 864#define MAP_OUT(k) freezer.put (KW_ ## k, k)
855#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 865#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
856 866
857 MAP_OUT2 (arch, "map"); 867 MAP_OUT2 (arch, "map");
… …
861 MAP_OUT (reset_time); 871 MAP_OUT (reset_time);
862 MAP_OUT (reset_timeout); 872 MAP_OUT (reset_timeout);
863 MAP_OUT (fixed_resettime); 873 MAP_OUT (fixed_resettime);
864 MAP_OUT (difficulty); 874 MAP_OUT (difficulty);
865 875
866 if (region) MAP_OUT2 (region, region->name); 876 if (default_region) MAP_OUT2 (region, default_region->name);
867 877
868 if (shopitems) 878 if (shopitems)
869 { 879 {
870 char shop[MAX_BUF]; 880 char shop[MAX_BUF];
871 print_shop_string (this, shop); 881 print_shop_string (this, shop);
… …
906 916
907 return true; 917 return true;
908} 918}
909 919
910bool 920bool
911maptile::save_header (const char *path) 921maptile::_save_header (const char *path)
912{ 922{
913 object_freezer freezer; 923 object_freezer freezer;
914 924
915 if (!save_header (freezer)) 925 if (!_save_header (freezer))
916 return false; 926 return false;
917 927
918 return freezer.save (path); 928 return freezer.save (path);
919} 929}
920 930
… …
1099 */ 1109 */
1100void 1110void
1101mapspace::update_ () 1111mapspace::update_ ()
1102{ 1112{
1103 object *tmp, *last = 0; 1113 object *tmp, *last = 0;
1104 uint8 flags = 0, light = 0, anywhere = 0; 1114 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1105 New_Face *top, *floor, *middle; 1115 facetile *top, *floor, *middle;
1106 object *top_obj, *floor_obj, *middle_obj; 1116 object *top_obj, *floor_obj, *middle_obj;
1107 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1117 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1108 1118
1109 middle = blank_face; 1119 middle = blank_face;
1110 top = blank_face; 1120 top = blank_face;
… …
1226 1236
1227 /* If two top faces are already set, quit processing */ 1237 /* If two top faces are already set, quit processing */
1228 if ((top != blank_face) && (middle != blank_face)) 1238 if ((top != blank_face) && (middle != blank_face))
1229 break; 1239 break;
1230 1240
1231 /* Only show visible faces, unless its the editor - show all */ 1241 /* Only show visible faces */
1232 if (!tmp->invisible || editor) 1242 if (!tmp->invisible)
1233 { 1243 {
1234 /* Fill in top if needed */ 1244 /* Fill in top if needed */
1235 if (top == blank_face) 1245 if (top == blank_face)
1236 { 1246 {
1237 top = tmp->face; 1247 top = tmp->face;
… …
1267 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1277 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; 1278 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; 1279 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1270} 1280}
1271 1281
1272/* this updates the orig_map->tile_map[tile_num] value after loading 1282/* 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 1283 * 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 1284 * 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 1285 * the value of orig_map->tile_map[tile_num].
1276 * so that it is easier for calling functions to verify success.
1277 */ 1286 */
1278static maptile * 1287static inline maptile *
1279load_and_link_tiled_map (maptile *orig_map, int tile_num) 1288find_and_link (maptile *orig_map, int tile_num)
1280{ 1289{
1290 maptile *mp = orig_map->tile_map [tile_num];
1291
1292 if (!mp)
1293 {
1281 maptile *mp = orig_map->load_map_sync (orig_map->tile_path [tile_num], orig_map); 1294 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1282 1295
1283 if (!mp || mp->in_memory != MAP_IN_MEMORY) 1296 if (!mp)
1284 { 1297 {
1285 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine 1298 // 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", 1299 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); 1300 &orig_map->tile_path[tile_num], &orig_map->path);
1288 mp = new maptile (1, 1); 1301 mp = new maptile (1, 1);
1289 mp->alloc (); 1302 mp->alloc ();
1290 mp->in_memory = MAP_IN_MEMORY; 1303 mp->in_memory = MAP_IN_MEMORY;
1304 }
1291 } 1305 }
1292 1306
1293 int dest_tile = (tile_num + 2) % 4; 1307 int dest_tile = (tile_num + 2) % 4;
1294 1308
1295 orig_map->tile_map[tile_num] = mp; 1309 orig_map->tile_map [tile_num] = mp;
1296 1310
1297 // optimisation: back-link map to origin map if euclidean 1311 // optimisation: back-link map to origin map if euclidean
1298 //TODO: non-euclidean maps MUST GO 1312 //TODO: non-euclidean maps MUST GO
1299 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) 1313 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; 1314 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1301 1315
1302 return mp; 1316 return mp;
1317}
1318
1319static inline void
1320load_and_link (maptile *orig_map, int tile_num)
1321{
1322 find_and_link (orig_map, tile_num)->load_sync ();
1303} 1323}
1304 1324
1305/* this returns TRUE if the coordinates (x,y) are out of 1325/* this returns TRUE if the coordinates (x,y) are out of
1306 * map m. This function also takes into account any 1326 * map m. This function also takes into account any
1307 * tiling considerations, loading adjacant maps as needed. 1327 * tiling considerations, loading adjacant maps as needed.
… …
1324 { 1344 {
1325 if (!m->tile_path[3]) 1345 if (!m->tile_path[3])
1326 return 1; 1346 return 1;
1327 1347
1328 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1348 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1329 load_and_link_tiled_map (m, 3); 1349 find_and_link (m, 3);
1330 1350
1331 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1351 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1332 } 1352 }
1333 1353
1334 if (x >= m->width) 1354 if (x >= m->width)
1335 { 1355 {
1336 if (!m->tile_path[1]) 1356 if (!m->tile_path[1])
1337 return 1; 1357 return 1;
1338 1358
1339 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1359 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1340 load_and_link_tiled_map (m, 1); 1360 find_and_link (m, 1);
1341 1361
1342 return out_of_map (m->tile_map[1], x - m->width, y); 1362 return out_of_map (m->tile_map[1], x - m->width, y);
1343 } 1363 }
1344 1364
1345 if (y < 0) 1365 if (y < 0)
1346 { 1366 {
1347 if (!m->tile_path[0]) 1367 if (!m->tile_path[0])
1348 return 1; 1368 return 1;
1349 1369
1350 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1370 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1351 load_and_link_tiled_map (m, 0); 1371 find_and_link (m, 0);
1352 1372
1353 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1373 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1354 } 1374 }
1355 1375
1356 if (y >= m->height) 1376 if (y >= m->height)
1357 { 1377 {
1358 if (!m->tile_path[2]) 1378 if (!m->tile_path[2])
1359 return 1; 1379 return 1;
1360 1380
1361 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1381 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1362 load_and_link_tiled_map (m, 2); 1382 find_and_link (m, 2);
1363 1383
1364 return out_of_map (m->tile_map[2], x, y - m->height); 1384 return out_of_map (m->tile_map[2], x, y - m->height);
1365 } 1385 }
1366 1386
1367 /* Simple case - coordinates are within this local 1387 /* Simple case - coordinates are within this local
… …
1372 1392
1373/* This is basically the same as out_of_map above, but 1393/* This is basically the same as out_of_map above, but
1374 * instead we return NULL if no map is valid (coordinates 1394 * instead we return NULL if no map is valid (coordinates
1375 * out of bounds and no tiled map), otherwise it returns 1395 * out of bounds and no tiled map), otherwise it returns
1376 * the map as that the coordinates are really on, and 1396 * the map as that the coordinates are really on, and
1377 * updates x and y to be the localized coordinates. 1397 * updates x and y to be the localised coordinates.
1378 * Using this is more efficient of calling out_of_map 1398 * Using this is more efficient of calling out_of_map
1379 * and then figuring out what the real map is 1399 * and then figuring out what the real map is
1380 */ 1400 */
1381maptile * 1401maptile *
1382get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1402maptile::xy_find (sint16 &x, sint16 &y)
1383{ 1403{
1384 if (*x < 0) 1404 if (x < 0)
1385 { 1405 {
1386 if (!m->tile_path[3]) 1406 if (!tile_path[3])
1387 return 0; 1407 return 0;
1388 1408
1389 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1409 find_and_link (this, 3);
1390 load_and_link_tiled_map (m, 3);
1391
1392 *x += m->tile_map[3]->width; 1410 x += tile_map[3]->width;
1393 return (get_map_from_coord (m->tile_map[3], x, y)); 1411 return tile_map[3]->xy_find (x, y);
1394 } 1412 }
1395 1413
1396 if (*x >= m->width) 1414 if (x >= width)
1397 { 1415 {
1398 if (!m->tile_path[1]) 1416 if (!tile_path[1])
1399 return 0; 1417 return 0;
1400 1418
1401 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1419 find_and_link (this, 1);
1402 load_and_link_tiled_map (m, 1);
1403
1404 *x -= m->width; 1420 x -= width;
1405 return (get_map_from_coord (m->tile_map[1], x, y)); 1421 return tile_map[1]->xy_find (x, y);
1406 } 1422 }
1407 1423
1408 if (*y < 0) 1424 if (y < 0)
1409 { 1425 {
1410 if (!m->tile_path[0]) 1426 if (!tile_path[0])
1411 return 0; 1427 return 0;
1412 1428
1413 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1429 find_and_link (this, 0);
1414 load_and_link_tiled_map (m, 0);
1415
1416 *y += m->tile_map[0]->height; 1430 y += tile_map[0]->height;
1417 return (get_map_from_coord (m->tile_map[0], x, y)); 1431 return tile_map[0]->xy_find (x, y);
1418 } 1432 }
1419 1433
1420 if (*y >= m->height) 1434 if (y >= height)
1421 { 1435 {
1422 if (!m->tile_path[2]) 1436 if (!tile_path[2])
1423 return 0; 1437 return 0;
1424 1438
1425 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1439 find_and_link (this, 2);
1426 load_and_link_tiled_map (m, 2);
1427
1428 *y -= m->height; 1440 y -= height;
1429 return (get_map_from_coord (m->tile_map[2], x, y)); 1441 return tile_map[2]->xy_find (x, y);
1430 } 1442 }
1431 1443
1432 /* Simple case - coordinates are within this local 1444 /* Simple case - coordinates are within this local
1433 * map. 1445 * map.
1434 */ 1446 */
1435 return m; 1447 return this;
1436} 1448}
1437 1449
1438/** 1450/**
1439 * Return whether map2 is adjacent to map1. If so, store the distance from 1451 * Return whether map2 is adjacent to map1. If so, store the distance from
1440 * map1 to map2 in dx/dy. 1452 * map1 to map2 in dx/dy.
… …
1443adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1455adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1444{ 1456{
1445 if (!map1 || !map2) 1457 if (!map1 || !map2)
1446 return 0; 1458 return 0;
1447 1459
1460 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1461 //fix: compare paths instead (this is likely faster, too!)
1448 if (map1 == map2) 1462 if (map1 == map2)
1449 { 1463 {
1450 *dx = 0; 1464 *dx = 0;
1451 *dy = 0; 1465 *dy = 0;
1452 } 1466 }
… …
1512 } 1526 }
1513 else 1527 else
1514 return 0; 1528 return 0;
1515 1529
1516 return 1; 1530 return 1;
1531}
1532
1533maptile *
1534maptile::xy_load (sint16 &x, sint16 &y)
1535{
1536 maptile *map = xy_find (x, y);
1537
1538 if (map)
1539 map->load_sync ();
1540
1541 return map;
1542}
1543
1544maptile *
1545get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1546{
1547 return m->xy_load (*x, *y);
1517} 1548}
1518 1549
1519/* From map.c 1550/* From map.c
1520 * This is used by get_player to determine where the other 1551 * This is used by get_player to determine where the other
1521 * creature is. get_rangevector takes into account map tiling, 1552 * creature is. get_rangevector takes into account map tiling,
1522 * so you just can not look the the map coordinates and get the 1553 * so you just can not look the the map coordinates and get the
1523 * righte value. distance_x/y are distance away, which 1554 * righte value. distance_x/y are distance away, which
1524 * can be negativbe. direction is the crossfire direction scheme 1555 * can be negative. direction is the crossfire direction scheme
1525 * that the creature should head. part is the part of the 1556 * that the creature should head. part is the part of the
1526 * monster that is closest. 1557 * monster that is closest.
1527 * 1558 *
1528 * get_rangevector looks at op1 and op2, and fills in the 1559 * get_rangevector looks at op1 and op2, and fills in the
1529 * structure for op1 to get to op2. 1560 * structure for op1 to get to op2.
… …
1576 { 1607 {
1577 best_distance = tmpi; 1608 best_distance = tmpi;
1578 best = tmp; 1609 best = tmp;
1579 } 1610 }
1580 } 1611 }
1612
1581 if (best != op1) 1613 if (best != op1)
1582 { 1614 {
1583 retval->distance_x += op1->x - best->x; 1615 retval->distance_x += op1->x - best->x;
1584 retval->distance_y += op1->y - best->y; 1616 retval->distance_y += op1->y - best->y;
1585 } 1617 }
1586 } 1618 }
1619
1587 retval->part = best; 1620 retval->part = best;
1588 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1621 retval->distance = idistance (retval->distance_x, retval->distance_y);
1589 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1622 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1590 } 1623 }
1591} 1624}
1592 1625
1593/* this is basically the same as get_rangevector above, but instead of 1626/* this is basically the same as get_rangevector above, but instead of
… …
1617 { 1650 {
1618 retval->distance_x += op2->x - x; 1651 retval->distance_x += op2->x - x;
1619 retval->distance_y += op2->y - y; 1652 retval->distance_y += op2->y - y;
1620 1653
1621 retval->part = NULL; 1654 retval->part = NULL;
1622 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1655 retval->distance = idistance (retval->distance_x, retval->distance_y);
1623 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1656 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1624 } 1657 }
1625} 1658}
1626 1659
1627/* Returns true of op1 and op2 are effectively on the same map 1660/* Returns true of op1 and op2 are effectively on the same map

Diff Legend

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