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.174 by root, Tue Nov 10 05:05:22 2009 UTC vs.
Revision 1.201 by root, Sat Jul 10 21:07:47 2010 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 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 *
… …
217 } 214 }
218 215
219 return 0; 216 return 0;
220} 217}
221 218
222/* When the map is loaded, load_object does not actually insert objects
223 * into inventory, but just links them. What this does is go through
224 * and insert them properly.
225 * The object 'container' is the object that contains the inventory.
226 * This is needed so that we can update the containers weight.
227 */
228static void
229fix_container (object *container)
230{
231 object *tmp = container->inv, *next;
232
233 container->inv = 0;
234 while (tmp)
235 {
236 next = tmp->below;
237 if (tmp->inv)
238 fix_container (tmp);
239
240 insert_ob_in_ob (tmp, container);
241 tmp = next;
242 }
243
244 // go through and calculate what all the containers are carrying.
245 //TODO: remove
246 container->update_weight ();
247}
248
249//-GPL 219//-GPL
250 220
251void 221void
252maptile::set_object_flag (int flag, int value) 222maptile::set_object_flag (int flag, int value)
253{ 223{
… …
268 set_object_flag (FLAG_OBJ_ORIGINAL); 238 set_object_flag (FLAG_OBJ_ORIGINAL);
269 239
270 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 240 for (mapspace *ms = spaces + size (); ms-- > spaces; )
271 for (object *tmp = ms->bot; tmp; tmp = tmp->above) 241 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
272 INVOKE_OBJECT (RESET, tmp); 242 INVOKE_OBJECT (RESET, tmp);
243}
244
245void
246maptile::post_load ()
247{
248#if 0
249 if (!spaces)
250 return;
251
252 for (mapspace *ms = spaces + size (); ms-- > spaces; )
253 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
254 ; // nop
255#endif
273} 256}
274 257
275//+GPL 258//+GPL
276 259
277/* link_multipart_objects go through all the objects on the map looking 260/* link_multipart_objects go through all the objects on the map looking
… …
328 case KW_arch: 311 case KW_arch:
329 if (object *op = object::read (f, this)) 312 if (object *op = object::read (f, this))
330 { 313 {
331 // TODO: why? 314 // TODO: why?
332 if (op->inv) 315 if (op->inv)
316 {
317 op->carrying = 0;
333 op->update_weight (); 318 op->update_weight ();
319 }
334 320
335 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))
336 { 322 {
337 // we insert manually because 323 // we insert manually because
338 // a) its way faster 324 // a) its way faster
… …
438 return false; 424 return false;
439 425
440 return freezer.save (path); 426 return freezer.save (path);
441} 427}
442 428
443maptile::maptile () 429void
430maptile::init ()
444{ 431{
445 in_memory = MAP_SWAPPED; 432 in_memory = MAP_SWAPPED;
446 433
447 /* The maps used to pick up default x and y values from the 434 /* The maps used to pick up default x and y values from the
448 * map archetype. Mimic that behaviour. 435 * map archetype. Mimic that behaviour.
449 */ 436 */
450 width = 16; 437 width = 16;
451 height = 16; 438 height = 16;
452 timeout = 300; 439 timeout = 300;
453 max_items = MAX_ITEM_PER_ACTION; 440 max_items = MAX_ITEM_PER_ACTION;
454 max_volume = 2000000; // 2m³ 441 max_volume = 2000000; // 2m³
455}
456
457maptile::maptile (int w, int h)
458{
459 in_memory = MAP_SWAPPED;
460
461 width = w;
462 height = h;
463 reset_timeout = 0; 442 reset_timeout = 0;
464 timeout = 300;
465 enter_x = 0; 443 enter_x = 0;
466 enter_y = 0; 444 enter_y = 0;
445}
446
447maptile::maptile ()
448{
449 init ();
450}
451
452maptile::maptile (int w, int h)
453{
454 init ();
455
456 width = w;
457 height = h;
467 458
468 alloc (); 459 alloc ();
469} 460}
470 461
471/* 462/*
… …
571 * the map (or something equivilent) into output_string. */ 562 * the map (or something equivilent) into output_string. */
572static const char * 563static const char *
573print_shop_string (maptile *m) 564print_shop_string (maptile *m)
574{ 565{
575 static dynbuf_text buf; buf.clear (); 566 static dynbuf_text buf; buf.clear ();
567 bool first = true;
576 568
577 for (int i = 0; i < m->shopitems[0].index; i++) 569 for (int i = 0; i < m->shopitems[0].index; i++)
578 { 570 {
571 if (!first)
572 buf << ';';
573
574 first = false;
575
579 if (m->shopitems[i].typenum) 576 if (m->shopitems[i].typenum)
580 { 577 {
581 if (m->shopitems[i].strength) 578 if (m->shopitems[i].strength)
582 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 579 buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
583 else 580 else
584 buf.printf ("%s;", m->shopitems[i].name); 581 buf.printf ("%s", m->shopitems[i].name);
585 } 582 }
586 else 583 else
587 { 584 {
588 if (m->shopitems[i].strength) 585 if (m->shopitems[i].strength)
589 buf.printf ("*:%d;", m->shopitems[i].strength); 586 buf.printf ("*:%d", m->shopitems[i].strength);
590 else 587 else
591 buf.printf ("*"); 588 buf.printf ("*");
592 } 589 }
593 } 590 }
594 591
… …
617 { 614 {
618 case KW_msg: 615 case KW_msg:
619 thawer.get_ml (KW_endmsg, msg); 616 thawer.get_ml (KW_endmsg, msg);
620 break; 617 break;
621 618
622 case KW_lore: // CF+ extension 619 case KW_lore: // deliantra extension
623 thawer.get_ml (KW_endlore, maplore); 620 thawer.get_ml (KW_endlore, maplore);
624 break; 621 break;
625 622
626 case KW_maplore: 623 case KW_maplore:
627 thawer.get_ml (KW_endmaplore, maplore); 624 thawer.get_ml (KW_endmaplore, maplore);
… …
644 case KW_shopgreed: thawer.get (shopgreed); break; 641 case KW_shopgreed: thawer.get (shopgreed); break;
645 case KW_shopmin: thawer.get (shopmin); break; 642 case KW_shopmin: thawer.get (shopmin); break;
646 case KW_shopmax: thawer.get (shopmax); break; 643 case KW_shopmax: thawer.get (shopmax); break;
647 case KW_shoprace: thawer.get (shoprace); break; 644 case KW_shoprace: thawer.get (shoprace); break;
648 case KW_outdoor: thawer.get (outdoor); break; 645 case KW_outdoor: thawer.get (outdoor); break;
649 case KW_temp: thawer.get (temp); break;
650 case KW_pressure: thawer.get (pressure); break;
651 case KW_humid: thawer.get (humid); break;
652 case KW_windspeed: thawer.get (windspeed); break;
653 case KW_winddir: thawer.get (winddir); break;
654 case KW_sky: thawer.get (sky); break;
655 646
656 case KW_per_player: thawer.get (per_player); break; 647 case KW_per_player: thawer.get (per_player); break;
657 case KW_per_party: thawer.get (per_party); break; 648 case KW_per_party: thawer.get (per_party); break;
658 case KW_no_reset: thawer.get (no_reset); break; 649 case KW_no_reset: thawer.get (no_reset); break;
659 case KW_no_drop: thawer.get (no_drop); break; 650 case KW_no_drop: thawer.get (no_drop); break;
660 651
661 case KW_region: default_region = region::find (thawer.get_str ()); break; 652 case KW_region: thawer.get (default_region); break;
662 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 653 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
663 654
664 // old names new names 655 // old names new names
665 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 656 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
666 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 657 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
684 case KW_end: 675 case KW_end:
685 thawer.next (); 676 thawer.next ();
686 return true; 677 return true;
687 678
688 default: 679 default:
689 if (!thawer.parse_error ("map", 0)) 680 if (!thawer.parse_error ("map"))
690 return false; 681 return false;
691 break; 682 break;
692 } 683 }
693 684
694 thawer.next (); 685 thawer.next ();
… …
712 int unique = 0; 703 int unique = 0;
713 for (object *op = spaces [i].bot; op; ) 704 for (object *op = spaces [i].bot; op; )
714 { 705 {
715 object *above = op->above; 706 object *above = op->above;
716 707
717 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 708 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
718 unique = 1; 709 unique = 1;
719 710
720 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 711 if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
721 op->destroy (); 712 op->destroy ();
722 713
723 op = above; 714 op = above;
724 } 715 }
725 } 716 }
… …
728//-GPL 719//-GPL
729 720
730bool 721bool
731maptile::_save_header (object_freezer &freezer) 722maptile::_save_header (object_freezer &freezer)
732{ 723{
733#define MAP_OUT(k) freezer.put (KW_ ## k, k) 724#define MAP_OUT(k) freezer.put (KW(k), k)
734#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 725#define MAP_OUT2(k,v) freezer.put (KW(k), v)
735 726
736 MAP_OUT2 (arch, "map"); 727 MAP_OUT2 (arch, CS(map));
737 728
738 if (name) MAP_OUT (name); 729 if (name) MAP_OUT (name);
739 MAP_OUT (swap_time); 730 MAP_OUT (swap_time);
740 MAP_OUT (reset_time); 731 MAP_OUT (reset_time);
741 MAP_OUT (reset_timeout); 732 MAP_OUT (reset_timeout);
… …
749 MAP_OUT (shopgreed); 740 MAP_OUT (shopgreed);
750 MAP_OUT (shopmin); 741 MAP_OUT (shopmin);
751 MAP_OUT (shopmax); 742 MAP_OUT (shopmax);
752 if (shoprace) MAP_OUT (shoprace); 743 if (shoprace) MAP_OUT (shoprace);
753 744
754 MAP_OUT (darkness);
755 MAP_OUT (width); 745 MAP_OUT (width);
756 MAP_OUT (height); 746 MAP_OUT (height);
757 MAP_OUT (enter_x); 747 MAP_OUT (enter_x);
758 MAP_OUT (enter_y); 748 MAP_OUT (enter_y);
759 749 MAP_OUT (darkness);
760 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
761 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
762
763 MAP_OUT (outdoor); 750 MAP_OUT (outdoor);
764 MAP_OUT (temp); 751
765 MAP_OUT (pressure); 752 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
766 MAP_OUT (humid); 753 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
767 MAP_OUT (windspeed);
768 MAP_OUT (winddir);
769 MAP_OUT (sky);
770 754
771 MAP_OUT (per_player); 755 MAP_OUT (per_player);
772 MAP_OUT (per_party); 756 MAP_OUT (per_party);
773 757
774 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 758 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
775 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 759 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
776 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 760 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
777 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 761 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
778 762
779 freezer.put (this); 763 freezer.put (this);
780 freezer.put (KW_end); 764 freezer.put (KW(end));
781 765
782 return true; 766 return true;
783} 767}
784 768
785bool 769bool
… …
870 854
871 clear (); 855 clear ();
872} 856}
873 857
874/* decay and destroy perishable items in a map */ 858/* decay and destroy perishable items in a map */
859// TODO: should be done regularly, not on map load?
875void 860void
876maptile::do_decay_objects () 861maptile::do_decay_objects ()
877{ 862{
878 if (!spaces) 863 if (!spaces)
879 return; 864 return;
… …
881 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 866 for (mapspace *ms = spaces + size (); ms-- > spaces; )
882 for (object *above, *op = ms->bot; op; op = above) 867 for (object *above, *op = ms->bot; op; op = above)
883 { 868 {
884 above = op->above; 869 above = op->above;
885 870
871 // do not decay anything above unique floor tiles (yet :)
872 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
873 break;
874
886 bool destroy = 0; 875 bool destroy = 0;
887 876
888 // do not decay anything above unique floor tiles (yet :) 877 if (op->flag [FLAG_IS_FLOOR]
889 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 878 || op->flag [FLAG_OBJ_ORIGINAL]
890 break; 879 || op->flag [FLAG_UNIQUE]
891 880 || op->flag [FLAG_OVERLAY_FLOOR]
892 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 881 || op->flag [FLAG_UNPAID]
893 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
894 || QUERY_FLAG (op, FLAG_UNIQUE)
895 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
896 || QUERY_FLAG (op, FLAG_UNPAID)
897 || op->is_alive ()) 882 || op->is_alive ())
898 ; // do not decay 883 ; // do not decay
899 else if (op->is_weapon ()) 884 else if (op->is_weapon ())
900 { 885 {
901 op->stats.dam--; 886 op->stats.dam--;
… …
926 || mat & M_LIQUID 911 || mat & M_LIQUID
927 || (mat & M_IRON && rndm (1, 5) == 1) 912 || (mat & M_IRON && rndm (1, 5) == 1)
928 || (mat & M_GLASS && rndm (1, 2) == 1) 913 || (mat & M_GLASS && rndm (1, 2) == 1)
929 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 914 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
930 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 915 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
931 || (mat & M_ICE && temp > 32)) 916 //|| (mat & M_ICE && temp > 32)
917 )
932 destroy = 1; 918 destroy = 1;
933 } 919 }
934 920
935 /* adjust overall chance below */ 921 /* adjust overall chance below */
936 if (destroy && rndm (0, 1)) 922 if (destroy && rndm (0, 1))
… …
956 sint64 total_exp = 0; 942 sint64 total_exp = 0;
957 943
958 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 944 for (mapspace *ms = spaces + size (); ms-- > spaces; )
959 for (object *op = ms->bot; op; op = op->above) 945 for (object *op = ms->bot; op; op = op->above)
960 { 946 {
961 if (QUERY_FLAG (op, FLAG_MONSTER)) 947 if (op->flag [FLAG_MONSTER])
962 { 948 {
963 total_exp += op->stats.exp; 949 total_exp += op->stats.exp;
964 monster_cnt++; 950 monster_cnt++;
965 } 951 }
966 952
967 if (QUERY_FLAG (op, FLAG_GENERATOR)) 953 if (op->flag [FLAG_GENERATOR])
968 { 954 {
969 total_exp += op->stats.exp; 955 total_exp += op->stats.exp;
970 956
971 if (archetype *at = op->other_arch) 957 if (archetype *at = op->other_arch)
972 { 958 {
… …
1154 */ 1140 */
1155 1141
1156 for (object *tmp = last; tmp; tmp = tmp->below) 1142 for (object *tmp = last; tmp; tmp = tmp->below)
1157 { 1143 {
1158 /* Once we get to a floor, stop, since we already have a floor object */ 1144 /* Once we get to a floor, stop, since we already have a floor object */
1159 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1145 if (tmp->flag [FLAG_IS_FLOOR])
1160 break; 1146 break;
1161 1147
1162 /* If two top faces are already set, quit processing */ 1148 /* If two top faces are already set, quit processing */
1163 if (top && middle) 1149 if (top && middle)
1164 break; 1150 break;
… …
1331/** 1317/**
1332 * Return whether map2 is adjacent to map1. If so, store the distance from 1318 * Return whether map2 is adjacent to map1. If so, store the distance from
1333 * map1 to map2 in dx/dy. 1319 * map1 to map2 in dx/dy.
1334 */ 1320 */
1335int 1321int
1336adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1322adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy)
1337{ 1323{
1338 if (!map1 || !map2) 1324 if (!map1 || !map2)
1339 return 0; 1325 return 0;
1340 1326
1341 //TODO: this doesn't actually check correctly when intermediate maps are not loaded 1327 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
… …
1343 if (map1 == map2) 1329 if (map1 == map2)
1344 { 1330 {
1345 *dx = 0; 1331 *dx = 0;
1346 *dy = 0; 1332 *dy = 0;
1347 } 1333 }
1348 else if (map1->tile_map[0] == map2) 1334 else if (map1->tile_available (0, false) == map2)
1349 { /* up */ 1335 { /* up */
1350 *dx = 0; 1336 *dx = 0;
1351 *dy = -map2->height; 1337 *dy = -map2->height;
1352 } 1338 }
1353 else if (map1->tile_map[1] == map2) 1339 else if (map1->tile_available (1, false) == map2)
1354 { /* right */ 1340 { /* right */
1355 *dx = map1->width; 1341 *dx = map1->width;
1356 *dy = 0; 1342 *dy = 0;
1357 } 1343 }
1358 else if (map1->tile_map[2] == map2) 1344 else if (map1->tile_available (2, false) == map2)
1359 { /* down */ 1345 { /* down */
1360 *dx = 0; 1346 *dx = 0;
1361 *dy = map1->height; 1347 *dy = map1->height;
1362 } 1348 }
1363 else if (map1->tile_map[3] == map2) 1349 else if (map1->tile_available (3, false) == map2)
1364 { /* left */ 1350 { /* left */
1365 *dx = -map2->width; 1351 *dx = -map2->width;
1366 *dy = 0; 1352 *dy = 0;
1367 } 1353 }
1368 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1354 else if (map1->tile_map[0] && map1->tile_map[0]->tile_available (1, false) == map2)
1369 { /* up right */ 1355 { /* up right */
1370 *dx = map1->tile_map[0]->width; 1356 *dx = map1->tile_map[0]->width;
1371 *dy = -map1->tile_map[0]->height; 1357 *dy = -map1->tile_map[0]->height;
1372 } 1358 }
1373 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 1359 else if (map1->tile_map[0] && map1->tile_map[0]->tile_available (3, false) == map2)
1374 { /* up left */ 1360 { /* up left */
1375 *dx = -map2->width; 1361 *dx = -map2->width;
1376 *dy = -map1->tile_map[0]->height; 1362 *dy = -map1->tile_map[0]->height;
1377 } 1363 }
1378 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 1364 else if (map1->tile_map[1] && map1->tile_map[1]->tile_available (0, false) == map2)
1379 { /* right up */ 1365 { /* right up */
1380 *dx = map1->width; 1366 *dx = map1->width;
1381 *dy = -map2->height; 1367 *dy = -map2->height;
1382 } 1368 }
1383 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 1369 else if (map1->tile_map[1] && map1->tile_map[1]->tile_available (2, false) == map2)
1384 { /* right down */ 1370 { /* right down */
1385 *dx = map1->width; 1371 *dx = map1->width;
1386 *dy = map1->tile_map[1]->height; 1372 *dy = map1->tile_map[1]->height;
1387 } 1373 }
1388 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 1374 else if (map1->tile_map[2] && map1->tile_map[2]->tile_available (1, false) == map2)
1389 { /* down right */ 1375 { /* down right */
1390 *dx = map1->tile_map[2]->width; 1376 *dx = map1->tile_map[2]->width;
1391 *dy = map1->height; 1377 *dy = map1->height;
1392 } 1378 }
1393 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 1379 else if (map1->tile_map[2] && map1->tile_map[2]->tile_available (3, false) == map2)
1394 { /* down left */ 1380 { /* down left */
1395 *dx = -map2->width; 1381 *dx = -map2->width;
1396 *dy = map1->height; 1382 *dy = map1->height;
1397 } 1383 }
1398 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 1384 else if (map1->tile_map[3] && map1->tile_map[3]->tile_available (0, false) == map2)
1399 { /* left up */ 1385 { /* left up */
1400 *dx = -map1->tile_map[3]->width; 1386 *dx = -map1->tile_map[3]->width;
1401 *dy = -map2->height; 1387 *dy = -map2->height;
1402 } 1388 }
1403 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1389 else if (map1->tile_map[3] && map1->tile_map[3]->tile_available (2, false) == map2)
1404 { /* left down */ 1390 { /* left down */
1405 *dx = -map1->tile_map[3]->width; 1391 *dx = -map1->tile_map[3]->width;
1406 *dy = map1->tile_map[3]->height; 1392 *dy = map1->tile_map[3]->height;
1407 } 1393 }
1408 else 1394 else
… …
1447 * 1433 *
1448 * currently, the only flag supported (0x1) is don't translate for 1434 * currently, the only flag supported (0x1) is don't translate for
1449 * closest body part of 'op1' 1435 * closest body part of 'op1'
1450 */ 1436 */
1451void 1437void
1452get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1438get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1453{ 1439{
1454 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1440 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1455 { 1441 {
1456 /* be conservative and fill in _some_ data */ 1442 /* be conservative and fill in _some_ data */
1457 retval->distance = 10000; 1443 retval->distance = 10000;
1458 retval->distance_x = 10000; 1444 retval->distance_x = 10000;
1459 retval->distance_y = 10000; 1445 retval->distance_y = 10000;
1460 retval->direction = 0; 1446 retval->direction = 0;
1461 retval->part = 0; 1447 retval->part = 0;
1462 } 1448 }
1463 else 1449 else
1464 { 1450 {
1465 object *best;
1466
1467 retval->distance_x += op2->x - op1->x; 1451 retval->distance_x += op2->x - op1->x;
1468 retval->distance_y += op2->y - op1->y; 1452 retval->distance_y += op2->y - op1->y;
1469 1453
1470 best = op1; 1454 object *best = op1;
1455
1471 /* If this is multipart, find the closest part now */ 1456 /* If this is multipart, find the closest part now */
1472 if (!(flags & 0x1) && op1->more) 1457 if (!(flags & 1) && op1->more)
1473 { 1458 {
1474 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1459 int best_distance = idistance (retval->distance_x, retval->distance_y);
1475 1460
1476 /* we just take the offset of the piece to head to figure 1461 /* we just take the offset of the piece to head to figure
1477 * distance instead of doing all that work above again 1462 * distance instead of doing all that work above again
1478 * since the distance fields we set above are positive in the 1463 * since the distance fields we set above are positive in the
1479 * same axis as is used for multipart objects, the simply arithmetic 1464 * same axis as is used for multipart objects, the simply arithmetic
1480 * below works. 1465 * below works.
1481 */ 1466 */
1482 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1467 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1483 { 1468 {
1484 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1469 int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1485 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1470
1486 if (tmpi < best_distance) 1471 if (tmpi < best_distance)
1487 { 1472 {
1488 best_distance = tmpi; 1473 best_distance = tmpi;
1489 best = tmp; 1474 best = tmp;
1490 } 1475 }
1491 } 1476 }
1492 1477
1493 if (best != op1) 1478 if (best != op1)
1494 { 1479 {
1495 retval->distance_x += op1->x - best->x; 1480 retval->distance_x += op1->x - best->x;
1496 retval->distance_y += op1->y - best->y; 1481 retval->distance_y += op1->y - best->y;
1497 } 1482 }
1498 } 1483 }
1499 1484
1500 retval->part = best; 1485 retval->part = best;
1501 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1486 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1502 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1487 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1503 } 1488 }
1504} 1489}
1505 1490
1506/* this is basically the same as get_rangevector above, but instead of 1491/* this is basically the same as get_rangevector above, but instead of
1507 * the first parameter being an object, it instead is the map 1492 * the first parameter being an object, it instead is the map
… …
1512 * be more consistant with the above function and also in case they are needed 1497 * be more consistant with the above function and also in case they are needed
1513 * for something in the future. Also, since no object is pasted, the best 1498 * for something in the future. Also, since no object is pasted, the best
1514 * field of the rv_vector is set to NULL. 1499 * field of the rv_vector is set to NULL.
1515 */ 1500 */
1516void 1501void
1517get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1502get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1518{ 1503{
1519 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1504 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1520 { 1505 {
1521 /* be conservative and fill in _some_ data */ 1506 /* be conservative and fill in _some_ data */
1522 retval->distance = 100000; 1507 retval->distance = 100000;
1523 retval->distance_x = 32767; 1508 retval->distance_x = 32767;
1524 retval->distance_y = 32767; 1509 retval->distance_y = 32767;
1525 retval->direction = 0; 1510 retval->direction = 0;
1526 retval->part = 0; 1511 retval->part = 0;
1527 } 1512 }
1528 else 1513 else
1529 { 1514 {
1530 retval->distance_x += op2->x - x; 1515 retval->distance_x += op2->x - x;
1531 retval->distance_y += op2->y - y; 1516 retval->distance_y += op2->y - y;
1532 1517
1533 retval->part = 0; 1518 retval->part = 0;
1534 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1519 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1535 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1520 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1536 } 1521 }
1537} 1522}
1538 1523
1539/* Returns true of op1 and op2 are effectively on the same map 1524/* Returns true of op1 and op2 are effectively on the same map
1540 * (as related to map tiling). Note that this looks for a path from 1525 * (as related to map tiling). Note that this looks for a path from
… …
1590 */ 1575 */
1591 for (int i = 1000; --i;) 1576 for (int i = 1000; --i;)
1592 { 1577 {
1593 object *pick = at (gen (width), gen (height)).bot; 1578 object *pick = at (gen (width), gen (height)).bot;
1594 1579
1595 // do not prefer big monsters just because they are big. 1580 // must be head: do not prefer big monsters just because they are big.
1596 if (pick && pick->is_head ()) 1581 if (pick && pick->is_head ())
1597 return pick->head_ (); 1582 return pick;
1598 } 1583 }
1599 1584
1600 // instead of crashing in the unlikely(?) case, try to return *something* 1585 // instead of crashing in the unlikely(?) case, try to return *something*
1601 return archetype::find (shstr_bug); 1586 return archetype::find (shstr_bug);
1602} 1587}
… …
1635 1620
1636 if (distance <= MAX_SOUND_DISTANCE) 1621 if (distance <= MAX_SOUND_DISTANCE)
1637 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg); 1622 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1638 } 1623 }
1639} 1624}
1625
1626dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1640 1627
1641static void 1628static void
1642split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy) 1629split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1643{ 1630{
1644 // clip to map to the left 1631 // clip to map to the left
… …
1700 r->dx = dx; 1687 r->dx = dx;
1701 r->dy = dy; 1688 r->dy = dy;
1702} 1689}
1703 1690
1704maprect * 1691maprect *
1705maptile::split_to_tiles (int x0, int y0, int x1, int y1) 1692maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1706{ 1693{
1707 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1708 buf.clear (); 1694 buf.clear ();
1709 1695
1710 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0); 1696 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1711 1697
1712 // add end marker 1698 // add end marker

Diff Legend

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