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.83 by root, Thu Feb 1 19:15:38 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)
734 { 743 {
735 case KW_EOF:
736 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
737 return false;
738
739 case KW_end:
740 return true;
741
742 case KW_msg: 744 case KW_msg:
743 thawer.get_ml (KW_endmsg, msg); 745 thawer.get_ml (KW_endmsg, msg);
744 break; 746 break;
745 747
746 case KW_lore: // CF+ extension 748 case KW_lore: // CF+ extension
… …
778 case KW_sky: thawer.get (sky); break; 780 case KW_sky: thawer.get (sky); break;
779 781
780 case KW_per_player: thawer.get (per_player); break; 782 case KW_per_player: thawer.get (per_player); break;
781 case KW_per_party: thawer.get (per_party); break; 783 case KW_per_party: thawer.get (per_party); break;
782 784
783 case KW_region: get_region_by_name (thawer.get_str ()); break; 785 case KW_region: default_region = region::find (thawer.get_str ()); break;
784 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 786 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
785 787
786 // old names new names 788 // old names new names
787 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 789 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; 790 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
797 case KW_tile_path_1: thawer.get (tile_path [0]); break; 799 case KW_tile_path_1: thawer.get (tile_path [0]); break;
798 case KW_tile_path_2: thawer.get (tile_path [1]); break; 800 case KW_tile_path_2: thawer.get (tile_path [1]); break;
799 case KW_tile_path_3: thawer.get (tile_path [2]); break; 801 case KW_tile_path_3: thawer.get (tile_path [2]); break;
800 case KW_tile_path_4: thawer.get (tile_path [3]); break; 802 case KW_tile_path_4: thawer.get (tile_path [3]); break;
801 803
804 case KW_end:
805 return true;
806
802 default: 807 default:
803 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]); 808 if (!thawer.parse_error (kw, "map", 0))
809 return false;
804 break; 810 break;
805 } 811 }
806 } 812 }
807 813
808 abort (); 814 abort ();
809} 815}
810 816
811bool 817bool
812maptile::load_header (const char *path) 818maptile::_load_header (const char *path)
813{ 819{
814 object_thawer thawer (path); 820 object_thawer thawer (path);
815 821
816 if (!thawer) 822 if (!thawer)
817 return false; 823 return false;
818 824
819 return load_header (thawer); 825 return _load_header (thawer);
820} 826}
821 827
822/****************************************************************************** 828/******************************************************************************
823 * This is the start of unique map handling code 829 * This is the start of unique map handling code
824 *****************************************************************************/ 830 *****************************************************************************/
… …
847 } 853 }
848 } 854 }
849} 855}
850 856
851bool 857bool
852maptile::save_header (object_freezer &freezer) 858maptile::_save_header (object_freezer &freezer)
853{ 859{
854#define MAP_OUT(k) freezer.put (KW_ ## k, k) 860#define MAP_OUT(k) freezer.put (KW_ ## k, k)
855#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 861#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
856 862
857 MAP_OUT2 (arch, "map"); 863 MAP_OUT2 (arch, "map");
… …
861 MAP_OUT (reset_time); 867 MAP_OUT (reset_time);
862 MAP_OUT (reset_timeout); 868 MAP_OUT (reset_timeout);
863 MAP_OUT (fixed_resettime); 869 MAP_OUT (fixed_resettime);
864 MAP_OUT (difficulty); 870 MAP_OUT (difficulty);
865 871
866 if (region) MAP_OUT2 (region, region->name); 872 if (default_region) MAP_OUT2 (region, default_region->name);
867 873
868 if (shopitems) 874 if (shopitems)
869 { 875 {
870 char shop[MAX_BUF]; 876 char shop[MAX_BUF];
871 print_shop_string (this, shop); 877 print_shop_string (this, shop);
… …
906 912
907 return true; 913 return true;
908} 914}
909 915
910bool 916bool
911maptile::save_header (const char *path) 917maptile::_save_header (const char *path)
912{ 918{
913 object_freezer freezer; 919 object_freezer freezer;
914 920
915 if (!save_header (freezer)) 921 if (!_save_header (freezer))
916 return false; 922 return false;
917 923
918 return freezer.save (path); 924 return freezer.save (path);
919} 925}
920 926
… …
922 * Remove and free all objects in the given map. 928 * Remove and free all objects in the given map.
923 */ 929 */
924void 930void
925maptile::clear () 931maptile::clear ()
926{ 932{
933 sfree (regions, size ()), regions = 0;
934 free (regionmap), regionmap = 0;
935
927 if (!spaces) 936 if (spaces)
928 return; 937 {
929
930 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 938 for (mapspace *ms = spaces + size (); ms-- > spaces; )
931 while (object *op = ms->bot) 939 while (object *op = ms->bot)
932 { 940 {
933 if (op->head) 941 if (op->head)
934 op = op->head; 942 op = op->head;
935 943
936 op->destroy_inv (false); 944 op->destroy_inv (false);
937 op->destroy (); 945 op->destroy ();
938 } 946 }
939 947
940 sfree (spaces, size ()), spaces = 0; 948 sfree (spaces, size ()), spaces = 0;
949 }
941 950
942 if (buttons) 951 if (buttons)
943 free_objectlinkpt (buttons), buttons = 0; 952 free_objectlinkpt (buttons), buttons = 0;
944} 953}
945 954
… …
1099 */ 1108 */
1100void 1109void
1101mapspace::update_ () 1110mapspace::update_ ()
1102{ 1111{
1103 object *tmp, *last = 0; 1112 object *tmp, *last = 0;
1104 uint8 flags = 0, light = 0, anywhere = 0; 1113 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1105 New_Face *top, *floor, *middle; 1114 facetile *top, *floor, *middle;
1106 object *top_obj, *floor_obj, *middle_obj; 1115 object *top_obj, *floor_obj, *middle_obj;
1107 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1116 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1108 1117
1109 middle = blank_face; 1118 middle = blank_face;
1110 top = blank_face; 1119 top = blank_face;
… …
1226 1235
1227 /* If two top faces are already set, quit processing */ 1236 /* If two top faces are already set, quit processing */
1228 if ((top != blank_face) && (middle != blank_face)) 1237 if ((top != blank_face) && (middle != blank_face))
1229 break; 1238 break;
1230 1239
1231 /* Only show visible faces, unless its the editor - show all */ 1240 /* Only show visible faces */
1232 if (!tmp->invisible || editor) 1241 if (!tmp->invisible)
1233 { 1242 {
1234 /* Fill in top if needed */ 1243 /* Fill in top if needed */
1235 if (top == blank_face) 1244 if (top == blank_face)
1236 { 1245 {
1237 top = tmp->face; 1246 top = tmp->face;
… …
1267 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1276 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; 1277 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; 1278 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1270} 1279}
1271 1280
1272/* this updates the orig_map->tile_map[tile_num] value after loading 1281/* 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 1282 * 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 1283 * 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 1284 * the value of orig_map->tile_map[tile_num].
1276 * so that it is easier for calling functions to verify success.
1277 */ 1285 */
1278static maptile * 1286static inline maptile *
1279load_and_link_tiled_map (maptile *orig_map, int tile_num) 1287find_and_link (maptile *orig_map, int tile_num)
1280{ 1288{
1289 maptile *mp = orig_map->tile_map [tile_num];
1290
1291 if (!mp)
1292 {
1281 maptile *mp = orig_map->load_map_sync (orig_map->tile_path [tile_num], orig_map); 1293 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1282 1294
1283 if (!mp || mp->in_memory != MAP_IN_MEMORY) 1295 if (!mp)
1284 { 1296 {
1285 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine 1297 // 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", 1298 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); 1299 &orig_map->tile_path[tile_num], &orig_map->path);
1288 mp = new maptile (1, 1); 1300 mp = new maptile (1, 1);
1289 mp->alloc (); 1301 mp->alloc ();
1290 mp->in_memory = MAP_IN_MEMORY; 1302 mp->in_memory = MAP_IN_MEMORY;
1303 }
1291 } 1304 }
1292 1305
1293 int dest_tile = (tile_num + 2) % 4; 1306 int dest_tile = (tile_num + 2) % 4;
1294 1307
1295 orig_map->tile_map[tile_num] = mp; 1308 orig_map->tile_map [tile_num] = mp;
1296 1309
1297 // optimisation: back-link map to origin map if euclidean 1310 // optimisation: back-link map to origin map if euclidean
1298 //TODO: non-euclidean maps MUST GO 1311 //TODO: non-euclidean maps MUST GO
1299 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) 1312 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; 1313 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1301 1314
1302 return mp; 1315 return mp;
1316}
1317
1318static inline void
1319load_and_link (maptile *orig_map, int tile_num)
1320{
1321 find_and_link (orig_map, tile_num)->load_sync ();
1303} 1322}
1304 1323
1305/* this returns TRUE if the coordinates (x,y) are out of 1324/* this returns TRUE if the coordinates (x,y) are out of
1306 * map m. This function also takes into account any 1325 * map m. This function also takes into account any
1307 * tiling considerations, loading adjacant maps as needed. 1326 * tiling considerations, loading adjacant maps as needed.
… …
1324 { 1343 {
1325 if (!m->tile_path[3]) 1344 if (!m->tile_path[3])
1326 return 1; 1345 return 1;
1327 1346
1328 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1347 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1329 load_and_link_tiled_map (m, 3); 1348 find_and_link (m, 3);
1330 1349
1331 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1350 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1332 } 1351 }
1333 1352
1334 if (x >= m->width) 1353 if (x >= m->width)
1335 { 1354 {
1336 if (!m->tile_path[1]) 1355 if (!m->tile_path[1])
1337 return 1; 1356 return 1;
1338 1357
1339 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1358 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1340 load_and_link_tiled_map (m, 1); 1359 find_and_link (m, 1);
1341 1360
1342 return out_of_map (m->tile_map[1], x - m->width, y); 1361 return out_of_map (m->tile_map[1], x - m->width, y);
1343 } 1362 }
1344 1363
1345 if (y < 0) 1364 if (y < 0)
1346 { 1365 {
1347 if (!m->tile_path[0]) 1366 if (!m->tile_path[0])
1348 return 1; 1367 return 1;
1349 1368
1350 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1369 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1351 load_and_link_tiled_map (m, 0); 1370 find_and_link (m, 0);
1352 1371
1353 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1372 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1354 } 1373 }
1355 1374
1356 if (y >= m->height) 1375 if (y >= m->height)
1357 { 1376 {
1358 if (!m->tile_path[2]) 1377 if (!m->tile_path[2])
1359 return 1; 1378 return 1;
1360 1379
1361 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1380 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1362 load_and_link_tiled_map (m, 2); 1381 find_and_link (m, 2);
1363 1382
1364 return out_of_map (m->tile_map[2], x, y - m->height); 1383 return out_of_map (m->tile_map[2], x, y - m->height);
1365 } 1384 }
1366 1385
1367 /* Simple case - coordinates are within this local 1386 /* Simple case - coordinates are within this local
… …
1372 1391
1373/* This is basically the same as out_of_map above, but 1392/* This is basically the same as out_of_map above, but
1374 * instead we return NULL if no map is valid (coordinates 1393 * instead we return NULL if no map is valid (coordinates
1375 * out of bounds and no tiled map), otherwise it returns 1394 * out of bounds and no tiled map), otherwise it returns
1376 * the map as that the coordinates are really on, and 1395 * the map as that the coordinates are really on, and
1377 * updates x and y to be the localized coordinates. 1396 * updates x and y to be the localised coordinates.
1378 * Using this is more efficient of calling out_of_map 1397 * Using this is more efficient of calling out_of_map
1379 * and then figuring out what the real map is 1398 * and then figuring out what the real map is
1380 */ 1399 */
1381maptile * 1400maptile *
1382get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1401maptile::xy_find (sint16 &x, sint16 &y)
1383{ 1402{
1384 if (*x < 0) 1403 if (x < 0)
1385 { 1404 {
1386 if (!m->tile_path[3]) 1405 if (!tile_path[3])
1387 return 0; 1406 return 0;
1388 1407
1389 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1408 find_and_link (this, 3);
1390 load_and_link_tiled_map (m, 3);
1391
1392 *x += m->tile_map[3]->width; 1409 x += tile_map[3]->width;
1393 return (get_map_from_coord (m->tile_map[3], x, y)); 1410 return tile_map[3]->xy_find (x, y);
1394 } 1411 }
1395 1412
1396 if (*x >= m->width) 1413 if (x >= width)
1397 { 1414 {
1398 if (!m->tile_path[1]) 1415 if (!tile_path[1])
1399 return 0; 1416 return 0;
1400 1417
1401 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1418 find_and_link (this, 1);
1402 load_and_link_tiled_map (m, 1);
1403
1404 *x -= m->width; 1419 x -= width;
1405 return (get_map_from_coord (m->tile_map[1], x, y)); 1420 return tile_map[1]->xy_find (x, y);
1406 } 1421 }
1407 1422
1408 if (*y < 0) 1423 if (y < 0)
1409 { 1424 {
1410 if (!m->tile_path[0]) 1425 if (!tile_path[0])
1411 return 0; 1426 return 0;
1412 1427
1413 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1428 find_and_link (this, 0);
1414 load_and_link_tiled_map (m, 0);
1415
1416 *y += m->tile_map[0]->height; 1429 y += tile_map[0]->height;
1417 return (get_map_from_coord (m->tile_map[0], x, y)); 1430 return tile_map[0]->xy_find (x, y);
1418 } 1431 }
1419 1432
1420 if (*y >= m->height) 1433 if (y >= height)
1421 { 1434 {
1422 if (!m->tile_path[2]) 1435 if (!tile_path[2])
1423 return 0; 1436 return 0;
1424 1437
1425 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1438 find_and_link (this, 2);
1426 load_and_link_tiled_map (m, 2);
1427
1428 *y -= m->height; 1439 y -= height;
1429 return (get_map_from_coord (m->tile_map[2], x, y)); 1440 return tile_map[2]->xy_find (x, y);
1430 } 1441 }
1431 1442
1432 /* Simple case - coordinates are within this local 1443 /* Simple case - coordinates are within this local
1433 * map. 1444 * map.
1434 */ 1445 */
1435 return m; 1446 return this;
1436} 1447}
1437 1448
1438/** 1449/**
1439 * Return whether map2 is adjacent to map1. If so, store the distance from 1450 * Return whether map2 is adjacent to map1. If so, store the distance from
1440 * map1 to map2 in dx/dy. 1451 * map1 to map2 in dx/dy.
1441 */ 1452 */
1442static int 1453int
1443adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1454adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1444{ 1455{
1445 if (!map1 || !map2) 1456 if (!map1 || !map2)
1446 return 0; 1457 return 0;
1447 1458
1459 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1460 //fix: compare paths instead (this is likely faster, too!)
1448 if (map1 == map2) 1461 if (map1 == map2)
1449 { 1462 {
1450 *dx = 0; 1463 *dx = 0;
1451 *dy = 0; 1464 *dy = 0;
1452 } 1465 }
… …
1512 } 1525 }
1513 else 1526 else
1514 return 0; 1527 return 0;
1515 1528
1516 return 1; 1529 return 1;
1530}
1531
1532maptile *
1533maptile::xy_load (sint16 &x, sint16 &y)
1534{
1535 maptile *map = xy_find (x, y);
1536
1537 if (map)
1538 map->load_sync ();
1539
1540 return map;
1541}
1542
1543maptile *
1544get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1545{
1546 return m->xy_load (*x, *y);
1517} 1547}
1518 1548
1519/* From map.c 1549/* From map.c
1520 * This is used by get_player to determine where the other 1550 * This is used by get_player to determine where the other
1521 * creature is. get_rangevector takes into account map tiling, 1551 * creature is. get_rangevector takes into account map tiling,
1522 * so you just can not look the the map coordinates and get the 1552 * so you just can not look the the map coordinates and get the
1523 * righte value. distance_x/y are distance away, which 1553 * righte value. distance_x/y are distance away, which
1524 * can be negativbe. direction is the crossfire direction scheme 1554 * can be negative. direction is the crossfire direction scheme
1525 * that the creature should head. part is the part of the 1555 * that the creature should head. part is the part of the
1526 * monster that is closest. 1556 * monster that is closest.
1527 * 1557 *
1528 * get_rangevector looks at op1 and op2, and fills in the 1558 * get_rangevector looks at op1 and op2, and fills in the
1529 * structure for op1 to get to op2. 1559 * structure for op1 to get to op2.
… …
1576 { 1606 {
1577 best_distance = tmpi; 1607 best_distance = tmpi;
1578 best = tmp; 1608 best = tmp;
1579 } 1609 }
1580 } 1610 }
1611
1581 if (best != op1) 1612 if (best != op1)
1582 { 1613 {
1583 retval->distance_x += op1->x - best->x; 1614 retval->distance_x += op1->x - best->x;
1584 retval->distance_y += op1->y - best->y; 1615 retval->distance_y += op1->y - best->y;
1585 } 1616 }
1586 } 1617 }
1618
1587 retval->part = best; 1619 retval->part = best;
1588 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1620 retval->distance = idistance (retval->distance_x, retval->distance_y);
1589 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1621 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1590 } 1622 }
1591} 1623}
1592 1624
1593/* this is basically the same as get_rangevector above, but instead of 1625/* this is basically the same as get_rangevector above, but instead of
… …
1598 * flags has no meaning for this function at this time - I kept it in to 1630 * flags has no meaning for this function at this time - I kept it in to
1599 * be more consistant with the above function and also in case they are needed 1631 * be more consistant with the above function and also in case they are needed
1600 * for something in the future. Also, since no object is pasted, the best 1632 * for something in the future. Also, since no object is pasted, the best
1601 * field of the rv_vector is set to NULL. 1633 * field of the rv_vector is set to NULL.
1602 */ 1634 */
1603
1604void 1635void
1605get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1636get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1606{ 1637{
1607 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1638 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1608 { 1639 {
1609 /* be conservative and fill in _some_ data */ 1640 /* be conservative and fill in _some_ data */
1610 retval->distance = 100000; 1641 retval->distance = 100000;
… …
1617 { 1648 {
1618 retval->distance_x += op2->x - x; 1649 retval->distance_x += op2->x - x;
1619 retval->distance_y += op2->y - y; 1650 retval->distance_y += op2->y - y;
1620 1651
1621 retval->part = NULL; 1652 retval->part = NULL;
1622 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1653 retval->distance = idistance (retval->distance_x, retval->distance_y);
1623 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1654 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1624 } 1655 }
1625} 1656}
1626 1657
1627/* Returns true of op1 and op2 are effectively on the same map 1658/* Returns true of op1 and op2 are effectively on the same map
… …
1647 op->remove (); 1678 op->remove ();
1648 1679
1649 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1680 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1650} 1681}
1651 1682
1683region *
1684maptile::region (int x, int y) const
1685{
1686 if (regions
1687 && regionmap
1688 && !OUT_OF_REAL_MAP (this, x, y))
1689 if (struct region *reg = regionmap [regions [y * width + x]])
1690 return reg;
1691
1692 if (default_region)
1693 return default_region;
1694
1695 return ::region::default_region ();
1696}
1697

Diff Legend

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