ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/common/map.C
(Generate patch)

Comparing cf.schmorp.de/server/common/map.C (file contents):
Revision 1.62 by root, Sun Dec 31 22:23:11 2006 UTC vs.
Revision 1.97 by root, Sat Mar 17 21:13:21 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 coroapi::cede ();
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 // disabled, there still seem to be races somewhere
470 static int cede_count = 0;
471
472 if (cede_count >= 500)
473 {
474 cede_count = 0;
475 coroapi::cede ();
476 }
477#endif
478
489 int unique = 0; 479 int unique = 0;
490 for (object *op = spaces [i].bot; op; op = op->above) 480 for (object *op = spaces [i].bot; op; op = op->above)
491 { 481 {
482 // count per-object, but cede only when modification-safe
483 cede_count++;
484
492 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 485 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
493 unique = 1; 486 unique = 1;
494 487
495 if (!op->can_map_save ()) 488 if (!op->can_map_save ())
496 continue; 489 continue;
497 490
498 if (unique || op->flag [FLAG_UNIQUE]) 491 if (unique || op->flag [FLAG_UNIQUE])
499 { 492 {
500 if (flags & IO_UNIQUES) 493 if (flags & IO_UNIQUES)
501 save_object (freezer, op, 1); 494 op->write (f);
502 } 495 }
503 else if (flags & IO_OBJECTS) 496 else if (flags & IO_OBJECTS)
504 save_object (freezer, op, 1); 497 op->write (f);
505 } 498 }
506 } 499 }
507 500
501 coroapi::cede ();
502
508 return true; 503 return true;
509} 504}
510 505
511bool 506bool
512maptile::load_objects (const char *path, bool skip_header) 507maptile::_load_objects (const char *path, bool skip_header)
513{ 508{
514 object_thawer thawer (path); 509 object_thawer f (path);
515 510
516 if (!thawer) 511 if (!f)
517 return false; 512 return false;
513
514 f.next ();
518 515
519 if (skip_header) 516 if (skip_header)
520 for (;;) 517 for (;;)
521 { 518 {
522 keyword kw = thawer.get_kv (); 519 keyword kw = f.kw;
523 520 f.skip ();
524 if (kw == KW_end) 521 if (kw == KW_end)
525 break; 522 break;
526
527 thawer.skip_kv (kw);
528 } 523 }
529 524
530 return load_objects (thawer); 525 return _load_objects (f);
531} 526}
532 527
533bool 528bool
534maptile::save_objects (const char *path, int flags) 529maptile::_save_objects (const char *path, int flags)
535{ 530{
536 object_freezer freezer; 531 object_freezer freezer;
537 532
538 if (!save_objects (freezer, flags)) 533 if (!_save_objects (freezer, flags))
539 return false; 534 return false;
540 535
541 return freezer.save (path); 536 return freezer.save (path);
542} 537}
543 538
544maptile::maptile () 539maptile::maptile ()
545{ 540{
546 in_memory = MAP_SWAPPED; 541 in_memory = MAP_SWAPPED;
547 542
548 /* 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
549 * map archetype. Mimic that behaviour. 544 * map archetype. Mimic that behaviour.
550 */ 545 */
551 width = 16; 546 width = 16;
552 height = 16; 547 height = 16;
553 reset_timeout = 0;
554 timeout = 300; 548 timeout = 300;
555 enter_x = 0; 549 max_nrof = 1000; // 1000 items of anything
556 enter_y = 0; 550 max_volume = 2000000; // 2m³
557} 551}
558 552
559maptile::maptile (int w, int h) 553maptile::maptile (int w, int h)
560{ 554{
561 in_memory = MAP_SWAPPED; 555 in_memory = MAP_SWAPPED;
… …
707 * 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
708 * 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.
709 * MSW 2001-07-01 703 * MSW 2001-07-01
710 */ 704 */
711bool 705bool
712maptile::load_header (object_thawer &thawer) 706maptile::_load_header (object_thawer &thawer)
713{ 707{
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 (;;) 708 for (;;)
719 { 709 {
720 keyword kw = thawer.get_kv (); 710 keyword kw = thawer.get_kv ();
721 711
722 switch (kw) 712 switch (kw)
723 { 713 {
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: 714 case KW_msg:
732 thawer.get_ml (KW_endmsg, msg); 715 thawer.get_ml (KW_endmsg, msg);
733 break; 716 break;
734 717
735 case KW_lore: // CF+ extension 718 case KW_lore: // CF+ extension
… …
767 case KW_sky: thawer.get (sky); break; 750 case KW_sky: thawer.get (sky); break;
768 751
769 case KW_per_player: thawer.get (per_player); break; 752 case KW_per_player: thawer.get (per_player); break;
770 case KW_per_party: thawer.get (per_party); break; 753 case KW_per_party: thawer.get (per_party); break;
771 754
772 case KW_region: get_region_by_name (thawer.get_str ()); break; 755 case KW_region: default_region = region::find (thawer.get_str ()); break;
773 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 756 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
774 757
775 // old names new names 758 // old names new names
776 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;
777 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;
… …
786 case KW_tile_path_1: thawer.get (tile_path [0]); break; 769 case KW_tile_path_1: thawer.get (tile_path [0]); break;
787 case KW_tile_path_2: thawer.get (tile_path [1]); break; 770 case KW_tile_path_2: thawer.get (tile_path [1]); break;
788 case KW_tile_path_3: thawer.get (tile_path [2]); break; 771 case KW_tile_path_3: thawer.get (tile_path [2]); break;
789 case KW_tile_path_4: thawer.get (tile_path [3]); break; 772 case KW_tile_path_4: thawer.get (tile_path [3]); break;
790 773
774 case KW_end:
775 return true;
776
791 default: 777 default:
792 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;
793 break; 780 break;
794 } 781 }
795 } 782 }
796 783
797 abort (); 784 abort ();
798} 785}
799 786
800bool 787bool
801maptile::load_header (const char *path) 788maptile::_load_header (const char *path)
802{ 789{
803 object_thawer thawer (path); 790 object_thawer thawer (path);
804 791
805 if (!thawer) 792 if (!thawer)
806 return false; 793 return false;
807 794
808 return load_header (thawer); 795 return _load_header (thawer);
809} 796}
810 797
811/****************************************************************************** 798/******************************************************************************
812 * This is the start of unique map handling code 799 * This is the start of unique map handling code
813 *****************************************************************************/ 800 *****************************************************************************/
… …
836 } 823 }
837 } 824 }
838} 825}
839 826
840bool 827bool
841maptile::save_header (object_freezer &freezer) 828maptile::_save_header (object_freezer &freezer)
842{ 829{
843#define MAP_OUT(k) freezer.put (KW_ ## k, k) 830#define MAP_OUT(k) freezer.put (KW_ ## k, k)
844#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 831#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
845 832
846 MAP_OUT2 (arch, "map"); 833 MAP_OUT2 (arch, "map");
… …
850 MAP_OUT (reset_time); 837 MAP_OUT (reset_time);
851 MAP_OUT (reset_timeout); 838 MAP_OUT (reset_timeout);
852 MAP_OUT (fixed_resettime); 839 MAP_OUT (fixed_resettime);
853 MAP_OUT (difficulty); 840 MAP_OUT (difficulty);
854 841
855 if (region) MAP_OUT2 (region, region->name); 842 if (default_region) MAP_OUT2 (region, default_region->name);
856 843
857 if (shopitems) 844 if (shopitems)
858 { 845 {
859 char shop[MAX_BUF]; 846 char shop[MAX_BUF];
860 print_shop_string (this, shop); 847 print_shop_string (this, shop);
… …
888 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 875 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
889 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 876 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
890 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 877 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
891 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 878 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
892 879
880 freezer.put (this);
893 freezer.put (KW_end); 881 freezer.put (KW_end);
894 882
895 return true; 883 return true;
896} 884}
897 885
898bool 886bool
899maptile::save_header (const char *path) 887maptile::_save_header (const char *path)
900{ 888{
901 object_freezer freezer; 889 object_freezer freezer;
902 890
903 if (!save_header (freezer)) 891 if (!_save_header (freezer))
904 return false; 892 return false;
905 893
906 return freezer.save (path); 894 return freezer.save (path);
907} 895}
908 896
… …
910 * Remove and free all objects in the given map. 898 * Remove and free all objects in the given map.
911 */ 899 */
912void 900void
913maptile::clear () 901maptile::clear ()
914{ 902{
903 sfree (regions, size ()), regions = 0;
904 free (regionmap), regionmap = 0;
905
915 if (!spaces) 906 if (spaces)
916 return; 907 {
917
918 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 908 for (mapspace *ms = spaces + size (); ms-- > spaces; )
919 while (object *op = ms->bot) 909 while (object *op = ms->bot)
920 { 910 {
921 if (op->head) 911 if (op->head)
922 op = op->head; 912 op = op->head;
923 913
924 op->destroy_inv (false); 914 op->destroy_inv (false);
925 op->destroy (); 915 op->destroy ();
926 } 916 }
927 917
928 sfree (spaces, size ()), spaces = 0; 918 sfree (spaces, size ()), spaces = 0;
919 }
929 920
930 if (buttons) 921 if (buttons)
931 free_objectlinkpt (buttons), buttons = 0; 922 free_objectlinkpt (buttons), buttons = 0;
932} 923}
933 924
… …
1087 */ 1078 */
1088void 1079void
1089mapspace::update_ () 1080mapspace::update_ ()
1090{ 1081{
1091 object *tmp, *last = 0; 1082 object *tmp, *last = 0;
1092 uint8 flags = 0, light = 0, anywhere = 0; 1083 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1093 New_Face *top, *floor, *middle;
1094 object *top_obj, *floor_obj, *middle_obj;
1095 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1084 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1096 1085
1097 middle = blank_face; 1086 //object *middle = 0;
1098 top = blank_face; 1087 //object *top = 0;
1099 floor = blank_face; 1088 //object *floor = 0;
1100 1089 // this seems to generate better code than using locals, above
1101 middle_obj = 0; 1090 object *&top = faces_obj[0] = 0;
1102 top_obj = 0; 1091 object *&middle = faces_obj[1] = 0;
1103 floor_obj = 0; 1092 object *&floor = faces_obj[2] = 0;
1104 1093
1105 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1094 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1106 { 1095 {
1107 /* This could be made additive I guess (two lights better than 1096 /* This could be made additive I guess (two lights better than
1108 * one). But if so, it shouldn't be a simple additive - 2 1097 * one). But if so, it shouldn't be a simple additive - 2
… …
1121 * Always put the player down for drawing. 1110 * Always put the player down for drawing.
1122 */ 1111 */
1123 if (!tmp->invisible) 1112 if (!tmp->invisible)
1124 { 1113 {
1125 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1114 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1126 {
1127 top = tmp->face;
1128 top_obj = tmp; 1115 top = tmp;
1129 }
1130 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1116 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1131 { 1117 {
1132 /* If we got a floor, that means middle and top were below it, 1118 /* If we got a floor, that means middle and top were below it,
1133 * so should not be visible, so we clear them. 1119 * so should not be visible, so we clear them.
1134 */ 1120 */
1135 middle = blank_face; 1121 middle = 0;
1136 top = blank_face; 1122 top = 0;
1137 floor = tmp->face;
1138 floor_obj = tmp; 1123 floor = tmp;
1139 } 1124 }
1140 /* Flag anywhere have high priority */ 1125 /* Flag anywhere have high priority */
1141 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1126 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1142 { 1127 {
1143 middle = tmp->face;
1144
1145 middle_obj = tmp; 1128 middle = tmp;
1146 anywhere = 1; 1129 anywhere = 1;
1147 } 1130 }
1148 /* Find the highest visible face around. If equal 1131 /* Find the highest visible face around. If equal
1149 * visibilities, we still want the one nearer to the 1132 * visibilities, we still want the one nearer to the
1150 * top 1133 * top
1151 */ 1134 */
1152 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1135 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1153 {
1154 middle = tmp->face;
1155 middle_obj = tmp; 1136 middle = tmp;
1156 }
1157 } 1137 }
1158 1138
1159 if (tmp == tmp->above) 1139 if (tmp == tmp->above)
1160 { 1140 {
1161 LOG (llevError, "Error in structure of map\n"); 1141 LOG (llevError, "Error in structure of map\n");
… …
1196 * middle face. This should not happen, as we already have the 1176 * middle face. This should not happen, as we already have the
1197 * else statement above so middle should not get set. OTOH, it 1177 * else statement above so middle should not get set. OTOH, it
1198 * may be possible for the faces to match but be different objects. 1178 * may be possible for the faces to match but be different objects.
1199 */ 1179 */
1200 if (top == middle) 1180 if (top == middle)
1201 middle = blank_face; 1181 middle = 0;
1202 1182
1203 /* There are three posibilities at this point: 1183 /* There are three posibilities at this point:
1204 * 1) top face is set, need middle to be set. 1184 * 1) top face is set, need middle to be set.
1205 * 2) middle is set, need to set top. 1185 * 2) middle is set, need to set top.
1206 * 3) neither middle or top is set - need to set both. 1186 * 3) neither middle or top is set - need to set both.
… …
1211 /* Once we get to a floor, stop, since we already have a floor object */ 1191 /* Once we get to a floor, stop, since we already have a floor object */
1212 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1192 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1213 break; 1193 break;
1214 1194
1215 /* If two top faces are already set, quit processing */ 1195 /* If two top faces are already set, quit processing */
1216 if ((top != blank_face) && (middle != blank_face)) 1196 if (top && middle)
1217 break; 1197 break;
1218 1198
1219 /* Only show visible faces, unless its the editor - show all */ 1199 /* Only show visible faces */
1220 if (!tmp->invisible || editor) 1200 if (!tmp->invisible)
1221 { 1201 {
1222 /* Fill in top if needed */ 1202 /* Fill in top if needed */
1223 if (top == blank_face) 1203 if (!top)
1224 { 1204 {
1225 top = tmp->face;
1226 top_obj = tmp; 1205 top = tmp;
1227 if (top == middle) 1206 if (top == middle)
1228 middle = blank_face; 1207 middle = 0;
1229 } 1208 }
1230 else 1209 else
1231 { 1210 {
1232 /* top is already set - we should only get here if 1211 /* top is already set - we should only get here if
1233 * middle is not set 1212 * middle is not set
1234 * 1213 *
1235 * Set the middle face and break out, since there is nothing 1214 * Set the middle face and break out, since there is nothing
1236 * more to fill in. We don't check visiblity here, since 1215 * more to fill in. We don't check visiblity here, since
1237 * 1216 *
1238 */ 1217 */
1239 if (tmp->face != top) 1218 if (tmp != top)
1240 { 1219 {
1241 middle = tmp->face;
1242 middle_obj = tmp; 1220 middle = tmp;
1243 break; 1221 break;
1244 } 1222 }
1245 } 1223 }
1246 } 1224 }
1247 } 1225 }
1248 1226
1249 if (middle == floor) 1227 if (middle == floor)
1250 middle = blank_face; 1228 middle = 0;
1251 1229
1252 if (top == middle) 1230 if (top == middle)
1253 middle = blank_face; 1231 middle = 0;
1254 1232
1255 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1233#if 0
1256 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1234 faces_obj [0] = top;
1257 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1235 faces_obj [1] = middle;
1236 faces_obj [2] = floor;
1237#endif
1258} 1238}
1259 1239
1240uint64
1241mapspace::volume () const
1242{
1243 uint64 vol = 0;
1244
1245 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1246 vol += op->volume ();
1247
1248 return vol;
1249}
1250
1260/* this updates the orig_map->tile_map[tile_num] value after loading 1251/* this updates the orig_map->tile_map[tile_num] value after finding
1261 * the map. It also takes care of linking back the freshly loaded 1252 * the map. It also takes care of linking back the freshly found
1262 * maps tile_map values if it tiles back to this one. It returns 1253 * maps tile_map values if it tiles back to this one. It returns
1263 * the value of orig_map->tile_map[tile_num]. It really only does this 1254 * the value of orig_map->tile_map[tile_num].
1264 * so that it is easier for calling functions to verify success.
1265 */ 1255 */
1266static maptile * 1256static inline maptile *
1267load_and_link_tiled_map (maptile *orig_map, int tile_num) 1257find_and_link (maptile *orig_map, int tile_num)
1268{ 1258{
1259 maptile *mp = orig_map->tile_map [tile_num];
1260
1261 if (!mp)
1262 {
1269 maptile *mp = orig_map->load_map_sync (orig_map->tile_path [tile_num], orig_map); 1263 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1270 1264
1271 if (!mp || mp->in_memory != MAP_IN_MEMORY) 1265 if (!mp)
1272 { 1266 {
1273 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine 1267 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1274 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n", 1268 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1275 &orig_map->tile_path[tile_num], &orig_map->path); 1269 &orig_map->tile_path[tile_num], &orig_map->path);
1276 mp = new maptile (1, 1); 1270 mp = new maptile (1, 1);
1277 mp->alloc (); 1271 mp->alloc ();
1278 mp->in_memory = MAP_IN_MEMORY; 1272 mp->in_memory = MAP_IN_MEMORY;
1273 }
1279 } 1274 }
1280 1275
1281 int dest_tile = (tile_num + 2) % 4; 1276 int dest_tile = (tile_num + 2) % 4;
1282 1277
1283 orig_map->tile_map[tile_num] = mp; 1278 orig_map->tile_map [tile_num] = mp;
1284 1279
1285 // optimisation: back-link map to origin map if euclidean 1280 // optimisation: back-link map to origin map if euclidean
1286 //TODO: non-euclidean maps MUST GO 1281 //TODO: non-euclidean maps MUST GO
1287 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) 1282 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1288 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1283 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1289 1284
1290 return mp; 1285 return mp;
1286}
1287
1288static inline void
1289load_and_link (maptile *orig_map, int tile_num)
1290{
1291 find_and_link (orig_map, tile_num)->load_sync ();
1291} 1292}
1292 1293
1293/* this returns TRUE if the coordinates (x,y) are out of 1294/* this returns TRUE if the coordinates (x,y) are out of
1294 * map m. This function also takes into account any 1295 * map m. This function also takes into account any
1295 * tiling considerations, loading adjacant maps as needed. 1296 * tiling considerations, loading adjacant maps as needed.
… …
1312 { 1313 {
1313 if (!m->tile_path[3]) 1314 if (!m->tile_path[3])
1314 return 1; 1315 return 1;
1315 1316
1316 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1317 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1317 load_and_link_tiled_map (m, 3); 1318 find_and_link (m, 3);
1318 1319
1319 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1320 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1320 } 1321 }
1321 1322
1322 if (x >= m->width) 1323 if (x >= m->width)
1323 { 1324 {
1324 if (!m->tile_path[1]) 1325 if (!m->tile_path[1])
1325 return 1; 1326 return 1;
1326 1327
1327 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1328 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1328 load_and_link_tiled_map (m, 1); 1329 find_and_link (m, 1);
1329 1330
1330 return out_of_map (m->tile_map[1], x - m->width, y); 1331 return out_of_map (m->tile_map[1], x - m->width, y);
1331 } 1332 }
1332 1333
1333 if (y < 0) 1334 if (y < 0)
1334 { 1335 {
1335 if (!m->tile_path[0]) 1336 if (!m->tile_path[0])
1336 return 1; 1337 return 1;
1337 1338
1338 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1339 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1339 load_and_link_tiled_map (m, 0); 1340 find_and_link (m, 0);
1340 1341
1341 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1342 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1342 } 1343 }
1343 1344
1344 if (y >= m->height) 1345 if (y >= m->height)
1345 { 1346 {
1346 if (!m->tile_path[2]) 1347 if (!m->tile_path[2])
1347 return 1; 1348 return 1;
1348 1349
1349 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1350 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1350 load_and_link_tiled_map (m, 2); 1351 find_and_link (m, 2);
1351 1352
1352 return out_of_map (m->tile_map[2], x, y - m->height); 1353 return out_of_map (m->tile_map[2], x, y - m->height);
1353 } 1354 }
1354 1355
1355 /* Simple case - coordinates are within this local 1356 /* Simple case - coordinates are within this local
… …
1360 1361
1361/* This is basically the same as out_of_map above, but 1362/* This is basically the same as out_of_map above, but
1362 * instead we return NULL if no map is valid (coordinates 1363 * instead we return NULL if no map is valid (coordinates
1363 * out of bounds and no tiled map), otherwise it returns 1364 * out of bounds and no tiled map), otherwise it returns
1364 * the map as that the coordinates are really on, and 1365 * the map as that the coordinates are really on, and
1365 * updates x and y to be the localized coordinates. 1366 * updates x and y to be the localised coordinates.
1366 * Using this is more efficient of calling out_of_map 1367 * Using this is more efficient of calling out_of_map
1367 * and then figuring out what the real map is 1368 * and then figuring out what the real map is
1368 */ 1369 */
1369maptile * 1370maptile *
1370get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1371maptile::xy_find (sint16 &x, sint16 &y)
1371{ 1372{
1372 if (*x < 0) 1373 if (x < 0)
1373 { 1374 {
1374 if (!m->tile_path[3]) 1375 if (!tile_path[3])
1375 return 0; 1376 return 0;
1376 1377
1377 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1378 find_and_link (this, 3);
1378 load_and_link_tiled_map (m, 3);
1379
1380 *x += m->tile_map[3]->width; 1379 x += tile_map[3]->width;
1381 return (get_map_from_coord (m->tile_map[3], x, y)); 1380 return tile_map[3]->xy_find (x, y);
1382 } 1381 }
1383 1382
1384 if (*x >= m->width) 1383 if (x >= width)
1385 { 1384 {
1386 if (!m->tile_path[1]) 1385 if (!tile_path[1])
1387 return 0; 1386 return 0;
1388 1387
1389 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1388 find_and_link (this, 1);
1390 load_and_link_tiled_map (m, 1);
1391
1392 *x -= m->width; 1389 x -= width;
1393 return (get_map_from_coord (m->tile_map[1], x, y)); 1390 return tile_map[1]->xy_find (x, y);
1394 } 1391 }
1395 1392
1396 if (*y < 0) 1393 if (y < 0)
1397 { 1394 {
1398 if (!m->tile_path[0]) 1395 if (!tile_path[0])
1399 return 0; 1396 return 0;
1400 1397
1401 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1398 find_and_link (this, 0);
1402 load_and_link_tiled_map (m, 0);
1403
1404 *y += m->tile_map[0]->height; 1399 y += tile_map[0]->height;
1405 return (get_map_from_coord (m->tile_map[0], x, y)); 1400 return tile_map[0]->xy_find (x, y);
1406 } 1401 }
1407 1402
1408 if (*y >= m->height) 1403 if (y >= height)
1409 { 1404 {
1410 if (!m->tile_path[2]) 1405 if (!tile_path[2])
1411 return 0; 1406 return 0;
1412 1407
1413 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1408 find_and_link (this, 2);
1414 load_and_link_tiled_map (m, 2);
1415
1416 *y -= m->height; 1409 y -= height;
1417 return (get_map_from_coord (m->tile_map[2], x, y)); 1410 return tile_map[2]->xy_find (x, y);
1418 } 1411 }
1419 1412
1420 /* Simple case - coordinates are within this local 1413 /* Simple case - coordinates are within this local
1421 * map. 1414 * map.
1422 */ 1415 */
1423 return m; 1416 return this;
1424} 1417}
1425 1418
1426/** 1419/**
1427 * Return whether map2 is adjacent to map1. If so, store the distance from 1420 * Return whether map2 is adjacent to map1. If so, store the distance from
1428 * map1 to map2 in dx/dy. 1421 * map1 to map2 in dx/dy.
1429 */ 1422 */
1430static int 1423int
1431adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1424adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1432{ 1425{
1433 if (!map1 || !map2) 1426 if (!map1 || !map2)
1434 return 0; 1427 return 0;
1435 1428
1429 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1430 //fix: compare paths instead (this is likely faster, too!)
1436 if (map1 == map2) 1431 if (map1 == map2)
1437 { 1432 {
1438 *dx = 0; 1433 *dx = 0;
1439 *dy = 0; 1434 *dy = 0;
1440 } 1435 }
… …
1500 } 1495 }
1501 else 1496 else
1502 return 0; 1497 return 0;
1503 1498
1504 return 1; 1499 return 1;
1500}
1501
1502maptile *
1503maptile::xy_load (sint16 &x, sint16 &y)
1504{
1505 maptile *map = xy_find (x, y);
1506
1507 if (map)
1508 map->load_sync ();
1509
1510 return map;
1511}
1512
1513maptile *
1514get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1515{
1516 return m->xy_load (*x, *y);
1505} 1517}
1506 1518
1507/* From map.c 1519/* From map.c
1508 * This is used by get_player to determine where the other 1520 * This is used by get_player to determine where the other
1509 * creature is. get_rangevector takes into account map tiling, 1521 * creature is. get_rangevector takes into account map tiling,
1510 * so you just can not look the the map coordinates and get the 1522 * so you just can not look the the map coordinates and get the
1511 * righte value. distance_x/y are distance away, which 1523 * righte value. distance_x/y are distance away, which
1512 * can be negativbe. direction is the crossfire direction scheme 1524 * can be negative. direction is the crossfire direction scheme
1513 * that the creature should head. part is the part of the 1525 * that the creature should head. part is the part of the
1514 * monster that is closest. 1526 * monster that is closest.
1515 * 1527 *
1516 * get_rangevector looks at op1 and op2, and fills in the 1528 * get_rangevector looks at op1 and op2, and fills in the
1517 * structure for op1 to get to op2. 1529 * structure for op1 to get to op2.
… …
1528get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1540get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1529{ 1541{
1530 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1542 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1531 { 1543 {
1532 /* be conservative and fill in _some_ data */ 1544 /* be conservative and fill in _some_ data */
1533 retval->distance = 100000; 1545 retval->distance = 10000;
1534 retval->distance_x = 32767; 1546 retval->distance_x = 10000;
1535 retval->distance_y = 32767; 1547 retval->distance_y = 10000;
1536 retval->direction = 0; 1548 retval->direction = 0;
1537 retval->part = 0; 1549 retval->part = 0;
1538 } 1550 }
1539 else 1551 else
1540 { 1552 {
… …
1545 1557
1546 best = op1; 1558 best = op1;
1547 /* If this is multipart, find the closest part now */ 1559 /* If this is multipart, find the closest part now */
1548 if (!(flags & 0x1) && op1->more) 1560 if (!(flags & 0x1) && op1->more)
1549 { 1561 {
1550 object *tmp;
1551 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1562 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1552 1563
1553 /* we just take the offset of the piece to head to figure 1564 /* we just take the offset of the piece to head to figure
1554 * distance instead of doing all that work above again 1565 * distance instead of doing all that work above again
1555 * since the distance fields we set above are positive in the 1566 * since the distance fields we set above are positive in the
1556 * same axis as is used for multipart objects, the simply arithmetic 1567 * same axis as is used for multipart objects, the simply arithmetic
1557 * below works. 1568 * below works.
1558 */ 1569 */
1559 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1570 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1560 { 1571 {
1561 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1572 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1562 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1573 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1563 if (tmpi < best_distance) 1574 if (tmpi < best_distance)
1564 { 1575 {
1565 best_distance = tmpi; 1576 best_distance = tmpi;
1566 best = tmp; 1577 best = tmp;
1567 } 1578 }
1568 } 1579 }
1580
1569 if (best != op1) 1581 if (best != op1)
1570 { 1582 {
1571 retval->distance_x += op1->x - best->x; 1583 retval->distance_x += op1->x - best->x;
1572 retval->distance_y += op1->y - best->y; 1584 retval->distance_y += op1->y - best->y;
1573 } 1585 }
1574 } 1586 }
1587
1575 retval->part = best; 1588 retval->part = best;
1576 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1589 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1577 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1590 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1578 } 1591 }
1579} 1592}
1580 1593
1581/* this is basically the same as get_rangevector above, but instead of 1594/* this is basically the same as get_rangevector above, but instead of
… …
1586 * flags has no meaning for this function at this time - I kept it in to 1599 * flags has no meaning for this function at this time - I kept it in to
1587 * be more consistant with the above function and also in case they are needed 1600 * be more consistant with the above function and also in case they are needed
1588 * for something in the future. Also, since no object is pasted, the best 1601 * for something in the future. Also, since no object is pasted, the best
1589 * field of the rv_vector is set to NULL. 1602 * field of the rv_vector is set to NULL.
1590 */ 1603 */
1591
1592void 1604void
1593get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1605get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1594{ 1606{
1595 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1607 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1596 { 1608 {
1597 /* be conservative and fill in _some_ data */ 1609 /* be conservative and fill in _some_ data */
1598 retval->distance = 100000; 1610 retval->distance = 100000;
… …
1605 { 1617 {
1606 retval->distance_x += op2->x - x; 1618 retval->distance_x += op2->x - x;
1607 retval->distance_y += op2->y - y; 1619 retval->distance_y += op2->y - y;
1608 1620
1609 retval->part = NULL; 1621 retval->part = NULL;
1610 retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y); 1622 retval->distance = idistance (retval->distance_x, retval->distance_y);
1611 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1623 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1612 } 1624 }
1613} 1625}
1614 1626
1615/* Returns true of op1 and op2 are effectively on the same map 1627/* Returns true of op1 and op2 are effectively on the same map
… …
1635 op->remove (); 1647 op->remove ();
1636 1648
1637 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1649 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1638} 1650}
1639 1651
1652region *
1653maptile::region (int x, int y) const
1654{
1655 if (regions
1656 && regionmap
1657 && !OUT_OF_REAL_MAP (this, x, y))
1658 if (struct region *reg = regionmap [regions [y * width + x]])
1659 return reg;
1660
1661 if (default_region)
1662 return default_region;
1663
1664 return ::region::default_region ();
1665}
1666
1667/* picks a random object from a style map.
1668 * Redone by MSW so it should be faster and not use static
1669 * variables to generate tables.
1670 */
1671object *
1672maptile::pick_random_object () const
1673{
1674 /* while returning a null object will result in a crash, that
1675 * is actually preferable to an infinite loop. That is because
1676 * most servers will automatically restart in case of crash.
1677 * Change the logic on getting the random space - shouldn't make
1678 * any difference, but this seems clearer to me.
1679 */
1680 for (int i = 1000; --i;)
1681 {
1682 object *pick = at (rndm (width), rndm (height)).bot;
1683
1684 // do not prefer big monsters just because they are big.
1685 if (pick && pick->head_ () == pick)
1686 return pick->head_ ();
1687 }
1688
1689 // instead of crashing in the unlikely(?) case, try to return *something*
1690 return get_archetype ("blocked");
1691}
1692

Diff Legend

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