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.178 by root, Sun Nov 29 09:41:27 2009 UTC vs.
Revision 1.202 by root, Fri Apr 22 06:10:32 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 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
… …
424 return false; 424 return false;
425 425
426 return freezer.save (path); 426 return freezer.save (path);
427} 427}
428 428
429maptile::maptile () 429void
430maptile::init ()
430{ 431{
431 in_memory = MAP_SWAPPED; 432 in_memory = MAP_SWAPPED;
432 433
433 /* 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
434 * map archetype. Mimic that behaviour. 435 * map archetype. Mimic that behaviour.
435 */ 436 */
436 width = 16; 437 width = 16;
437 height = 16; 438 height = 16;
438 timeout = 300; 439 timeout = 300;
439 max_items = MAX_ITEM_PER_ACTION; 440 max_items = MAX_ITEM_PER_ACTION;
440 max_volume = 2000000; // 2m³ 441 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; 442 reset_timeout = 0;
450 timeout = 300;
451 enter_x = 0; 443 enter_x = 0;
452 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;
453 458
454 alloc (); 459 alloc ();
455} 460}
456 461
457/* 462/*
… …
557 * the map (or something equivilent) into output_string. */ 562 * the map (or something equivilent) into output_string. */
558static const char * 563static const char *
559print_shop_string (maptile *m) 564print_shop_string (maptile *m)
560{ 565{
561 static dynbuf_text buf; buf.clear (); 566 static dynbuf_text buf; buf.clear ();
567 bool first = true;
562 568
563 for (int i = 0; i < m->shopitems[0].index; i++) 569 for (int i = 0; i < m->shopitems[0].index; i++)
564 { 570 {
571 if (!first)
572 buf << ';';
573
574 first = false;
575
565 if (m->shopitems[i].typenum) 576 if (m->shopitems[i].typenum)
566 { 577 {
567 if (m->shopitems[i].strength) 578 if (m->shopitems[i].strength)
568 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);
569 else 580 else
570 buf.printf ("%s;", m->shopitems[i].name); 581 buf.printf ("%s", m->shopitems[i].name);
571 } 582 }
572 else 583 else
573 { 584 {
574 if (m->shopitems[i].strength) 585 if (m->shopitems[i].strength)
575 buf.printf ("*:%d;", m->shopitems[i].strength); 586 buf.printf ("*:%d", m->shopitems[i].strength);
576 else 587 else
577 buf.printf ("*"); 588 buf.printf ("*");
578 } 589 }
579 } 590 }
580 591
… …
603 { 614 {
604 case KW_msg: 615 case KW_msg:
605 thawer.get_ml (KW_endmsg, msg); 616 thawer.get_ml (KW_endmsg, msg);
606 break; 617 break;
607 618
608 case KW_lore: // CF+ extension 619 case KW_lore: // deliantra extension
609 thawer.get_ml (KW_endlore, maplore); 620 thawer.get_ml (KW_endlore, maplore);
610 break; 621 break;
611 622
612 case KW_maplore: 623 case KW_maplore:
613 thawer.get_ml (KW_endmaplore, maplore); 624 thawer.get_ml (KW_endmaplore, maplore);
… …
636 case KW_per_player: thawer.get (per_player); break; 647 case KW_per_player: thawer.get (per_player); break;
637 case KW_per_party: thawer.get (per_party); break; 648 case KW_per_party: thawer.get (per_party); break;
638 case KW_no_reset: thawer.get (no_reset); break; 649 case KW_no_reset: thawer.get (no_reset); break;
639 case KW_no_drop: thawer.get (no_drop); break; 650 case KW_no_drop: thawer.get (no_drop); break;
640 651
641 case KW_region: default_region = region::find (thawer.get_str ()); break; 652 case KW_region: thawer.get (default_region); break;
642 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 653 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
643 654
644 // old names new names 655 // old names new names
645 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;
646 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;
… …
654 665
655 case KW_tile_path_1: thawer.get (tile_path [0]); break; 666 case KW_tile_path_1: thawer.get (tile_path [0]); break;
656 case KW_tile_path_2: thawer.get (tile_path [1]); break; 667 case KW_tile_path_2: thawer.get (tile_path [1]); break;
657 case KW_tile_path_3: thawer.get (tile_path [2]); break; 668 case KW_tile_path_3: thawer.get (tile_path [2]); break;
658 case KW_tile_path_4: thawer.get (tile_path [3]); break; 669 case KW_tile_path_4: thawer.get (tile_path [3]); break;
670 case KW_tile_path_5: thawer.get (tile_path [4]); break;
671 case KW_tile_path_6: thawer.get (tile_path [5]); break;
659 672
660 case KW_ERROR: 673 case KW_ERROR:
661 set_key_text (thawer.kw_str, thawer.value); 674 set_key_text (thawer.kw_str, thawer.value);
662 break; 675 break;
663 676
664 case KW_end: 677 case KW_end:
665 thawer.next (); 678 thawer.next ();
666 return true; 679 return true;
667 680
668 default: 681 default:
669 if (!thawer.parse_error ("map", 0)) 682 if (!thawer.parse_error ("map"))
670 return false; 683 return false;
671 break; 684 break;
672 } 685 }
673 686
674 thawer.next (); 687 thawer.next ();
… …
692 int unique = 0; 705 int unique = 0;
693 for (object *op = spaces [i].bot; op; ) 706 for (object *op = spaces [i].bot; op; )
694 { 707 {
695 object *above = op->above; 708 object *above = op->above;
696 709
697 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 710 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
698 unique = 1; 711 unique = 1;
699 712
700 if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) 713 if (op->head_ () == op && (op->flag [FLAG_UNIQUE] || unique))
701 op->destroy (); 714 op->destroy ();
702 715
703 op = above; 716 op = above;
704 } 717 }
705 } 718 }
… …
746 759
747 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 760 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
748 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 761 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
749 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 762 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
750 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 763 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
764 if (tile_path [4]) MAP_OUT2 (tile_path_5, tile_path [4]);
765 if (tile_path [5]) MAP_OUT2 (tile_path_6, tile_path [5]);
751 766
752 freezer.put (this); 767 freezer.put (this);
753 freezer.put (KW(end)); 768 freezer.put (KW(end));
754 769
755 return true; 770 return true;
… …
812 msg = 0; 827 msg = 0;
813 maplore = 0; 828 maplore = 0;
814 shoprace = 0; 829 shoprace = 0;
815 delete [] shopitems, shopitems = 0; 830 delete [] shopitems, shopitems = 0;
816 831
817 for (int i = 0; i < 4; i++) 832 for (int i = 0; i < TILE_NUM; i++)
818 tile_path [i] = 0; 833 tile_path [i] = 0;
819} 834}
820 835
821maptile::~maptile () 836maptile::~maptile ()
822{ 837{
… …
855 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 870 for (mapspace *ms = spaces + size (); ms-- > spaces; )
856 for (object *above, *op = ms->bot; op; op = above) 871 for (object *above, *op = ms->bot; op; op = above)
857 { 872 {
858 above = op->above; 873 above = op->above;
859 874
875 // do not decay anything above unique floor tiles (yet :)
876 if (op->flag [FLAG_IS_FLOOR] && op->flag [FLAG_UNIQUE])
877 break;
878
860 bool destroy = 0; 879 bool destroy = 0;
861 880
862 // do not decay anything above unique floor tiles (yet :) 881 if (op->flag [FLAG_IS_FLOOR]
863 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 882 || op->flag [FLAG_OBJ_ORIGINAL]
864 break; 883 || op->flag [FLAG_UNIQUE]
865 884 || op->flag [FLAG_OVERLAY_FLOOR]
866 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 885 || op->flag [FLAG_UNPAID]
867 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
868 || QUERY_FLAG (op, FLAG_UNIQUE)
869 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
870 || QUERY_FLAG (op, FLAG_UNPAID)
871 || op->is_alive ()) 886 || op->is_alive ())
872 ; // do not decay 887 ; // do not decay
873 else if (op->is_weapon ()) 888 else if (op->is_weapon ())
874 { 889 {
875 op->stats.dam--; 890 op->stats.dam--;
… …
931 sint64 total_exp = 0; 946 sint64 total_exp = 0;
932 947
933 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 948 for (mapspace *ms = spaces + size (); ms-- > spaces; )
934 for (object *op = ms->bot; op; op = op->above) 949 for (object *op = ms->bot; op; op = op->above)
935 { 950 {
936 if (QUERY_FLAG (op, FLAG_MONSTER)) 951 if (op->flag [FLAG_MONSTER])
937 { 952 {
938 total_exp += op->stats.exp; 953 total_exp += op->stats.exp;
939 monster_cnt++; 954 monster_cnt++;
940 } 955 }
941 956
942 if (QUERY_FLAG (op, FLAG_GENERATOR)) 957 if (op->flag [FLAG_GENERATOR])
943 { 958 {
944 total_exp += op->stats.exp; 959 total_exp += op->stats.exp;
945 960
946 if (archetype *at = op->other_arch) 961 if (archetype *at = op->other_arch)
947 { 962 {
… …
1129 */ 1144 */
1130 1145
1131 for (object *tmp = last; tmp; tmp = tmp->below) 1146 for (object *tmp = last; tmp; tmp = tmp->below)
1132 { 1147 {
1133 /* Once we get to a floor, stop, since we already have a floor object */ 1148 /* Once we get to a floor, stop, since we already have a floor object */
1134 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 1149 if (tmp->flag [FLAG_IS_FLOOR])
1135 break; 1150 break;
1136 1151
1137 /* If two top faces are already set, quit processing */ 1152 /* If two top faces are already set, quit processing */
1138 if (top && middle) 1153 if (top && middle)
1139 break; 1154 break;
… …
1182maptile * 1197maptile *
1183maptile::tile_available (int dir, bool load) 1198maptile::tile_available (int dir, bool load)
1184{ 1199{
1185 if (tile_path[dir]) 1200 if (tile_path[dir])
1186 { 1201 {
1202 // map is there and we don't need to load it OR it's loaded => return what we have
1187 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1203 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE))
1188 return tile_map[dir]; 1204 return tile_map[dir];
1189 1205
1206 // well, try to locate it then, if possible - maybe it's there already
1190 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1207 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1191 return tile_map[dir]; 1208 return tile_map[dir];
1192 } 1209 }
1193 1210
1194 return 0; 1211 return 0;
… …
1306/** 1323/**
1307 * Return whether map2 is adjacent to map1. If so, store the distance from 1324 * Return whether map2 is adjacent to map1. If so, store the distance from
1308 * map1 to map2 in dx/dy. 1325 * map1 to map2 in dx/dy.
1309 */ 1326 */
1310int 1327int
1311adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1328adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy)
1312{ 1329{
1313 if (!map1 || !map2) 1330 if (!map1 || !map2)
1314 return 0; 1331 return 0;
1315 1332
1316 //TODO: this doesn't actually check correctly when intermediate maps are not loaded 1333 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
… …
1318 if (map1 == map2) 1335 if (map1 == map2)
1319 { 1336 {
1320 *dx = 0; 1337 *dx = 0;
1321 *dy = 0; 1338 *dy = 0;
1322 } 1339 }
1323 else if (map1->tile_map[0] == map2) 1340 else if (map1->tile_available (TILE_NORTH, false) == map2)
1324 { /* up */ 1341 {
1325 *dx = 0; 1342 *dx = 0;
1326 *dy = -map2->height; 1343 *dy = -map2->height;
1327 } 1344 }
1328 else if (map1->tile_map[1] == map2) 1345 else if (map1->tile_available (TILE_EAST , false) == map2)
1329 { /* right */ 1346 {
1330 *dx = map1->width; 1347 *dx = map1->width;
1331 *dy = 0; 1348 *dy = 0;
1332 } 1349 }
1333 else if (map1->tile_map[2] == map2) 1350 else if (map1->tile_available (TILE_SOUTH, false) == map2)
1334 { /* down */ 1351 {
1335 *dx = 0; 1352 *dx = 0;
1336 *dy = map1->height; 1353 *dy = map1->height;
1337 } 1354 }
1338 else if (map1->tile_map[3] == map2) 1355 else if (map1->tile_available (TILE_WEST , false) == map2)
1339 { /* left */ 1356 {
1340 *dx = -map2->width; 1357 *dx = -map2->width;
1341 *dy = 0; 1358 *dy = 0;
1342 } 1359 }
1343 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1360 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1344 { /* up right */ 1361 { /* up right */
1345 *dx = map1->tile_map[0]->width; 1362 *dx = +map1->tile_map[TILE_NORTH]->width;
1346 *dy = -map1->tile_map[0]->height; 1363 *dy = -map1->tile_map[TILE_NORTH]->height;
1347 } 1364 }
1348 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 1365 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1349 { /* up left */ 1366 { /* up left */
1350 *dx = -map2->width; 1367 *dx = -map2->width;
1351 *dy = -map1->tile_map[0]->height; 1368 *dy = -map1->tile_map[TILE_NORTH]->height;
1352 } 1369 }
1353 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 1370 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1354 { /* right up */ 1371 { /* right up */
1355 *dx = map1->width; 1372 *dx = +map1->width;
1356 *dy = -map2->height; 1373 *dy = -map2->height;
1357 } 1374 }
1358 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 1375 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1359 { /* right down */ 1376 { /* right down */
1360 *dx = map1->width; 1377 *dx = +map1->width;
1361 *dy = map1->tile_map[1]->height; 1378 *dy = +map1->tile_map[TILE_EAST]->height;
1362 } 1379 }
1363 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 1380 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1364 { /* down right */ 1381 { /* down right */
1365 *dx = map1->tile_map[2]->width; 1382 *dx = +map1->tile_map[TILE_SOUTH]->width;
1366 *dy = map1->height; 1383 *dy = +map1->height;
1367 } 1384 }
1368 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 1385 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1369 { /* down left */ 1386 { /* down left */
1370 *dx = -map2->width; 1387 *dx = -map2->width;
1371 *dy = map1->height; 1388 *dy = +map1->height;
1372 } 1389 }
1373 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 1390 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1374 { /* left up */ 1391 { /* left up */
1375 *dx = -map1->tile_map[3]->width; 1392 *dx = -map1->tile_map[TILE_WEST]->width;
1376 *dy = -map2->height; 1393 *dy = -map2->height;
1377 } 1394 }
1378 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1395 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1379 { /* left down */ 1396 { /* left down */
1380 *dx = -map1->tile_map[3]->width; 1397 *dx = -map1->tile_map[TILE_WEST]->width;
1381 *dy = map1->tile_map[3]->height; 1398 *dy = +map1->tile_map[TILE_WEST]->height;
1382 } 1399 }
1383 else 1400 else
1384 return 0; 1401 return 0;
1385 1402
1386 return 1; 1403 return 1;
… …
1422 * 1439 *
1423 * currently, the only flag supported (0x1) is don't translate for 1440 * currently, the only flag supported (0x1) is don't translate for
1424 * closest body part of 'op1' 1441 * closest body part of 'op1'
1425 */ 1442 */
1426void 1443void
1427get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1444get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1428{ 1445{
1429 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1446 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1430 { 1447 {
1431 /* be conservative and fill in _some_ data */ 1448 /* be conservative and fill in _some_ data */
1432 retval->distance = 10000; 1449 retval->distance = 10000;
1433 retval->distance_x = 10000; 1450 retval->distance_x = 10000;
1434 retval->distance_y = 10000; 1451 retval->distance_y = 10000;
1435 retval->direction = 0; 1452 retval->direction = 0;
1436 retval->part = 0; 1453 retval->part = 0;
1437 } 1454 }
1438 else 1455 else
1439 { 1456 {
1440 object *best;
1441
1442 retval->distance_x += op2->x - op1->x; 1457 retval->distance_x += op2->x - op1->x;
1443 retval->distance_y += op2->y - op1->y; 1458 retval->distance_y += op2->y - op1->y;
1444 1459
1445 best = op1; 1460 object *best = op1;
1461
1446 /* If this is multipart, find the closest part now */ 1462 /* If this is multipart, find the closest part now */
1447 if (!(flags & 0x1) && op1->more) 1463 if (!(flags & 1) && op1->more)
1448 { 1464 {
1449 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1465 int best_distance = idistance (retval->distance_x, retval->distance_y);
1450 1466
1451 /* we just take the offset of the piece to head to figure 1467 /* we just take the offset of the piece to head to figure
1452 * distance instead of doing all that work above again 1468 * distance instead of doing all that work above again
1453 * since the distance fields we set above are positive in the 1469 * since the distance fields we set above are positive in the
1454 * same axis as is used for multipart objects, the simply arithmetic 1470 * same axis as is used for multipart objects, the simply arithmetic
1455 * below works. 1471 * below works.
1456 */ 1472 */
1457 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1473 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1458 { 1474 {
1459 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1475 int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1460 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1476
1461 if (tmpi < best_distance) 1477 if (tmpi < best_distance)
1462 { 1478 {
1463 best_distance = tmpi; 1479 best_distance = tmpi;
1464 best = tmp; 1480 best = tmp;
1465 } 1481 }
1466 } 1482 }
1467 1483
1468 if (best != op1) 1484 if (best != op1)
1469 { 1485 {
1470 retval->distance_x += op1->x - best->x; 1486 retval->distance_x += op1->x - best->x;
1471 retval->distance_y += op1->y - best->y; 1487 retval->distance_y += op1->y - best->y;
1472 } 1488 }
1473 } 1489 }
1474 1490
1475 retval->part = best; 1491 retval->part = best;
1476 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1492 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1477 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1493 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1478 } 1494 }
1479} 1495}
1480 1496
1481/* this is basically the same as get_rangevector above, but instead of 1497/* this is basically the same as get_rangevector above, but instead of
1482 * the first parameter being an object, it instead is the map 1498 * the first parameter being an object, it instead is the map
… …
1487 * be more consistant with the above function and also in case they are needed 1503 * be more consistant with the above function and also in case they are needed
1488 * for something in the future. Also, since no object is pasted, the best 1504 * for something in the future. Also, since no object is pasted, the best
1489 * field of the rv_vector is set to NULL. 1505 * field of the rv_vector is set to NULL.
1490 */ 1506 */
1491void 1507void
1492get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1508get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1493{ 1509{
1494 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1510 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1495 { 1511 {
1496 /* be conservative and fill in _some_ data */ 1512 /* be conservative and fill in _some_ data */
1497 retval->distance = 100000; 1513 retval->distance = 100000;
1498 retval->distance_x = 32767; 1514 retval->distance_x = 32767;
1499 retval->distance_y = 32767; 1515 retval->distance_y = 32767;
1500 retval->direction = 0; 1516 retval->direction = 0;
1501 retval->part = 0; 1517 retval->part = 0;
1502 } 1518 }
1503 else 1519 else
1504 { 1520 {
1505 retval->distance_x += op2->x - x; 1521 retval->distance_x += op2->x - x;
1506 retval->distance_y += op2->y - y; 1522 retval->distance_y += op2->y - y;
1507 1523
1508 retval->part = 0; 1524 retval->part = 0;
1509 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1525 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1510 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1526 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1511 } 1527 }
1512} 1528}
1513 1529
1514/* Returns true of op1 and op2 are effectively on the same map 1530/* Returns true of op1 and op2 are effectively on the same map
1515 * (as related to map tiling). Note that this looks for a path from 1531 * (as related to map tiling). Note that this looks for a path from
… …
1565 */ 1581 */
1566 for (int i = 1000; --i;) 1582 for (int i = 1000; --i;)
1567 { 1583 {
1568 object *pick = at (gen (width), gen (height)).bot; 1584 object *pick = at (gen (width), gen (height)).bot;
1569 1585
1570 // do not prefer big monsters just because they are big. 1586 // must be head: do not prefer big monsters just because they are big.
1571 if (pick && pick->is_head ()) 1587 if (pick && pick->is_head ())
1572 return pick->head_ (); 1588 return pick;
1573 } 1589 }
1574 1590
1575 // instead of crashing in the unlikely(?) case, try to return *something* 1591 // instead of crashing in the unlikely(?) case, try to return *something*
1576 return archetype::find (shstr_bug); 1592 return archetype::find (shstr_bug);
1577} 1593}
… …
1611 if (distance <= MAX_SOUND_DISTANCE) 1627 if (distance <= MAX_SOUND_DISTANCE)
1612 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg); 1628 ns->send_msg (NDI_GREY | NDI_DEF, SAY_CHANNEL, msg);
1613 } 1629 }
1614} 1630}
1615 1631
1632dynbuf mapwalk_buf (sizeof (maprect) * 25, sizeof (maprect) * 25);
1633
1616static void 1634static void
1617split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy) 1635split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1618{ 1636{
1619 // clip to map to the left 1637 // clip to map to the left
1620 if (x0 < 0) 1638 if (x0 < 0)
1621 { 1639 {
1622 if (maptile *tile = m->tile_available (TILE_LEFT, 1)) 1640 if (maptile *tile = m->tile_available (TILE_WEST, 1))
1623 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy); 1641 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1624 1642
1625 if (x1 < 0) // entirely to the left 1643 if (x1 < 0) // entirely to the left
1626 return; 1644 return;
1627 1645
… …
1629 } 1647 }
1630 1648
1631 // clip to map to the right 1649 // clip to map to the right
1632 if (x1 > m->width) 1650 if (x1 > m->width)
1633 { 1651 {
1634 if (maptile *tile = m->tile_available (TILE_RIGHT, 1)) 1652 if (maptile *tile = m->tile_available (TILE_EAST, 1))
1635 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy); 1653 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1636 1654
1637 if (x0 > m->width) // entirely to the right 1655 if (x0 > m->width) // entirely to the right
1638 return; 1656 return;
1639 1657
… …
1641 } 1659 }
1642 1660
1643 // clip to map above 1661 // clip to map above
1644 if (y0 < 0) 1662 if (y0 < 0)
1645 { 1663 {
1646 if (maptile *tile = m->tile_available (TILE_UP, 1)) 1664 if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1647 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height); 1665 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1648 1666
1649 if (y1 < 0) // entirely above 1667 if (y1 < 0) // entirely above
1650 return; 1668 return;
1651 1669
… …
1653 } 1671 }
1654 1672
1655 // clip to map below 1673 // clip to map below
1656 if (y1 > m->height) 1674 if (y1 > m->height)
1657 { 1675 {
1658 if (maptile *tile = m->tile_available (TILE_DOWN, 1)) 1676 if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1659 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height); 1677 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1660 1678
1661 if (y0 > m->height) // entirely below 1679 if (y0 > m->height) // entirely below
1662 return; 1680 return;
1663 1681
… …
1675 r->dx = dx; 1693 r->dx = dx;
1676 r->dy = dy; 1694 r->dy = dy;
1677} 1695}
1678 1696
1679maprect * 1697maprect *
1680maptile::split_to_tiles (int x0, int y0, int x1, int y1) 1698maptile::split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1)
1681{ 1699{
1682 static dynbuf buf (sizeof (maprect) * 8, sizeof (maprect) * 8);
1683 buf.clear (); 1700 buf.clear ();
1684 1701
1685 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0); 1702 ::split_to_tiles (buf, this, x0, y0, x1, y1, 0, 0);
1686 1703
1687 // add end marker 1704 // add end marker

Diff Legend

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