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.63 by root, Mon Jan 1 00:41:02 2007 UTC vs.
Revision 1.90 by root, Fri Feb 16 22:21:46 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
… …
329 * carrying. 330 * carrying.
330 */ 331 */
331 sum_weight (container); 332 sum_weight (container);
332} 333}
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;
344}
345
334/* 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
335 * 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
336 * 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
337 * they are saved). We do have to look for the old maps that did save 349 * they are saved). We do have to look for the old maps that did save
338 * the more sections and not re-add sections for them. 350 * the more sections and not re-add sections for them.
… …
342{ 354{
343 if (!spaces) 355 if (!spaces)
344 return; 356 return;
345 357
346 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 358 for (mapspace *ms = spaces + size (); ms-- > spaces; )
347 for (object *tmp = ms->bot; tmp; ) 359 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
348 { 360 {
349 object *above = tmp->above;
350
351 /* already multipart - don't do anything more */ 361 /* already multipart - don't do anything more */
352 if (!tmp->head && !tmp->more) 362 if (!tmp->head && !tmp->more)
353 { 363 {
354 /* If there is nothing more to this object, this for loop 364 /* If there is nothing more to this object, this for loop
355 * won't do anything. 365 * won't do anything.
… …
377 * the coding is simpler to just to it here with each part. 387 * the coding is simpler to just to it here with each part.
378 */ 388 */
379 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 389 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
380 } 390 }
381 } 391 }
382
383 tmp = above;
384 } 392 }
385} 393}
386 394
387/* 395/*
388 * Loads (ands parses) the objects into a given map from the specified 396 * Loads (ands parses) the objects into a given map from the specified
389 * file pointer. 397 * file pointer.
390 * mapflags is the same as we get with load_original_map
391 */ 398 */
392bool 399bool
393maptile::load_objects (object_thawer &thawer) 400maptile::_load_objects (object_thawer &f)
394{ 401{
395 int unique; 402 for (;;)
396 object *op, *prev = NULL, *last_more = NULL, *otmp;
397
398 op = object::create ();
399 op->map = this; /* To handle buttons correctly */
400
401 while (int i = load_object (thawer, op, 0))
402 { 403 {
403 /* if the archetype for the object is null, means that we 404 coroapi::cede_every (1000); // cede once in a while
404 * got an invalid object. Don't do anything with it - the game 405
405 * or editor will not be able to do anything with it either. 406 switch (f.kw)
406 */
407 if (op->arch == NULL)
408 { 407 {
409 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 408 case KW_arch:
410 continue; 409 if (object *op = object::read (f, this))
411 }
412
413 switch (i)
414 { 410 {
415 case LL_NORMAL: 411 if (op->inv)
412 sum_weight (op);
413
416 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 414 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
415 }
417 416
418 if (op->inv) 417 continue;
419 sum_weight (op);
420 418
421 prev = op, last_more = op;
422 break;
423
424 case LL_MORE: 419 case KW_EOF:
425 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 420 return true;
426 op->head = prev, last_more->more = op, last_more = op; 421
422 default:
423 if (!f.parse_error ("map file"))
424 return false;
427 break; 425 break;
428 } 426 }
429 427
430 op = object::create (); 428 f.next ();
431 op->map = this;
432 }
433
434 op->destroy ();
435
436#if 0
437 for (i = 0; i < width; i++)
438 for (j = 0; j < height; j++)
439 {
440 unique = 0;
441 /* check for unique items, or unique squares */
442 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
443 {
444 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
445 unique = 1;
446
447 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
448 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
449 }
450 } 429 }
451#endif
452 430
453 return true; 431 return true;
454} 432}
455 433
456void 434void
… …
474 for (object *op = ms->bot; op; op = op->above) 452 for (object *op = ms->bot; op; op = op->above)
475 op->deactivate_recursive (); 453 op->deactivate_recursive ();
476} 454}
477 455
478bool 456bool
479maptile::save_objects (object_freezer &freezer, int flags) 457maptile::_save_objects (object_freezer &f, int flags)
480{ 458{
459 static int cede_count = 0;
460
481 if (flags & IO_HEADER) 461 if (flags & IO_HEADER)
482 save_header (freezer); 462 _save_header (f);
483 463
484 if (!spaces) 464 if (!spaces)
485 return false; 465 return false;
486 466
487 for (int i = 0; i < size (); ++i) 467 for (int i = 0; i < size (); ++i)
488 { 468 {
469#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
470 if (cede_count >= 500)
471 {
472 cede_count = 0;
473 coroapi::cede ();
474 }
475#endif
476
489 int unique = 0; 477 int unique = 0;
490 for (object *op = spaces [i].bot; op; op = op->above) 478 for (object *op = spaces [i].bot; op; op = op->above)
491 { 479 {
480 // count per-object, but cede only when modification-safe
481 cede_count++;
482
492 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 483 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
493 unique = 1; 484 unique = 1;
494 485
495 if (!op->can_map_save ()) 486 if (!op->can_map_save ())
496 continue; 487 continue;
497 488
498 if (unique || op->flag [FLAG_UNIQUE]) 489 if (unique || op->flag [FLAG_UNIQUE])
499 { 490 {
500 if (flags & IO_UNIQUES) 491 if (flags & IO_UNIQUES)
501 save_object (freezer, op, 1); 492 op->write (f);
502 } 493 }
503 else if (flags & IO_OBJECTS) 494 else if (flags & IO_OBJECTS)
504 save_object (freezer, op, 1); 495 op->write (f);
505 } 496 }
506 } 497 }
507 498
508 return true; 499 return true;
509} 500}
510 501
511bool 502bool
512maptile::load_objects (const char *path, bool skip_header) 503maptile::_load_objects (const char *path, bool skip_header)
513{ 504{
514 object_thawer thawer (path); 505 object_thawer f (path);
515 506
516 if (!thawer) 507 if (!f)
517 return false; 508 return false;
509
510 f.next ();
518 511
519 if (skip_header) 512 if (skip_header)
520 for (;;) 513 for (;;)
521 { 514 {
522 keyword kw = thawer.get_kv (); 515 keyword kw = f.kw;
523 516 f.skip ();
524 if (kw == KW_end) 517 if (kw == KW_end)
525 break; 518 break;
526
527 thawer.skip_kv (kw);
528 } 519 }
529 520
530 return load_objects (thawer); 521 return _load_objects (f);
531} 522}
532 523
533bool 524bool
534maptile::save_objects (const char *path, int flags) 525maptile::_save_objects (const char *path, int flags)
535{ 526{
536 object_freezer freezer; 527 object_freezer freezer;
537 528
538 if (!save_objects (freezer, flags)) 529 if (!_save_objects (freezer, flags))
539 return false; 530 return false;
540 531
541 return freezer.save (path); 532 return freezer.save (path);
542} 533}
543 534
544maptile::maptile () 535maptile::maptile ()
545{ 536{
546 in_memory = MAP_SWAPPED; 537 in_memory = MAP_SWAPPED;
547 538
548 /* The maps used to pick up default x and y values from the 539 /* The maps used to pick up default x and y values from the
549 * map archetype. Mimic that behaviour. 540 * map archetype. Mimic that behaviour.
550 */ 541 */
551 width = 16; 542 width = 16;
552 height = 16; 543 height = 16;
553 reset_timeout = 0;
554 timeout = 300; 544 timeout = 300;
555 enter_x = 0; 545 max_nrof = 1000; // 1000 items of anything
556 enter_y = 0; 546 max_volume = 2000000; // 2m³
557} 547}
558 548
559maptile::maptile (int w, int h) 549maptile::maptile (int w, int h)
560{ 550{
561 in_memory = MAP_SWAPPED; 551 in_memory = MAP_SWAPPED;
… …
707 * This could be done in lex (like the object loader), but I think 697 * This could be done in lex (like the object loader), but I think
708 * currently, there are few enough fields this is not a big deal. 698 * currently, there are few enough fields this is not a big deal.
709 * MSW 2001-07-01 699 * MSW 2001-07-01
710 */ 700 */
711bool 701bool
712maptile::load_header (object_thawer &thawer) 702maptile::_load_header (object_thawer &thawer)
713{ 703{
714 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
715 int msgpos = 0;
716 int maplorepos = 0;
717
718 for (;;) 704 for (;;)
719 { 705 {
720 keyword kw = thawer.get_kv (); 706 keyword kw = thawer.get_kv ();
721 707
722 switch (kw) 708 switch (kw)
723 { 709 {
724 case KW_EOF:
725 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
726 return false;
727
728 case KW_end:
729 return true;
730
731 case KW_msg: 710 case KW_msg:
732 thawer.get_ml (KW_endmsg, msg); 711 thawer.get_ml (KW_endmsg, msg);
733 break; 712 break;
734 713
735 case KW_lore: // CF+ extension 714 case KW_lore: // CF+ extension
… …
767 case KW_sky: thawer.get (sky); break; 746 case KW_sky: thawer.get (sky); break;
768 747
769 case KW_per_player: thawer.get (per_player); break; 748 case KW_per_player: thawer.get (per_player); break;
770 case KW_per_party: thawer.get (per_party); break; 749 case KW_per_party: thawer.get (per_party); break;
771 750
772 case KW_region: get_region_by_name (thawer.get_str ()); break; 751 case KW_region: default_region = region::find (thawer.get_str ()); break;
773 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 752 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
774 753
775 // old names new names 754 // old names new names
776 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 755 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
777 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 756 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
786 case KW_tile_path_1: thawer.get (tile_path [0]); break; 765 case KW_tile_path_1: thawer.get (tile_path [0]); break;
787 case KW_tile_path_2: thawer.get (tile_path [1]); break; 766 case KW_tile_path_2: thawer.get (tile_path [1]); break;
788 case KW_tile_path_3: thawer.get (tile_path [2]); break; 767 case KW_tile_path_3: thawer.get (tile_path [2]); break;
789 case KW_tile_path_4: thawer.get (tile_path [3]); break; 768 case KW_tile_path_4: thawer.get (tile_path [3]); break;
790 769
770 case KW_end:
771 return true;
772
791 default: 773 default:
792 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]); 774 if (!thawer.parse_error ("map", 0))
775 return false;
793 break; 776 break;
794 } 777 }
795 } 778 }
796 779
797 abort (); 780 abort ();
798} 781}
799 782
800bool 783bool
801maptile::load_header (const char *path) 784maptile::_load_header (const char *path)
802{ 785{
803 object_thawer thawer (path); 786 object_thawer thawer (path);
804 787
805 if (!thawer) 788 if (!thawer)
806 return false; 789 return false;
807 790
808 return load_header (thawer); 791 return _load_header (thawer);
809} 792}
810 793
811/****************************************************************************** 794/******************************************************************************
812 * This is the start of unique map handling code 795 * This is the start of unique map handling code
813 *****************************************************************************/ 796 *****************************************************************************/
… …
836 } 819 }
837 } 820 }
838} 821}
839 822
840bool 823bool
841maptile::save_header (object_freezer &freezer) 824maptile::_save_header (object_freezer &freezer)
842{ 825{
843#define MAP_OUT(k) freezer.put (KW_ ## k, k) 826#define MAP_OUT(k) freezer.put (KW_ ## k, k)
844#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 827#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
845 828
846 MAP_OUT2 (arch, "map"); 829 MAP_OUT2 (arch, "map");
… …
850 MAP_OUT (reset_time); 833 MAP_OUT (reset_time);
851 MAP_OUT (reset_timeout); 834 MAP_OUT (reset_timeout);
852 MAP_OUT (fixed_resettime); 835 MAP_OUT (fixed_resettime);
853 MAP_OUT (difficulty); 836 MAP_OUT (difficulty);
854 837
855 if (region) MAP_OUT2 (region, region->name); 838 if (default_region) MAP_OUT2 (region, default_region->name);
856 839
857 if (shopitems) 840 if (shopitems)
858 { 841 {
859 char shop[MAX_BUF]; 842 char shop[MAX_BUF];
860 print_shop_string (this, shop); 843 print_shop_string (this, shop);
… …
895 878
896 return true; 879 return true;
897} 880}
898 881
899bool 882bool
900maptile::save_header (const char *path) 883maptile::_save_header (const char *path)
901{ 884{
902 object_freezer freezer; 885 object_freezer freezer;
903 886
904 if (!save_header (freezer)) 887 if (!_save_header (freezer))
905 return false; 888 return false;
906 889
907 return freezer.save (path); 890 return freezer.save (path);
908} 891}
909 892
… …
911 * Remove and free all objects in the given map. 894 * Remove and free all objects in the given map.
912 */ 895 */
913void 896void
914maptile::clear () 897maptile::clear ()
915{ 898{
899 sfree (regions, size ()), regions = 0;
900 free (regionmap), regionmap = 0;
901
916 if (!spaces) 902 if (spaces)
917 return; 903 {
918
919 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 904 for (mapspace *ms = spaces + size (); ms-- > spaces; )
920 while (object *op = ms->bot) 905 while (object *op = ms->bot)
921 { 906 {
922 if (op->head) 907 if (op->head)
923 op = op->head; 908 op = op->head;
924 909
925 op->destroy_inv (false); 910 op->destroy_inv (false);
926 op->destroy (); 911 op->destroy ();
927 } 912 }
928 913
929 sfree (spaces, size ()), spaces = 0; 914 sfree (spaces, size ()), spaces = 0;
915 }
930 916
931 if (buttons) 917 if (buttons)
932 free_objectlinkpt (buttons), buttons = 0; 918 free_objectlinkpt (buttons), buttons = 0;
933} 919}
934 920
… …
1088 */ 1074 */
1089void 1075void
1090mapspace::update_ () 1076mapspace::update_ ()
1091{ 1077{
1092 object *tmp, *last = 0; 1078 object *tmp, *last = 0;
1093 uint8 flags = 0, light = 0, anywhere = 0; 1079 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1094 New_Face *top, *floor, *middle; 1080 facetile *top, *floor, *middle;
1095 object *top_obj, *floor_obj, *middle_obj; 1081 object *top_obj, *floor_obj, *middle_obj;
1096 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1082 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1097 1083
1098 middle = blank_face; 1084 middle = blank_face;
1099 top = blank_face; 1085 top = blank_face;
… …
1215 1201
1216 /* If two top faces are already set, quit processing */ 1202 /* If two top faces are already set, quit processing */
1217 if ((top != blank_face) && (middle != blank_face)) 1203 if ((top != blank_face) && (middle != blank_face))
1218 break; 1204 break;
1219 1205
1220 /* Only show visible faces, unless its the editor - show all */ 1206 /* Only show visible faces */
1221 if (!tmp->invisible || editor) 1207 if (!tmp->invisible)
1222 { 1208 {
1223 /* Fill in top if needed */ 1209 /* Fill in top if needed */
1224 if (top == blank_face) 1210 if (top == blank_face)
1225 { 1211 {
1226 top = tmp->face; 1212 top = tmp->face;
… …
1256 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1242 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1257 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1243 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1258 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1244 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1259} 1245}
1260 1246
1247uint64
1248mapspace::volume () const
1249{
1250 uint64 vol = 0;
1251
1252 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1253 vol += op->volume ();
1254
1255 return vol;
1256}
1257
1261/* this updates the orig_map->tile_map[tile_num] value after loading 1258/* this updates the orig_map->tile_map[tile_num] value after finding
1262 * the map. It also takes care of linking back the freshly loaded 1259 * the map. It also takes care of linking back the freshly found
1263 * maps tile_map values if it tiles back to this one. It returns 1260 * maps tile_map values if it tiles back to this one. It returns
1264 * the value of orig_map->tile_map[tile_num]. It really only does this 1261 * the value of orig_map->tile_map[tile_num].
1265 * so that it is easier for calling functions to verify success.
1266 */ 1262 */
1267static maptile * 1263static inline maptile *
1268load_and_link_tiled_map (maptile *orig_map, int tile_num) 1264find_and_link (maptile *orig_map, int tile_num)
1269{ 1265{
1266 maptile *mp = orig_map->tile_map [tile_num];
1267
1268 if (!mp)
1269 {
1270 maptile *mp = orig_map->load_map_sync (orig_map->tile_path [tile_num], orig_map); 1270 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1271 1271
1272 if (!mp || mp->in_memory != MAP_IN_MEMORY) 1272 if (!mp)
1273 { 1273 {
1274 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine 1274 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1275 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n", 1275 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1276 &orig_map->tile_path[tile_num], &orig_map->path); 1276 &orig_map->tile_path[tile_num], &orig_map->path);
1277 mp = new maptile (1, 1); 1277 mp = new maptile (1, 1);
1278 mp->alloc (); 1278 mp->alloc ();
1279 mp->in_memory = MAP_IN_MEMORY; 1279 mp->in_memory = MAP_IN_MEMORY;
1280 }
1280 } 1281 }
1281 1282
1282 int dest_tile = (tile_num + 2) % 4; 1283 int dest_tile = (tile_num + 2) % 4;
1283 1284
1284 orig_map->tile_map[tile_num] = mp; 1285 orig_map->tile_map [tile_num] = mp;
1285 1286
1286 // optimisation: back-link map to origin map if euclidean 1287 // optimisation: back-link map to origin map if euclidean
1287 //TODO: non-euclidean maps MUST GO 1288 //TODO: non-euclidean maps MUST GO
1288 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) 1289 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1289 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1290 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1290 1291
1291 return mp; 1292 return mp;
1293}
1294
1295static inline void
1296load_and_link (maptile *orig_map, int tile_num)
1297{
1298 find_and_link (orig_map, tile_num)->load_sync ();
1292} 1299}
1293 1300
1294/* this returns TRUE if the coordinates (x,y) are out of 1301/* this returns TRUE if the coordinates (x,y) are out of
1295 * map m. This function also takes into account any 1302 * map m. This function also takes into account any
1296 * tiling considerations, loading adjacant maps as needed. 1303 * tiling considerations, loading adjacant maps as needed.
… …
1313 { 1320 {
1314 if (!m->tile_path[3]) 1321 if (!m->tile_path[3])
1315 return 1; 1322 return 1;
1316 1323
1317 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1324 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1318 load_and_link_tiled_map (m, 3); 1325 find_and_link (m, 3);
1319 1326
1320 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1327 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1321 } 1328 }
1322 1329
1323 if (x >= m->width) 1330 if (x >= m->width)
1324 { 1331 {
1325 if (!m->tile_path[1]) 1332 if (!m->tile_path[1])
1326 return 1; 1333 return 1;
1327 1334
1328 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1335 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1329 load_and_link_tiled_map (m, 1); 1336 find_and_link (m, 1);
1330 1337
1331 return out_of_map (m->tile_map[1], x - m->width, y); 1338 return out_of_map (m->tile_map[1], x - m->width, y);
1332 } 1339 }
1333 1340
1334 if (y < 0) 1341 if (y < 0)
1335 { 1342 {
1336 if (!m->tile_path[0]) 1343 if (!m->tile_path[0])
1337 return 1; 1344 return 1;
1338 1345
1339 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1346 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1340 load_and_link_tiled_map (m, 0); 1347 find_and_link (m, 0);
1341 1348
1342 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1349 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1343 } 1350 }
1344 1351
1345 if (y >= m->height) 1352 if (y >= m->height)
1346 { 1353 {
1347 if (!m->tile_path[2]) 1354 if (!m->tile_path[2])
1348 return 1; 1355 return 1;
1349 1356
1350 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1357 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1351 load_and_link_tiled_map (m, 2); 1358 find_and_link (m, 2);
1352 1359
1353 return out_of_map (m->tile_map[2], x, y - m->height); 1360 return out_of_map (m->tile_map[2], x, y - m->height);
1354 } 1361 }
1355 1362
1356 /* Simple case - coordinates are within this local 1363 /* Simple case - coordinates are within this local
… …
1361 1368
1362/* This is basically the same as out_of_map above, but 1369/* This is basically the same as out_of_map above, but
1363 * instead we return NULL if no map is valid (coordinates 1370 * instead we return NULL if no map is valid (coordinates
1364 * out of bounds and no tiled map), otherwise it returns 1371 * out of bounds and no tiled map), otherwise it returns
1365 * the map as that the coordinates are really on, and 1372 * the map as that the coordinates are really on, and
1366 * updates x and y to be the localized coordinates. 1373 * updates x and y to be the localised coordinates.
1367 * Using this is more efficient of calling out_of_map 1374 * Using this is more efficient of calling out_of_map
1368 * and then figuring out what the real map is 1375 * and then figuring out what the real map is
1369 */ 1376 */
1370maptile * 1377maptile *
1371get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1378maptile::xy_find (sint16 &x, sint16 &y)
1372{ 1379{
1373 if (*x < 0) 1380 if (x < 0)
1374 { 1381 {
1375 if (!m->tile_path[3]) 1382 if (!tile_path[3])
1376 return 0; 1383 return 0;
1377 1384
1378 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1385 find_and_link (this, 3);
1379 load_and_link_tiled_map (m, 3);
1380
1381 *x += m->tile_map[3]->width; 1386 x += tile_map[3]->width;
1382 return (get_map_from_coord (m->tile_map[3], x, y)); 1387 return tile_map[3]->xy_find (x, y);
1383 } 1388 }
1384 1389
1385 if (*x >= m->width) 1390 if (x >= width)
1386 { 1391 {
1387 if (!m->tile_path[1]) 1392 if (!tile_path[1])
1388 return 0; 1393 return 0;
1389 1394
1390 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1395 find_and_link (this, 1);
1391 load_and_link_tiled_map (m, 1);
1392
1393 *x -= m->width; 1396 x -= width;
1394 return (get_map_from_coord (m->tile_map[1], x, y)); 1397 return tile_map[1]->xy_find (x, y);
1395 } 1398 }
1396 1399
1397 if (*y < 0) 1400 if (y < 0)
1398 { 1401 {
1399 if (!m->tile_path[0]) 1402 if (!tile_path[0])
1400 return 0; 1403 return 0;
1401 1404
1402 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1405 find_and_link (this, 0);
1403 load_and_link_tiled_map (m, 0);
1404
1405 *y += m->tile_map[0]->height; 1406 y += tile_map[0]->height;
1406 return (get_map_from_coord (m->tile_map[0], x, y)); 1407 return tile_map[0]->xy_find (x, y);
1407 } 1408 }
1408 1409
1409 if (*y >= m->height) 1410 if (y >= height)
1410 { 1411 {
1411 if (!m->tile_path[2]) 1412 if (!tile_path[2])
1412 return 0; 1413 return 0;
1413 1414
1414 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1415 find_and_link (this, 2);
1415 load_and_link_tiled_map (m, 2);
1416
1417 *y -= m->height; 1416 y -= height;
1418 return (get_map_from_coord (m->tile_map[2], x, y)); 1417 return tile_map[2]->xy_find (x, y);
1419 } 1418 }
1420 1419
1421 /* Simple case - coordinates are within this local 1420 /* Simple case - coordinates are within this local
1422 * map. 1421 * map.
1423 */ 1422 */
1424 return m; 1423 return this;
1425} 1424}
1426 1425
1427/** 1426/**
1428 * Return whether map2 is adjacent to map1. If so, store the distance from 1427 * Return whether map2 is adjacent to map1. If so, store the distance from
1429 * map1 to map2 in dx/dy. 1428 * map1 to map2 in dx/dy.
1430 */ 1429 */
1431static int 1430int
1432adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1431adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1433{ 1432{
1434 if (!map1 || !map2) 1433 if (!map1 || !map2)
1435 return 0; 1434 return 0;
1436 1435
1436 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1437 //fix: compare paths instead (this is likely faster, too!)
1437 if (map1 == map2) 1438 if (map1 == map2)
1438 { 1439 {
1439 *dx = 0; 1440 *dx = 0;
1440 *dy = 0; 1441 *dy = 0;
1441 } 1442 }
… …
1501 } 1502 }
1502 else 1503 else
1503 return 0; 1504 return 0;
1504 1505
1505 return 1; 1506 return 1;
1507}
1508
1509maptile *
1510maptile::xy_load (sint16 &x, sint16 &y)
1511{
1512 maptile *map = xy_find (x, y);
1513
1514 if (map)
1515 map->load_sync ();
1516
1517 return map;
1518}
1519
1520maptile *
1521get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1522{
1523 return m->xy_load (*x, *y);
1506} 1524}
1507 1525
1508/* From map.c 1526/* From map.c
1509 * This is used by get_player to determine where the other 1527 * This is used by get_player to determine where the other
1510 * creature is. get_rangevector takes into account map tiling, 1528 * creature is. get_rangevector takes into account map tiling,
1511 * so you just can not look the the map coordinates and get the 1529 * so you just can not look the the map coordinates and get the
1512 * righte value. distance_x/y are distance away, which 1530 * righte value. distance_x/y are distance away, which
1513 * can be negativbe. direction is the crossfire direction scheme 1531 * can be negative. direction is the crossfire direction scheme
1514 * that the creature should head. part is the part of the 1532 * that the creature should head. part is the part of the
1515 * monster that is closest. 1533 * monster that is closest.
1516 * 1534 *
1517 * get_rangevector looks at op1 and op2, and fills in the 1535 * get_rangevector looks at op1 and op2, and fills in the
1518 * structure for op1 to get to op2. 1536 * structure for op1 to get to op2.
… …
1529get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1547get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1530{ 1548{
1531 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1549 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1532 { 1550 {
1533 /* be conservative and fill in _some_ data */ 1551 /* be conservative and fill in _some_ data */
1534 retval->distance = 100000; 1552 retval->distance = 10000;
1535 retval->distance_x = 32767; 1553 retval->distance_x = 10000;
1536 retval->distance_y = 32767; 1554 retval->distance_y = 10000;
1537 retval->direction = 0; 1555 retval->direction = 0;
1538 retval->part = 0; 1556 retval->part = 0;
1539 } 1557 }
1540 else 1558 else
1541 { 1559 {
… …
1546 1564
1547 best = op1; 1565 best = op1;
1548 /* If this is multipart, find the closest part now */ 1566 /* If this is multipart, find the closest part now */
1549 if (!(flags & 0x1) && op1->more) 1567 if (!(flags & 0x1) && op1->more)
1550 { 1568 {
1551 object *tmp;
1552 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1569 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1553 1570
1554 /* we just take the offset of the piece to head to figure 1571 /* we just take the offset of the piece to head to figure
1555 * distance instead of doing all that work above again 1572 * distance instead of doing all that work above again
1556 * since the distance fields we set above are positive in the 1573 * since the distance fields we set above are positive in the
1557 * same axis as is used for multipart objects, the simply arithmetic 1574 * same axis as is used for multipart objects, the simply arithmetic
1558 * below works. 1575 * below works.
1559 */ 1576 */
1560 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1577 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1561 { 1578 {
1562 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1579 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1563 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1580 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1564 if (tmpi < best_distance) 1581 if (tmpi < best_distance)
1565 { 1582 {
1566 best_distance = tmpi; 1583 best_distance = tmpi;
1567 best = tmp; 1584 best = tmp;
1568 } 1585 }
1569 } 1586 }
1587
1570 if (best != op1) 1588 if (best != op1)
1571 { 1589 {
1572 retval->distance_x += op1->x - best->x; 1590 retval->distance_x += op1->x - best->x;
1573 retval->distance_y += op1->y - best->y; 1591 retval->distance_y += op1->y - best->y;
1574 } 1592 }
1575 } 1593 }
1594
1576 retval->part = best; 1595 retval->part = best;
1577 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1596 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1578 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1597 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1579 } 1598 }
1580} 1599}
1581 1600
1582/* this is basically the same as get_rangevector above, but instead of 1601/* this is basically the same as get_rangevector above, but instead of
… …
1587 * flags has no meaning for this function at this time - I kept it in to 1606 * flags has no meaning for this function at this time - I kept it in to
1588 * be more consistant with the above function and also in case they are needed 1607 * be more consistant with the above function and also in case they are needed
1589 * for something in the future. Also, since no object is pasted, the best 1608 * for something in the future. Also, since no object is pasted, the best
1590 * field of the rv_vector is set to NULL. 1609 * field of the rv_vector is set to NULL.
1591 */ 1610 */
1592
1593void 1611void
1594get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1612get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1595{ 1613{
1596 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1614 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1597 { 1615 {
1598 /* be conservative and fill in _some_ data */ 1616 /* be conservative and fill in _some_ data */
1599 retval->distance = 100000; 1617 retval->distance = 100000;
… …
1606 { 1624 {
1607 retval->distance_x += op2->x - x; 1625 retval->distance_x += op2->x - x;
1608 retval->distance_y += op2->y - y; 1626 retval->distance_y += op2->y - y;
1609 1627
1610 retval->part = NULL; 1628 retval->part = NULL;
1611 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1629 retval->distance = idistance (retval->distance_x, retval->distance_y);
1612 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1630 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1613 } 1631 }
1614} 1632}
1615 1633
1616/* Returns true of op1 and op2 are effectively on the same map 1634/* Returns true of op1 and op2 are effectively on the same map
… …
1636 op->remove (); 1654 op->remove ();
1637 1655
1638 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1656 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1639} 1657}
1640 1658
1659region *
1660maptile::region (int x, int y) const
1661{
1662 if (regions
1663 && regionmap
1664 && !OUT_OF_REAL_MAP (this, x, y))
1665 if (struct region *reg = regionmap [regions [y * width + x]])
1666 return reg;
1667
1668 if (default_region)
1669 return default_region;
1670
1671 return ::region::default_region ();
1672}
1673
1674

Diff Legend

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