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

Diff Legend

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