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.56 by root, Sat Dec 30 10:16:10 2006 UTC vs.
Revision 1.76 by pippijn, Mon Jan 15 21:06:18 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
… …
331 archetype *tmp; 263 archetype *tmp;
332 int flag; 264 int flag;
333 maptile *m1; 265 maptile *m1;
334 sint16 sx, sy; 266 sint16 sx, sy;
335 267
336 if (ob == NULL) 268 if (!ob)
337 { 269 {
338 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 270 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
339 if (flag & P_OUT_OF_MAP) 271 if (flag & P_OUT_OF_MAP)
340 return P_OUT_OF_MAP; 272 return P_OUT_OF_MAP;
341 273
… …
396 328
397 /* sum_weight will go through and calculate what all the containers are 329 /* sum_weight will go through and calculate what all the containers are
398 * carrying. 330 * carrying.
399 */ 331 */
400 sum_weight (container); 332 sum_weight (container);
333}
334
335void
336maptile::set_object_flag (int flag, int value)
337{
338 if (!spaces)
339 return;
340
341 for (mapspace *ms = spaces + size (); ms-- > spaces; )
342 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
343 tmp->flag [flag] = value;
401} 344}
402 345
403/* link_multipart_objects go through all the objects on the map looking 346/* link_multipart_objects go through all the objects on the map looking
404 * for objects whose arch says they are multipart yet according to the 347 * for objects whose arch says they are multipart yet according to the
405 * info we have, they only have the head (as would be expected when 348 * info we have, they only have the head (as would be expected when
… …
457 * Loads (ands parses) the objects into a given map from the specified 400 * Loads (ands parses) the objects into a given map from the specified
458 * file pointer. 401 * file pointer.
459 * mapflags is the same as we get with load_original_map 402 * mapflags is the same as we get with load_original_map
460 */ 403 */
461bool 404bool
462maptile::load_objects (object_thawer &thawer) 405maptile::_load_objects (object_thawer &thawer)
463{ 406{
464 int unique; 407 int unique;
465 object *op, *prev = NULL, *last_more = NULL, *otmp; 408 object *op, *prev = NULL, *last_more = NULL, *otmp;
466 409
467 op = object::create (); 410 op = object::create ();
… …
528 if (!spaces) 471 if (!spaces)
529 return; 472 return;
530 473
531 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 474 for (mapspace *ms = spaces + size (); ms-- > spaces; )
532 for (object *op = ms->bot; op; op = op->above) 475 for (object *op = ms->bot; op; op = op->above)
533 op->activate (1); 476 op->activate_recursive ();
534} 477}
535 478
536void 479void
537maptile::deactivate () 480maptile::deactivate ()
538{ 481{
539 if (!spaces) 482 if (!spaces)
540 return; 483 return;
541 484
542 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 485 for (mapspace *ms = spaces + size (); ms-- > spaces; )
543 for (object *op = ms->bot; op; op = op->above) 486 for (object *op = ms->bot; op; op = op->above)
544 op->deactivate (1); 487 op->deactivate_recursive ();
545} 488}
546 489
547bool 490bool
548maptile::save_objects (object_freezer &freezer, int flags) 491maptile::_save_objects (object_freezer &freezer, int flags)
549{ 492{
493 static int cede_count = 0;
494
550 if (flags & IO_HEADER) 495 if (flags & IO_HEADER)
551 save_header (freezer); 496 _save_header (freezer);
552 497
553 if (!spaces) 498 if (!spaces)
554 return false; 499 return false;
555 500
556 for (int i = 0; i < size (); ++i) 501 for (int i = 0; i < size (); ++i)
557 { 502 {
503#if 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
558 int unique = 0; 511 int unique = 0;
559 for (object *op = spaces [i].bot; op; op = op->above) 512 for (object *op = spaces [i].bot; op; op = op->above)
560 { 513 {
514 // count per-object, but cede only when modification-safe
515 cede_count++;
516
561 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 517 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
562 unique = 1; 518 unique = 1;
563 519
564 if (!op->can_map_save ()) 520 if (!op->can_map_save ())
565 continue; 521 continue;
… …
576 532
577 return true; 533 return true;
578} 534}
579 535
580bool 536bool
581maptile::load_objects (const char *path, bool skip_header) 537maptile::_load_objects (const char *path, bool skip_header)
582{ 538{
583 object_thawer thawer (path); 539 object_thawer thawer (path);
584 540
585 if (!thawer) 541 if (!thawer)
586 return false; 542 return false;
… …
594 break; 550 break;
595 551
596 thawer.skip_kv (kw); 552 thawer.skip_kv (kw);
597 } 553 }
598 554
599 return load_objects (thawer); 555 return _load_objects (thawer);
600} 556}
601 557
602bool 558bool
603maptile::save_objects (const char *path, int flags) 559maptile::_save_objects (const char *path, int flags)
604{ 560{
605 object_freezer freezer; 561 object_freezer freezer;
606 562
607 if (!save_objects (freezer, flags)) 563 if (!_save_objects (freezer, flags))
608 return false; 564 return false;
609 565
610 return freezer.save (path); 566 return freezer.save (path);
611} 567}
612 568
… …
776 * 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
777 * 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.
778 * MSW 2001-07-01 734 * MSW 2001-07-01
779 */ 735 */
780bool 736bool
781maptile::load_header (object_thawer &thawer) 737maptile::_load_header (object_thawer &thawer)
782{ 738{
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 (;;) 739 for (;;)
788 { 740 {
789 keyword kw = thawer.get_kv (); 741 keyword kw = thawer.get_kv ();
790 742
791 switch (kw) 743 switch (kw)
792 { 744 {
793 case KW_EOF: 745 case KW_EOF:
794 LOG (llevError, "%s: end of file while reading map header, aborting header load.", &path); 746 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
795 return false; 747 return false;
796 748
797 case KW_end: 749 case KW_end:
798 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;
799 756
800 case KW_msg: 757 case KW_msg:
801 thawer.get_ml (KW_endmsg, msg); 758 thawer.get_ml (KW_endmsg, msg);
802 break; 759 break;
803 760
… …
854 811
855 case KW_tile_path_1: thawer.get (tile_path [0]); break; 812 case KW_tile_path_1: thawer.get (tile_path [0]); break;
856 case KW_tile_path_2: thawer.get (tile_path [1]); break; 813 case KW_tile_path_2: thawer.get (tile_path [1]); break;
857 case KW_tile_path_3: thawer.get (tile_path [2]); break; 814 case KW_tile_path_3: thawer.get (tile_path [2]); break;
858 case KW_tile_path_4: thawer.get (tile_path [3]); break; 815 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 } 816 }
864 } 817 }
865 818
866 abort (); 819 abort ();
867} 820}
868 821
869bool 822bool
870maptile::load_header (const char *path) 823maptile::_load_header (const char *path)
871{ 824{
872 object_thawer thawer (path); 825 object_thawer thawer (path);
873 826
874 if (!thawer) 827 if (!thawer)
875 return false; 828 return false;
876 829
877 return load_header (thawer); 830 return _load_header (thawer);
878} 831}
879 832
880/****************************************************************************** 833/******************************************************************************
881 * This is the start of unique map handling code 834 * This is the start of unique map handling code
882 *****************************************************************************/ 835 *****************************************************************************/
… …
905 } 858 }
906 } 859 }
907} 860}
908 861
909bool 862bool
910maptile::save_header (object_freezer &freezer) 863maptile::_save_header (object_freezer &freezer)
911{ 864{
912#define MAP_OUT(k) freezer.put (KW_ ## k, k) 865#define MAP_OUT(k) freezer.put (KW_ ## k, k)
913#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 866#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
914 867
915 MAP_OUT2 (arch, "map"); 868 MAP_OUT2 (arch, "map");
… …
957 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 910 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]); 911 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]); 912 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]); 913 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
961 914
962 MAP_OUT2 (end, 0); 915 freezer.put (this);
916 freezer.put (KW_end);
963 917
964 return true; 918 return true;
965} 919}
966 920
967bool 921bool
968maptile::save_header (const char *path) 922maptile::_save_header (const char *path)
969{ 923{
970 object_freezer freezer; 924 object_freezer freezer;
971 925
972 if (!save_header (freezer)) 926 if (!_save_header (freezer))
973 return false; 927 return false;
974 928
975 return freezer.save (path); 929 return freezer.save (path);
976} 930}
977 931
… …
1156 */ 1110 */
1157void 1111void
1158mapspace::update_ () 1112mapspace::update_ ()
1159{ 1113{
1160 object *tmp, *last = 0; 1114 object *tmp, *last = 0;
1161 uint8 flags = 0, light = 0, anywhere = 0; 1115 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1162 New_Face *top, *floor, *middle; 1116 New_Face *top, *floor, *middle;
1163 object *top_obj, *floor_obj, *middle_obj; 1117 object *top_obj, *floor_obj, *middle_obj;
1164 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;
1165 1119
1166 middle = blank_face; 1120 middle = blank_face;
… …
1283 1237
1284 /* If two top faces are already set, quit processing */ 1238 /* If two top faces are already set, quit processing */
1285 if ((top != blank_face) && (middle != blank_face)) 1239 if ((top != blank_face) && (middle != blank_face))
1286 break; 1240 break;
1287 1241
1288 /* Only show visible faces, unless its the editor - show all */ 1242 /* Only show visible faces */
1289 if (!tmp->invisible || editor) 1243 if (!tmp->invisible)
1290 { 1244 {
1291 /* Fill in top if needed */ 1245 /* Fill in top if needed */
1292 if (top == blank_face) 1246 if (top == blank_face)
1293 { 1247 {
1294 top = tmp->face; 1248 top = tmp->face;
… …
1324 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;
1325 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;
1326 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;
1327} 1281}
1328 1282
1329void
1330set_map_reset_time (maptile *map)
1331{
1332 int timeout = map->reset_timeout;
1333
1334 if (timeout <= 0)
1335 timeout = MAP_DEFAULTRESET;
1336 if (timeout >= MAP_MAXRESET)
1337 timeout = MAP_MAXRESET;
1338
1339 map->reset_time = time (0) + timeout;
1340}
1341
1342/* 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
1343 * 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
1344 * 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
1345 * the value of orig_map->tile_map[tile_num]. It really only does this 1286 * the value of orig_map->tile_map[tile_num].
1346 * so that it is easier for calling functions to verify success.
1347 */ 1287 */
1348static maptile * 1288static inline maptile *
1349load_and_link_tiled_map (maptile *orig_map, int tile_num) 1289find_and_link (maptile *orig_map, int tile_num)
1350{ 1290{
1291 maptile *mp = orig_map->tile_map [tile_num];
1292
1293 if (!mp)
1294 {
1351 maptile *mp = orig_map->find_map (orig_map->tile_path[tile_num]); 1295 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1352 mp->load (); 1296
1297 if (!mp)
1298 {
1299 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1300 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1301 &orig_map->tile_path[tile_num], &orig_map->path);
1302 mp = new maptile (1, 1);
1303 mp->alloc ();
1304 mp->in_memory = MAP_IN_MEMORY;
1305 }
1306 }
1353 1307
1354 int dest_tile = (tile_num + 2) % 4; 1308 int dest_tile = (tile_num + 2) % 4;
1355 1309
1356 orig_map->tile_map[tile_num] = mp; 1310 orig_map->tile_map [tile_num] = mp;
1357 1311
1358 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1312 // optimisation: back-link map to origin map if euclidean
1359 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) 1313 //TODO: non-euclidean maps MUST GO
1314 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1360 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;
1361 1316
1362 return mp; 1317 return mp;
1318}
1319
1320static inline void
1321load_and_link (maptile *orig_map, int tile_num)
1322{
1323 find_and_link (orig_map, tile_num)->load_sync ();
1363} 1324}
1364 1325
1365/* this returns TRUE if the coordinates (x,y) are out of 1326/* this returns TRUE if the coordinates (x,y) are out of
1366 * map m. This function also takes into account any 1327 * map m. This function also takes into account any
1367 * tiling considerations, loading adjacant maps as needed. 1328 * tiling considerations, loading adjacant maps as needed.
… …
1384 { 1345 {
1385 if (!m->tile_path[3]) 1346 if (!m->tile_path[3])
1386 return 1; 1347 return 1;
1387 1348
1388 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)
1389 load_and_link_tiled_map (m, 3); 1350 find_and_link (m, 3);
1390 1351
1391 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);
1392 } 1353 }
1393 1354
1394 if (x >= m->width) 1355 if (x >= m->width)
1395 { 1356 {
1396 if (!m->tile_path[1]) 1357 if (!m->tile_path[1])
1397 return 1; 1358 return 1;
1398 1359
1399 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)
1400 load_and_link_tiled_map (m, 1); 1361 find_and_link (m, 1);
1401 1362
1402 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);
1403 } 1364 }
1404 1365
1405 if (y < 0) 1366 if (y < 0)
1406 { 1367 {
1407 if (!m->tile_path[0]) 1368 if (!m->tile_path[0])
1408 return 1; 1369 return 1;
1409 1370
1410 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)
1411 load_and_link_tiled_map (m, 0); 1372 find_and_link (m, 0);
1412 1373
1413 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);
1414 } 1375 }
1415 1376
1416 if (y >= m->height) 1377 if (y >= m->height)
1417 { 1378 {
1418 if (!m->tile_path[2]) 1379 if (!m->tile_path[2])
1419 return 1; 1380 return 1;
1420 1381
1421 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)
1422 load_and_link_tiled_map (m, 2); 1383 find_and_link (m, 2);
1423 1384
1424 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);
1425 } 1386 }
1426 1387
1427 /* Simple case - coordinates are within this local 1388 /* Simple case - coordinates are within this local
… …
1432 1393
1433/* This is basically the same as out_of_map above, but 1394/* This is basically the same as out_of_map above, but
1434 * instead we return NULL if no map is valid (coordinates 1395 * instead we return NULL if no map is valid (coordinates
1435 * out of bounds and no tiled map), otherwise it returns 1396 * out of bounds and no tiled map), otherwise it returns
1436 * the map as that the coordinates are really on, and 1397 * the map as that the coordinates are really on, and
1437 * updates x and y to be the localized coordinates. 1398 * updates x and y to be the localised coordinates.
1438 * Using this is more efficient of calling out_of_map 1399 * Using this is more efficient of calling out_of_map
1439 * and then figuring out what the real map is 1400 * and then figuring out what the real map is
1440 */ 1401 */
1441maptile * 1402maptile *
1442get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1403maptile::xy_find (sint16 &x, sint16 &y)
1443{ 1404{
1444 if (*x < 0) 1405 if (x < 0)
1445 { 1406 {
1446 if (!m->tile_path[3]) 1407 if (!tile_path[3])
1447 return 0; 1408 return 0;
1448 1409
1449 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1410 find_and_link (this, 3);
1450 load_and_link_tiled_map (m, 3);
1451
1452 *x += m->tile_map[3]->width; 1411 x += tile_map[3]->width;
1453 return (get_map_from_coord (m->tile_map[3], x, y)); 1412 return tile_map[3]->xy_find (x, y);
1454 } 1413 }
1455 1414
1456 if (*x >= m->width) 1415 if (x >= width)
1457 { 1416 {
1458 if (!m->tile_path[1]) 1417 if (!tile_path[1])
1459 return 0; 1418 return 0;
1460 1419
1461 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1420 find_and_link (this, 1);
1462 load_and_link_tiled_map (m, 1);
1463
1464 *x -= m->width; 1421 x -= width;
1465 return (get_map_from_coord (m->tile_map[1], x, y)); 1422 return tile_map[1]->xy_find (x, y);
1466 } 1423 }
1467 1424
1468 if (*y < 0) 1425 if (y < 0)
1469 { 1426 {
1470 if (!m->tile_path[0]) 1427 if (!tile_path[0])
1471 return 0; 1428 return 0;
1472 1429
1473 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1430 find_and_link (this, 0);
1474 load_and_link_tiled_map (m, 0);
1475
1476 *y += m->tile_map[0]->height; 1431 y += tile_map[0]->height;
1477 return (get_map_from_coord (m->tile_map[0], x, y)); 1432 return tile_map[0]->xy_find (x, y);
1478 } 1433 }
1479 1434
1480 if (*y >= m->height) 1435 if (y >= height)
1481 { 1436 {
1482 if (!m->tile_path[2]) 1437 if (!tile_path[2])
1483 return 0; 1438 return 0;
1484 1439
1485 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1440 find_and_link (this, 2);
1486 load_and_link_tiled_map (m, 2);
1487
1488 *y -= m->height; 1441 y -= height;
1489 return (get_map_from_coord (m->tile_map[2], x, y)); 1442 return tile_map[2]->xy_find (x, y);
1490 } 1443 }
1491 1444
1492 /* Simple case - coordinates are within this local 1445 /* Simple case - coordinates are within this local
1493 * map. 1446 * map.
1494 */ 1447 */
1495
1496 m->last_access = runtime;
1497 return m; 1448 return this;
1498} 1449}
1499 1450
1500/** 1451/**
1501 * 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
1502 * map1 to map2 in dx/dy. 1453 * map1 to map2 in dx/dy.
… …
1505adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1456adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1506{ 1457{
1507 if (!map1 || !map2) 1458 if (!map1 || !map2)
1508 return 0; 1459 return 0;
1509 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!)
1510 if (map1 == map2) 1463 if (map1 == map2)
1511 { 1464 {
1512 *dx = 0; 1465 *dx = 0;
1513 *dy = 0; 1466 *dy = 0;
1514 } 1467 }
… …
1574 } 1527 }
1575 else 1528 else
1576 return 0; 1529 return 0;
1577 1530
1578 return 1; 1531 return 1;
1532}
1533
1534maptile *
1535maptile::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
1545maptile *
1546get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1547{
1548 return m->xy_load (*x, *y);
1579} 1549}
1580 1550
1581/* From map.c 1551/* From map.c
1582 * This is used by get_player to determine where the other 1552 * This is used by get_player to determine where the other
1583 * creature is. get_rangevector takes into account map tiling, 1553 * creature is. get_rangevector takes into account map tiling,
… …
1638 { 1608 {
1639 best_distance = tmpi; 1609 best_distance = tmpi;
1640 best = tmp; 1610 best = tmp;
1641 } 1611 }
1642 } 1612 }
1613
1643 if (best != op1) 1614 if (best != op1)
1644 { 1615 {
1645 retval->distance_x += op1->x - best->x; 1616 retval->distance_x += op1->x - best->x;
1646 retval->distance_y += op1->y - best->y; 1617 retval->distance_y += op1->y - best->y;
1647 } 1618 }
1648 } 1619 }
1620
1649 retval->part = best; 1621 retval->part = best;
1650 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1622 retval->distance = idistance (retval->distance_x, retval->distance_y);
1651 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1623 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1652 } 1624 }
1653} 1625}
1654 1626
1655/* this is basically the same as get_rangevector above, but instead of 1627/* this is basically the same as get_rangevector above, but instead of
… …
1679 { 1651 {
1680 retval->distance_x += op2->x - x; 1652 retval->distance_x += op2->x - x;
1681 retval->distance_y += op2->y - y; 1653 retval->distance_y += op2->y - y;
1682 1654
1683 retval->part = NULL; 1655 retval->part = NULL;
1684 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1656 retval->distance = idistance (retval->distance_x, retval->distance_y);
1685 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1657 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1686 } 1658 }
1687} 1659}
1688 1660
1689/* Returns true of op1 and op2 are effectively on the same map 1661/* Returns true of op1 and op2 are effectively on the same map

Diff Legend

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