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.188 by root, Fri Apr 16 02:32:25 2010 UTC vs.
Revision 1.211 by root, Sat May 7 14:13:48 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,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 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
… …
77 /* 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
78 * have already checked this. 78 * have already checked this.
79 */ 79 */
80 if (OUT_OF_REAL_MAP (m, sx, sy)) 80 if (OUT_OF_REAL_MAP (m, sx, sy))
81 { 81 {
82 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");
83 return 1; 83 return 1;
84 } 84 }
85 85
86 mapspace &ms = m->at (sx, sy); 86 mapspace &ms = m->at (sx, sy);
87 87
… …
90 90
91 /* If space is currently not blocked by anything, no need to 91 /* If space is currently not blocked by anything, no need to
92 * go further. Not true for players - all sorts of special 92 * go further. Not true for players - all sorts of special
93 * things we need to do for players. 93 * things we need to do for players.
94 */ 94 */
95 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0)) 95 if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && blocked == 0)
96 return 0; 96 return 0;
97 97
98 /* 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
99 * 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
100 * 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
… …
110 /* 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
111 * 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
112 * true. If we get through the entire stack, that must mean 112 * true. If we get through the entire stack, that must mean
113 * ob is blocking it, so return 0. 113 * ob is blocking it, so return 0.
114 */ 114 */
115 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 115 for (object *tmp = ms.top; tmp; tmp = tmp->below)
116 { 116 {
117 if (OB_MOVE_BLOCK (ob, tmp)) 117 if (OB_MOVE_BLOCK (ob, tmp))
118 { 118 {
119 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob)) 119 if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
120 if (RESULT_INT (0)) 120 if (RESULT_INT (0))
… …
144 return 1; // unconditional block 144 return 1; // unconditional block
145 145
146 } else { 146 } else {
147 // space does not block the ob, directly, but 147 // space does not block the ob, directly, but
148 // anything alive that is not a door still 148 // anything alive that is not a door still
149 // blocks anything but wizards. 149 // blocks anything
150 150
151 if (tmp->flag [FLAG_ALIVE] 151 if (tmp->flag [FLAG_ALIVE]
152 && tmp->head_ () != ob
153 && tmp != ob
154 && tmp->type != DOOR) 152 && tmp->type != DOOR
153 && tmp->head_ () != ob) //TODO: maybe move these check up?
155 return 1; 154 return 1;
156 } 155 }
157 } 156 }
158 157
159 return 0; 158 return 0;
160} 159}
161 160
162/* 161/*
163 * 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
164 * 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,
165 * just calling get_map_blocked and checking that against movement type 164 * just calling get_map_blocked and checking that against movement type
166 * 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
167 * object and makes sure they can be inserted. 166 * object and makes sure they can be inserted.
168 * 167 *
… …
312 case KW_arch: 311 case KW_arch:
313 if (object *op = object::read (f, this)) 312 if (object *op = object::read (f, this))
314 { 313 {
315 // TODO: why? 314 // TODO: why?
316 if (op->inv) 315 if (op->inv)
316 {
317 op->carrying = 0;
317 op->update_weight (); 318 op->update_weight ();
319 }
318 320
319 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))
320 { 322 {
321 // we insert manually because 323 // we insert manually because
322 // a) its way faster 324 // a) its way faster
… …
359} 361}
360 362
361void 363void
362maptile::activate () 364maptile::activate ()
363{ 365{
364 if (spaces) 366 if (state != MAP_INACTIVE)
367 return;
368
365 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 369 for (mapspace *ms = spaces + size (); ms-- > spaces; )
366 for (object *op = ms->bot; op; op = op->above) 370 for (object *op = ms->bot; op; op = op->above)
367 op->activate_recursive (); 371 op->activate_recursive ();
372
373 state = MAP_ACTIVE;
374
375 activate_physics ();
368} 376}
369 377
370void 378void
371maptile::deactivate () 379maptile::deactivate ()
372{ 380{
373 if (spaces) 381 if (state != MAP_ACTIVE)
382 return;
383
374 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 384 for (mapspace *ms = spaces + size (); ms-- > spaces; )
375 for (object *op = ms->bot; op; op = op->above) 385 for (object *op = ms->bot; op; op = op->above)
376 op->deactivate_recursive (); 386 op->deactivate_recursive ();
387
388 state = MAP_INACTIVE;
377} 389}
378 390
379bool 391bool
380maptile::_save_objects (object_freezer &f, int flags) 392maptile::_save_objects (object_freezer &f, int flags)
381{ 393{
… …
425} 437}
426 438
427void 439void
428maptile::init () 440maptile::init ()
429{ 441{
430 in_memory = MAP_SWAPPED; 442 state = MAP_SWAPPED;
431 443
432 /* The maps used to pick up default x and y values from the 444 /* The maps used to pick up default x and y values from the
433 * map archetype. Mimic that behaviour. 445 * map archetype. Mimic that behaviour.
434 */ 446 */
435 width = 16; 447 width = 16;
… …
560 * the map (or something equivilent) into output_string. */ 572 * the map (or something equivilent) into output_string. */
561static const char * 573static const char *
562print_shop_string (maptile *m) 574print_shop_string (maptile *m)
563{ 575{
564 static dynbuf_text buf; buf.clear (); 576 static dynbuf_text buf; buf.clear ();
577 bool first = true;
565 578
566 for (int i = 0; i < m->shopitems[0].index; i++) 579 for (int i = 0; i < m->shopitems[0].index; i++)
567 { 580 {
581 if (!first)
582 buf << ';';
583
584 first = false;
585
568 if (m->shopitems[i].typenum) 586 if (m->shopitems[i].typenum)
569 { 587 {
570 if (m->shopitems[i].strength) 588 if (m->shopitems[i].strength)
571 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 589 buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
572 else 590 else
573 buf.printf ("%s;", m->shopitems[i].name); 591 buf.printf ("%s", m->shopitems[i].name);
574 } 592 }
575 else 593 else
576 { 594 {
577 if (m->shopitems[i].strength) 595 if (m->shopitems[i].strength)
578 buf.printf ("*:%d;", m->shopitems[i].strength); 596 buf.printf ("*:%d", m->shopitems[i].strength);
579 else 597 else
580 buf.printf ("*"); 598 buf.printf ("*");
581 } 599 }
582 } 600 }
583 601
… …
606 { 624 {
607 case KW_msg: 625 case KW_msg:
608 thawer.get_ml (KW_endmsg, msg); 626 thawer.get_ml (KW_endmsg, msg);
609 break; 627 break;
610 628
611 case KW_lore: // CF+ extension 629 case KW_lore: // deliantra extension
612 thawer.get_ml (KW_endlore, maplore); 630 thawer.get_ml (KW_endlore, maplore);
613 break; 631 break;
614 632
615 case KW_maplore: 633 case KW_maplore:
616 thawer.get_ml (KW_endmaplore, maplore); 634 thawer.get_ml (KW_endmaplore, maplore);
… …
639 case KW_per_player: thawer.get (per_player); break; 657 case KW_per_player: thawer.get (per_player); break;
640 case KW_per_party: thawer.get (per_party); break; 658 case KW_per_party: thawer.get (per_party); break;
641 case KW_no_reset: thawer.get (no_reset); break; 659 case KW_no_reset: thawer.get (no_reset); break;
642 case KW_no_drop: thawer.get (no_drop); break; 660 case KW_no_drop: thawer.get (no_drop); break;
643 661
644 case KW_region: default_region = region::find (thawer.get_str ()); break; 662 case KW_region: thawer.get (default_region); break;
645 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 663 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
646 664
647 // old names new names 665 // old names new names
648 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 666 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
649 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 667 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
657 675
658 case KW_tile_path_1: thawer.get (tile_path [0]); break; 676 case KW_tile_path_1: thawer.get (tile_path [0]); break;
659 case KW_tile_path_2: thawer.get (tile_path [1]); break; 677 case KW_tile_path_2: thawer.get (tile_path [1]); break;
660 case KW_tile_path_3: thawer.get (tile_path [2]); break; 678 case KW_tile_path_3: thawer.get (tile_path [2]); break;
661 case KW_tile_path_4: thawer.get (tile_path [3]); break; 679 case KW_tile_path_4: thawer.get (tile_path [3]); break;
680 case KW_tile_path_5: thawer.get (tile_path [4]); break;
681 case KW_tile_path_6: thawer.get (tile_path [5]); break;
662 682
663 case KW_ERROR: 683 case KW_ERROR:
664 set_key_text (thawer.kw_str, thawer.value); 684 set_key_text (thawer.kw_str, thawer.value);
665 break; 685 break;
666 686
… …
749 769
750 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 770 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
751 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 771 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
752 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 772 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
753 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 773 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
774 if (tile_path [4]) MAP_OUT2 (tile_path_5, tile_path [4]);
775 if (tile_path [5]) MAP_OUT2 (tile_path_6, tile_path [5]);
754 776
755 freezer.put (this); 777 freezer.put (this);
756 freezer.put (KW(end)); 778 freezer.put (KW(end));
757 779
758 return true; 780 return true;
… …
815 msg = 0; 837 msg = 0;
816 maplore = 0; 838 maplore = 0;
817 shoprace = 0; 839 shoprace = 0;
818 delete [] shopitems, shopitems = 0; 840 delete [] shopitems, shopitems = 0;
819 841
820 for (int i = 0; i < 4; i++) 842 for (int i = 0; i < array_length (tile_path); i++)
821 tile_path [i] = 0; 843 tile_path [i] = 0;
822} 844}
823 845
824maptile::~maptile () 846maptile::~maptile ()
825{ 847{
… …
832 /* We need to look through all the maps and see if any maps 854 /* We need to look through all the maps and see if any maps
833 * are pointing at this one for tiling information. Since 855 * are pointing at this one for tiling information. Since
834 * tiling can be asymetric, we just can not look to see which 856 * tiling can be asymetric, we just can not look to see which
835 * maps this map tiles with and clears those. 857 * maps this map tiles with and clears those.
836 */ 858 */
837 for (int i = 0; i < 4; i++) 859 for (int i = 0; i < array_length (tile_path); i++)
838 if (tile_map[i] == m) 860 if (tile_map[i] == m)
839 tile_map[i] = 0; 861 tile_map[i] = 0;
840} 862}
841 863
842void 864void
… …
1173 middle = 0; 1195 middle = 0;
1174 1196
1175 if (top == middle) 1197 if (top == middle)
1176 middle = 0; 1198 middle = 0;
1177 1199
1200 // dire hack to handle "transparent" floors - currently only open_space
1201 if (floor && floor->arch->archname == shstr_quad_open_space)
1202 {
1203 floor->set_anim_frame (0);
1204
1205 if (maptile *m = floor->map->tile_map [TILE_DOWN])
1206 {
1207 // mirror the floor - very unreliable because usually outdated,
1208 // but somewhta works because floors do not change often :/
1209 mapspace &ms = m->at (floor->x, floor->y);
1210 ms.update ();
1211
1212 if (object *floor2 = ms.faces_obj [2])
1213 if (floor2->arch->archname != shstr_quad_open_space && !middle)
1214 {
1215 floor->set_anim_frame (1);
1216 middle = floor;
1217 floor = floor2;
1218 }
1219 }
1220 }
1221
1178#if 0 1222#if 0
1179 faces_obj [0] = top; 1223 faces_obj [0] = top;
1180 faces_obj [1] = middle; 1224 faces_obj [1] = middle;
1181 faces_obj [2] = floor; 1225 faces_obj [2] = floor;
1182#endif 1226#endif
… …
1185maptile * 1229maptile *
1186maptile::tile_available (int dir, bool load) 1230maptile::tile_available (int dir, bool load)
1187{ 1231{
1188 if (tile_path[dir]) 1232 if (tile_path[dir])
1189 { 1233 {
1234 // map is there and we don't need to load it OR it's loaded => return what we have
1190 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1235 if (tile_map[dir] && (!load || tile_map[dir]->linkable ()))
1191 return tile_map[dir]; 1236 return tile_map[dir];
1192 1237
1238 // well, try to locate it then, if possible - maybe it's there already
1193 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1239 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1194 return tile_map[dir]; 1240 return tile_map[dir];
1195 } 1241 }
1196 1242
1197 return 0; 1243 return 0;
… …
1309/** 1355/**
1310 * Return whether map2 is adjacent to map1. If so, store the distance from 1356 * Return whether map2 is adjacent to map1. If so, store the distance from
1311 * map1 to map2 in dx/dy. 1357 * map1 to map2 in dx/dy.
1312 */ 1358 */
1313int 1359int
1314adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1360adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy)
1315{ 1361{
1316 if (!map1 || !map2) 1362 if (!map1 || !map2)
1317 return 0; 1363 return 0;
1318 1364
1319 //TODO: this doesn't actually check correctly when intermediate maps are not loaded 1365 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
… …
1321 if (map1 == map2) 1367 if (map1 == map2)
1322 { 1368 {
1323 *dx = 0; 1369 *dx = 0;
1324 *dy = 0; 1370 *dy = 0;
1325 } 1371 }
1326 else if (map1->tile_map[0] == map2) 1372 else if (map1->tile_available (TILE_NORTH, false) == map2)
1327 { /* up */ 1373 {
1328 *dx = 0; 1374 *dx = 0;
1329 *dy = -map2->height; 1375 *dy = -map2->height;
1330 } 1376 }
1331 else if (map1->tile_map[1] == map2) 1377 else if (map1->tile_available (TILE_EAST , false) == map2)
1332 { /* right */ 1378 {
1333 *dx = map1->width; 1379 *dx = map1->width;
1334 *dy = 0; 1380 *dy = 0;
1335 } 1381 }
1336 else if (map1->tile_map[2] == map2) 1382 else if (map1->tile_available (TILE_SOUTH, false) == map2)
1337 { /* down */ 1383 {
1338 *dx = 0; 1384 *dx = 0;
1339 *dy = map1->height; 1385 *dy = map1->height;
1340 } 1386 }
1341 else if (map1->tile_map[3] == map2) 1387 else if (map1->tile_available (TILE_WEST , false) == map2)
1342 { /* left */ 1388 {
1343 *dx = -map2->width; 1389 *dx = -map2->width;
1344 *dy = 0; 1390 *dy = 0;
1345 } 1391 }
1346 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1392 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1347 { /* up right */ 1393 { /* up right */
1348 *dx = map1->tile_map[0]->width; 1394 *dx = +map1->tile_map[TILE_NORTH]->width;
1349 *dy = -map1->tile_map[0]->height; 1395 *dy = -map1->tile_map[TILE_NORTH]->height;
1350 } 1396 }
1351 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 1397 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1352 { /* up left */ 1398 { /* up left */
1353 *dx = -map2->width; 1399 *dx = -map2->width;
1354 *dy = -map1->tile_map[0]->height; 1400 *dy = -map1->tile_map[TILE_NORTH]->height;
1355 } 1401 }
1356 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 1402 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1357 { /* right up */ 1403 { /* right up */
1358 *dx = map1->width; 1404 *dx = +map1->width;
1359 *dy = -map2->height; 1405 *dy = -map2->height;
1360 } 1406 }
1361 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 1407 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1362 { /* right down */ 1408 { /* right down */
1363 *dx = map1->width; 1409 *dx = +map1->width;
1364 *dy = map1->tile_map[1]->height; 1410 *dy = +map1->tile_map[TILE_EAST]->height;
1365 } 1411 }
1366 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 1412 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1367 { /* down right */ 1413 { /* down right */
1368 *dx = map1->tile_map[2]->width; 1414 *dx = +map1->tile_map[TILE_SOUTH]->width;
1369 *dy = map1->height; 1415 *dy = +map1->height;
1370 } 1416 }
1371 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 1417 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1372 { /* down left */ 1418 { /* down left */
1373 *dx = -map2->width; 1419 *dx = -map2->width;
1374 *dy = map1->height; 1420 *dy = +map1->height;
1375 } 1421 }
1376 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 1422 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1377 { /* left up */ 1423 { /* left up */
1378 *dx = -map1->tile_map[3]->width; 1424 *dx = -map1->tile_map[TILE_WEST]->width;
1379 *dy = -map2->height; 1425 *dy = -map2->height;
1380 } 1426 }
1381 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1427 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1382 { /* left down */ 1428 { /* left down */
1383 *dx = -map1->tile_map[3]->width; 1429 *dx = -map1->tile_map[TILE_WEST]->width;
1384 *dy = map1->tile_map[3]->height; 1430 *dy = +map1->tile_map[TILE_WEST]->height;
1385 } 1431 }
1386 else 1432 else
1387 return 0; 1433 return 0;
1388 1434
1389 return 1; 1435 return 1;
… …
1430get_rangevector (object *op1, object *op2, rv_vector *retval, int flags) 1476get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1431{ 1477{
1432 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1478 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1433 { 1479 {
1434 /* be conservative and fill in _some_ data */ 1480 /* be conservative and fill in _some_ data */
1435 retval->distance = 10000; 1481 retval->distance = 10000;
1436 retval->distance_x = 10000; 1482 retval->distance_x = 10000;
1437 retval->distance_y = 10000; 1483 retval->distance_y = 10000;
1438 retval->direction = 0; 1484 retval->direction = 0;
1439 retval->part = 0; 1485 retval->part = 0;
1440 } 1486 }
1441 else 1487 else
1442 { 1488 {
1443 retval->distance_x += op2->x - op1->x; 1489 retval->distance_x += op2->x - op1->x;
1444 retval->distance_y += op2->y - op1->y; 1490 retval->distance_y += op2->y - op1->y;
… …
1446 object *best = op1; 1492 object *best = op1;
1447 1493
1448 /* If this is multipart, find the closest part now */ 1494 /* If this is multipart, find the closest part now */
1449 if (!(flags & 1) && op1->more) 1495 if (!(flags & 1) && op1->more)
1450 { 1496 {
1451 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1497 int best_distance = idistance (retval->distance_x, retval->distance_y);
1452 1498
1453 /* we just take the offset of the piece to head to figure 1499 /* we just take the offset of the piece to head to figure
1454 * distance instead of doing all that work above again 1500 * distance instead of doing all that work above again
1455 * since the distance fields we set above are positive in the 1501 * since the distance fields we set above are positive in the
1456 * same axis as is used for multipart objects, the simply arithmetic 1502 * same axis as is used for multipart objects, the simply arithmetic
1457 * below works. 1503 * below works.
1458 */ 1504 */
1459 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1505 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1460 { 1506 {
1461 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1507 int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1462 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1508
1463 if (tmpi < best_distance) 1509 if (tmpi < best_distance)
1464 { 1510 {
1465 best_distance = tmpi; 1511 best_distance = tmpi;
1466 best = tmp; 1512 best = tmp;
1467 } 1513 }
1468 } 1514 }
1469 1515
1470 if (best != op1) 1516 if (best != op1)
1471 { 1517 {
1472 retval->distance_x += op1->x - best->x; 1518 retval->distance_x += op1->x - best->x;
1473 retval->distance_y += op1->y - best->y; 1519 retval->distance_y += op1->y - best->y;
1474 } 1520 }
1475 } 1521 }
1476 1522
1477 retval->part = best; 1523 retval->part = best;
1478 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1524 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1479 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1525 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1480 } 1526 }
1481} 1527}
1482 1528
1483/* this is basically the same as get_rangevector above, but instead of 1529/* this is basically the same as get_rangevector above, but instead of
1484 * the first parameter being an object, it instead is the map 1530 * the first parameter being an object, it instead is the map
… …
1489 * be more consistant with the above function and also in case they are needed 1535 * be more consistant with the above function and also in case they are needed
1490 * for something in the future. Also, since no object is pasted, the best 1536 * for something in the future. Also, since no object is pasted, the best
1491 * field of the rv_vector is set to NULL. 1537 * field of the rv_vector is set to NULL.
1492 */ 1538 */
1493void 1539void
1494get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1540get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1495{ 1541{
1496 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1542 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1497 { 1543 {
1498 /* be conservative and fill in _some_ data */ 1544 /* be conservative and fill in _some_ data */
1499 retval->distance = 100000; 1545 retval->distance = 100000;
1500 retval->distance_x = 32767; 1546 retval->distance_x = 32767;
1501 retval->distance_y = 32767; 1547 retval->distance_y = 32767;
1502 retval->direction = 0; 1548 retval->direction = 0;
1503 retval->part = 0; 1549 retval->part = 0;
1504 } 1550 }
1505 else 1551 else
1506 { 1552 {
1507 retval->distance_x += op2->x - x; 1553 retval->distance_x += op2->x - x;
1508 retval->distance_y += op2->y - y; 1554 retval->distance_y += op2->y - y;
1509 1555
1510 retval->part = 0; 1556 retval->part = 0;
1511 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1557 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1512 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1558 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1513 } 1559 }
1514} 1560}
1515 1561
1516/* Returns true of op1 and op2 are effectively on the same map 1562/* Returns true of op1 and op2 are effectively on the same map
1517 * (as related to map tiling). Note that this looks for a path from 1563 * (as related to map tiling). Note that this looks for a path from
… …
1621split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy) 1667split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1622{ 1668{
1623 // clip to map to the left 1669 // clip to map to the left
1624 if (x0 < 0) 1670 if (x0 < 0)
1625 { 1671 {
1626 if (maptile *tile = m->tile_available (TILE_LEFT, 1)) 1672 if (maptile *tile = m->tile_available (TILE_WEST, 1))
1627 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy); 1673 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1628 1674
1629 if (x1 < 0) // entirely to the left 1675 if (x1 < 0) // entirely to the left
1630 return; 1676 return;
1631 1677
… …
1633 } 1679 }
1634 1680
1635 // clip to map to the right 1681 // clip to map to the right
1636 if (x1 > m->width) 1682 if (x1 > m->width)
1637 { 1683 {
1638 if (maptile *tile = m->tile_available (TILE_RIGHT, 1)) 1684 if (maptile *tile = m->tile_available (TILE_EAST, 1))
1639 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy); 1685 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1640 1686
1641 if (x0 > m->width) // entirely to the right 1687 if (x0 > m->width) // entirely to the right
1642 return; 1688 return;
1643 1689
… …
1645 } 1691 }
1646 1692
1647 // clip to map above 1693 // clip to map above
1648 if (y0 < 0) 1694 if (y0 < 0)
1649 { 1695 {
1650 if (maptile *tile = m->tile_available (TILE_UP, 1)) 1696 if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1651 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height); 1697 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1652 1698
1653 if (y1 < 0) // entirely above 1699 if (y1 < 0) // entirely above
1654 return; 1700 return;
1655 1701
… …
1657 } 1703 }
1658 1704
1659 // clip to map below 1705 // clip to map below
1660 if (y1 > m->height) 1706 if (y1 > m->height)
1661 { 1707 {
1662 if (maptile *tile = m->tile_available (TILE_DOWN, 1)) 1708 if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1663 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height); 1709 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1664 1710
1665 if (y0 > m->height) // entirely below 1711 if (y0 > m->height) // entirely below
1666 return; 1712 return;
1667 1713

Diff Legend

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