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.176 by root, Tue Nov 10 05:11:05 2009 UTC vs.
Revision 1.197 by root, Thu Apr 29 07:32:34 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 *
… …
424 return false; 421 return false;
425 422
426 return freezer.save (path); 423 return freezer.save (path);
427} 424}
428 425
429maptile::maptile () 426void
427maptile::init ()
430{ 428{
431 in_memory = MAP_SWAPPED; 429 in_memory = MAP_SWAPPED;
432 430
433 /* The maps used to pick up default x and y values from the 431 /* The maps used to pick up default x and y values from the
434 * map archetype. Mimic that behaviour. 432 * map archetype. Mimic that behaviour.
435 */ 433 */
436 width = 16; 434 width = 16;
437 height = 16; 435 height = 16;
438 timeout = 300; 436 timeout = 300;
439 max_items = MAX_ITEM_PER_ACTION; 437 max_items = MAX_ITEM_PER_ACTION;
440 max_volume = 2000000; // 2m³ 438 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; 439 reset_timeout = 0;
450 timeout = 300;
451 enter_x = 0; 440 enter_x = 0;
452 enter_y = 0; 441 enter_y = 0;
442}
443
444maptile::maptile ()
445{
446 init ();
447}
448
449maptile::maptile (int w, int h)
450{
451 init ();
452
453 width = w;
454 height = h;
453 455
454 alloc (); 456 alloc ();
455} 457}
456 458
457/* 459/*
… …
557 * the map (or something equivilent) into output_string. */ 559 * the map (or something equivilent) into output_string. */
558static const char * 560static const char *
559print_shop_string (maptile *m) 561print_shop_string (maptile *m)
560{ 562{
561 static dynbuf_text buf; buf.clear (); 563 static dynbuf_text buf; buf.clear ();
564 bool first = true;
562 565
563 for (int i = 0; i < m->shopitems[0].index; i++) 566 for (int i = 0; i < m->shopitems[0].index; i++)
564 { 567 {
568 if (!first)
569 buf << ';';
570
571 first = false;
572
565 if (m->shopitems[i].typenum) 573 if (m->shopitems[i].typenum)
566 { 574 {
567 if (m->shopitems[i].strength) 575 if (m->shopitems[i].strength)
568 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 576 buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
569 else 577 else
570 buf.printf ("%s;", m->shopitems[i].name); 578 buf.printf ("%s", m->shopitems[i].name);
571 } 579 }
572 else 580 else
573 { 581 {
574 if (m->shopitems[i].strength) 582 if (m->shopitems[i].strength)
575 buf.printf ("*:%d;", m->shopitems[i].strength); 583 buf.printf ("*:%d", m->shopitems[i].strength);
576 else 584 else
577 buf.printf ("*"); 585 buf.printf ("*");
578 } 586 }
579 } 587 }
580 588
… …
630 case KW_shopgreed: thawer.get (shopgreed); break; 638 case KW_shopgreed: thawer.get (shopgreed); break;
631 case KW_shopmin: thawer.get (shopmin); break; 639 case KW_shopmin: thawer.get (shopmin); break;
632 case KW_shopmax: thawer.get (shopmax); break; 640 case KW_shopmax: thawer.get (shopmax); break;
633 case KW_shoprace: thawer.get (shoprace); break; 641 case KW_shoprace: thawer.get (shoprace); break;
634 case KW_outdoor: thawer.get (outdoor); break; 642 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 643
642 case KW_per_player: thawer.get (per_player); break; 644 case KW_per_player: thawer.get (per_player); break;
643 case KW_per_party: thawer.get (per_party); break; 645 case KW_per_party: thawer.get (per_party); break;
644 case KW_no_reset: thawer.get (no_reset); break; 646 case KW_no_reset: thawer.get (no_reset); break;
645 case KW_no_drop: thawer.get (no_drop); break; 647 case KW_no_drop: thawer.get (no_drop); break;
646 648
647 case KW_region: default_region = region::find (thawer.get_str ()); break; 649 case KW_region: default_region = region::find (thawer); break;
648 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 650 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
649 651
650 // old names new names 652 // old names new names
651 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 653 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; 654 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
670 case KW_end: 672 case KW_end:
671 thawer.next (); 673 thawer.next ();
672 return true; 674 return true;
673 675
674 default: 676 default:
675 if (!thawer.parse_error ("map", 0)) 677 if (!thawer.parse_error ("map"))
676 return false; 678 return false;
677 break; 679 break;
678 } 680 }
679 681
680 thawer.next (); 682 thawer.next ();
… …
698 int unique = 0; 700 int unique = 0;
699 for (object *op = spaces [i].bot; op; ) 701 for (object *op = spaces [i].bot; op; )
700 { 702 {
701 object *above = op->above; 703 object *above = op->above;
702 704
703 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 705 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
704 unique = 1; 706 unique = 1;
705 707
706 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 708 if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
707 op->destroy (); 709 op->destroy ();
708 710
709 op = above; 711 op = above;
710 } 712 }
711 } 713 }
… …
714//-GPL 716//-GPL
715 717
716bool 718bool
717maptile::_save_header (object_freezer &freezer) 719maptile::_save_header (object_freezer &freezer)
718{ 720{
719#define MAP_OUT(k) freezer.put (KW_ ## k, k) 721#define MAP_OUT(k) freezer.put (KW(k), k)
720#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 722#define MAP_OUT2(k,v) freezer.put (KW(k), v)
721 723
722 MAP_OUT2 (arch, "map"); 724 MAP_OUT2 (arch, CS(map));
723 725
724 if (name) MAP_OUT (name); 726 if (name) MAP_OUT (name);
725 MAP_OUT (swap_time); 727 MAP_OUT (swap_time);
726 MAP_OUT (reset_time); 728 MAP_OUT (reset_time);
727 MAP_OUT (reset_timeout); 729 MAP_OUT (reset_timeout);
… …
735 MAP_OUT (shopgreed); 737 MAP_OUT (shopgreed);
736 MAP_OUT (shopmin); 738 MAP_OUT (shopmin);
737 MAP_OUT (shopmax); 739 MAP_OUT (shopmax);
738 if (shoprace) MAP_OUT (shoprace); 740 if (shoprace) MAP_OUT (shoprace);
739 741
740 MAP_OUT (darkness);
741 MAP_OUT (width); 742 MAP_OUT (width);
742 MAP_OUT (height); 743 MAP_OUT (height);
743 MAP_OUT (enter_x); 744 MAP_OUT (enter_x);
744 MAP_OUT (enter_y); 745 MAP_OUT (enter_y);
745 746 MAP_OUT (darkness);
746 if (msg) freezer.put (KW_msg , KW_endmsg , msg);
747 if (maplore) freezer.put (KW_maplore, KW_endmaplore, maplore);
748
749 MAP_OUT (outdoor); 747 MAP_OUT (outdoor);
750 MAP_OUT (temp); 748
751 MAP_OUT (pressure); 749 if (msg) freezer.put (KW(msg) , KW(endmsg) , msg);
752 MAP_OUT (humid); 750 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
753 MAP_OUT (windspeed);
754 MAP_OUT (winddir);
755 MAP_OUT (sky);
756 751
757 MAP_OUT (per_player); 752 MAP_OUT (per_player);
758 MAP_OUT (per_party); 753 MAP_OUT (per_party);
759 754
760 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 755 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]); 756 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]); 757 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]); 758 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
764 759
765 freezer.put (this); 760 freezer.put (this);
766 freezer.put (KW_end); 761 freezer.put (KW(end));
767 762
768 return true; 763 return true;
769} 764}
770 765
771bool 766bool
… …
856 851
857 clear (); 852 clear ();
858} 853}
859 854
860/* decay and destroy perishable items in a map */ 855/* decay and destroy perishable items in a map */
856// TODO: should be done regularly, not on map load?
861void 857void
862maptile::do_decay_objects () 858maptile::do_decay_objects ()
863{ 859{
864 if (!spaces) 860 if (!spaces)
865 return; 861 return;
… …
867 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 863 for (mapspace *ms = spaces + size (); ms-- > spaces; )
868 for (object *above, *op = ms->bot; op; op = above) 864 for (object *above, *op = ms->bot; op; op = above)
869 { 865 {
870 above = op->above; 866 above = op->above;
871 867
868 // do not decay anything above unique floor tiles (yet :)
869 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
870 break;
871
872 bool destroy = 0; 872 bool destroy = 0;
873 873
874 // do not decay anything above unique floor tiles (yet :) 874 if (op->flag [FLAG_IS_FLOOR]
875 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 875 || op->flag [FLAG_OBJ_ORIGINAL]
876 break; 876 || op->flag [FLAG_UNIQUE]
877 877 || op->flag [FLAG_OVERLAY_FLOOR]
878 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 878 || 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 ()) 879 || op->is_alive ())
884 ; // do not decay 880 ; // do not decay
885 else if (op->is_weapon ()) 881 else if (op->is_weapon ())
886 { 882 {
887 op->stats.dam--; 883 op->stats.dam--;
… …
912 || mat & M_LIQUID 908 || mat & M_LIQUID
913 || (mat & M_IRON && rndm (1, 5) == 1) 909 || (mat & M_IRON && rndm (1, 5) == 1)
914 || (mat & M_GLASS && rndm (1, 2) == 1) 910 || (mat & M_GLASS && rndm (1, 2) == 1)
915 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) 911 || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1)
916 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) 912 || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1)
917 || (mat & M_ICE && temp > 32)) 913 //|| (mat & M_ICE && temp > 32)
914 )
918 destroy = 1; 915 destroy = 1;
919 } 916 }
920 917
921 /* adjust overall chance below */ 918 /* adjust overall chance below */
922 if (destroy && rndm (0, 1)) 919 if (destroy && rndm (0, 1))
… …
942 sint64 total_exp = 0; 939 sint64 total_exp = 0;
943 940
944 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 941 for (mapspace *ms = spaces + size (); ms-- > spaces; )
945 for (object *op = ms->bot; op; op = op->above) 942 for (object *op = ms->bot; op; op = op->above)
946 { 943 {
947 if (QUERY_FLAG (op, FLAG_MONSTER)) 944 if (op->flag [FLAG_MONSTER])
948 { 945 {
949 total_exp += op->stats.exp; 946 total_exp += op->stats.exp;
950 monster_cnt++; 947 monster_cnt++;
951 } 948 }
952 949
953 if (QUERY_FLAG (op, FLAG_GENERATOR)) 950 if (op->flag [FLAG_GENERATOR])
954 { 951 {
955 total_exp += op->stats.exp; 952 total_exp += op->stats.exp;
956 953
957 if (archetype *at = op->other_arch) 954 if (archetype *at = op->other_arch)
958 { 955 {
… …
1140 */ 1137 */
1141 1138
1142 for (object *tmp = last; tmp; tmp = tmp->below) 1139 for (object *tmp = last; tmp; tmp = tmp->below)
1143 { 1140 {
1144 /* Once we get to a floor, stop, since we already have a floor object */ 1141 /* Once we get to a floor, stop, since we already have a floor object */
1145 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1142 if (tmp->flag [FLAG_IS_FLOOR])
1146 break; 1143 break;
1147 1144
1148 /* If two top faces are already set, quit processing */ 1145 /* If two top faces are already set, quit processing */
1149 if (top && middle) 1146 if (top && middle)
1150 break; 1147 break;
… …
1433 * 1430 *
1434 * currently, the only flag supported (0x1) is don't translate for 1431 * currently, the only flag supported (0x1) is don't translate for
1435 * closest body part of 'op1' 1432 * closest body part of 'op1'
1436 */ 1433 */
1437void 1434void
1438get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1435get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1439{ 1436{
1440 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1437 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1441 { 1438 {
1442 /* be conservative and fill in _some_ data */ 1439 /* be conservative and fill in _some_ data */
1443 retval->distance = 10000; 1440 retval->distance = 10000;
1444 retval->distance_x = 10000; 1441 retval->distance_x = 10000;
1445 retval->distance_y = 10000; 1442 retval->distance_y = 10000;
1446 retval->direction = 0; 1443 retval->direction = 0;
1447 retval->part = 0; 1444 retval->part = 0;
1448 } 1445 }
1449 else 1446 else
1450 { 1447 {
1451 object *best;
1452
1453 retval->distance_x += op2->x - op1->x; 1448 retval->distance_x += op2->x - op1->x;
1454 retval->distance_y += op2->y - op1->y; 1449 retval->distance_y += op2->y - op1->y;
1455 1450
1456 best = op1; 1451 object *best = op1;
1452
1457 /* If this is multipart, find the closest part now */ 1453 /* If this is multipart, find the closest part now */
1458 if (!(flags & 0x1) && op1->more) 1454 if (!(flags & 1) && op1->more)
1459 { 1455 {
1460 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1456 int best_distance = idistance (retval->distance_x, retval->distance_y);
1461 1457
1462 /* we just take the offset of the piece to head to figure 1458 /* we just take the offset of the piece to head to figure
1463 * distance instead of doing all that work above again 1459 * distance instead of doing all that work above again
1464 * since the distance fields we set above are positive in the 1460 * since the distance fields we set above are positive in the
1465 * same axis as is used for multipart objects, the simply arithmetic 1461 * same axis as is used for multipart objects, the simply arithmetic
1466 * below works. 1462 * below works.
1467 */ 1463 */
1468 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1464 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1469 { 1465 {
1470 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1466 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); 1467
1472 if (tmpi < best_distance) 1468 if (tmpi < best_distance)
1473 { 1469 {
1474 best_distance = tmpi; 1470 best_distance = tmpi;
1475 best = tmp; 1471 best = tmp;
1476 } 1472 }
1477 } 1473 }
1478 1474
1479 if (best != op1) 1475 if (best != op1)
1480 { 1476 {
1481 retval->distance_x += op1->x - best->x; 1477 retval->distance_x += op1->x - best->x;
1482 retval->distance_y += op1->y - best->y; 1478 retval->distance_y += op1->y - best->y;
1483 } 1479 }
1484 } 1480 }
1485 1481
1486 retval->part = best; 1482 retval->part = best;
1487 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1483 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1488 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1484 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1489 } 1485 }
1490} 1486}
1491 1487
1492/* this is basically the same as get_rangevector above, but instead of 1488/* this is basically the same as get_rangevector above, but instead of
1493 * the first parameter being an object, it instead is the map 1489 * the first parameter being an object, it instead is the map
… …
1503get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1499get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1504{ 1500{
1505 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1501 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1506 { 1502 {
1507 /* be conservative and fill in _some_ data */ 1503 /* be conservative and fill in _some_ data */
1508 retval->distance = 100000; 1504 retval->distance = 100000;
1509 retval->distance_x = 32767; 1505 retval->distance_x = 32767;
1510 retval->distance_y = 32767; 1506 retval->distance_y = 32767;
1511 retval->direction = 0; 1507 retval->direction = 0;
1512 retval->part = 0; 1508 retval->part = 0;
1513 } 1509 }
1514 else 1510 else
1515 { 1511 {
1516 retval->distance_x += op2->x - x; 1512 retval->distance_x += op2->x - x;
1517 retval->distance_y += op2->y - y; 1513 retval->distance_y += op2->y - y;
1518 1514
1519 retval->part = 0; 1515 retval->part = 0;
1520 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1516 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1521 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1517 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1522 } 1518 }
1523} 1519}
1524 1520
1525/* Returns true of op1 and op2 are effectively on the same map 1521/* 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 1522 * (as related to map tiling). Note that this looks for a path from
… …
1576 */ 1572 */
1577 for (int i = 1000; --i;) 1573 for (int i = 1000; --i;)
1578 { 1574 {
1579 object *pick = at (gen (width), gen (height)).bot; 1575 object *pick = at (gen (width), gen (height)).bot;
1580 1576
1581 // do not prefer big monsters just because they are big. 1577 // must be head: do not prefer big monsters just because they are big.
1582 if (pick && pick->is_head ()) 1578 if (pick && pick->is_head ())
1583 return pick->head_ (); 1579 return pick;
1584 } 1580 }
1585 1581
1586 // instead of crashing in the unlikely(?) case, try to return *something* 1582 // instead of crashing in the unlikely(?) case, try to return *something*
1587 return archetype::find (shstr_bug); 1583 return archetype::find (shstr_bug);
1588} 1584}
… …
1621 1617
1622 if (distance <= MAX_SOUND_DISTANCE) 1618 if (distance <= MAX_SOUND_DISTANCE)
1623 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg); 1619 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1624 } 1620 }
1625} 1621}
1622
1623dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1626 1624
1627static void 1625static void
1628split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy) 1626split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1629{ 1627{
1630 // clip to map to the left 1628 // clip to map to the left
… …
1686 r->dx = dx; 1684 r->dx = dx;
1687 r->dy = dy; 1685 r->dy = dy;
1688} 1686}
1689 1687
1690maprect * 1688maprect *
1691maptile::split_to_tiles (int x0, int y0, int x1, int y1) 1689maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1692{ 1690{
1693 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1694 buf.clear (); 1691 buf.clear ();
1695 1692
1696 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0); 1693 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1697 1694
1698 // add end marker 1695 // add end marker

Diff Legend

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