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.62 by root, Sun Dec 31 22:23:11 2006 UTC vs.
Revision 1.78 by root, Fri Jan 19 17:50:10 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
… …
329 * carrying. 329 * carrying.
330 */ 330 */
331 sum_weight (container); 331 sum_weight (container);
332} 332}
333 333
334void
335maptile::set_object_flag (int flag, int value)
336{
337 if (!spaces)
338 return;
339
340 for (mapspace *ms = spaces + size (); ms-- > spaces; )
341 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
342 tmp->flag [flag] = value;
343}
344
334/* link_multipart_objects go through all the objects on the map looking 345/* link_multipart_objects go through all the objects on the map looking
335 * for objects whose arch says they are multipart yet according to the 346 * for objects whose arch says they are multipart yet according to the
336 * info we have, they only have the head (as would be expected when 347 * info we have, they only have the head (as would be expected when
337 * they are saved). We do have to look for the old maps that did save 348 * they are saved). We do have to look for the old maps that did save
338 * the more sections and not re-add sections for them. 349 * the more sections and not re-add sections for them.
… …
388 * 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
389 * file pointer. 400 * file pointer.
390 * mapflags is the same as we get with load_original_map 401 * mapflags is the same as we get with load_original_map
391 */ 402 */
392bool 403bool
393maptile::load_objects (object_thawer &thawer) 404maptile::_load_objects (object_thawer &thawer)
394{ 405{
395 int unique; 406 int unique;
396 object *op, *prev = NULL, *last_more = NULL, *otmp; 407 object *op, *prev = NULL, *last_more = NULL, *otmp;
397 408
398 op = object::create (); 409 op = object::create ();
… …
474 for (object *op = ms->bot; op; op = op->above) 485 for (object *op = ms->bot; op; op = op->above)
475 op->deactivate_recursive (); 486 op->deactivate_recursive ();
476} 487}
477 488
478bool 489bool
479maptile::save_objects (object_freezer &freezer, int flags) 490maptile::_save_objects (object_freezer &freezer, int flags)
480{ 491{
492 static int cede_count = 0;
493
481 if (flags & IO_HEADER) 494 if (flags & IO_HEADER)
482 save_header (freezer); 495 _save_header (freezer);
483 496
484 if (!spaces) 497 if (!spaces)
485 return false; 498 return false;
486 499
487 for (int i = 0; i < size (); ++i) 500 for (int i = 0; i < size (); ++i)
488 { 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
489 int unique = 0; 510 int unique = 0;
490 for (object *op = spaces [i].bot; op; op = op->above) 511 for (object *op = spaces [i].bot; op; op = op->above)
491 { 512 {
513 // count per-object, but cede only when modification-safe
514 cede_count++;
515
492 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 516 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
493 unique = 1; 517 unique = 1;
494 518
495 if (!op->can_map_save ()) 519 if (!op->can_map_save ())
496 continue; 520 continue;
… …
507 531
508 return true; 532 return true;
509} 533}
510 534
511bool 535bool
512maptile::load_objects (const char *path, bool skip_header) 536maptile::_load_objects (const char *path, bool skip_header)
513{ 537{
514 object_thawer thawer (path); 538 object_thawer thawer (path);
515 539
516 if (!thawer) 540 if (!thawer)
517 return false; 541 return false;
… …
525 break; 549 break;
526 550
527 thawer.skip_kv (kw); 551 thawer.skip_kv (kw);
528 } 552 }
529 553
530 return load_objects (thawer); 554 return _load_objects (thawer);
531} 555}
532 556
533bool 557bool
534maptile::save_objects (const char *path, int flags) 558maptile::_save_objects (const char *path, int flags)
535{ 559{
536 object_freezer freezer; 560 object_freezer freezer;
537 561
538 if (!save_objects (freezer, flags)) 562 if (!_save_objects (freezer, flags))
539 return false; 563 return false;
540 564
541 return freezer.save (path); 565 return freezer.save (path);
542} 566}
543 567
… …
707 * 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
708 * 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.
709 * MSW 2001-07-01 733 * MSW 2001-07-01
710 */ 734 */
711bool 735bool
712maptile::load_header (object_thawer &thawer) 736maptile::_load_header (object_thawer &thawer)
713{ 737{
714 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
715 int msgpos = 0;
716 int maplorepos = 0;
717
718 for (;;) 738 for (;;)
719 { 739 {
720 keyword kw = thawer.get_kv (); 740 keyword kw = thawer.get_kv ();
721 741
722 switch (kw) 742 switch (kw)
… …
725 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);
726 return false; 746 return false;
727 747
728 case KW_end: 748 case KW_end:
729 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;
730 755
731 case KW_msg: 756 case KW_msg:
732 thawer.get_ml (KW_endmsg, msg); 757 thawer.get_ml (KW_endmsg, msg);
733 break; 758 break;
734 759
… …
785 810
786 case KW_tile_path_1: thawer.get (tile_path [0]); break; 811 case KW_tile_path_1: thawer.get (tile_path [0]); break;
787 case KW_tile_path_2: thawer.get (tile_path [1]); break; 812 case KW_tile_path_2: thawer.get (tile_path [1]); break;
788 case KW_tile_path_3: thawer.get (tile_path [2]); break; 813 case KW_tile_path_3: thawer.get (tile_path [2]); break;
789 case KW_tile_path_4: thawer.get (tile_path [3]); break; 814 case KW_tile_path_4: thawer.get (tile_path [3]); break;
790
791 default:
792 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]);
793 break;
794 } 815 }
795 } 816 }
796 817
797 abort (); 818 abort ();
798} 819}
799 820
800bool 821bool
801maptile::load_header (const char *path) 822maptile::_load_header (const char *path)
802{ 823{
803 object_thawer thawer (path); 824 object_thawer thawer (path);
804 825
805 if (!thawer) 826 if (!thawer)
806 return false; 827 return false;
807 828
808 return load_header (thawer); 829 return _load_header (thawer);
809} 830}
810 831
811/****************************************************************************** 832/******************************************************************************
812 * This is the start of unique map handling code 833 * This is the start of unique map handling code
813 *****************************************************************************/ 834 *****************************************************************************/
… …
836 } 857 }
837 } 858 }
838} 859}
839 860
840bool 861bool
841maptile::save_header (object_freezer &freezer) 862maptile::_save_header (object_freezer &freezer)
842{ 863{
843#define MAP_OUT(k) freezer.put (KW_ ## k, k) 864#define MAP_OUT(k) freezer.put (KW_ ## k, k)
844#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 865#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
845 866
846 MAP_OUT2 (arch, "map"); 867 MAP_OUT2 (arch, "map");
… …
888 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 909 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
889 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 910 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
890 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 911 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
891 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 912 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
892 913
914 freezer.put (this);
893 freezer.put (KW_end); 915 freezer.put (KW_end);
894 916
895 return true; 917 return true;
896} 918}
897 919
898bool 920bool
899maptile::save_header (const char *path) 921maptile::_save_header (const char *path)
900{ 922{
901 object_freezer freezer; 923 object_freezer freezer;
902 924
903 if (!save_header (freezer)) 925 if (!_save_header (freezer))
904 return false; 926 return false;
905 927
906 return freezer.save (path); 928 return freezer.save (path);
907} 929}
908 930
… …
1087 */ 1109 */
1088void 1110void
1089mapspace::update_ () 1111mapspace::update_ ()
1090{ 1112{
1091 object *tmp, *last = 0; 1113 object *tmp, *last = 0;
1092 uint8 flags = 0, light = 0, anywhere = 0; 1114 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1093 New_Face *top, *floor, *middle; 1115 facetile *top, *floor, *middle;
1094 object *top_obj, *floor_obj, *middle_obj; 1116 object *top_obj, *floor_obj, *middle_obj;
1095 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;
1096 1118
1097 middle = blank_face; 1119 middle = blank_face;
1098 top = blank_face; 1120 top = blank_face;
… …
1214 1236
1215 /* If two top faces are already set, quit processing */ 1237 /* If two top faces are already set, quit processing */
1216 if ((top != blank_face) && (middle != blank_face)) 1238 if ((top != blank_face) && (middle != blank_face))
1217 break; 1239 break;
1218 1240
1219 /* Only show visible faces, unless its the editor - show all */ 1241 /* Only show visible faces */
1220 if (!tmp->invisible || editor) 1242 if (!tmp->invisible)
1221 { 1243 {
1222 /* Fill in top if needed */ 1244 /* Fill in top if needed */
1223 if (top == blank_face) 1245 if (top == blank_face)
1224 { 1246 {
1225 top = tmp->face; 1247 top = tmp->face;
… …
1255 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;
1256 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;
1257 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;
1258} 1280}
1259 1281
1260/* 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
1261 * 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
1262 * 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
1263 * the value of orig_map->tile_map[tile_num]. It really only does this 1285 * the value of orig_map->tile_map[tile_num].
1264 * so that it is easier for calling functions to verify success.
1265 */ 1286 */
1266static maptile * 1287static inline maptile *
1267load_and_link_tiled_map (maptile *orig_map, int tile_num) 1288find_and_link (maptile *orig_map, int tile_num)
1268{ 1289{
1290 maptile *mp = orig_map->tile_map [tile_num];
1291
1292 if (!mp)
1293 {
1269 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);
1270 1295
1271 if (!mp || mp->in_memory != MAP_IN_MEMORY) 1296 if (!mp)
1272 { 1297 {
1273 // 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
1274 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",
1275 &orig_map->tile_path[tile_num], &orig_map->path); 1300 &orig_map->tile_path[tile_num], &orig_map->path);
1276 mp = new maptile (1, 1); 1301 mp = new maptile (1, 1);
1277 mp->alloc (); 1302 mp->alloc ();
1278 mp->in_memory = MAP_IN_MEMORY; 1303 mp->in_memory = MAP_IN_MEMORY;
1304 }
1279 } 1305 }
1280 1306
1281 int dest_tile = (tile_num + 2) % 4; 1307 int dest_tile = (tile_num + 2) % 4;
1282 1308
1283 orig_map->tile_map[tile_num] = mp; 1309 orig_map->tile_map [tile_num] = mp;
1284 1310
1285 // optimisation: back-link map to origin map if euclidean 1311 // optimisation: back-link map to origin map if euclidean
1286 //TODO: non-euclidean maps MUST GO 1312 //TODO: non-euclidean maps MUST GO
1287 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)
1288 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;
1289 1315
1290 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 ();
1291} 1323}
1292 1324
1293/* this returns TRUE if the coordinates (x,y) are out of 1325/* this returns TRUE if the coordinates (x,y) are out of
1294 * map m. This function also takes into account any 1326 * map m. This function also takes into account any
1295 * tiling considerations, loading adjacant maps as needed. 1327 * tiling considerations, loading adjacant maps as needed.
… …
1312 { 1344 {
1313 if (!m->tile_path[3]) 1345 if (!m->tile_path[3])
1314 return 1; 1346 return 1;
1315 1347
1316 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)
1317 load_and_link_tiled_map (m, 3); 1349 find_and_link (m, 3);
1318 1350
1319 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);
1320 } 1352 }
1321 1353
1322 if (x >= m->width) 1354 if (x >= m->width)
1323 { 1355 {
1324 if (!m->tile_path[1]) 1356 if (!m->tile_path[1])
1325 return 1; 1357 return 1;
1326 1358
1327 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)
1328 load_and_link_tiled_map (m, 1); 1360 find_and_link (m, 1);
1329 1361
1330 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);
1331 } 1363 }
1332 1364
1333 if (y < 0) 1365 if (y < 0)
1334 { 1366 {
1335 if (!m->tile_path[0]) 1367 if (!m->tile_path[0])
1336 return 1; 1368 return 1;
1337 1369
1338 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)
1339 load_and_link_tiled_map (m, 0); 1371 find_and_link (m, 0);
1340 1372
1341 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);
1342 } 1374 }
1343 1375
1344 if (y >= m->height) 1376 if (y >= m->height)
1345 { 1377 {
1346 if (!m->tile_path[2]) 1378 if (!m->tile_path[2])
1347 return 1; 1379 return 1;
1348 1380
1349 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)
1350 load_and_link_tiled_map (m, 2); 1382 find_and_link (m, 2);
1351 1383
1352 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);
1353 } 1385 }
1354 1386
1355 /* Simple case - coordinates are within this local 1387 /* Simple case - coordinates are within this local
… …
1360 1392
1361/* This is basically the same as out_of_map above, but 1393/* This is basically the same as out_of_map above, but
1362 * instead we return NULL if no map is valid (coordinates 1394 * instead we return NULL if no map is valid (coordinates
1363 * out of bounds and no tiled map), otherwise it returns 1395 * out of bounds and no tiled map), otherwise it returns
1364 * the map as that the coordinates are really on, and 1396 * the map as that the coordinates are really on, and
1365 * updates x and y to be the localized coordinates. 1397 * updates x and y to be the localised coordinates.
1366 * Using this is more efficient of calling out_of_map 1398 * Using this is more efficient of calling out_of_map
1367 * and then figuring out what the real map is 1399 * and then figuring out what the real map is
1368 */ 1400 */
1369maptile * 1401maptile *
1370get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1402maptile::xy_find (sint16 &x, sint16 &y)
1371{ 1403{
1372 if (*x < 0) 1404 if (x < 0)
1373 { 1405 {
1374 if (!m->tile_path[3]) 1406 if (!tile_path[3])
1375 return 0; 1407 return 0;
1376 1408
1377 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1409 find_and_link (this, 3);
1378 load_and_link_tiled_map (m, 3);
1379
1380 *x += m->tile_map[3]->width; 1410 x += tile_map[3]->width;
1381 return (get_map_from_coord (m->tile_map[3], x, y)); 1411 return tile_map[3]->xy_find (x, y);
1382 } 1412 }
1383 1413
1384 if (*x >= m->width) 1414 if (x >= width)
1385 { 1415 {
1386 if (!m->tile_path[1]) 1416 if (!tile_path[1])
1387 return 0; 1417 return 0;
1388 1418
1389 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1419 find_and_link (this, 1);
1390 load_and_link_tiled_map (m, 1);
1391
1392 *x -= m->width; 1420 x -= width;
1393 return (get_map_from_coord (m->tile_map[1], x, y)); 1421 return tile_map[1]->xy_find (x, y);
1394 } 1422 }
1395 1423
1396 if (*y < 0) 1424 if (y < 0)
1397 { 1425 {
1398 if (!m->tile_path[0]) 1426 if (!tile_path[0])
1399 return 0; 1427 return 0;
1400 1428
1401 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1429 find_and_link (this, 0);
1402 load_and_link_tiled_map (m, 0);
1403
1404 *y += m->tile_map[0]->height; 1430 y += tile_map[0]->height;
1405 return (get_map_from_coord (m->tile_map[0], x, y)); 1431 return tile_map[0]->xy_find (x, y);
1406 } 1432 }
1407 1433
1408 if (*y >= m->height) 1434 if (y >= height)
1409 { 1435 {
1410 if (!m->tile_path[2]) 1436 if (!tile_path[2])
1411 return 0; 1437 return 0;
1412 1438
1413 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1439 find_and_link (this, 2);
1414 load_and_link_tiled_map (m, 2);
1415
1416 *y -= m->height; 1440 y -= height;
1417 return (get_map_from_coord (m->tile_map[2], x, y)); 1441 return tile_map[2]->xy_find (x, y);
1418 } 1442 }
1419 1443
1420 /* Simple case - coordinates are within this local 1444 /* Simple case - coordinates are within this local
1421 * map. 1445 * map.
1422 */ 1446 */
1423 return m; 1447 return this;
1424} 1448}
1425 1449
1426/** 1450/**
1427 * 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
1428 * map1 to map2 in dx/dy. 1452 * map1 to map2 in dx/dy.
… …
1431adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1455adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1432{ 1456{
1433 if (!map1 || !map2) 1457 if (!map1 || !map2)
1434 return 0; 1458 return 0;
1435 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!)
1436 if (map1 == map2) 1462 if (map1 == map2)
1437 { 1463 {
1438 *dx = 0; 1464 *dx = 0;
1439 *dy = 0; 1465 *dy = 0;
1440 } 1466 }
… …
1500 } 1526 }
1501 else 1527 else
1502 return 0; 1528 return 0;
1503 1529
1504 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);
1505} 1548}
1506 1549
1507/* From map.c 1550/* From map.c
1508 * This is used by get_player to determine where the other 1551 * This is used by get_player to determine where the other
1509 * creature is. get_rangevector takes into account map tiling, 1552 * creature is. get_rangevector takes into account map tiling,
… …
1564 { 1607 {
1565 best_distance = tmpi; 1608 best_distance = tmpi;
1566 best = tmp; 1609 best = tmp;
1567 } 1610 }
1568 } 1611 }
1612
1569 if (best != op1) 1613 if (best != op1)
1570 { 1614 {
1571 retval->distance_x += op1->x - best->x; 1615 retval->distance_x += op1->x - best->x;
1572 retval->distance_y += op1->y - best->y; 1616 retval->distance_y += op1->y - best->y;
1573 } 1617 }
1574 } 1618 }
1619
1575 retval->part = best; 1620 retval->part = best;
1576 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);
1577 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1622 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1578 } 1623 }
1579} 1624}
1580 1625
1581/* 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
… …
1605 { 1650 {
1606 retval->distance_x += op2->x - x; 1651 retval->distance_x += op2->x - x;
1607 retval->distance_y += op2->y - y; 1652 retval->distance_y += op2->y - y;
1608 1653
1609 retval->part = NULL; 1654 retval->part = NULL;
1610 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);
1611 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1656 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1612 } 1657 }
1613} 1658}
1614 1659
1615/* 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