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.189 by root, Sun Apr 18 05:54:18 2010 UTC vs.
Revision 1.209 by root, Sat May 7 11:49:08 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
… …
311 case KW_arch: 311 case KW_arch:
312 if (object *op = object::read (f, this)) 312 if (object *op = object::read (f, this))
313 { 313 {
314 // TODO: why? 314 // TODO: why?
315 if (op->inv) 315 if (op->inv)
316 {
317 op->carrying = 0;
316 op->update_weight (); 318 op->update_weight ();
319 }
317 320
318 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))
319 { 322 {
320 // we insert manually because 323 // we insert manually because
321 // a) its way faster 324 // a) its way faster
… …
358} 361}
359 362
360void 363void
361maptile::activate () 364maptile::activate ()
362{ 365{
363 if (spaces) 366 if (state != MAP_INACTIVE)
367 return;
368
364 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 369 for (mapspace *ms = spaces + size (); ms-- > spaces; )
365 for (object *op = ms->bot; op; op = op->above) 370 for (object *op = ms->bot; op; op = op->above)
366 op->activate_recursive (); 371 op->activate_recursive ();
372
373 state = MAP_ACTIVE;
374
375 activate_physics ();
367} 376}
368 377
369void 378void
370maptile::deactivate () 379maptile::deactivate ()
371{ 380{
372 if (spaces) 381 if (state != MAP_ACTIVE)
382 return;
383
373 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 384 for (mapspace *ms = spaces + size (); ms-- > spaces; )
374 for (object *op = ms->bot; op; op = op->above) 385 for (object *op = ms->bot; op; op = op->above)
375 op->deactivate_recursive (); 386 op->deactivate_recursive ();
387
388 state = MAP_INACTIVE;
376} 389}
377 390
378bool 391bool
379maptile::_save_objects (object_freezer &f, int flags) 392maptile::_save_objects (object_freezer &f, int flags)
380{ 393{
… …
424} 437}
425 438
426void 439void
427maptile::init () 440maptile::init ()
428{ 441{
429 in_memory = MAP_SWAPPED; 442 state = MAP_SWAPPED;
430 443
431 /* 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
432 * map archetype. Mimic that behaviour. 445 * map archetype. Mimic that behaviour.
433 */ 446 */
434 width = 16; 447 width = 16;
… …
559 * the map (or something equivilent) into output_string. */ 572 * the map (or something equivilent) into output_string. */
560static const char * 573static const char *
561print_shop_string (maptile *m) 574print_shop_string (maptile *m)
562{ 575{
563 static dynbuf_text buf; buf.clear (); 576 static dynbuf_text buf; buf.clear ();
577 bool first = true;
564 578
565 for (int i = 0; i < m->shopitems[0].index; i++) 579 for (int i = 0; i < m->shopitems[0].index; i++)
566 { 580 {
581 if (!first)
582 buf << ';';
583
584 first = false;
585
567 if (m->shopitems[i].typenum) 586 if (m->shopitems[i].typenum)
568 { 587 {
569 if (m->shopitems[i].strength) 588 if (m->shopitems[i].strength)
570 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);
571 else 590 else
572 buf.printf ("%s;", m->shopitems[i].name); 591 buf.printf ("%s", m->shopitems[i].name);
573 } 592 }
574 else 593 else
575 { 594 {
576 if (m->shopitems[i].strength) 595 if (m->shopitems[i].strength)
577 buf.printf ("*:%d;", m->shopitems[i].strength); 596 buf.printf ("*:%d", m->shopitems[i].strength);
578 else 597 else
579 buf.printf ("*"); 598 buf.printf ("*");
580 } 599 }
581 } 600 }
582 601
… …
605 { 624 {
606 case KW_msg: 625 case KW_msg:
607 thawer.get_ml (KW_endmsg, msg); 626 thawer.get_ml (KW_endmsg, msg);
608 break; 627 break;
609 628
610 case KW_lore: // CF+ extension 629 case KW_lore: // deliantra extension
611 thawer.get_ml (KW_endlore, maplore); 630 thawer.get_ml (KW_endlore, maplore);
612 break; 631 break;
613 632
614 case KW_maplore: 633 case KW_maplore:
615 thawer.get_ml (KW_endmaplore, maplore); 634 thawer.get_ml (KW_endmaplore, maplore);
… …
638 case KW_per_player: thawer.get (per_player); break; 657 case KW_per_player: thawer.get (per_player); break;
639 case KW_per_party: thawer.get (per_party); break; 658 case KW_per_party: thawer.get (per_party); break;
640 case KW_no_reset: thawer.get (no_reset); break; 659 case KW_no_reset: thawer.get (no_reset); break;
641 case KW_no_drop: thawer.get (no_drop); break; 660 case KW_no_drop: thawer.get (no_drop); break;
642 661
643 case KW_region: default_region = region::find (thawer.get_str ()); break; 662 case KW_region: thawer.get (default_region); break;
644 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 663 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
645 664
646 // old names new names 665 // old names new names
647 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;
648 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;
… …
656 675
657 case KW_tile_path_1: thawer.get (tile_path [0]); break; 676 case KW_tile_path_1: thawer.get (tile_path [0]); break;
658 case KW_tile_path_2: thawer.get (tile_path [1]); break; 677 case KW_tile_path_2: thawer.get (tile_path [1]); break;
659 case KW_tile_path_3: thawer.get (tile_path [2]); break; 678 case KW_tile_path_3: thawer.get (tile_path [2]); break;
660 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;
661 682
662 case KW_ERROR: 683 case KW_ERROR:
663 set_key_text (thawer.kw_str, thawer.value); 684 set_key_text (thawer.kw_str, thawer.value);
664 break; 685 break;
665 686
… …
748 769
749 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]);
750 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]);
751 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]);
752 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]);
753 776
754 freezer.put (this); 777 freezer.put (this);
755 freezer.put (KW(end)); 778 freezer.put (KW(end));
756 779
757 return true; 780 return true;
… …
814 msg = 0; 837 msg = 0;
815 maplore = 0; 838 maplore = 0;
816 shoprace = 0; 839 shoprace = 0;
817 delete [] shopitems, shopitems = 0; 840 delete [] shopitems, shopitems = 0;
818 841
819 for (int i = 0; i < 4; i++) 842 for (int i = 0; i < array_length (tile_path); i++)
820 tile_path [i] = 0; 843 tile_path [i] = 0;
821} 844}
822 845
823maptile::~maptile () 846maptile::~maptile ()
824{ 847{
… …
831 /* 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
832 * are pointing at this one for tiling information. Since 855 * are pointing at this one for tiling information. Since
833 * 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
834 * maps this map tiles with and clears those. 857 * maps this map tiles with and clears those.
835 */ 858 */
836 for (int i = 0; i < 4; i++) 859 for (int i = 0; i < array_length (tile_path); i++)
837 if (tile_map[i] == m) 860 if (tile_map[i] == m)
838 tile_map[i] = 0; 861 tile_map[i] = 0;
839} 862}
840 863
841void 864void
… …
1172 middle = 0; 1195 middle = 0;
1173 1196
1174 if (top == middle) 1197 if (top == middle)
1175 middle = 0; 1198 middle = 0;
1176 1199
1200 // dire hack to handle "transparent" floors - currently only open_space
1201 if (floor && floor->arch->archname == shstr_quad_open_space
1202 && !middle)
1203 {
1204 floor->set_anim_frame (0);
1205
1206 if (maptile *m = floor->map->tile_map [TILE_DOWN])
1207 {
1208 // mirror the floor - very unreliable because usually outdated,
1209 // but somewhta works because floors do not change often :/
1210 middle = floor;
1211
1212 mapspace &ms = m->at (floor->x, floor->y);
1213
1214 ms.update ();
1215
1216 if (object *floor2 = ms.faces_obj [2])
1217 if (floor2->arch->archname != shstr_quad_open_space)
1218 {
1219 floor->set_anim_frame (1);
1220 middle = floor;
1221 floor = floor2;
1222 }
1223 }
1224 }
1225
1177#if 0 1226#if 0
1178 faces_obj [0] = top; 1227 faces_obj [0] = top;
1179 faces_obj [1] = middle; 1228 faces_obj [1] = middle;
1180 faces_obj [2] = floor; 1229 faces_obj [2] = floor;
1181#endif 1230#endif
… …
1184maptile * 1233maptile *
1185maptile::tile_available (int dir, bool load) 1234maptile::tile_available (int dir, bool load)
1186{ 1235{
1187 if (tile_path[dir]) 1236 if (tile_path[dir])
1188 { 1237 {
1238 // map is there and we don't need to load it OR it's loaded => return what we have
1189 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1239 if (tile_map[dir] && (!load || tile_map[dir]->linkable ()))
1190 return tile_map[dir]; 1240 return tile_map[dir];
1191 1241
1242 // well, try to locate it then, if possible - maybe it's there already
1192 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1243 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1193 return tile_map[dir]; 1244 return tile_map[dir];
1194 } 1245 }
1195 1246
1196 return 0; 1247 return 0;
… …
1308/** 1359/**
1309 * Return whether map2 is adjacent to map1. If so, store the distance from 1360 * Return whether map2 is adjacent to map1. If so, store the distance from
1310 * map1 to map2 in dx/dy. 1361 * map1 to map2 in dx/dy.
1311 */ 1362 */
1312int 1363int
1313adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1364adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy)
1314{ 1365{
1315 if (!map1 || !map2) 1366 if (!map1 || !map2)
1316 return 0; 1367 return 0;
1317 1368
1318 //TODO: this doesn't actually check correctly when intermediate maps are not loaded 1369 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
… …
1320 if (map1 == map2) 1371 if (map1 == map2)
1321 { 1372 {
1322 *dx = 0; 1373 *dx = 0;
1323 *dy = 0; 1374 *dy = 0;
1324 } 1375 }
1325 else if (map1->tile_map[0] == map2) 1376 else if (map1->tile_available (TILE_NORTH, false) == map2)
1326 { /* up */ 1377 {
1327 *dx = 0; 1378 *dx = 0;
1328 *dy = -map2->height; 1379 *dy = -map2->height;
1329 } 1380 }
1330 else if (map1->tile_map[1] == map2) 1381 else if (map1->tile_available (TILE_EAST , false) == map2)
1331 { /* right */ 1382 {
1332 *dx = map1->width; 1383 *dx = map1->width;
1333 *dy = 0; 1384 *dy = 0;
1334 } 1385 }
1335 else if (map1->tile_map[2] == map2) 1386 else if (map1->tile_available (TILE_SOUTH, false) == map2)
1336 { /* down */ 1387 {
1337 *dx = 0; 1388 *dx = 0;
1338 *dy = map1->height; 1389 *dy = map1->height;
1339 } 1390 }
1340 else if (map1->tile_map[3] == map2) 1391 else if (map1->tile_available (TILE_WEST , false) == map2)
1341 { /* left */ 1392 {
1342 *dx = -map2->width; 1393 *dx = -map2->width;
1343 *dy = 0; 1394 *dy = 0;
1344 } 1395 }
1345 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1396 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1346 { /* up right */ 1397 { /* up right */
1347 *dx = map1->tile_map[0]->width; 1398 *dx = +map1->tile_map[TILE_NORTH]->width;
1348 *dy = -map1->tile_map[0]->height; 1399 *dy = -map1->tile_map[TILE_NORTH]->height;
1349 } 1400 }
1350 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 1401 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1351 { /* up left */ 1402 { /* up left */
1352 *dx = -map2->width; 1403 *dx = -map2->width;
1353 *dy = -map1->tile_map[0]->height; 1404 *dy = -map1->tile_map[TILE_NORTH]->height;
1354 } 1405 }
1355 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 1406 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1356 { /* right up */ 1407 { /* right up */
1357 *dx = map1->width; 1408 *dx = +map1->width;
1358 *dy = -map2->height; 1409 *dy = -map2->height;
1359 } 1410 }
1360 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 1411 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1361 { /* right down */ 1412 { /* right down */
1362 *dx = map1->width; 1413 *dx = +map1->width;
1363 *dy = map1->tile_map[1]->height; 1414 *dy = +map1->tile_map[TILE_EAST]->height;
1364 } 1415 }
1365 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 1416 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1366 { /* down right */ 1417 { /* down right */
1367 *dx = map1->tile_map[2]->width; 1418 *dx = +map1->tile_map[TILE_SOUTH]->width;
1368 *dy = map1->height; 1419 *dy = +map1->height;
1369 } 1420 }
1370 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 1421 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1371 { /* down left */ 1422 { /* down left */
1372 *dx = -map2->width; 1423 *dx = -map2->width;
1373 *dy = map1->height; 1424 *dy = +map1->height;
1374 } 1425 }
1375 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 1426 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1376 { /* left up */ 1427 { /* left up */
1377 *dx = -map1->tile_map[3]->width; 1428 *dx = -map1->tile_map[TILE_WEST]->width;
1378 *dy = -map2->height; 1429 *dy = -map2->height;
1379 } 1430 }
1380 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1431 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1381 { /* left down */ 1432 { /* left down */
1382 *dx = -map1->tile_map[3]->width; 1433 *dx = -map1->tile_map[TILE_WEST]->width;
1383 *dy = map1->tile_map[3]->height; 1434 *dy = +map1->tile_map[TILE_WEST]->height;
1384 } 1435 }
1385 else 1436 else
1386 return 0; 1437 return 0;
1387 1438
1388 return 1; 1439 return 1;
… …
1429get_rangevector (object *op1, object *op2, rv_vector *retval, int flags) 1480get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1430{ 1481{
1431 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1482 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1432 { 1483 {
1433 /* be conservative and fill in _some_ data */ 1484 /* be conservative and fill in _some_ data */
1434 retval->distance = 10000; 1485 retval->distance = 10000;
1435 retval->distance_x = 10000; 1486 retval->distance_x = 10000;
1436 retval->distance_y = 10000; 1487 retval->distance_y = 10000;
1437 retval->direction = 0; 1488 retval->direction = 0;
1438 retval->part = 0; 1489 retval->part = 0;
1439 } 1490 }
1440 else 1491 else
1441 { 1492 {
1442 retval->distance_x += op2->x - op1->x; 1493 retval->distance_x += op2->x - op1->x;
1443 retval->distance_y += op2->y - op1->y; 1494 retval->distance_y += op2->y - op1->y;
… …
1445 object *best = op1; 1496 object *best = op1;
1446 1497
1447 /* If this is multipart, find the closest part now */ 1498 /* If this is multipart, find the closest part now */
1448 if (!(flags & 1) && op1->more) 1499 if (!(flags & 1) && op1->more)
1449 { 1500 {
1450 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1501 int best_distance = idistance (retval->distance_x, retval->distance_y);
1451 1502
1452 /* we just take the offset of the piece to head to figure 1503 /* we just take the offset of the piece to head to figure
1453 * distance instead of doing all that work above again 1504 * distance instead of doing all that work above again
1454 * since the distance fields we set above are positive in the 1505 * since the distance fields we set above are positive in the
1455 * same axis as is used for multipart objects, the simply arithmetic 1506 * same axis as is used for multipart objects, the simply arithmetic
1456 * below works. 1507 * below works.
1457 */ 1508 */
1458 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1509 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1459 { 1510 {
1460 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1511 int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1461 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1512
1462 if (tmpi < best_distance) 1513 if (tmpi < best_distance)
1463 { 1514 {
1464 best_distance = tmpi; 1515 best_distance = tmpi;
1465 best = tmp; 1516 best = tmp;
1466 } 1517 }
1467 } 1518 }
1468 1519
1469 if (best != op1) 1520 if (best != op1)
1470 { 1521 {
1471 retval->distance_x += op1->x - best->x; 1522 retval->distance_x += op1->x - best->x;
1472 retval->distance_y += op1->y - best->y; 1523 retval->distance_y += op1->y - best->y;
1473 } 1524 }
1474 } 1525 }
1475 1526
1476 retval->part = best; 1527 retval->part = best;
1477 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1528 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1478 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1529 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1479 } 1530 }
1480} 1531}
1481 1532
1482/* this is basically the same as get_rangevector above, but instead of 1533/* this is basically the same as get_rangevector above, but instead of
1483 * the first parameter being an object, it instead is the map 1534 * the first parameter being an object, it instead is the map
… …
1488 * be more consistant with the above function and also in case they are needed 1539 * be more consistant with the above function and also in case they are needed
1489 * for something in the future. Also, since no object is pasted, the best 1540 * for something in the future. Also, since no object is pasted, the best
1490 * field of the rv_vector is set to NULL. 1541 * field of the rv_vector is set to NULL.
1491 */ 1542 */
1492void 1543void
1493get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1544get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1494{ 1545{
1495 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1546 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1496 { 1547 {
1497 /* be conservative and fill in _some_ data */ 1548 /* be conservative and fill in _some_ data */
1498 retval->distance = 100000; 1549 retval->distance = 100000;
1499 retval->distance_x = 32767; 1550 retval->distance_x = 32767;
1500 retval->distance_y = 32767; 1551 retval->distance_y = 32767;
1501 retval->direction = 0; 1552 retval->direction = 0;
1502 retval->part = 0; 1553 retval->part = 0;
1503 } 1554 }
1504 else 1555 else
1505 { 1556 {
1506 retval->distance_x += op2->x - x; 1557 retval->distance_x += op2->x - x;
1507 retval->distance_y += op2->y - y; 1558 retval->distance_y += op2->y - y;
1508 1559
1509 retval->part = 0; 1560 retval->part = 0;
1510 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1561 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1511 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1562 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1512 } 1563 }
1513} 1564}
1514 1565
1515/* Returns true of op1 and op2 are effectively on the same map 1566/* Returns true of op1 and op2 are effectively on the same map
1516 * (as related to map tiling). Note that this looks for a path from 1567 * (as related to map tiling). Note that this looks for a path from
… …
1620split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy) 1671split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1621{ 1672{
1622 // clip to map to the left 1673 // clip to map to the left
1623 if (x0 < 0) 1674 if (x0 < 0)
1624 { 1675 {
1625 if (maptile *tile = m->tile_available (TILE_LEFT, 1)) 1676 if (maptile *tile = m->tile_available (TILE_WEST, 1))
1626 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy); 1677 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1627 1678
1628 if (x1 < 0) // entirely to the left 1679 if (x1 < 0) // entirely to the left
1629 return; 1680 return;
1630 1681
… …
1632 } 1683 }
1633 1684
1634 // clip to map to the right 1685 // clip to map to the right
1635 if (x1 > m->width) 1686 if (x1 > m->width)
1636 { 1687 {
1637 if (maptile *tile = m->tile_available (TILE_RIGHT, 1)) 1688 if (maptile *tile = m->tile_available (TILE_EAST, 1))
1638 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy); 1689 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1639 1690
1640 if (x0 > m->width) // entirely to the right 1691 if (x0 > m->width) // entirely to the right
1641 return; 1692 return;
1642 1693
… …
1644 } 1695 }
1645 1696
1646 // clip to map above 1697 // clip to map above
1647 if (y0 < 0) 1698 if (y0 < 0)
1648 { 1699 {
1649 if (maptile *tile = m->tile_available (TILE_UP, 1)) 1700 if (maptile *tile = m->tile_available (TILE_NORTH, 1))
1650 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height); 1701 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1651 1702
1652 if (y1 < 0) // entirely above 1703 if (y1 < 0) // entirely above
1653 return; 1704 return;
1654 1705
… …
1656 } 1707 }
1657 1708
1658 // clip to map below 1709 // clip to map below
1659 if (y1 > m->height) 1710 if (y1 > m->height)
1660 { 1711 {
1661 if (maptile *tile = m->tile_available (TILE_DOWN, 1)) 1712 if (maptile *tile = m->tile_available (TILE_SOUTH, 1))
1662 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height); 1713 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1663 1714
1664 if (y0 > m->height) // entirely below 1715 if (y0 > m->height) // entirely below
1665 return; 1716 return;
1666 1717

Diff Legend

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