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.69 by root, Thu Jan 4 16:56:39 2007 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
… …
353{ 354{
354 if (!spaces) 355 if (!spaces)
355 return; 356 return;
356 357
357 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 358 for (mapspace *ms = spaces + size (); ms-- > spaces; )
358 for (object *tmp = ms->bot; tmp; ) 359 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
359 { 360 {
360 object *above = tmp->above;
361
362 /* already multipart - don't do anything more */ 361 /* already multipart - don't do anything more */
363 if (!tmp->head && !tmp->more) 362 if (!tmp->head && !tmp->more)
364 { 363 {
365 /* If there is nothing more to this object, this for loop 364 /* If there is nothing more to this object, this for loop
366 * won't do anything. 365 * won't do anything.
… …
388 * 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.
389 */ 388 */
390 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);
391 } 390 }
392 } 391 }
393
394 tmp = above;
395 } 392 }
396} 393}
397 394
398/* 395/*
399 * 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
400 * file pointer. 397 * file pointer.
401 * mapflags is the same as we get with load_original_map
402 */ 398 */
403bool 399bool
404maptile::load_objects (object_thawer &thawer) 400maptile::_load_objects (object_thawer &f)
405{ 401{
406 int unique; 402 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 { 403 {
414 /* if the archetype for the object is null, means that we 404 coroapi::cede_every (1000); // cede once in a while
415 * got an invalid object. Don't do anything with it - the game 405
416 * or editor will not be able to do anything with it either. 406 switch (f.kw)
417 */
418 if (op->arch == NULL)
419 { 407 {
420 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 408 case KW_arch:
421 continue; 409 if (object *op = object::read (f, this))
422 }
423
424 switch (i)
425 { 410 {
426 case LL_NORMAL: 411 if (op->inv)
412 sum_weight (op);
413
427 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 }
428 416
429 if (op->inv) 417 continue;
430 sum_weight (op);
431 418
432 prev = op, last_more = op;
433 break;
434
435 case LL_MORE: 419 case KW_EOF:
436 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 420 return true;
437 op->head = prev, last_more->more = op, last_more = op; 421
422 default:
423 if (!f.parse_error ("map file"))
424 return false;
438 break; 425 break;
439 } 426 }
440 427
441 op = object::create (); 428 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 } 429 }
462#endif
463 430
464 return true; 431 return true;
465} 432}
466 433
467void 434void
… …
485 for (object *op = ms->bot; op; op = op->above) 452 for (object *op = ms->bot; op; op = op->above)
486 op->deactivate_recursive (); 453 op->deactivate_recursive ();
487} 454}
488 455
489bool 456bool
490maptile::save_objects (object_freezer &freezer, int flags) 457maptile::_save_objects (object_freezer &f, int flags)
491{ 458{
492 static int cede_count = 0; 459 coroapi::cede ();
493 460
494 if (flags & IO_HEADER) 461 if (flags & IO_HEADER)
495 save_header (freezer); 462 _save_header (f);
496 463
497 if (!spaces) 464 if (!spaces)
498 return false; 465 return false;
499 466
500 for (int i = 0; i < size (); ++i) 467 for (int i = 0; i < size (); ++i)
501 { 468 {
469#if 0 // disabled, there still seem to be races somewhere
470 static int cede_count = 0;
471
502 if (cede_count >= 500) 472 if (cede_count >= 500)
503 { 473 {
504 cede_count = 0; 474 cede_count = 0;
505 coroapi::cede (); 475 coroapi::cede ();
506 } 476 }
477#endif
507 478
508 int unique = 0; 479 int unique = 0;
509 for (object *op = spaces [i].bot; op; op = op->above) 480 for (object *op = spaces [i].bot; op; op = op->above)
510 { 481 {
511 // count per-object, but cede only when modification-safe 482 // count per-object, but cede only when modification-safe
… …
518 continue; 489 continue;
519 490
520 if (unique || op->flag [FLAG_UNIQUE]) 491 if (unique || op->flag [FLAG_UNIQUE])
521 { 492 {
522 if (flags & IO_UNIQUES) 493 if (flags & IO_UNIQUES)
523 save_object (freezer, op, 1); 494 op->write (f);
524 } 495 }
525 else if (flags & IO_OBJECTS) 496 else if (flags & IO_OBJECTS)
526 save_object (freezer, op, 1); 497 op->write (f);
527 } 498 }
528 } 499 }
529 500
501 coroapi::cede ();
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;
1117 object *top_obj, *floor_obj, *middle_obj;
1118 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;
1119 1085
1120 middle = blank_face; 1086 //object *middle = 0;
1121 top = blank_face; 1087 //object *top = 0;
1122 floor = blank_face; 1088 //object *floor = 0;
1123 1089 // this seems to generate better code than using locals, above
1124 middle_obj = 0; 1090 object *&top = faces_obj[0] = 0;
1125 top_obj = 0; 1091 object *&middle = faces_obj[1] = 0;
1126 floor_obj = 0; 1092 object *&floor = faces_obj[2] = 0;
1127 1093
1128 for (tmp = bot; tmp; last = tmp, tmp = tmp->above) 1094 for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1129 { 1095 {
1130 /* This could be made additive I guess (two lights better than 1096 /* This could be made additive I guess (two lights better than
1131 * 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
… …
1144 * Always put the player down for drawing. 1110 * Always put the player down for drawing.
1145 */ 1111 */
1146 if (!tmp->invisible) 1112 if (!tmp->invisible)
1147 { 1113 {
1148 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER))) 1114 if ((tmp->type == PLAYER || QUERY_FLAG (tmp, FLAG_MONSTER)))
1149 {
1150 top = tmp->face;
1151 top_obj = tmp; 1115 top = tmp;
1152 }
1153 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1116 else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1154 { 1117 {
1155 /* 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,
1156 * so should not be visible, so we clear them. 1119 * so should not be visible, so we clear them.
1157 */ 1120 */
1158 middle = blank_face; 1121 middle = 0;
1159 top = blank_face; 1122 top = 0;
1160 floor = tmp->face;
1161 floor_obj = tmp; 1123 floor = tmp;
1162 } 1124 }
1163 /* Flag anywhere have high priority */ 1125 /* Flag anywhere have high priority */
1164 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE)) 1126 else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1165 { 1127 {
1166 middle = tmp->face;
1167
1168 middle_obj = tmp; 1128 middle = tmp;
1169 anywhere = 1; 1129 anywhere = 1;
1170 } 1130 }
1171 /* Find the highest visible face around. If equal 1131 /* Find the highest visible face around. If equal
1172 * visibilities, we still want the one nearer to the 1132 * visibilities, we still want the one nearer to the
1173 * top 1133 * top
1174 */ 1134 */
1175 else if (middle == blank_face || (tmp->face->visibility > middle->visibility && !anywhere)) 1135 else if (!middle || (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1176 {
1177 middle = tmp->face;
1178 middle_obj = tmp; 1136 middle = tmp;
1179 }
1180 } 1137 }
1181 1138
1182 if (tmp == tmp->above) 1139 if (tmp == tmp->above)
1183 { 1140 {
1184 LOG (llevError, "Error in structure of map\n"); 1141 LOG (llevError, "Error in structure of map\n");
… …
1219 * middle face. This should not happen, as we already have the 1176 * middle face. This should not happen, as we already have the
1220 * else statement above so middle should not get set. OTOH, it 1177 * else statement above so middle should not get set. OTOH, it
1221 * 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.
1222 */ 1179 */
1223 if (top == middle) 1180 if (top == middle)
1224 middle = blank_face; 1181 middle = 0;
1225 1182
1226 /* There are three posibilities at this point: 1183 /* There are three posibilities at this point:
1227 * 1) top face is set, need middle to be set. 1184 * 1) top face is set, need middle to be set.
1228 * 2) middle is set, need to set top. 1185 * 2) middle is set, need to set top.
1229 * 3) neither middle or top is set - need to set both. 1186 * 3) neither middle or top is set - need to set both.
… …
1234 /* 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 */
1235 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1192 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1236 break; 1193 break;
1237 1194
1238 /* If two top faces are already set, quit processing */ 1195 /* If two top faces are already set, quit processing */
1239 if ((top != blank_face) && (middle != blank_face)) 1196 if (top && middle)
1240 break; 1197 break;
1241 1198
1242 /* Only show visible faces */ 1199 /* Only show visible faces */
1243 if (!tmp->invisible) 1200 if (!tmp->invisible)
1244 { 1201 {
1245 /* Fill in top if needed */ 1202 /* Fill in top if needed */
1246 if (top == blank_face) 1203 if (!top)
1247 { 1204 {
1248 top = tmp->face;
1249 top_obj = tmp; 1205 top = tmp;
1250 if (top == middle) 1206 if (top == middle)
1251 middle = blank_face; 1207 middle = 0;
1252 } 1208 }
1253 else 1209 else
1254 { 1210 {
1255 /* top is already set - we should only get here if 1211 /* top is already set - we should only get here if
1256 * middle is not set 1212 * middle is not set
1257 * 1213 *
1258 * Set the middle face and break out, since there is nothing 1214 * Set the middle face and break out, since there is nothing
1259 * more to fill in. We don't check visiblity here, since 1215 * more to fill in. We don't check visiblity here, since
1260 * 1216 *
1261 */ 1217 */
1262 if (tmp->face != top) 1218 if (tmp != top)
1263 { 1219 {
1264 middle = tmp->face;
1265 middle_obj = tmp; 1220 middle = tmp;
1266 break; 1221 break;
1267 } 1222 }
1268 } 1223 }
1269 } 1224 }
1270 } 1225 }
1271 1226
1272 if (middle == floor) 1227 if (middle == floor)
1273 middle = blank_face; 1228 middle = 0;
1274 1229
1275 if (top == middle) 1230 if (top == middle)
1276 middle = blank_face; 1231 middle = 0;
1277 1232
1278 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1233#if 0
1279 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1234 faces_obj [0] = top;
1280 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1235 faces_obj [1] = middle;
1236 faces_obj [2] = floor;
1237#endif
1238}
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;
1281} 1249}
1282 1250
1283/* this updates the orig_map->tile_map[tile_num] value after finding 1251/* this updates the orig_map->tile_map[tile_num] value after finding
1284 * the map. It also takes care of linking back the freshly found 1252 * 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 1253 * maps tile_map values if it tiles back to this one. It returns
… …
1450 1418
1451/** 1419/**
1452 * 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
1453 * map1 to map2 in dx/dy. 1421 * map1 to map2 in dx/dy.
1454 */ 1422 */
1455static int 1423int
1456adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1424adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1457{ 1425{
1458 if (!map1 || !map2) 1426 if (!map1 || !map2)
1459 return 0; 1427 return 0;
1460 1428
… …
1551/* From map.c 1519/* From map.c
1552 * This is used by get_player to determine where the other 1520 * This is used by get_player to determine where the other
1553 * creature is. get_rangevector takes into account map tiling, 1521 * creature is. get_rangevector takes into account map tiling,
1554 * 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
1555 * righte value. distance_x/y are distance away, which 1523 * righte value. distance_x/y are distance away, which
1556 * can be negativbe. direction is the crossfire direction scheme 1524 * can be negative. direction is the crossfire direction scheme
1557 * that the creature should head. part is the part of the 1525 * that the creature should head. part is the part of the
1558 * monster that is closest. 1526 * monster that is closest.
1559 * 1527 *
1560 * get_rangevector looks at op1 and op2, and fills in the 1528 * get_rangevector looks at op1 and op2, and fills in the
1561 * structure for op1 to get to op2. 1529 * structure for op1 to get to op2.
… …
1572get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1540get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1573{ 1541{
1574 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))
1575 { 1543 {
1576 /* be conservative and fill in _some_ data */ 1544 /* be conservative and fill in _some_ data */
1577 retval->distance = 100000; 1545 retval->distance = 10000;
1578 retval->distance_x = 32767; 1546 retval->distance_x = 10000;
1579 retval->distance_y = 32767; 1547 retval->distance_y = 10000;
1580 retval->direction = 0; 1548 retval->direction = 0;
1581 retval->part = 0; 1549 retval->part = 0;
1582 } 1550 }
1583 else 1551 else
1584 { 1552 {
… …
1589 1557
1590 best = op1; 1558 best = op1;
1591 /* If this is multipart, find the closest part now */ 1559 /* If this is multipart, find the closest part now */
1592 if (!(flags & 0x1) && op1->more) 1560 if (!(flags & 0x1) && op1->more)
1593 { 1561 {
1594 object *tmp;
1595 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;
1596 1563
1597 /* 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
1598 * distance instead of doing all that work above again 1565 * distance instead of doing all that work above again
1599 * since the distance fields we set above are positive in the 1566 * since the distance fields we set above are positive in the
1600 * same axis as is used for multipart objects, the simply arithmetic 1567 * same axis as is used for multipart objects, the simply arithmetic
1601 * below works. 1568 * below works.
1602 */ 1569 */
1603 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1570 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1604 { 1571 {
1605 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) +
1606 (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);
1607 if (tmpi < best_distance) 1574 if (tmpi < best_distance)
1608 { 1575 {
1609 best_distance = tmpi; 1576 best_distance = tmpi;
1610 best = tmp; 1577 best = tmp;
1611 } 1578 }
1612 } 1579 }
1580
1613 if (best != op1) 1581 if (best != op1)
1614 { 1582 {
1615 retval->distance_x += op1->x - best->x; 1583 retval->distance_x += op1->x - best->x;
1616 retval->distance_y += op1->y - best->y; 1584 retval->distance_y += op1->y - best->y;
1617 } 1585 }
1618 } 1586 }
1587
1619 retval->part = best; 1588 retval->part = best;
1620 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));
1621 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1590 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1622 } 1591 }
1623} 1592}
1624 1593
1625/* 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
… …
1630 * 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
1631 * 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
1632 * 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
1633 * field of the rv_vector is set to NULL. 1602 * field of the rv_vector is set to NULL.
1634 */ 1603 */
1635
1636void 1604void
1637get_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)
1638{ 1606{
1639 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))
1640 { 1608 {
1641 /* be conservative and fill in _some_ data */ 1609 /* be conservative and fill in _some_ data */
1642 retval->distance = 100000; 1610 retval->distance = 100000;
… …
1649 { 1617 {
1650 retval->distance_x += op2->x - x; 1618 retval->distance_x += op2->x - x;
1651 retval->distance_y += op2->y - y; 1619 retval->distance_y += op2->y - y;
1652 1620
1653 retval->part = NULL; 1621 retval->part = NULL;
1654 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);
1655 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1623 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1656 } 1624 }
1657} 1625}
1658 1626
1659/* 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
… …
1679 op->remove (); 1647 op->remove ();
1680 1648
1681 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);
1682} 1650}
1683 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