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.177 by root, Wed Nov 11 23:27:56 2009 UTC vs.
Revision 1.204 by root, Wed May 4 07:36:40 2011 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
23 */ 23 */
24 24
25#include <unistd.h> 25#include <unistd.h>
26 26
27#include "global.h" 27#include "global.h"
28#include "loader.h"
29#include "path.h" 28#include "path.h"
30 29
31//+GPL 30//+GPL
32 31
33sint8 maptile::outdoor_darkness; 32sint8 maptile::outdoor_darkness;
… …
78 /* Make sure the coordinates are valid - they should be, as caller should 77 /* Make sure the coordinates are valid - they should be, as caller should
79 * have already checked this. 78 * have already checked this.
80 */ 79 */
81 if (OUT_OF_REAL_MAP (m, sx, sy)) 80 if (OUT_OF_REAL_MAP (m, sx, sy))
82 { 81 {
83 LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n"); 82 LOG (llevError | logBacktrace, "blocked_link: Passed map, x, y coordinates outside of map\n");
84 return 1; 83 return 1;
85 } 84 }
86 85
87 mapspace &ms = m->at (sx, sy); 86 mapspace &ms = m->at (sx, sy);
88 87
… …
91 90
92 /* If space is currently not blocked by anything, no need to 91 /* If space is currently not blocked by anything, no need to
93 * go further. Not true for players - all sorts of special 92 * go further. Not true for players - all sorts of special
94 * things we need to do for players. 93 * things we need to do for players.
95 */ 94 */
96 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 95 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
97 return 0; 96 return 0;
98 97
99 /* if there isn't anything alive on this space, and this space isn't 98 /* if there isn't anything alive on this space, and this space isn't
100 * otherwise blocked, we can return now. Only if there is a living 99 * otherwise blocked, we can return now. Only if there is a living
101 * creature do we need to investigate if it is part of this creature 100 * creature do we need to investigate if it is part of this creature
… …
111 /* We basically go through the stack of objects, and if there is 110 /* We basically go through the stack of objects, and if there is
112 * some other object that has NO_PASS or FLAG_ALIVE set, return 111 * some other object that has NO_PASS or FLAG_ALIVE set, return
113 * true. If we get through the entire stack, that must mean 112 * true. If we get through the entire stack, that must mean
114 * ob is blocking it, so return 0. 113 * ob is blocking it, so return 0.
115 */ 114 */
116 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 115 for (object *tmp = ms.top; tmp; tmp = tmp->below)
117 { 116 {
118 if (OB_MOVE_BLOCK (ob, tmp)) 117 if (OB_MOVE_BLOCK (ob, tmp))
119 { 118 {
120 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob)) 119 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
121 if (RESULT_INT (0)) 120 if (RESULT_INT (0))
… …
145 return 1; // unconditional block 144 return 1; // unconditional block
146 145
147 } else { 146 } else {
148 // space does not block the ob, directly, but 147 // space does not block the ob, directly, but
149 // anything alive that is not a door still 148 // anything alive that is not a door still
150 // blocks anything but wizards. 149 // blocks anything
151 150
152 if (tmp->flag [FLAG_ALIVE] 151 if (tmp->flag [FLAG_ALIVE]
153 && tmp->head_ () != ob
154 && tmp != ob
155 && tmp->type != DOOR 152 && tmp->type != DOOR
156 && !tmp->flag [FLAG_WIZPASS]) 153 && tmp->head_ () != ob) //TODO: maybe move these check up?
157 return 1; 154 return 1;
158 } 155 }
159 } 156 }
160 157
161 return 0; 158 return 0;
162} 159}
163 160
164/* 161/*
165 * Returns qthe blocking object if the given object can't fit in the given 162 * Returns the blocking object if the given object can't fit in the given
166 * spot. This is meant for multi space objects - for single space objecs, 163 * spot. This is meant for multi space objects - for single space objecs,
167 * just calling get_map_blocked and checking that against movement type 164 * just calling get_map_blocked and checking that against movement type
168 * of object. This function goes through all the parts of the multipart 165 * of object. This function goes through all the parts of the multipart
169 * object and makes sure they can be inserted. 166 * object and makes sure they can be inserted.
170 * 167 *
… …
314 case KW_arch: 311 case KW_arch:
315 if (object *op = object::read (f, this)) 312 if (object *op = object::read (f, this))
316 { 313 {
317 // TODO: why? 314 // TODO: why?
318 if (op->inv) 315 if (op->inv)
316 {
317 op->carrying = 0;
319 op->update_weight (); 318 op->update_weight ();
319 }
320 320
321 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) 321 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
322 { 322 {
323 // we insert manually because 323 // we insert manually because
324 // a) its way faster 324 // a) its way faster
… …
361} 361}
362 362
363void 363void
364maptile::activate () 364maptile::activate ()
365{ 365{
366 if (spaces) 366 if (in_memory != MAP_INACTIVE)
367 return;
368
367 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 369 for (mapspace *ms = spaces + size (); ms-- > spaces; )
368 for (object *op = ms->bot; op; op = op->above) 370 for (object *op = ms->bot; op; op = op->above)
369 op->activate_recursive (); 371 op->activate_recursive ();
372
373 in_memory = MAP_ACTIVE;
370} 374}
371 375
372void 376void
373maptile::deactivate () 377maptile::deactivate ()
374{ 378{
375 if (spaces) 379 if (in_memory != MAP_ACTIVE)
380 return;
381
376 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 382 for (mapspace *ms = spaces + size (); ms-- > spaces; )
377 for (object *op = ms->bot; op; op = op->above) 383 for (object *op = ms->bot; op; op = op->above)
378 op->deactivate_recursive (); 384 op->deactivate_recursive ();
385
386 in_memory = MAP_INACTIVE;
379} 387}
380 388
381bool 389bool
382maptile::_save_objects (object_freezer &f, int flags) 390maptile::_save_objects (object_freezer &f, int flags)
383{ 391{
… …
424 return false; 432 return false;
425 433
426 return freezer.save (path); 434 return freezer.save (path);
427} 435}
428 436
429maptile::maptile () 437void
438maptile::init ()
430{ 439{
431 in_memory = MAP_SWAPPED; 440 in_memory = MAP_SWAPPED;
432 441
433 /* The maps used to pick up default x and y values from the 442 /* The maps used to pick up default x and y values from the
434 * map archetype. Mimic that behaviour. 443 * map archetype. Mimic that behaviour.
435 */ 444 */
436 width = 16; 445 width = 16;
437 height = 16; 446 height = 16;
438 timeout = 300; 447 timeout = 300;
439 max_items = MAX_ITEM_PER_ACTION; 448 max_items = MAX_ITEM_PER_ACTION;
440 max_volume = 2000000; // 2m³ 449 max_volume = 2000000; // 2m³
441}
442
443maptile::maptile (int w, int h)
444{
445 in_memory = MAP_SWAPPED;
446
447 width = w;
448 height = h;
449 reset_timeout = 0; 450 reset_timeout = 0;
450 timeout = 300;
451 enter_x = 0; 451 enter_x = 0;
452 enter_y = 0; 452 enter_y = 0;
453}
454
455maptile::maptile ()
456{
457 init ();
458}
459
460maptile::maptile (int w, int h)
461{
462 init ();
463
464 width = w;
465 height = h;
453 466
454 alloc (); 467 alloc ();
455} 468}
456 469
457/* 470/*
… …
557 * the map (or something equivilent) into output_string. */ 570 * the map (or something equivilent) into output_string. */
558static const char * 571static const char *
559print_shop_string (maptile *m) 572print_shop_string (maptile *m)
560{ 573{
561 static dynbuf_text buf; buf.clear (); 574 static dynbuf_text buf; buf.clear ();
575 bool first = true;
562 576
563 for (int i = 0; i < m->shopitems[0].index; i++) 577 for (int i = 0; i < m->shopitems[0].index; i++)
564 { 578 {
579 if (!first)
580 buf << ';';
581
582 first = false;
583
565 if (m->shopitems[i].typenum) 584 if (m->shopitems[i].typenum)
566 { 585 {
567 if (m->shopitems[i].strength) 586 if (m->shopitems[i].strength)
568 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 587 buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
569 else 588 else
570 buf.printf ("%s;", m->shopitems[i].name); 589 buf.printf ("%s", m->shopitems[i].name);
571 } 590 }
572 else 591 else
573 { 592 {
574 if (m->shopitems[i].strength) 593 if (m->shopitems[i].strength)
575 buf.printf ("*:%d;", m->shopitems[i].strength); 594 buf.printf ("*:%d", m->shopitems[i].strength);
576 else 595 else
577 buf.printf ("*"); 596 buf.printf ("*");
578 } 597 }
579 } 598 }
580 599
… …
603 { 622 {
604 case KW_msg: 623 case KW_msg:
605 thawer.get_ml (KW_endmsg, msg); 624 thawer.get_ml (KW_endmsg, msg);
606 break; 625 break;
607 626
608 case KW_lore: // CF+ extension 627 case KW_lore: // deliantra extension
609 thawer.get_ml (KW_endlore, maplore); 628 thawer.get_ml (KW_endlore, maplore);
610 break; 629 break;
611 630
612 case KW_maplore: 631 case KW_maplore:
613 thawer.get_ml (KW_endmaplore, maplore); 632 thawer.get_ml (KW_endmaplore, maplore);
… …
630 case KW_shopgreed: thawer.get (shopgreed); break; 649 case KW_shopgreed: thawer.get (shopgreed); break;
631 case KW_shopmin: thawer.get (shopmin); break; 650 case KW_shopmin: thawer.get (shopmin); break;
632 case KW_shopmax: thawer.get (shopmax); break; 651 case KW_shopmax: thawer.get (shopmax); break;
633 case KW_shoprace: thawer.get (shoprace); break; 652 case KW_shoprace: thawer.get (shoprace); break;
634 case KW_outdoor: thawer.get (outdoor); break; 653 case KW_outdoor: thawer.get (outdoor); break;
635 case KW_temp: thawer.get (temp); break;
636 case KW_pressure: thawer.get (pressure); break;
637 case KW_humid: thawer.get (humid); break;
638 case KW_windspeed: thawer.get (windspeed); break;
639 case KW_winddir: thawer.get (winddir); break;
640 case KW_sky: thawer.get (sky); break;
641 654
642 case KW_per_player: thawer.get (per_player); break; 655 case KW_per_player: thawer.get (per_player); break;
643 case KW_per_party: thawer.get (per_party); break; 656 case KW_per_party: thawer.get (per_party); break;
644 case KW_no_reset: thawer.get (no_reset); break; 657 case KW_no_reset: thawer.get (no_reset); break;
645 case KW_no_drop: thawer.get (no_drop); break; 658 case KW_no_drop: thawer.get (no_drop); break;
646 659
647 case KW_region: default_region = region::find (thawer.get_str ()); break; 660 case KW_region: thawer.get (default_region); break;
648 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 661 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
649 662
650 // old names new names 663 // old names new names
651 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 664 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
652 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 665 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
660 673
661 case KW_tile_path_1: thawer.get (tile_path [0]); break; 674 case KW_tile_path_1: thawer.get (tile_path [0]); break;
662 case KW_tile_path_2: thawer.get (tile_path [1]); break; 675 case KW_tile_path_2: thawer.get (tile_path [1]); break;
663 case KW_tile_path_3: thawer.get (tile_path [2]); break; 676 case KW_tile_path_3: thawer.get (tile_path [2]); break;
664 case KW_tile_path_4: thawer.get (tile_path [3]); break; 677 case KW_tile_path_4: thawer.get (tile_path [3]); break;
678 case KW_tile_path_5: thawer.get (tile_path [4]); break;
679 case KW_tile_path_6: thawer.get (tile_path [5]); break;
665 680
666 case KW_ERROR: 681 case KW_ERROR:
667 set_key_text (thawer.kw_str, thawer.value); 682 set_key_text (thawer.kw_str, thawer.value);
668 break; 683 break;
669 684
670 case KW_end: 685 case KW_end:
671 thawer.next (); 686 thawer.next ();
672 return true; 687 return true;
673 688
674 default: 689 default:
675 if (!thawer.parse_error ("map", 0)) 690 if (!thawer.parse_error ("map"))
676 return false; 691 return false;
677 break; 692 break;
678 } 693 }
679 694
680 thawer.next (); 695 thawer.next ();
… …
698 int unique = 0; 713 int unique = 0;
699 for (object *op = spaces [i].bot; op; ) 714 for (object *op = spaces [i].bot; op; )
700 { 715 {
701 object *above = op->above; 716 object *above = op->above;
702 717
703 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 718 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
704 unique = 1; 719 unique = 1;
705 720
706 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 721 if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
707 op->destroy (); 722 op->destroy ();
708 723
709 op = above; 724 op = above;
710 } 725 }
711 } 726 }
… …
735 MAP_OUT (shopgreed); 750 MAP_OUT (shopgreed);
736 MAP_OUT (shopmin); 751 MAP_OUT (shopmin);
737 MAP_OUT (shopmax); 752 MAP_OUT (shopmax);
738 if (shoprace) MAP_OUT (shoprace); 753 if (shoprace) MAP_OUT (shoprace);
739 754
740 MAP_OUT (darkness);
741 MAP_OUT (width); 755 MAP_OUT (width);
742 MAP_OUT (height); 756 MAP_OUT (height);
743 MAP_OUT (enter_x); 757 MAP_OUT (enter_x);
744 MAP_OUT (enter_y); 758 MAP_OUT (enter_y);
759 MAP_OUT (darkness);
760 MAP_OUT (outdoor);
745 761
746 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg); 762 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
747 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore); 763 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
748
749 MAP_OUT (outdoor);
750 MAP_OUT (temp);
751 MAP_OUT (pressure);
752 MAP_OUT (humid);
753 MAP_OUT (windspeed);
754 MAP_OUT (winddir);
755 MAP_OUT (sky);
756 764
757 MAP_OUT (per_player); 765 MAP_OUT (per_player);
758 MAP_OUT (per_party); 766 MAP_OUT (per_party);
759 767
760 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 768 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
761 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 769 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
762 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 770 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
763 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 771 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
772 if (tile_path [4]) MAP_OUT2 (tile_path_5, tile_path [4]);
773 if (tile_path [5]) MAP_OUT2 (tile_path_6, tile_path [5]);
764 774
765 freezer.put (this); 775 freezer.put (this);
766 freezer.put (KW(end)); 776 freezer.put (KW(end));
767 777
768 return true; 778 return true;
… …
825 msg = 0; 835 msg = 0;
826 maplore = 0; 836 maplore = 0;
827 shoprace = 0; 837 shoprace = 0;
828 delete [] shopitems, shopitems = 0; 838 delete [] shopitems, shopitems = 0;
829 839
830 for (int i = 0; i < 4; i++) 840 for (int i = 0; i < TILE_NUM; i++)
831 tile_path [i] = 0; 841 tile_path [i] = 0;
832} 842}
833 843
834maptile::~maptile () 844maptile::~maptile ()
835{ 845{
… …
856 866
857 clear (); 867 clear ();
858} 868}
859 869
860/* decay and destroy perishable items in a map */ 870/* decay and destroy perishable items in a map */
871// TODO: should be done regularly, not on map load?
861void 872void
862maptile::do_decay_objects () 873maptile::do_decay_objects ()
863{ 874{
864 if (!spaces) 875 if (!spaces)
865 return; 876 return;
… …
867 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 878 for (mapspace *ms = spaces + size (); ms-- > spaces; )
868 for (object *above, *op = ms->bot; op; op = above) 879 for (object *above, *op = ms->bot; op; op = above)
869 { 880 {
870 above = op->above; 881 above = op->above;
871 882
883 // do not decay anything above unique floor tiles (yet :)
884 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
885 break;
886
872 bool destroy = 0; 887 bool destroy = 0;
873 888
874 // do not decay anything above unique floor tiles (yet :) 889 if (op->flag [FLAG_IS_FLOOR]
875 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 890 || op->flag [FLAG_OBJ_ORIGINAL]
876 break; 891 || op->flag [FLAG_UNIQUE]
877 892 || op->flag [FLAG_OVERLAY_FLOOR]
878 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 893 || op->flag [FLAG_UNPAID]
879 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
880 || QUERY_FLAG (op, FLAG_UNIQUE)
881 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
882 || QUERY_FLAG (op, FLAG_UNPAID)
883 || op->is_alive ()) 894 || op->is_alive ())
884 ; // do not decay 895 ; // do not decay
885 else if (op->is_weapon ()) 896 else if (op->is_weapon ())
886 { 897 {
887 op->stats.dam--; 898 op->stats.dam--;
… …
912 || mat & M_LIQUID 923 || mat & M_LIQUID
913 || (mat & M_IRON && rndm (1, 5) == 1) 924 || (mat & M_IRON && rndm (1, 5) == 1)
914 || (mat & M_GLASS && rndm (1, 2) == 1) 925 || (mat & M_GLASS && rndm (1, 2) == 1)
915 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 926 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
916 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 927 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
917 || (mat & M_ICE && temp > 32)) 928 //|| (mat & M_ICE && temp > 32)
929 )
918 destroy = 1; 930 destroy = 1;
919 } 931 }
920 932
921 /* adjust overall chance below */ 933 /* adjust overall chance below */
922 if (destroy && rndm (0, 1)) 934 if (destroy && rndm (0, 1))
… …
942 sint64 total_exp = 0; 954 sint64 total_exp = 0;
943 955
944 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 956 for (mapspace *ms = spaces + size (); ms-- > spaces; )
945 for (object *op = ms->bot; op; op = op->above) 957 for (object *op = ms->bot; op; op = op->above)
946 { 958 {
947 if (QUERY_FLAG (op, FLAG_MONSTER)) 959 if (op->flag [FLAG_MONSTER])
948 { 960 {
949 total_exp += op->stats.exp; 961 total_exp += op->stats.exp;
950 monster_cnt++; 962 monster_cnt++;
951 } 963 }
952 964
953 if (QUERY_FLAG (op, FLAG_GENERATOR)) 965 if (op->flag [FLAG_GENERATOR])
954 { 966 {
955 total_exp += op->stats.exp; 967 total_exp += op->stats.exp;
956 968
957 if (archetype *at = op->other_arch) 969 if (archetype *at = op->other_arch)
958 { 970 {
… …
1140 */ 1152 */
1141 1153
1142 for (object *tmp = last; tmp; tmp = tmp->below) 1154 for (object *tmp = last; tmp; tmp = tmp->below)
1143 { 1155 {
1144 /* Once we get to a floor, stop, since we already have a floor object */ 1156 /* Once we get to a floor, stop, since we already have a floor object */
1145 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1157 if (tmp->flag [FLAG_IS_FLOOR])
1146 break; 1158 break;
1147 1159
1148 /* If two top faces are already set, quit processing */ 1160 /* If two top faces are already set, quit processing */
1149 if (top && middle) 1161 if (top && middle)
1150 break; 1162 break;
… …
1193maptile * 1205maptile *
1194maptile::tile_available (int dir, bool load) 1206maptile::tile_available (int dir, bool load)
1195{ 1207{
1196 if (tile_path[dir]) 1208 if (tile_path[dir])
1197 { 1209 {
1210 // map is there and we don't need to load it OR it's loaded => return what we have
1198 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1211 if (tile_map[dir] && (!load || tile_map[dir]->linkable ()))
1199 return tile_map[dir]; 1212 return tile_map[dir];
1200 1213
1214 // well, try to locate it then, if possible - maybe it's there already
1201 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1215 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1202 return tile_map[dir]; 1216 return tile_map[dir];
1203 } 1217 }
1204 1218
1205 return 0; 1219 return 0;
… …
1317/** 1331/**
1318 * Return whether map2 is adjacent to map1. If so, store the distance from 1332 * Return whether map2 is adjacent to map1. If so, store the distance from
1319 * map1 to map2 in dx/dy. 1333 * map1 to map2 in dx/dy.
1320 */ 1334 */
1321int 1335int
1322adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1336adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy)
1323{ 1337{
1324 if (!map1 || !map2) 1338 if (!map1 || !map2)
1325 return 0; 1339 return 0;
1326 1340
1327 //TODO: this doesn't actually check correctly when intermediate maps are not loaded 1341 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
… …
1329 if (map1 == map2) 1343 if (map1 == map2)
1330 { 1344 {
1331 *dx = 0; 1345 *dx = 0;
1332 *dy = 0; 1346 *dy = 0;
1333 } 1347 }
1334 else if (map1->tile_map[0] == map2) 1348 else if (map1->tile_available (TILE_NORTH, false) == map2)
1335 { /* up */ 1349 {
1336 *dx = 0; 1350 *dx = 0;
1337 *dy = -map2->height; 1351 *dy = -map2->height;
1338 } 1352 }
1339 else if (map1->tile_map[1] == map2) 1353 else if (map1->tile_available (TILE_EAST , false) == map2)
1340 { /* right */ 1354 {
1341 *dx = map1->width; 1355 *dx = map1->width;
1342 *dy = 0; 1356 *dy = 0;
1343 } 1357 }
1344 else if (map1->tile_map[2] == map2) 1358 else if (map1->tile_available (TILE_SOUTH, false) == map2)
1345 { /* down */ 1359 {
1346 *dx = 0; 1360 *dx = 0;
1347 *dy = map1->height; 1361 *dy = map1->height;
1348 } 1362 }
1349 else if (map1->tile_map[3] == map2) 1363 else if (map1->tile_available (TILE_WEST , false) == map2)
1350 { /* left */ 1364 {
1351 *dx = -map2->width; 1365 *dx = -map2->width;
1352 *dy = 0; 1366 *dy = 0;
1353 } 1367 }
1354 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1368 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1355 { /* up right */ 1369 { /* up right */
1356 *dx = map1->tile_map[0]->width; 1370 *dx = +map1->tile_map[TILE_NORTH]->width;
1357 *dy = -map1->tile_map[0]->height; 1371 *dy = -map1->tile_map[TILE_NORTH]->height;
1358 } 1372 }
1359 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 1373 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1360 { /* up left */ 1374 { /* up left */
1361 *dx = -map2->width; 1375 *dx = -map2->width;
1362 *dy = -map1->tile_map[0]->height; 1376 *dy = -map1->tile_map[TILE_NORTH]->height;
1363 } 1377 }
1364 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 1378 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1365 { /* right up */ 1379 { /* right up */
1366 *dx = map1->width; 1380 *dx = +map1->width;
1367 *dy = -map2->height; 1381 *dy = -map2->height;
1368 } 1382 }
1369 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 1383 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1370 { /* right down */ 1384 { /* right down */
1371 *dx = map1->width; 1385 *dx = +map1->width;
1372 *dy = map1->tile_map[1]->height; 1386 *dy = +map1->tile_map[TILE_EAST]->height;
1373 } 1387 }
1374 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 1388 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1375 { /* down right */ 1389 { /* down right */
1376 *dx = map1->tile_map[2]->width; 1390 *dx = +map1->tile_map[TILE_SOUTH]->width;
1377 *dy = map1->height; 1391 *dy = +map1->height;
1378 } 1392 }
1379 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 1393 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1380 { /* down left */ 1394 { /* down left */
1381 *dx = -map2->width; 1395 *dx = -map2->width;
1382 *dy = map1->height; 1396 *dy = +map1->height;
1383 } 1397 }
1384 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 1398 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1385 { /* left up */ 1399 { /* left up */
1386 *dx = -map1->tile_map[3]->width; 1400 *dx = -map1->tile_map[TILE_WEST]->width;
1387 *dy = -map2->height; 1401 *dy = -map2->height;
1388 } 1402 }
1389 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1403 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1390 { /* left down */ 1404 { /* left down */
1391 *dx = -map1->tile_map[3]->width; 1405 *dx = -map1->tile_map[TILE_WEST]->width;
1392 *dy = map1->tile_map[3]->height; 1406 *dy = +map1->tile_map[TILE_WEST]->height;
1393 } 1407 }
1394 else 1408 else
1395 return 0; 1409 return 0;
1396 1410
1397 return 1; 1411 return 1;
… …
1433 * 1447 *
1434 * currently, the only flag supported (0x1) is don't translate for 1448 * currently, the only flag supported (0x1) is don't translate for
1435 * closest body part of 'op1' 1449 * closest body part of 'op1'
1436 */ 1450 */
1437void 1451void
1438get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1452get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1439{ 1453{
1440 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1454 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1441 { 1455 {
1442 /* be conservative and fill in _some_ data */ 1456 /* be conservative and fill in _some_ data */
1443 retval->distance = 10000; 1457 retval->distance = 10000;
1444 retval->distance_x = 10000; 1458 retval->distance_x = 10000;
1445 retval->distance_y = 10000; 1459 retval->distance_y = 10000;
1446 retval->direction = 0; 1460 retval->direction = 0;
1447 retval->part = 0; 1461 retval->part = 0;
1448 } 1462 }
1449 else 1463 else
1450 { 1464 {
1451 object *best;
1452
1453 retval->distance_x += op2->x - op1->x; 1465 retval->distance_x += op2->x - op1->x;
1454 retval->distance_y += op2->y - op1->y; 1466 retval->distance_y += op2->y - op1->y;
1455 1467
1456 best = op1; 1468 object *best = op1;
1469
1457 /* If this is multipart, find the closest part now */ 1470 /* If this is multipart, find the closest part now */
1458 if (!(flags & 0x1) && op1->more) 1471 if (!(flags & 1) && op1->more)
1459 { 1472 {
1460 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1473 int best_distance = idistance (retval->distance_x, retval->distance_y);
1461 1474
1462 /* we just take the offset of the piece to head to figure 1475 /* we just take the offset of the piece to head to figure
1463 * distance instead of doing all that work above again 1476 * distance instead of doing all that work above again
1464 * since the distance fields we set above are positive in the 1477 * since the distance fields we set above are positive in the
1465 * same axis as is used for multipart objects, the simply arithmetic 1478 * same axis as is used for multipart objects, the simply arithmetic
1466 * below works. 1479 * below works.
1467 */ 1480 */
1468 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1481 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1469 { 1482 {
1470 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1483 int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1471 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1484
1472 if (tmpi < best_distance) 1485 if (tmpi < best_distance)
1473 { 1486 {
1474 best_distance = tmpi; 1487 best_distance = tmpi;
1475 best = tmp; 1488 best = tmp;
1476 } 1489 }
1477 } 1490 }
1478 1491
1479 if (best != op1) 1492 if (best != op1)
1480 { 1493 {
1481 retval->distance_x += op1->x - best->x; 1494 retval->distance_x += op1->x - best->x;
1482 retval->distance_y += op1->y - best->y; 1495 retval->distance_y += op1->y - best->y;
1483 } 1496 }
1484 } 1497 }
1485 1498
1486 retval->part = best; 1499 retval->part = best;
1487 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1500 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1488 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1501 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1489 } 1502 }
1490} 1503}
1491 1504
1492/* this is basically the same as get_rangevector above, but instead of 1505/* this is basically the same as get_rangevector above, but instead of
1493 * the first parameter being an object, it instead is the map 1506 * the first parameter being an object, it instead is the map
… …
1498 * be more consistant with the above function and also in case they are needed 1511 * be more consistant with the above function and also in case they are needed
1499 * for something in the future. Also, since no object is pasted, the best 1512 * for something in the future. Also, since no object is pasted, the best
1500 * field of the rv_vector is set to NULL. 1513 * field of the rv_vector is set to NULL.
1501 */ 1514 */
1502void 1515void
1503get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1516get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1504{ 1517{
1505 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1518 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1506 { 1519 {
1507 /* be conservative and fill in _some_ data */ 1520 /* be conservative and fill in _some_ data */
1508 retval->distance = 100000; 1521 retval->distance = 100000;
1509 retval->distance_x = 32767; 1522 retval->distance_x = 32767;
1510 retval->distance_y = 32767; 1523 retval->distance_y = 32767;
1511 retval->direction = 0; 1524 retval->direction = 0;
1512 retval->part = 0; 1525 retval->part = 0;
1513 } 1526 }
1514 else 1527 else
1515 { 1528 {
1516 retval->distance_x += op2->x - x; 1529 retval->distance_x += op2->x - x;
1517 retval->distance_y += op2->y - y; 1530 retval->distance_y += op2->y - y;
1518 1531
1519 retval->part = 0; 1532 retval->part = 0;
1520 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1533 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1521 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1534 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1522 } 1535 }
1523} 1536}
1524 1537
1525/* Returns true of op1 and op2 are effectively on the same map 1538/* Returns true of op1 and op2 are effectively on the same map
1526 * (as related to map tiling). Note that this looks for a path from 1539 * (as related to map tiling). Note that this looks for a path from
… …
1576 */ 1589 */
1577 for (int i = 1000; --i;) 1590 for (int i = 1000; --i;)
1578 { 1591 {
1579 object *pick = at (gen (width), gen (height)).bot; 1592 object *pick = at (gen (width), gen (height)).bot;
1580 1593
1581 // do not prefer big monsters just because they are big. 1594 // must be head: do not prefer big monsters just because they are big.
1582 if (pick && pick->is_head ()) 1595 if (pick && pick->is_head ())
1583 return pick->head_ (); 1596 return pick;
1584 } 1597 }
1585 1598
1586 // instead of crashing in the unlikely(?) case, try to return *something* 1599 // instead of crashing in the unlikely(?) case, try to return *something*
1587 return archetype::find (shstr_bug); 1600 return archetype::find (shstr_bug);
1588} 1601}
… …
1622 if (distance <= MAX_SOUND_DISTANCE) 1635 if (distance <= MAX_SOUND_DISTANCE)
1623 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg); 1636 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1624 } 1637 }
1625} 1638}
1626 1639
1640dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1641
1627static void 1642static void
1628split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy) 1643split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1629{ 1644{
1630 // clip to map to the left 1645 // clip to map to the left
1631 if (x0 < 0) 1646 if (x0 < 0)
1632 { 1647 {
1633 if (maptile *tile = m->tile_available (TILE_LEFT, 1)) 1648 if (maptile *tile = m->tile_available (TILE_WEST, 1))
1634 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy); 1649 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1635 1650
1636 if (x1 < 0) // entirely to the left 1651 if (x1 < 0) // entirely to the left
1637 return; 1652 return;
1638 1653
… …
1640 } 1655 }
1641 1656
1642 // clip to map to the right 1657 // clip to map to the right
1643 if (x1 > m->width) 1658 if (x1 > m->width)
1644 { 1659 {
1645 if (maptile *tile = m->tile_available (TILE_RIGHT, 1)) 1660 if (maptile *tile = m->tile_available (TILE_EAST, 1))
1646 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy); 1661 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1647 1662
1648 if (x0 > m->width) // entirely to the right 1663 if (x0 > m->width) // entirely to the right
1649 return; 1664 return;
1650 1665
… …
1652 } 1667 }
1653 1668
1654 // clip to map above 1669 // clip to map above
1655 if (y0 < 0) 1670 if (y0 < 0)
1656 { 1671 {
1657 if (maptile *tile = m->tile_available (TILE_UP, 1)) 1672 if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1658 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height); 1673 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1659 1674
1660 if (y1 < 0) // entirely above 1675 if (y1 < 0) // entirely above
1661 return; 1676 return;
1662 1677
… …
1664 } 1679 }
1665 1680
1666 // clip to map below 1681 // clip to map below
1667 if (y1 > m->height) 1682 if (y1 > m->height)
1668 { 1683 {
1669 if (maptile *tile = m->tile_available (TILE_DOWN, 1)) 1684 if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1670 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height); 1685 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1671 1686
1672 if (y0 > m->height) // entirely below 1687 if (y0 > m->height) // entirely below
1673 return; 1688 return;
1674 1689
… …
1686 r->dx = dx; 1701 r->dx = dx;
1687 r->dy = dy; 1702 r->dy = dy;
1688} 1703}
1689 1704
1690maprect * 1705maprect *
1691maptile::split_to_tiles (int x0, int y0, int x1, int y1) 1706maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1692{ 1707{
1693 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1694 buf.clear (); 1708 buf.clear ();
1695 1709
1696 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0); 1710 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1697 1711
1698 // add end marker 1712 // add end marker

Diff Legend

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