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.187 by root, Thu Apr 15 21:49:15 2010 UTC vs.
Revision 1.204 by root, Wed May 4 07:36:40 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 (in_memory != 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 in_memory = MAP_ACTIVE;
368} 374}
369 375
370void 376void
371maptile::deactivate () 377maptile::deactivate ()
372{ 378{
373 if (spaces) 379 if (in_memory != MAP_ACTIVE)
380 return;
381
374 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 382 for (mapspace *ms = spaces + size (); ms-- > spaces; )
375 for (object *op = ms->bot; op; op = op->above) 383 for (object *op = ms->bot; op; op = op->above)
376 op->deactivate_recursive (); 384 op->deactivate_recursive ();
385
386 in_memory = MAP_INACTIVE;
377} 387}
378 388
379bool 389bool
380maptile::_save_objects (object_freezer &f, int flags) 390maptile::_save_objects (object_freezer &f, int flags)
381{ 391{
… …
422 return false; 432 return false;
423 433
424 return freezer.save (path); 434 return freezer.save (path);
425} 435}
426 436
427maptile::maptile () 437void
438maptile::init ()
428{ 439{
429 in_memory = MAP_SWAPPED; 440 in_memory = MAP_SWAPPED;
430 441
431 /* The maps used to pick up default x and y values from the 442 /* The maps used to pick up default x and y values from the
432 * map archetype. Mimic that behaviour. 443 * map archetype. Mimic that behaviour.
433 */ 444 */
434 width = 16; 445 width = 16;
435 height = 16; 446 height = 16;
436 timeout = 300; 447 timeout = 300;
437 max_items = MAX_ITEM_PER_ACTION; 448 max_items = MAX_ITEM_PER_ACTION;
438 max_volume = 2000000; // 2m³ 449 max_volume = 2000000; // 2m³
439}
440
441maptile::maptile (int w, int h)
442{
443 in_memory = MAP_SWAPPED;
444
445 width = w;
446 height = h;
447 reset_timeout = 0; 450 reset_timeout = 0;
448 timeout = 300;
449 enter_x = 0; 451 enter_x = 0;
450 enter_y = 0; 452 enter_y = 0;
453}
454
455maptile::maptile ()
456{
457 init ();
458}
459
460maptile::maptile (int w, int h)
461{
462 init ();
463
464 width = w;
465 height = h;
451 466
452 alloc (); 467 alloc ();
453} 468}
454 469
455/* 470/*
… …
555 * the map (or something equivilent) into output_string. */ 570 * the map (or something equivilent) into output_string. */
556static const char * 571static const char *
557print_shop_string (maptile *m) 572print_shop_string (maptile *m)
558{ 573{
559 static dynbuf_text buf; buf.clear (); 574 static dynbuf_text buf; buf.clear ();
575 bool first = true;
560 576
561 for (int i = 0; i < m->shopitems[0].index; i++) 577 for (int i = 0; i < m->shopitems[0].index; i++)
562 { 578 {
579 if (!first)
580 buf << ';';
581
582 first = false;
583
563 if (m->shopitems[i].typenum) 584 if (m->shopitems[i].typenum)
564 { 585 {
565 if (m->shopitems[i].strength) 586 if (m->shopitems[i].strength)
566 buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength); 587 buf.printf ("%s:%d", m->shopitems[i].name, m->shopitems[i].strength);
567 else 588 else
568 buf.printf ("%s;", m->shopitems[i].name); 589 buf.printf ("%s", m->shopitems[i].name);
569 } 590 }
570 else 591 else
571 { 592 {
572 if (m->shopitems[i].strength) 593 if (m->shopitems[i].strength)
573 buf.printf ("*:%d;", m->shopitems[i].strength); 594 buf.printf ("*:%d", m->shopitems[i].strength);
574 else 595 else
575 buf.printf ("*"); 596 buf.printf ("*");
576 } 597 }
577 } 598 }
578 599
… …
601 { 622 {
602 case KW_msg: 623 case KW_msg:
603 thawer.get_ml (KW_endmsg, msg); 624 thawer.get_ml (KW_endmsg, msg);
604 break; 625 break;
605 626
606 case KW_lore: // CF+ extension 627 case KW_lore: // deliantra extension
607 thawer.get_ml (KW_endlore, maplore); 628 thawer.get_ml (KW_endlore, maplore);
608 break; 629 break;
609 630
610 case KW_maplore: 631 case KW_maplore:
611 thawer.get_ml (KW_endmaplore, maplore); 632 thawer.get_ml (KW_endmaplore, maplore);
… …
634 case KW_per_player: thawer.get (per_player); break; 655 case KW_per_player: thawer.get (per_player); break;
635 case KW_per_party: thawer.get (per_party); break; 656 case KW_per_party: thawer.get (per_party); break;
636 case KW_no_reset: thawer.get (no_reset); break; 657 case KW_no_reset: thawer.get (no_reset); break;
637 case KW_no_drop: thawer.get (no_drop); break; 658 case KW_no_drop: thawer.get (no_drop); break;
638 659
639 case KW_region: default_region = region::find (thawer.get_str ()); break; 660 case KW_region: thawer.get (default_region); break;
640 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 661 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
641 662
642 // old names new names 663 // old names new names
643 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 664 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
644 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 665 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
652 673
653 case KW_tile_path_1: thawer.get (tile_path [0]); break; 674 case KW_tile_path_1: thawer.get (tile_path [0]); break;
654 case KW_tile_path_2: thawer.get (tile_path [1]); break; 675 case KW_tile_path_2: thawer.get (tile_path [1]); break;
655 case KW_tile_path_3: thawer.get (tile_path [2]); break; 676 case KW_tile_path_3: thawer.get (tile_path [2]); break;
656 case KW_tile_path_4: thawer.get (tile_path [3]); break; 677 case KW_tile_path_4: thawer.get (tile_path [3]); break;
678 case KW_tile_path_5: thawer.get (tile_path [4]); break;
679 case KW_tile_path_6: thawer.get (tile_path [5]); break;
657 680
658 case KW_ERROR: 681 case KW_ERROR:
659 set_key_text (thawer.kw_str, thawer.value); 682 set_key_text (thawer.kw_str, thawer.value);
660 break; 683 break;
661 684
… …
744 767
745 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 768 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
746 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 769 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
747 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 770 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
748 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 771 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
772 if (tile_path [4]) MAP_OUT2 (tile_path_5, tile_path [4]);
773 if (tile_path [5]) MAP_OUT2 (tile_path_6, tile_path [5]);
749 774
750 freezer.put (this); 775 freezer.put (this);
751 freezer.put (KW(end)); 776 freezer.put (KW(end));
752 777
753 return true; 778 return true;
… …
810 msg = 0; 835 msg = 0;
811 maplore = 0; 836 maplore = 0;
812 shoprace = 0; 837 shoprace = 0;
813 delete [] shopitems, shopitems = 0; 838 delete [] shopitems, shopitems = 0;
814 839
815 for (int i = 0; i < 4; i++) 840 for (int i = 0; i < TILE_NUM; i++)
816 tile_path [i] = 0; 841 tile_path [i] = 0;
817} 842}
818 843
819maptile::~maptile () 844maptile::~maptile ()
820{ 845{
… …
1180maptile * 1205maptile *
1181maptile::tile_available (int dir, bool load) 1206maptile::tile_available (int dir, bool load)
1182{ 1207{
1183 if (tile_path[dir]) 1208 if (tile_path[dir])
1184 { 1209 {
1210 // map is there and we don't need to load it OR it's loaded => return what we have
1185 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1211 if (tile_map[dir] && (!load || tile_map[dir]->linkable ()))
1186 return tile_map[dir]; 1212 return tile_map[dir];
1187 1213
1214 // well, try to locate it then, if possible - maybe it's there already
1188 if ((tile_map[dir] = find_async (tile_path[dir], this, load))) 1215 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1189 return tile_map[dir]; 1216 return tile_map[dir];
1190 } 1217 }
1191 1218
1192 return 0; 1219 return 0;
… …
1304/** 1331/**
1305 * Return whether map2 is adjacent to map1. If so, store the distance from 1332 * Return whether map2 is adjacent to map1. If so, store the distance from
1306 * map1 to map2 in dx/dy. 1333 * map1 to map2 in dx/dy.
1307 */ 1334 */
1308int 1335int
1309adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1336adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy)
1310{ 1337{
1311 if (!map1 || !map2) 1338 if (!map1 || !map2)
1312 return 0; 1339 return 0;
1313 1340
1314 //TODO: this doesn't actually check correctly when intermediate maps are not loaded 1341 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
… …
1316 if (map1 == map2) 1343 if (map1 == map2)
1317 { 1344 {
1318 *dx = 0; 1345 *dx = 0;
1319 *dy = 0; 1346 *dy = 0;
1320 } 1347 }
1321 else if (map1->tile_map[0] == map2) 1348 else if (map1->tile_available (TILE_NORTH, false) == map2)
1322 { /* up */ 1349 {
1323 *dx = 0; 1350 *dx = 0;
1324 *dy = -map2->height; 1351 *dy = -map2->height;
1325 } 1352 }
1326 else if (map1->tile_map[1] == map2) 1353 else if (map1->tile_available (TILE_EAST , false) == map2)
1327 { /* right */ 1354 {
1328 *dx = map1->width; 1355 *dx = map1->width;
1329 *dy = 0; 1356 *dy = 0;
1330 } 1357 }
1331 else if (map1->tile_map[2] == map2) 1358 else if (map1->tile_available (TILE_SOUTH, false) == map2)
1332 { /* down */ 1359 {
1333 *dx = 0; 1360 *dx = 0;
1334 *dy = map1->height; 1361 *dy = map1->height;
1335 } 1362 }
1336 else if (map1->tile_map[3] == map2) 1363 else if (map1->tile_available (TILE_WEST , false) == map2)
1337 { /* left */ 1364 {
1338 *dx = -map2->width; 1365 *dx = -map2->width;
1339 *dy = 0; 1366 *dy = 0;
1340 } 1367 }
1341 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1368 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1342 { /* up right */ 1369 { /* up right */
1343 *dx = map1->tile_map[0]->width; 1370 *dx = +map1->tile_map[TILE_NORTH]->width;
1344 *dy = -map1->tile_map[0]->height; 1371 *dy = -map1->tile_map[TILE_NORTH]->height;
1345 } 1372 }
1346 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 1373 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1347 { /* up left */ 1374 { /* up left */
1348 *dx = -map2->width; 1375 *dx = -map2->width;
1349 *dy = -map1->tile_map[0]->height; 1376 *dy = -map1->tile_map[TILE_NORTH]->height;
1350 } 1377 }
1351 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 1378 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1352 { /* right up */ 1379 { /* right up */
1353 *dx = map1->width; 1380 *dx = +map1->width;
1354 *dy = -map2->height; 1381 *dy = -map2->height;
1355 } 1382 }
1356 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 1383 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1357 { /* right down */ 1384 { /* right down */
1358 *dx = map1->width; 1385 *dx = +map1->width;
1359 *dy = map1->tile_map[1]->height; 1386 *dy = +map1->tile_map[TILE_EAST]->height;
1360 } 1387 }
1361 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 1388 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1362 { /* down right */ 1389 { /* down right */
1363 *dx = map1->tile_map[2]->width; 1390 *dx = +map1->tile_map[TILE_SOUTH]->width;
1364 *dy = map1->height; 1391 *dy = +map1->height;
1365 } 1392 }
1366 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 1393 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1367 { /* down left */ 1394 { /* down left */
1368 *dx = -map2->width; 1395 *dx = -map2->width;
1369 *dy = map1->height; 1396 *dy = +map1->height;
1370 } 1397 }
1371 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 1398 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1372 { /* left up */ 1399 { /* left up */
1373 *dx = -map1->tile_map[3]->width; 1400 *dx = -map1->tile_map[TILE_WEST]->width;
1374 *dy = -map2->height; 1401 *dy = -map2->height;
1375 } 1402 }
1376 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1403 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1377 { /* left down */ 1404 { /* left down */
1378 *dx = -map1->tile_map[3]->width; 1405 *dx = -map1->tile_map[TILE_WEST]->width;
1379 *dy = map1->tile_map[3]->height; 1406 *dy = +map1->tile_map[TILE_WEST]->height;
1380 } 1407 }
1381 else 1408 else
1382 return 0; 1409 return 0;
1383 1410
1384 return 1; 1411 return 1;
… …
1425get_rangevector (object *op1, object *op2, rv_vector *retval, int flags) 1452get_rangevector (object *op1, object *op2, rv_vector *retval, int flags)
1426{ 1453{
1427 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1454 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1428 { 1455 {
1429 /* be conservative and fill in _some_ data */ 1456 /* be conservative and fill in _some_ data */
1430 retval->distance = 10000; 1457 retval->distance = 10000;
1431 retval->distance_x = 10000; 1458 retval->distance_x = 10000;
1432 retval->distance_y = 10000; 1459 retval->distance_y = 10000;
1433 retval->direction = 0; 1460 retval->direction = 0;
1434 retval->part = 0; 1461 retval->part = 0;
1435 } 1462 }
1436 else 1463 else
1437 { 1464 {
1438 retval->distance_x += op2->x - op1->x; 1465 retval->distance_x += op2->x - op1->x;
1439 retval->distance_y += op2->y - op1->y; 1466 retval->distance_y += op2->y - op1->y;
… …
1441 object *best = op1; 1468 object *best = op1;
1442 1469
1443 /* If this is multipart, find the closest part now */ 1470 /* If this is multipart, find the closest part now */
1444 if (!(flags & 1) && op1->more) 1471 if (!(flags & 1) && op1->more)
1445 { 1472 {
1446 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1473 int best_distance = idistance (retval->distance_x, retval->distance_y);
1447 1474
1448 /* we just take the offset of the piece to head to figure 1475 /* we just take the offset of the piece to head to figure
1449 * distance instead of doing all that work above again 1476 * distance instead of doing all that work above again
1450 * since the distance fields we set above are positive in the 1477 * since the distance fields we set above are positive in the
1451 * same axis as is used for multipart objects, the simply arithmetic 1478 * same axis as is used for multipart objects, the simply arithmetic
1452 * below works. 1479 * below works.
1453 */ 1480 */
1454 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1481 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1455 { 1482 {
1456 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1483 int tmpi = idistance (op1->x - tmp->x + retval->distance_x, op1->y - tmp->y + retval->distance_y);
1457 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1484
1458 if (tmpi < best_distance) 1485 if (tmpi < best_distance)
1459 { 1486 {
1460 best_distance = tmpi; 1487 best_distance = tmpi;
1461 best = tmp; 1488 best = tmp;
1462 } 1489 }
1463 } 1490 }
1464 1491
1465 if (best != op1) 1492 if (best != op1)
1466 { 1493 {
1467 retval->distance_x += op1->x - best->x; 1494 retval->distance_x += op1->x - best->x;
1468 retval->distance_y += op1->y - best->y; 1495 retval->distance_y += op1->y - best->y;
1469 } 1496 }
1470 } 1497 }
1471 1498
1472 retval->part = best; 1499 retval->part = best;
1473 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1500 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1474 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1501 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1475 } 1502 }
1476} 1503}
1477 1504
1478/* this is basically the same as get_rangevector above, but instead of 1505/* this is basically the same as get_rangevector above, but instead of
1479 * the first parameter being an object, it instead is the map 1506 * the first parameter being an object, it instead is the map
… …
1484 * be more consistant with the above function and also in case they are needed 1511 * be more consistant with the above function and also in case they are needed
1485 * for something in the future. Also, since no object is pasted, the best 1512 * for something in the future. Also, since no object is pasted, the best
1486 * field of the rv_vector is set to NULL. 1513 * field of the rv_vector is set to NULL.
1487 */ 1514 */
1488void 1515void
1489get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1516get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1490{ 1517{
1491 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1518 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1492 { 1519 {
1493 /* be conservative and fill in _some_ data */ 1520 /* be conservative and fill in _some_ data */
1494 retval->distance = 100000; 1521 retval->distance = 100000;
1495 retval->distance_x = 32767; 1522 retval->distance_x = 32767;
1496 retval->distance_y = 32767; 1523 retval->distance_y = 32767;
1497 retval->direction = 0; 1524 retval->direction = 0;
1498 retval->part = 0; 1525 retval->part = 0;
1499 } 1526 }
1500 else 1527 else
1501 { 1528 {
1502 retval->distance_x += op2->x - x; 1529 retval->distance_x += op2->x - x;
1503 retval->distance_y += op2->y - y; 1530 retval->distance_y += op2->y - y;
1504 1531
1505 retval->part = 0; 1532 retval->part = 0;
1506 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1533 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1507 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1534 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1508 } 1535 }
1509} 1536}
1510 1537
1511/* Returns true of op1 and op2 are effectively on the same map 1538/* Returns true of op1 and op2 are effectively on the same map
1512 * (as related to map tiling). Note that this looks for a path from 1539 * (as related to map tiling). Note that this looks for a path from
… …
1616split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy) 1643split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1617{ 1644{
1618 // clip to map to the left 1645 // clip to map to the left
1619 if (x0 < 0) 1646 if (x0 < 0)
1620 { 1647 {
1621 if (maptile *tile = m->tile_available (TILE_LEFT, 1)) 1648 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); 1649 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1623 1650
1624 if (x1 < 0) // entirely to the left 1651 if (x1 < 0) // entirely to the left
1625 return; 1652 return;
1626 1653
… …
1628 } 1655 }
1629 1656
1630 // clip to map to the right 1657 // clip to map to the right
1631 if (x1 > m->width) 1658 if (x1 > m->width)
1632 { 1659 {
1633 if (maptile *tile = m->tile_available (TILE_RIGHT, 1)) 1660 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); 1661 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1635 1662
1636 if (x0 > m->width) // entirely to the right 1663 if (x0 > m->width) // entirely to the right
1637 return; 1664 return;
1638 1665
… …
1640 } 1667 }
1641 1668
1642 // clip to map above 1669 // clip to map above
1643 if (y0 < 0) 1670 if (y0 < 0)
1644 { 1671 {
1645 if (maptile *tile = m->tile_available (TILE_UP, 1)) 1672 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); 1673 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1647 1674
1648 if (y1 < 0) // entirely above 1675 if (y1 < 0) // entirely above
1649 return; 1676 return;
1650 1677
… …
1652 } 1679 }
1653 1680
1654 // clip to map below 1681 // clip to map below
1655 if (y1 > m->height) 1682 if (y1 > m->height)
1656 { 1683 {
1657 if (maptile *tile = m->tile_available (TILE_DOWN, 1)) 1684 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); 1685 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1659 1686
1660 if (y0 > m->height) // entirely below 1687 if (y0 > m->height) // entirely below
1661 return; 1688 return;
1662 1689

Diff Legend

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