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.67 by elmex, Wed Jan 3 02:51:09 2007 UTC vs.
Revision 1.88 by root, Fri Feb 16 19:43:40 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 <funcpoint.h>
26
27#include <loader.h>
28#include <unistd.h> 25#include <unistd.h>
26
27#include "global.h"
28#include "funcpoint.h"
29
30#include "loader.h"
29 31
30#include "path.h" 32#include "path.h"
31 33
32/* 34/*
33 * This makes a path absolute outside the world of Crossfire. 35 * This makes a path absolute outside the world of Crossfire.
… …
66 char *endbuf; 68 char *endbuf;
67 struct stat statbuf; 69 struct stat statbuf;
68 int mode = 0; 70 int mode = 0;
69 71
70 if (prepend_dir) 72 if (prepend_dir)
71 strcpy (buf, create_pathname (name)); 73 assign (buf, create_pathname (name));
72 else 74 else
73 strcpy (buf, name); 75 assign (buf, name);
74 76
75 /* old method (strchr(buf, '\0')) seemd very odd to me - 77 /* old method (strchr(buf, '\0')) seemd very odd to me -
76 * this method should be equivalant and is clearer. 78 * this method should be equivalant and is clearer.
77 * Can not use strcat because we need to cycle through 79 * Can not use strcat because we need to cycle through
78 * all the names. 80 * all the names.
… …
227 229
228 } 230 }
229 return 0; 231 return 0;
230} 232}
231 233
232
233/* 234/*
234 * Returns true if the given object can't fit in the given spot. 235 * 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, 236 * This is meant for multi space objects - for single space objecs,
236 * just calling get_map_blocked and checking that against movement type 237 * just calling get_map_blocked and checking that against movement type
237 * of object. This function goes through all the parts of the 238 * of object. This function goes through all the parts of the
… …
396} 397}
397 398
398/* 399/*
399 * 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
400 * file pointer. 401 * file pointer.
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 &f)
405{ 405{
406 int unique; 406 for (;;)
407 object *op, *prev = NULL, *last_more = NULL, *otmp;
408
409 op = object::create ();
410 op->map = this; /* To handle buttons correctly */
411
412 while (int i = load_object (thawer, op, 0))
413 { 407 {
414 /* if the archetype for the object is null, means that we 408 coroapi::cede_every (1000); // cede once in a while
415 * got an invalid object. Don't do anything with it - the game 409
416 * or editor will not be able to do anything with it either. 410 switch (f.kw)
417 */
418 if (op->arch == NULL)
419 { 411 {
420 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 412 case KW_arch:
421 continue; 413 if (object *op = object::read (f))
422 }
423
424 switch (i)
425 { 414 {
426 case LL_NORMAL: 415 if (op->inv)
416 sum_weight (op);
417
427 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 418 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
419 }
428 420
429 if (op->inv) 421 continue;
430 sum_weight (op);
431 422
432 prev = op, last_more = op;
433 break;
434
435 case LL_MORE: 423 case KW_EOF:
436 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 424 return true;
437 op->head = prev, last_more->more = op, last_more = op; 425
426 default:
427 if (!f.parse_error ("map file"))
428 return false;
438 break; 429 break;
439 } 430 }
440 431
441 op = object::create (); 432 f.next ();
442 op->map = this;
443 }
444
445 op->destroy ();
446
447#if 0
448 for (i = 0; i < width; i++)
449 for (j = 0; j < height; j++)
450 {
451 unique = 0;
452 /* check for unique items, or unique squares */
453 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
454 {
455 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
456 unique = 1;
457
458 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
459 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
460 }
461 } 433 }
462#endif
463 434
464 return true; 435 return true;
465} 436}
466 437
467void 438void
… …
485 for (object *op = ms->bot; op; op = op->above) 456 for (object *op = ms->bot; op; op = op->above)
486 op->deactivate_recursive (); 457 op->deactivate_recursive ();
487} 458}
488 459
489bool 460bool
490maptile::save_objects (object_freezer &freezer, int flags) 461maptile::_save_objects (object_freezer &f, int flags)
491{ 462{
492 static int cede_count = 0; 463 static int cede_count = 0;
493 464
494 if (flags & IO_HEADER) 465 if (flags & IO_HEADER)
495 save_header (freezer); 466 _save_header (f);
496 467
497 if (!spaces) 468 if (!spaces)
498 return false; 469 return false;
499 470
500 for (int i = 0; i < size (); ++i) 471 for (int i = 0; i < size (); ++i)
501 { 472 {
473#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
502 if (cede_count >= 500) 474 if (cede_count >= 500)
503 { 475 {
504 cede_count = 0; 476 cede_count = 0;
505 coroapi::cede (); 477 coroapi::cede ();
506 } 478 }
479#endif
507 480
508 int unique = 0; 481 int unique = 0;
509 for (object *op = spaces [i].bot; op; op = op->above) 482 for (object *op = spaces [i].bot; op; op = op->above)
510 { 483 {
511 // count per-object, but cede only when modification-safe 484 // count per-object, but cede only when modification-safe
… …
518 continue; 491 continue;
519 492
520 if (unique || op->flag [FLAG_UNIQUE]) 493 if (unique || op->flag [FLAG_UNIQUE])
521 { 494 {
522 if (flags & IO_UNIQUES) 495 if (flags & IO_UNIQUES)
523 save_object (freezer, op, 1); 496 op->write (f);
524 } 497 }
525 else if (flags & IO_OBJECTS) 498 else if (flags & IO_OBJECTS)
526 save_object (freezer, op, 1); 499 op->write (f);
527 } 500 }
528 } 501 }
529 502
530 return true; 503 return true;
531} 504}
532 505
533bool 506bool
534maptile::load_objects (const char *path, bool skip_header) 507maptile::_load_objects (const char *path, bool skip_header)
535{ 508{
536 object_thawer thawer (path); 509 object_thawer f (path);
537 510
538 if (!thawer) 511 if (!f)
539 return false; 512 return false;
513
514 f.next ();
540 515
541 if (skip_header) 516 if (skip_header)
542 for (;;) 517 for (;;)
543 { 518 {
544 keyword kw = thawer.get_kv (); 519 keyword kw = f.kw;
545 520 f.skip ();
546 if (kw == KW_end) 521 if (kw == KW_end)
547 break; 522 break;
548
549 thawer.skip_kv (kw);
550 } 523 }
551 524
552 return load_objects (thawer); 525 return _load_objects (f);
553} 526}
554 527
555bool 528bool
556maptile::save_objects (const char *path, int flags) 529maptile::_save_objects (const char *path, int flags)
557{ 530{
558 object_freezer freezer; 531 object_freezer freezer;
559 532
560 if (!save_objects (freezer, flags)) 533 if (!_save_objects (freezer, flags))
561 return false; 534 return false;
562 535
563 return freezer.save (path); 536 return freezer.save (path);
564} 537}
565 538
566maptile::maptile () 539maptile::maptile ()
567{ 540{
568 in_memory = MAP_SWAPPED; 541 in_memory = MAP_SWAPPED;
569 542
570 /* The maps used to pick up default x and y values from the 543 /* The maps used to pick up default x and y values from the
571 * map archetype. Mimic that behaviour. 544 * map archetype. Mimic that behaviour.
572 */ 545 */
573 width = 16; 546 width = 16;
574 height = 16; 547 height = 16;
575 reset_timeout = 0;
576 timeout = 300; 548 timeout = 300;
577 enter_x = 0; 549 max_nrof = 1000; // 1000 items of anything
578 enter_y = 0; 550 max_volume = 2000000; // 2m³
579} 551}
580 552
581maptile::maptile (int w, int h) 553maptile::maptile (int w, int h)
582{ 554{
583 in_memory = MAP_SWAPPED; 555 in_memory = MAP_SWAPPED;
… …
729 * This could be done in lex (like the object loader), but I think 701 * This could be done in lex (like the object loader), but I think
730 * currently, there are few enough fields this is not a big deal. 702 * currently, there are few enough fields this is not a big deal.
731 * MSW 2001-07-01 703 * MSW 2001-07-01
732 */ 704 */
733bool 705bool
734maptile::load_header (object_thawer &thawer) 706maptile::_load_header (object_thawer &thawer)
735{ 707{
736 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
737 int msgpos = 0;
738 int maplorepos = 0;
739
740 for (;;) 708 for (;;)
741 { 709 {
742 keyword kw = thawer.get_kv (); 710 keyword kw = thawer.get_kv ();
743 711
744 switch (kw) 712 switch (kw)
745 { 713 {
746 case KW_EOF:
747 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
748 return false;
749
750 case KW_end:
751 return true;
752
753 case KW_msg: 714 case KW_msg:
754 thawer.get_ml (KW_endmsg, msg); 715 thawer.get_ml (KW_endmsg, msg);
755 break; 716 break;
756 717
757 case KW_lore: // CF+ extension 718 case KW_lore: // CF+ extension
… …
789 case KW_sky: thawer.get (sky); break; 750 case KW_sky: thawer.get (sky); break;
790 751
791 case KW_per_player: thawer.get (per_player); break; 752 case KW_per_player: thawer.get (per_player); break;
792 case KW_per_party: thawer.get (per_party); break; 753 case KW_per_party: thawer.get (per_party); break;
793 754
794 case KW_region: get_region_by_name (thawer.get_str ()); break; 755 case KW_region: default_region = region::find (thawer.get_str ()); break;
795 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 756 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
796 757
797 // old names new names 758 // old names new names
798 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 759 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
799 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 760 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
808 case KW_tile_path_1: thawer.get (tile_path [0]); break; 769 case KW_tile_path_1: thawer.get (tile_path [0]); break;
809 case KW_tile_path_2: thawer.get (tile_path [1]); break; 770 case KW_tile_path_2: thawer.get (tile_path [1]); break;
810 case KW_tile_path_3: thawer.get (tile_path [2]); break; 771 case KW_tile_path_3: thawer.get (tile_path [2]); break;
811 case KW_tile_path_4: thawer.get (tile_path [3]); break; 772 case KW_tile_path_4: thawer.get (tile_path [3]); break;
812 773
774 case KW_end:
775 return true;
776
813 default: 777 default:
814 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]); 778 if (!thawer.parse_error ("map", 0))
779 return false;
815 break; 780 break;
816 } 781 }
817 } 782 }
818 783
819 abort (); 784 abort ();
820} 785}
821 786
822bool 787bool
823maptile::load_header (const char *path) 788maptile::_load_header (const char *path)
824{ 789{
825 object_thawer thawer (path); 790 object_thawer thawer (path);
826 791
827 if (!thawer) 792 if (!thawer)
828 return false; 793 return false;
829 794
830 return load_header (thawer); 795 return _load_header (thawer);
831} 796}
832 797
833/****************************************************************************** 798/******************************************************************************
834 * This is the start of unique map handling code 799 * This is the start of unique map handling code
835 *****************************************************************************/ 800 *****************************************************************************/
… …
858 } 823 }
859 } 824 }
860} 825}
861 826
862bool 827bool
863maptile::save_header (object_freezer &freezer) 828maptile::_save_header (object_freezer &freezer)
864{ 829{
865#define MAP_OUT(k) freezer.put (KW_ ## k, k) 830#define MAP_OUT(k) freezer.put (KW_ ## k, k)
866#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 831#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
867 832
868 MAP_OUT2 (arch, "map"); 833 MAP_OUT2 (arch, "map");
… …
872 MAP_OUT (reset_time); 837 MAP_OUT (reset_time);
873 MAP_OUT (reset_timeout); 838 MAP_OUT (reset_timeout);
874 MAP_OUT (fixed_resettime); 839 MAP_OUT (fixed_resettime);
875 MAP_OUT (difficulty); 840 MAP_OUT (difficulty);
876 841
877 if (region) MAP_OUT2 (region, region->name); 842 if (default_region) MAP_OUT2 (region, default_region->name);
878 843
879 if (shopitems) 844 if (shopitems)
880 { 845 {
881 char shop[MAX_BUF]; 846 char shop[MAX_BUF];
882 print_shop_string (this, shop); 847 print_shop_string (this, shop);
… …
917 882
918 return true; 883 return true;
919} 884}
920 885
921bool 886bool
922maptile::save_header (const char *path) 887maptile::_save_header (const char *path)
923{ 888{
924 object_freezer freezer; 889 object_freezer freezer;
925 890
926 if (!save_header (freezer)) 891 if (!_save_header (freezer))
927 return false; 892 return false;
928 893
929 return freezer.save (path); 894 return freezer.save (path);
930} 895}
931 896
… …
933 * Remove and free all objects in the given map. 898 * Remove and free all objects in the given map.
934 */ 899 */
935void 900void
936maptile::clear () 901maptile::clear ()
937{ 902{
903 sfree (regions, size ()), regions = 0;
904 free (regionmap), regionmap = 0;
905
938 if (!spaces) 906 if (spaces)
939 return; 907 {
940
941 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 908 for (mapspace *ms = spaces + size (); ms-- > spaces; )
942 while (object *op = ms->bot) 909 while (object *op = ms->bot)
943 { 910 {
944 if (op->head) 911 if (op->head)
945 op = op->head; 912 op = op->head;
946 913
947 op->destroy_inv (false); 914 op->destroy_inv (false);
948 op->destroy (); 915 op->destroy ();
949 } 916 }
950 917
951 sfree (spaces, size ()), spaces = 0; 918 sfree (spaces, size ()), spaces = 0;
919 }
952 920
953 if (buttons) 921 if (buttons)
954 free_objectlinkpt (buttons), buttons = 0; 922 free_objectlinkpt (buttons), buttons = 0;
955} 923}
956 924
… …
1110 */ 1078 */
1111void 1079void
1112mapspace::update_ () 1080mapspace::update_ ()
1113{ 1081{
1114 object *tmp, *last = 0; 1082 object *tmp, *last = 0;
1115 uint8 flags = 0, light = 0, anywhere = 0; 1083 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1116 New_Face *top, *floor, *middle; 1084 facetile *top, *floor, *middle;
1117 object *top_obj, *floor_obj, *middle_obj; 1085 object *top_obj, *floor_obj, *middle_obj;
1118 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1086 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1119 1087
1120 middle = blank_face; 1088 middle = blank_face;
1121 top = blank_face; 1089 top = blank_face;
… …
1278 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1246 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1279 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1247 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1280 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1248 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1281} 1249}
1282 1250
1251uint64
1252mapspace::volume () const
1253{
1254 uint64 vol = 0;
1255
1256 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1257 vol += op->volume ();
1258
1259 return vol;
1260}
1261
1283/* this updates the orig_map->tile_map[tile_num] value after loading 1262/* this updates the orig_map->tile_map[tile_num] value after finding
1284 * the map. It also takes care of linking back the freshly loaded 1263 * the map. It also takes care of linking back the freshly found
1285 * maps tile_map values if it tiles back to this one. It returns 1264 * maps tile_map values if it tiles back to this one. It returns
1286 * the value of orig_map->tile_map[tile_num]. It really only does this 1265 * the value of orig_map->tile_map[tile_num].
1287 * so that it is easier for calling functions to verify success.
1288 */ 1266 */
1289static maptile * 1267static inline maptile *
1290load_and_link_tiled_map (maptile *orig_map, int tile_num) 1268find_and_link (maptile *orig_map, int tile_num)
1291{ 1269{
1270 maptile *mp = orig_map->tile_map [tile_num];
1271
1272 if (!mp)
1273 {
1292 maptile *mp = orig_map->load_map_sync (orig_map->tile_path [tile_num], orig_map); 1274 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1293 1275
1294 if (!mp || mp->in_memory != MAP_IN_MEMORY) 1276 if (!mp)
1295 { 1277 {
1296 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine 1278 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1297 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n", 1279 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1298 &orig_map->tile_path[tile_num], &orig_map->path); 1280 &orig_map->tile_path[tile_num], &orig_map->path);
1299 mp = new maptile (1, 1); 1281 mp = new maptile (1, 1);
1300 mp->alloc (); 1282 mp->alloc ();
1301 mp->in_memory = MAP_IN_MEMORY; 1283 mp->in_memory = MAP_IN_MEMORY;
1284 }
1302 } 1285 }
1303 1286
1304 int dest_tile = (tile_num + 2) % 4; 1287 int dest_tile = (tile_num + 2) % 4;
1305 1288
1306 orig_map->tile_map[tile_num] = mp; 1289 orig_map->tile_map [tile_num] = mp;
1307 1290
1308 // optimisation: back-link map to origin map if euclidean 1291 // optimisation: back-link map to origin map if euclidean
1309 //TODO: non-euclidean maps MUST GO 1292 //TODO: non-euclidean maps MUST GO
1310 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) 1293 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1311 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1294 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1312 1295
1313 return mp; 1296 return mp;
1297}
1298
1299static inline void
1300load_and_link (maptile *orig_map, int tile_num)
1301{
1302 find_and_link (orig_map, tile_num)->load_sync ();
1314} 1303}
1315 1304
1316/* this returns TRUE if the coordinates (x,y) are out of 1305/* this returns TRUE if the coordinates (x,y) are out of
1317 * map m. This function also takes into account any 1306 * map m. This function also takes into account any
1318 * tiling considerations, loading adjacant maps as needed. 1307 * tiling considerations, loading adjacant maps as needed.
… …
1335 { 1324 {
1336 if (!m->tile_path[3]) 1325 if (!m->tile_path[3])
1337 return 1; 1326 return 1;
1338 1327
1339 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1328 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1340 load_and_link_tiled_map (m, 3); 1329 find_and_link (m, 3);
1341 1330
1342 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1331 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1343 } 1332 }
1344 1333
1345 if (x >= m->width) 1334 if (x >= m->width)
1346 { 1335 {
1347 if (!m->tile_path[1]) 1336 if (!m->tile_path[1])
1348 return 1; 1337 return 1;
1349 1338
1350 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1339 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1351 load_and_link_tiled_map (m, 1); 1340 find_and_link (m, 1);
1352 1341
1353 return out_of_map (m->tile_map[1], x - m->width, y); 1342 return out_of_map (m->tile_map[1], x - m->width, y);
1354 } 1343 }
1355 1344
1356 if (y < 0) 1345 if (y < 0)
1357 { 1346 {
1358 if (!m->tile_path[0]) 1347 if (!m->tile_path[0])
1359 return 1; 1348 return 1;
1360 1349
1361 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1350 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1362 load_and_link_tiled_map (m, 0); 1351 find_and_link (m, 0);
1363 1352
1364 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1353 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1365 } 1354 }
1366 1355
1367 if (y >= m->height) 1356 if (y >= m->height)
1368 { 1357 {
1369 if (!m->tile_path[2]) 1358 if (!m->tile_path[2])
1370 return 1; 1359 return 1;
1371 1360
1372 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1361 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1373 load_and_link_tiled_map (m, 2); 1362 find_and_link (m, 2);
1374 1363
1375 return out_of_map (m->tile_map[2], x, y - m->height); 1364 return out_of_map (m->tile_map[2], x, y - m->height);
1376 } 1365 }
1377 1366
1378 /* Simple case - coordinates are within this local 1367 /* Simple case - coordinates are within this local
… …
1388 * updates x and y to be the localised coordinates. 1377 * updates x and y to be the localised coordinates.
1389 * Using this is more efficient of calling out_of_map 1378 * Using this is more efficient of calling out_of_map
1390 * and then figuring out what the real map is 1379 * and then figuring out what the real map is
1391 */ 1380 */
1392maptile * 1381maptile *
1393get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1382maptile::xy_find (sint16 &x, sint16 &y)
1394{ 1383{
1395 if (*x < 0) 1384 if (x < 0)
1396 { 1385 {
1397 if (!m->tile_path[3]) 1386 if (!tile_path[3])
1398 return 0; 1387 return 0;
1399 1388
1400 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1389 find_and_link (this, 3);
1401 load_and_link_tiled_map (m, 3);
1402
1403 *x += m->tile_map[3]->width; 1390 x += tile_map[3]->width;
1404 return (get_map_from_coord (m->tile_map[3], x, y)); 1391 return tile_map[3]->xy_find (x, y);
1405 } 1392 }
1406 1393
1407 if (*x >= m->width) 1394 if (x >= width)
1408 { 1395 {
1409 if (!m->tile_path[1]) 1396 if (!tile_path[1])
1410 return 0; 1397 return 0;
1411 1398
1412 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1399 find_and_link (this, 1);
1413 load_and_link_tiled_map (m, 1);
1414
1415 *x -= m->width; 1400 x -= width;
1416 return (get_map_from_coord (m->tile_map[1], x, y)); 1401 return tile_map[1]->xy_find (x, y);
1417 } 1402 }
1418 1403
1419 if (*y < 0) 1404 if (y < 0)
1420 { 1405 {
1421 if (!m->tile_path[0]) 1406 if (!tile_path[0])
1422 return 0; 1407 return 0;
1423 1408
1424 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1409 find_and_link (this, 0);
1425 load_and_link_tiled_map (m, 0);
1426
1427 *y += m->tile_map[0]->height; 1410 y += tile_map[0]->height;
1428 return (get_map_from_coord (m->tile_map[0], x, y)); 1411 return tile_map[0]->xy_find (x, y);
1429 } 1412 }
1430 1413
1431 if (*y >= m->height) 1414 if (y >= height)
1432 { 1415 {
1433 if (!m->tile_path[2]) 1416 if (!tile_path[2])
1434 return 0; 1417 return 0;
1435 1418
1436 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1419 find_and_link (this, 2);
1437 load_and_link_tiled_map (m, 2);
1438
1439 *y -= m->height; 1420 y -= height;
1440 return (get_map_from_coord (m->tile_map[2], x, y)); 1421 return tile_map[2]->xy_find (x, y);
1441 } 1422 }
1442 1423
1443 /* Simple case - coordinates are within this local 1424 /* Simple case - coordinates are within this local
1444 * map. 1425 * map.
1445 */ 1426 */
1446 return m; 1427 return this;
1447} 1428}
1448 1429
1449/** 1430/**
1450 * Return whether map2 is adjacent to map1. If so, store the distance from 1431 * Return whether map2 is adjacent to map1. If so, store the distance from
1451 * map1 to map2 in dx/dy. 1432 * map1 to map2 in dx/dy.
1452 */ 1433 */
1453static int 1434int
1454adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1435adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1455{ 1436{
1456 if (!map1 || !map2) 1437 if (!map1 || !map2)
1457 return 0; 1438 return 0;
1458 1439
1440 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1441 //fix: compare paths instead (this is likely faster, too!)
1459 if (map1 == map2) 1442 if (map1 == map2)
1460 { 1443 {
1461 *dx = 0; 1444 *dx = 0;
1462 *dy = 0; 1445 *dy = 0;
1463 } 1446 }
… …
1523 } 1506 }
1524 else 1507 else
1525 return 0; 1508 return 0;
1526 1509
1527 return 1; 1510 return 1;
1511}
1512
1513maptile *
1514maptile::xy_load (sint16 &x, sint16 &y)
1515{
1516 maptile *map = xy_find (x, y);
1517
1518 if (map)
1519 map->load_sync ();
1520
1521 return map;
1522}
1523
1524maptile *
1525get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1526{
1527 return m->xy_load (*x, *y);
1528} 1528}
1529 1529
1530/* From map.c 1530/* From map.c
1531 * This is used by get_player to determine where the other 1531 * This is used by get_player to determine where the other
1532 * creature is. get_rangevector takes into account map tiling, 1532 * creature is. get_rangevector takes into account map tiling,
1533 * so you just can not look the the map coordinates and get the 1533 * so you just can not look the the map coordinates and get the
1534 * righte value. distance_x/y are distance away, which 1534 * righte value. distance_x/y are distance away, which
1535 * can be negativbe. direction is the crossfire direction scheme 1535 * can be negative. direction is the crossfire direction scheme
1536 * that the creature should head. part is the part of the 1536 * that the creature should head. part is the part of the
1537 * monster that is closest. 1537 * monster that is closest.
1538 * 1538 *
1539 * get_rangevector looks at op1 and op2, and fills in the 1539 * get_rangevector looks at op1 and op2, and fills in the
1540 * structure for op1 to get to op2. 1540 * structure for op1 to get to op2.
… …
1551get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1551get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1552{ 1552{
1553 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1553 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1554 { 1554 {
1555 /* be conservative and fill in _some_ data */ 1555 /* be conservative and fill in _some_ data */
1556 retval->distance = 100000; 1556 retval->distance = 10000;
1557 retval->distance_x = 32767; 1557 retval->distance_x = 10000;
1558 retval->distance_y = 32767; 1558 retval->distance_y = 10000;
1559 retval->direction = 0; 1559 retval->direction = 0;
1560 retval->part = 0; 1560 retval->part = 0;
1561 } 1561 }
1562 else 1562 else
1563 { 1563 {
… …
1568 1568
1569 best = op1; 1569 best = op1;
1570 /* If this is multipart, find the closest part now */ 1570 /* If this is multipart, find the closest part now */
1571 if (!(flags & 0x1) && op1->more) 1571 if (!(flags & 0x1) && op1->more)
1572 { 1572 {
1573 object *tmp;
1574 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1573 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1575 1574
1576 /* we just take the offset of the piece to head to figure 1575 /* we just take the offset of the piece to head to figure
1577 * distance instead of doing all that work above again 1576 * distance instead of doing all that work above again
1578 * since the distance fields we set above are positive in the 1577 * since the distance fields we set above are positive in the
1579 * same axis as is used for multipart objects, the simply arithmetic 1578 * same axis as is used for multipart objects, the simply arithmetic
1580 * below works. 1579 * below works.
1581 */ 1580 */
1582 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1581 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1583 { 1582 {
1584 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1583 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1585 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1584 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1586 if (tmpi < best_distance) 1585 if (tmpi < best_distance)
1587 { 1586 {
1588 best_distance = tmpi; 1587 best_distance = tmpi;
1589 best = tmp; 1588 best = tmp;
1590 } 1589 }
1591 } 1590 }
1591
1592 if (best != op1) 1592 if (best != op1)
1593 { 1593 {
1594 retval->distance_x += op1->x - best->x; 1594 retval->distance_x += op1->x - best->x;
1595 retval->distance_y += op1->y - best->y; 1595 retval->distance_y += op1->y - best->y;
1596 } 1596 }
1597 } 1597 }
1598
1598 retval->part = best; 1599 retval->part = best;
1599 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1600 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1600 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1601 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1601 } 1602 }
1602} 1603}
1603 1604
1604/* this is basically the same as get_rangevector above, but instead of 1605/* this is basically the same as get_rangevector above, but instead of
… …
1609 * flags has no meaning for this function at this time - I kept it in to 1610 * flags has no meaning for this function at this time - I kept it in to
1610 * be more consistant with the above function and also in case they are needed 1611 * be more consistant with the above function and also in case they are needed
1611 * for something in the future. Also, since no object is pasted, the best 1612 * for something in the future. Also, since no object is pasted, the best
1612 * field of the rv_vector is set to NULL. 1613 * field of the rv_vector is set to NULL.
1613 */ 1614 */
1614
1615void 1615void
1616get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1616get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1617{ 1617{
1618 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1618 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1619 { 1619 {
1620 /* be conservative and fill in _some_ data */ 1620 /* be conservative and fill in _some_ data */
1621 retval->distance = 100000; 1621 retval->distance = 100000;
… …
1628 { 1628 {
1629 retval->distance_x += op2->x - x; 1629 retval->distance_x += op2->x - x;
1630 retval->distance_y += op2->y - y; 1630 retval->distance_y += op2->y - y;
1631 1631
1632 retval->part = NULL; 1632 retval->part = NULL;
1633 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1633 retval->distance = idistance (retval->distance_x, retval->distance_y);
1634 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1634 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1635 } 1635 }
1636} 1636}
1637 1637
1638/* Returns true of op1 and op2 are effectively on the same map 1638/* Returns true of op1 and op2 are effectively on the same map
… …
1658 op->remove (); 1658 op->remove ();
1659 1659
1660 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1660 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1661} 1661}
1662 1662
1663region *
1664maptile::region (int x, int y) const
1665{
1666 if (regions
1667 && regionmap
1668 && !OUT_OF_REAL_MAP (this, x, y))
1669 if (struct region *reg = regionmap [regions [y * width + x]])
1670 return reg;
1671
1672 if (default_region)
1673 return default_region;
1674
1675 return ::region::default_region ();
1676}
1677
1678

Diff Legend

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