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.59 by root, Sat Dec 30 20:32:30 2006 UTC vs.
Revision 1.77 by root, Thu Jan 18 16:19:34 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>
… …
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
… …
296 228
297 } 229 }
298 return 0; 230 return 0;
299} 231}
300 232
301
302/* 233/*
303 * 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.
304 * This is meant for multi space objects - for single space objecs, 235 * This is meant for multi space objects - for single space objecs,
305 * just calling get_map_blocked and checking that against movement type 236 * just calling get_map_blocked and checking that against movement type
306 * of object. This function goes through all the parts of the 237 * of object. This function goes through all the parts of the
… …
398 * carrying. 329 * carrying.
399 */ 330 */
400 sum_weight (container); 331 sum_weight (container);
401} 332}
402 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
403/* 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
404 * 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
405 * 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
406 * 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
407 * the more sections and not re-add sections for them. 349 * the more sections and not re-add sections for them.
… …
457 * 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
458 * file pointer. 400 * file pointer.
459 * mapflags is the same as we get with load_original_map 401 * mapflags is the same as we get with load_original_map
460 */ 402 */
461bool 403bool
462maptile::load_objects (object_thawer &thawer) 404maptile::_load_objects (object_thawer &thawer)
463{ 405{
464 int unique; 406 int unique;
465 object *op, *prev = NULL, *last_more = NULL, *otmp; 407 object *op, *prev = NULL, *last_more = NULL, *otmp;
466 408
467 op = object::create (); 409 op = object::create ();
… …
528 if (!spaces) 470 if (!spaces)
529 return; 471 return;
530 472
531 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 473 for (mapspace *ms = spaces + size (); ms-- > spaces; )
532 for (object *op = ms->bot; op; op = op->above) 474 for (object *op = ms->bot; op; op = op->above)
533 op->activate (1); 475 op->activate_recursive ();
534} 476}
535 477
536void 478void
537maptile::deactivate () 479maptile::deactivate ()
538{ 480{
539 if (!spaces) 481 if (!spaces)
540 return; 482 return;
541 483
542 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 484 for (mapspace *ms = spaces + size (); ms-- > spaces; )
543 for (object *op = ms->bot; op; op = op->above) 485 for (object *op = ms->bot; op; op = op->above)
544 op->deactivate (1); 486 op->deactivate_recursive ();
545} 487}
546 488
547bool 489bool
548maptile::save_objects (object_freezer &freezer, int flags) 490maptile::_save_objects (object_freezer &freezer, int flags)
549{ 491{
492 static int cede_count = 0;
493
550 if (flags & IO_HEADER) 494 if (flags & IO_HEADER)
551 save_header (freezer); 495 _save_header (freezer);
552 496
553 if (!spaces) 497 if (!spaces)
554 return false; 498 return false;
555 499
556 for (int i = 0; i < size (); ++i) 500 for (int i = 0; i < size (); ++i)
557 { 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
558 int unique = 0; 510 int unique = 0;
559 for (object *op = spaces [i].bot; op; op = op->above) 511 for (object *op = spaces [i].bot; op; op = op->above)
560 { 512 {
513 // count per-object, but cede only when modification-safe
514 cede_count++;
515
561 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 516 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
562 unique = 1; 517 unique = 1;
563 518
564 if (!op->can_map_save ()) 519 if (!op->can_map_save ())
565 continue; 520 continue;
… …
576 531
577 return true; 532 return true;
578} 533}
579 534
580bool 535bool
581maptile::load_objects (const char *path, bool skip_header) 536maptile::_load_objects (const char *path, bool skip_header)
582{ 537{
583 object_thawer thawer (path); 538 object_thawer thawer (path);
584 539
585 if (!thawer) 540 if (!thawer)
586 return false; 541 return false;
… …
594 break; 549 break;
595 550
596 thawer.skip_kv (kw); 551 thawer.skip_kv (kw);
597 } 552 }
598 553
599 return load_objects (thawer); 554 return _load_objects (thawer);
600} 555}
601 556
602bool 557bool
603maptile::save_objects (const char *path, int flags) 558maptile::_save_objects (const char *path, int flags)
604{ 559{
605 object_freezer freezer; 560 object_freezer freezer;
606 561
607 if (!save_objects (freezer, flags)) 562 if (!_save_objects (freezer, flags))
608 return false; 563 return false;
609 564
610 return freezer.save (path); 565 return freezer.save (path);
611} 566}
612 567
… …
776 * 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
777 * 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.
778 * MSW 2001-07-01 733 * MSW 2001-07-01
779 */ 734 */
780bool 735bool
781maptile::load_header (object_thawer &thawer) 736maptile::_load_header (object_thawer &thawer)
782{ 737{
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 (;;) 738 for (;;)
788 { 739 {
789 keyword kw = thawer.get_kv (); 740 keyword kw = thawer.get_kv ();
790 741
791 switch (kw) 742 switch (kw)
792 { 743 {
793 case KW_EOF: 744 case KW_EOF:
794 LOG (llevError, "%s: end of file while reading map header, aborting header load.", &path); 745 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
795 return false; 746 return false;
796 747
797 case KW_end: 748 case KW_end:
798 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;
799 755
800 case KW_msg: 756 case KW_msg:
801 thawer.get_ml (KW_endmsg, msg); 757 thawer.get_ml (KW_endmsg, msg);
802 break; 758 break;
803 759
… …
854 810
855 case KW_tile_path_1: thawer.get (tile_path [0]); break; 811 case KW_tile_path_1: thawer.get (tile_path [0]); break;
856 case KW_tile_path_2: thawer.get (tile_path [1]); break; 812 case KW_tile_path_2: thawer.get (tile_path [1]); break;
857 case KW_tile_path_3: thawer.get (tile_path [2]); break; 813 case KW_tile_path_3: thawer.get (tile_path [2]); break;
858 case KW_tile_path_4: thawer.get (tile_path [3]); break; 814 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 } 815 }
864 } 816 }
865 817
866 abort (); 818 abort ();
867} 819}
868 820
869bool 821bool
870maptile::load_header (const char *path) 822maptile::_load_header (const char *path)
871{ 823{
872 object_thawer thawer (path); 824 object_thawer thawer (path);
873 825
874 if (!thawer) 826 if (!thawer)
875 return false; 827 return false;
876 828
877 return load_header (thawer); 829 return _load_header (thawer);
878} 830}
879 831
880/****************************************************************************** 832/******************************************************************************
881 * This is the start of unique map handling code 833 * This is the start of unique map handling code
882 *****************************************************************************/ 834 *****************************************************************************/
… …
905 } 857 }
906 } 858 }
907} 859}
908 860
909bool 861bool
910maptile::save_header (object_freezer &freezer) 862maptile::_save_header (object_freezer &freezer)
911{ 863{
912#define MAP_OUT(k) freezer.put (KW_ ## k, k) 864#define MAP_OUT(k) freezer.put (KW_ ## k, k)
913#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 865#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
914 866
915 MAP_OUT2 (arch, "map"); 867 MAP_OUT2 (arch, "map");
… …
957 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]);
958 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]);
959 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]);
960 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]);
961 913
962 MAP_OUT2 (end, 0); 914 freezer.put (this);
915 freezer.put (KW_end);
963 916
964 return true; 917 return true;
965} 918}
966 919
967bool 920bool
968maptile::save_header (const char *path) 921maptile::_save_header (const char *path)
969{ 922{
970 object_freezer freezer; 923 object_freezer freezer;
971 924
972 if (!save_header (freezer)) 925 if (!_save_header (freezer))
973 return false; 926 return false;
974 927
975 return freezer.save (path); 928 return freezer.save (path);
976} 929}
977 930
… …
1156 */ 1109 */
1157void 1110void
1158mapspace::update_ () 1111mapspace::update_ ()
1159{ 1112{
1160 object *tmp, *last = 0; 1113 object *tmp, *last = 0;
1161 uint8 flags = 0, light = 0, anywhere = 0; 1114 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1162 New_Face *top, *floor, *middle; 1115 New_Face *top, *floor, *middle;
1163 object *top_obj, *floor_obj, *middle_obj; 1116 object *top_obj, *floor_obj, *middle_obj;
1164 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;
1165 1118
1166 middle = blank_face; 1119 middle = blank_face;
… …
1283 1236
1284 /* If two top faces are already set, quit processing */ 1237 /* If two top faces are already set, quit processing */
1285 if ((top != blank_face) && (middle != blank_face)) 1238 if ((top != blank_face) && (middle != blank_face))
1286 break; 1239 break;
1287 1240
1288 /* Only show visible faces, unless its the editor - show all */ 1241 /* Only show visible faces */
1289 if (!tmp->invisible || editor) 1242 if (!tmp->invisible)
1290 { 1243 {
1291 /* Fill in top if needed */ 1244 /* Fill in top if needed */
1292 if (top == blank_face) 1245 if (top == blank_face)
1293 { 1246 {
1294 top = tmp->face; 1247 top = tmp->face;
… …
1324 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;
1325 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;
1326 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;
1327} 1280}
1328 1281
1329/* 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
1330 * 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
1331 * 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
1332 * the value of orig_map->tile_map[tile_num]. It really only does this 1285 * the value of orig_map->tile_map[tile_num].
1333 * so that it is easier for calling functions to verify success.
1334 */ 1286 */
1335static maptile * 1287static inline maptile *
1336load_and_link_tiled_map (maptile *orig_map, int tile_num) 1288find_and_link (maptile *orig_map, int tile_num)
1337{ 1289{
1290 maptile *mp = orig_map->tile_map [tile_num];
1291
1292 if (!mp)
1293 {
1338 maptile *mp = orig_map->find_map (orig_map->tile_path[tile_num]); 1294 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1339 mp->load (); 1295
1296 if (!mp)
1297 {
1298 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1299 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1300 &orig_map->tile_path[tile_num], &orig_map->path);
1301 mp = new maptile (1, 1);
1302 mp->alloc ();
1303 mp->in_memory = MAP_IN_MEMORY;
1304 }
1305 }
1340 1306
1341 int dest_tile = (tile_num + 2) % 4; 1307 int dest_tile = (tile_num + 2) % 4;
1342 1308
1343 orig_map->tile_map[tile_num] = mp; 1309 orig_map->tile_map [tile_num] = mp;
1344 1310
1345 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1311 // 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) 1312 //TODO: non-euclidean maps MUST GO
1313 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; 1314 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1348 1315
1349 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 ();
1350} 1323}
1351 1324
1352/* this returns TRUE if the coordinates (x,y) are out of 1325/* this returns TRUE if the coordinates (x,y) are out of
1353 * map m. This function also takes into account any 1326 * map m. This function also takes into account any
1354 * tiling considerations, loading adjacant maps as needed. 1327 * tiling considerations, loading adjacant maps as needed.
… …
1371 { 1344 {
1372 if (!m->tile_path[3]) 1345 if (!m->tile_path[3])
1373 return 1; 1346 return 1;
1374 1347
1375 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)
1376 load_and_link_tiled_map (m, 3); 1349 find_and_link (m, 3);
1377 1350
1378 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);
1379 } 1352 }
1380 1353
1381 if (x >= m->width) 1354 if (x >= m->width)
1382 { 1355 {
1383 if (!m->tile_path[1]) 1356 if (!m->tile_path[1])
1384 return 1; 1357 return 1;
1385 1358
1386 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)
1387 load_and_link_tiled_map (m, 1); 1360 find_and_link (m, 1);
1388 1361
1389 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);
1390 } 1363 }
1391 1364
1392 if (y < 0) 1365 if (y < 0)
1393 { 1366 {
1394 if (!m->tile_path[0]) 1367 if (!m->tile_path[0])
1395 return 1; 1368 return 1;
1396 1369
1397 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)
1398 load_and_link_tiled_map (m, 0); 1371 find_and_link (m, 0);
1399 1372
1400 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);
1401 } 1374 }
1402 1375
1403 if (y >= m->height) 1376 if (y >= m->height)
1404 { 1377 {
1405 if (!m->tile_path[2]) 1378 if (!m->tile_path[2])
1406 return 1; 1379 return 1;
1407 1380
1408 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)
1409 load_and_link_tiled_map (m, 2); 1382 find_and_link (m, 2);
1410 1383
1411 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);
1412 } 1385 }
1413 1386
1414 /* Simple case - coordinates are within this local 1387 /* Simple case - coordinates are within this local
… …
1419 1392
1420/* This is basically the same as out_of_map above, but 1393/* This is basically the same as out_of_map above, but
1421 * instead we return NULL if no map is valid (coordinates 1394 * instead we return NULL if no map is valid (coordinates
1422 * out of bounds and no tiled map), otherwise it returns 1395 * out of bounds and no tiled map), otherwise it returns
1423 * the map as that the coordinates are really on, and 1396 * the map as that the coordinates are really on, and
1424 * updates x and y to be the localized coordinates. 1397 * updates x and y to be the localised coordinates.
1425 * Using this is more efficient of calling out_of_map 1398 * Using this is more efficient of calling out_of_map
1426 * and then figuring out what the real map is 1399 * and then figuring out what the real map is
1427 */ 1400 */
1428maptile * 1401maptile *
1429get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1402maptile::xy_find (sint16 &x, sint16 &y)
1430{ 1403{
1431 if (*x < 0) 1404 if (x < 0)
1432 { 1405 {
1433 if (!m->tile_path[3]) 1406 if (!tile_path[3])
1434 return 0; 1407 return 0;
1435 1408
1436 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1409 find_and_link (this, 3);
1437 load_and_link_tiled_map (m, 3);
1438
1439 *x += m->tile_map[3]->width; 1410 x += tile_map[3]->width;
1440 return (get_map_from_coord (m->tile_map[3], x, y)); 1411 return tile_map[3]->xy_find (x, y);
1441 } 1412 }
1442 1413
1443 if (*x >= m->width) 1414 if (x >= width)
1444 { 1415 {
1445 if (!m->tile_path[1]) 1416 if (!tile_path[1])
1446 return 0; 1417 return 0;
1447 1418
1448 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1419 find_and_link (this, 1);
1449 load_and_link_tiled_map (m, 1);
1450
1451 *x -= m->width; 1420 x -= width;
1452 return (get_map_from_coord (m->tile_map[1], x, y)); 1421 return tile_map[1]->xy_find (x, y);
1453 } 1422 }
1454 1423
1455 if (*y < 0) 1424 if (y < 0)
1456 { 1425 {
1457 if (!m->tile_path[0]) 1426 if (!tile_path[0])
1458 return 0; 1427 return 0;
1459 1428
1460 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1429 find_and_link (this, 0);
1461 load_and_link_tiled_map (m, 0);
1462
1463 *y += m->tile_map[0]->height; 1430 y += tile_map[0]->height;
1464 return (get_map_from_coord (m->tile_map[0], x, y)); 1431 return tile_map[0]->xy_find (x, y);
1465 } 1432 }
1466 1433
1467 if (*y >= m->height) 1434 if (y >= height)
1468 { 1435 {
1469 if (!m->tile_path[2]) 1436 if (!tile_path[2])
1470 return 0; 1437 return 0;
1471 1438
1472 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1439 find_and_link (this, 2);
1473 load_and_link_tiled_map (m, 2);
1474
1475 *y -= m->height; 1440 y -= height;
1476 return (get_map_from_coord (m->tile_map[2], x, y)); 1441 return tile_map[2]->xy_find (x, y);
1477 } 1442 }
1478 1443
1479 /* Simple case - coordinates are within this local 1444 /* Simple case - coordinates are within this local
1480 * map. 1445 * map.
1481 */ 1446 */
1482 return m; 1447 return this;
1483} 1448}
1484 1449
1485/** 1450/**
1486 * 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
1487 * map1 to map2 in dx/dy. 1452 * map1 to map2 in dx/dy.
… …
1490adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1455adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1491{ 1456{
1492 if (!map1 || !map2) 1457 if (!map1 || !map2)
1493 return 0; 1458 return 0;
1494 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!)
1495 if (map1 == map2) 1462 if (map1 == map2)
1496 { 1463 {
1497 *dx = 0; 1464 *dx = 0;
1498 *dy = 0; 1465 *dy = 0;
1499 } 1466 }
… …
1559 } 1526 }
1560 else 1527 else
1561 return 0; 1528 return 0;
1562 1529
1563 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);
1564} 1548}
1565 1549
1566/* From map.c 1550/* From map.c
1567 * This is used by get_player to determine where the other 1551 * This is used by get_player to determine where the other
1568 * creature is. get_rangevector takes into account map tiling, 1552 * creature is. get_rangevector takes into account map tiling,
… …
1623 { 1607 {
1624 best_distance = tmpi; 1608 best_distance = tmpi;
1625 best = tmp; 1609 best = tmp;
1626 } 1610 }
1627 } 1611 }
1612
1628 if (best != op1) 1613 if (best != op1)
1629 { 1614 {
1630 retval->distance_x += op1->x - best->x; 1615 retval->distance_x += op1->x - best->x;
1631 retval->distance_y += op1->y - best->y; 1616 retval->distance_y += op1->y - best->y;
1632 } 1617 }
1633 } 1618 }
1619
1634 retval->part = best; 1620 retval->part = best;
1635 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);
1636 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1622 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1637 } 1623 }
1638} 1624}
1639 1625
1640/* 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
… …
1664 { 1650 {
1665 retval->distance_x += op2->x - x; 1651 retval->distance_x += op2->x - x;
1666 retval->distance_y += op2->y - y; 1652 retval->distance_y += op2->y - y;
1667 1653
1668 retval->part = NULL; 1654 retval->part = NULL;
1669 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);
1670 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1656 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1671 } 1657 }
1672} 1658}
1673 1659
1674/* 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