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.190 by root, Sun Apr 18 05:55:04 2010 UTC vs.
Revision 1.215 by root, Sun May 8 12:40:41 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;
… …
652 case KW_value: case KW_swap_time: thawer.get (timeout); break; 671 case KW_value: case KW_swap_time: thawer.get (timeout); break;
653 case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break; 672 case KW_level: case KW_difficulty: thawer.get (difficulty); difficulty = clamp (difficulty, 1, settings.max_level); break;
654 case KW_invisible: case KW_darkness: thawer.get (darkness); break; 673 case KW_invisible: case KW_darkness: thawer.get (darkness); break;
655 case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); break; 674 case KW_stand_still: case KW_fixed_resettime: thawer.get (fixed_resettime); 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 [TILE_NORTH]); break;
658 case KW_tile_path_2: thawer.get (tile_path [1]); break; 677 case KW_tile_path_2: thawer.get (tile_path [TILE_EAST ]); break;
659 case KW_tile_path_3: thawer.get (tile_path [2]); break; 678 case KW_tile_path_3: thawer.get (tile_path [TILE_SOUTH]); break;
660 case KW_tile_path_4: thawer.get (tile_path [3]); break; 679 case KW_tile_path_4: thawer.get (tile_path [TILE_WEST ]); break;
680 case KW_tile_path_5: thawer.get (tile_path [TILE_UP ]); break;
681 case KW_tile_path_6: thawer.get (tile_path [TILE_DOWN ]); 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
… …
744 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore); 765 if (maplore) freezer.put (KW(maplore), KW(endmaplore), maplore);
745 766
746 MAP_OUT (per_player); 767 MAP_OUT (per_player);
747 MAP_OUT (per_party); 768 MAP_OUT (per_party);
748 769
749 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 770 if (tile_path [TILE_NORTH]) MAP_OUT2 (tile_path_1, tile_path [TILE_NORTH]);
750 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 771 if (tile_path [TILE_EAST ]) MAP_OUT2 (tile_path_2, tile_path [TILE_EAST ]);
751 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 772 if (tile_path [TILE_SOUTH]) MAP_OUT2 (tile_path_3, tile_path [TILE_SOUTH]);
752 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 773 if (tile_path [TILE_WEST ]) MAP_OUT2 (tile_path_4, tile_path [TILE_WEST ]);
774 if (tile_path [TILE_UP ]) MAP_OUT2 (tile_path_5, tile_path [TILE_UP ]);
775 if (tile_path [TILE_DOWN ]) MAP_OUT2 (tile_path_6, tile_path [TILE_DOWN ]);
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 // set lower map transparent floor flag if applicable
1201 if (floor && floor->flag [FLAG_IS_TRANSPARENT_FLOOR] && !middle && !top)
1202 {
1203 floor->set_anim_frame (0);
1204
1205 if (maptile *m = floor->map->tile_map [TILE_DOWN])
1206 {
1207 mapspace &ms = m->at (floor->x, floor->y);
1208 ms.update ();
1209
1210 if (object *floor2 = ms.faces_obj [2])
1211 if (!floor2->flag [FLAG_IS_TRANSPARENT_FLOOR])
1212 {
1213 floor->set_anim_frame (1);
1214 top = floor;
1215 middle = ms.faces_obj [0];
1216 floor = floor2;
1217 }
1218
1219 ms.pflags |= PF_VIS_UP;
1220 }
1221 }
1222
1177#if 0 1223#if 0
1178 faces_obj [0] = top; 1224 faces_obj [0] = top;
1179 faces_obj [1] = middle; 1225 faces_obj [1] = middle;
1180 faces_obj [2] = floor; 1226 faces_obj [2] = floor;
1181#endif 1227#endif
1182} 1228}
1183 1229
1230void
1231mapspace::update_up ()
1232{
1233 // invalidate up
1234 if (!(pflags & PF_VIS_UP))
1235 return;
1236
1237 pflags &= ~PF_VIS_UP;
1238
1239 if (bot)
1240 if (maptile *m = bot->map->tile_map [TILE_UP])
1241 m->at (bot->x, bot->y).invalidate ();
1242}
1243
1184maptile * 1244maptile *
1185maptile::tile_available (int dir, bool load) 1245maptile::tile_available (int dir, bool load)
1186{ 1246{
1247 // map is there and we don't need to load it OR it's loaded => return what we have
1248 if (tile_map [dir] && (!load || tile_map [dir]->linkable ()))
1249 return tile_map [dir];
1250
1187 if (tile_path[dir]) 1251 if (tile_path [dir])
1188 { 1252 {
1189 if (tile_map[dir] && (!load || tile_map[dir]->in_memory == MAP_ACTIVE)) 1253 // well, try to locate it then, if possible - maybe it's there already
1254 // this is the ONLY place in the server that links maps with each other,
1255 // so any kind of inter-map stuff has to be initiated here.
1256 if (maptile *m = find_async (tile_path [dir], this, load))
1257 {
1258 bool mismatch = false;
1259
1260 if (dir == TILE_NORTH || dir == TILE_SOUTH || dir == TILE_UP || dir == TILE_DOWN)
1261 if (width != m->width)
1262 mismatch = true;
1263
1264 if (dir == TILE_EAST || dir == TILE_WEST || dir == TILE_UP || dir == TILE_DOWN)
1265 if (height != m->height)
1266 mismatch = true;
1267
1268 if (mismatch)
1269 {
1270 LOG (llevError, "tile dimension mismatch for direction %d from %s to %s\n",
1271 dir, &path, &m->path);
1272 m = 0;
1273 }
1274
1275 // as an optimisation, link us against the other map if the other map
1276 // has us as neighbour, which is very common, but not guaranteed.
1277 int dir2 = REVERSE_TILE_DIR (dir);
1278
1279 if (m->tile_path [dir2] == path)
1280 m->tile_map [dir2] = this;
1281
1190 return tile_map[dir]; 1282 return tile_map [dir] = m;
1191 1283 }
1192 if ((tile_map[dir] = find_async (tile_path[dir], this, load)))
1193 return tile_map[dir];
1194 } 1284 }
1195 1285
1196 return 0; 1286 return 0;
1197} 1287}
1198 1288
… …
1214 if (!m) 1304 if (!m)
1215 return 0; 1305 return 0;
1216 1306
1217 if (x < 0) 1307 if (x < 0)
1218 { 1308 {
1219 if (!m->tile_available (3)) 1309 if (!m->tile_available (TILE_WEST))
1220 return 1; 1310 return 1;
1221 1311
1222 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1312 return out_of_map (m->tile_map [TILE_WEST], x + m->tile_map [TILE_WEST]->width, y);
1223 } 1313 }
1224 1314
1225 if (x >= m->width) 1315 if (x >= m->width)
1226 { 1316 {
1227 if (!m->tile_available (1)) 1317 if (!m->tile_available (TILE_EAST))
1228 return 1; 1318 return 1;
1229 1319
1230 return out_of_map (m->tile_map[1], x - m->width, y); 1320 return out_of_map (m->tile_map [TILE_EAST], x - m->width, y);
1231 } 1321 }
1232 1322
1233 if (y < 0) 1323 if (y < 0)
1234 { 1324 {
1235 if (!m->tile_available (0)) 1325 if (!m->tile_available (TILE_NORTH))
1236 return 1; 1326 return 1;
1237 1327
1238 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1328 return out_of_map (m->tile_map [TILE_NORTH], x, y + m->tile_map [TILE_NORTH]->height);
1239 } 1329 }
1240 1330
1241 if (y >= m->height) 1331 if (y >= m->height)
1242 { 1332 {
1243 if (!m->tile_available (2)) 1333 if (!m->tile_available (TILE_SOUTH))
1244 return 1; 1334 return 1;
1245 1335
1246 return out_of_map (m->tile_map[2], x, y - m->height); 1336 return out_of_map (m->tile_map [TILE_SOUTH], x, y - m->height);
1247 } 1337 }
1248 1338
1249 /* Simple case - coordinates are within this local 1339 /* Simple case - coordinates are within this local
1250 * map. 1340 * map.
1251 */ 1341 */
… …
1263maptile * 1353maptile *
1264maptile::xy_find (sint16 &x, sint16 &y) 1354maptile::xy_find (sint16 &x, sint16 &y)
1265{ 1355{
1266 if (x < 0) 1356 if (x < 0)
1267 { 1357 {
1268 if (!tile_available (3)) 1358 if (!tile_available (TILE_WEST))
1269 return 0; 1359 return 0;
1270 1360
1271 x += tile_map[3]->width; 1361 x += tile_map [TILE_WEST]->width;
1272 return tile_map[3]->xy_find (x, y); 1362 return tile_map [TILE_WEST]->xy_find (x, y);
1273 } 1363 }
1274 1364
1275 if (x >= width) 1365 if (x >= width)
1276 { 1366 {
1277 if (!tile_available (1)) 1367 if (!tile_available (TILE_EAST))
1278 return 0; 1368 return 0;
1279 1369
1280 x -= width; 1370 x -= width;
1281 return tile_map[1]->xy_find (x, y); 1371 return tile_map [TILE_EAST]->xy_find (x, y);
1282 } 1372 }
1283 1373
1284 if (y < 0) 1374 if (y < 0)
1285 { 1375 {
1286 if (!tile_available (0)) 1376 if (!tile_available (TILE_NORTH))
1287 return 0; 1377 return 0;
1288 1378
1289 y += tile_map[0]->height; 1379 y += tile_map [TILE_NORTH]->height;
1290 return tile_map[0]->xy_find (x, y); 1380 return tile_map [TILE_NORTH]->xy_find (x, y);
1291 } 1381 }
1292 1382
1293 if (y >= height) 1383 if (y >= height)
1294 { 1384 {
1295 if (!tile_available (2)) 1385 if (!tile_available (TILE_SOUTH))
1296 return 0; 1386 return 0;
1297 1387
1298 y -= height; 1388 y -= height;
1299 return tile_map[2]->xy_find (x, y); 1389 return tile_map [TILE_SOUTH]->xy_find (x, y);
1300 } 1390 }
1301 1391
1302 /* Simple case - coordinates are within this local 1392 /* Simple case - coordinates are within this local
1303 * map. 1393 * map.
1304 */ 1394 */
… …
1308/** 1398/**
1309 * Return whether map2 is adjacent to map1. If so, store the distance from 1399 * Return whether map2 is adjacent to map1. If so, store the distance from
1310 * map1 to map2 in dx/dy. 1400 * map1 to map2 in dx/dy.
1311 */ 1401 */
1312int 1402int
1313adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1403adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy)
1314{ 1404{
1315 if (!map1 || !map2) 1405 if (!map1 || !map2)
1316 return 0; 1406 return 0;
1317 1407
1318 //TODO: this doesn't actually check correctly when intermediate maps are not loaded 1408 //TODO: this doesn't actually check correctly when intermediate maps are not loaded
… …
1320 if (map1 == map2) 1410 if (map1 == map2)
1321 { 1411 {
1322 *dx = 0; 1412 *dx = 0;
1323 *dy = 0; 1413 *dy = 0;
1324 } 1414 }
1325 else if (map1->tile_map[0] == map2) 1415 else if (map1->tile_available (TILE_NORTH, false) == map2)
1326 { /* up */ 1416 {
1327 *dx = 0; 1417 *dx = 0;
1328 *dy = -map2->height; 1418 *dy = -map2->height;
1329 } 1419 }
1330 else if (map1->tile_map[1] == map2) 1420 else if (map1->tile_available (TILE_EAST , false) == map2)
1331 { /* right */ 1421 {
1332 *dx = map1->width; 1422 *dx = map1->width;
1333 *dy = 0; 1423 *dy = 0;
1334 } 1424 }
1335 else if (map1->tile_map[2] == map2) 1425 else if (map1->tile_available (TILE_SOUTH, false) == map2)
1336 { /* down */ 1426 {
1337 *dx = 0; 1427 *dx = 0;
1338 *dy = map1->height; 1428 *dy = map1->height;
1339 } 1429 }
1340 else if (map1->tile_map[3] == map2) 1430 else if (map1->tile_available (TILE_WEST , false) == map2)
1341 { /* left */ 1431 {
1342 *dx = -map2->width; 1432 *dx = -map2->width;
1343 *dy = 0; 1433 *dy = 0;
1344 } 1434 }
1345 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[1] == map2) 1435 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_EAST , false) == map2)
1346 { /* up right */ 1436 { /* up right */
1347 *dx = map1->tile_map[0]->width; 1437 *dx = +map1->tile_map[TILE_NORTH]->width;
1348 *dy = -map1->tile_map[0]->height; 1438 *dy = -map1->tile_map[TILE_NORTH]->height;
1349 } 1439 }
1350 else if (map1->tile_map[0] && map1->tile_map[0]->tile_map[3] == map2) 1440 else if (map1->tile_map[TILE_NORTH] && map1->tile_map[TILE_NORTH]->tile_available (TILE_WEST , false) == map2)
1351 { /* up left */ 1441 { /* up left */
1352 *dx = -map2->width; 1442 *dx = -map2->width;
1353 *dy = -map1->tile_map[0]->height; 1443 *dy = -map1->tile_map[TILE_NORTH]->height;
1354 } 1444 }
1355 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[0] == map2) 1445 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_NORTH, false) == map2)
1356 { /* right up */ 1446 { /* right up */
1357 *dx = map1->width; 1447 *dx = +map1->width;
1358 *dy = -map2->height; 1448 *dy = -map2->height;
1359 } 1449 }
1360 else if (map1->tile_map[1] && map1->tile_map[1]->tile_map[2] == map2) 1450 else if (map1->tile_map[TILE_EAST ] && map1->tile_map[TILE_EAST ]->tile_available (TILE_SOUTH, false) == map2)
1361 { /* right down */ 1451 { /* right down */
1362 *dx = map1->width; 1452 *dx = +map1->width;
1363 *dy = map1->tile_map[1]->height; 1453 *dy = +map1->tile_map[TILE_EAST]->height;
1364 } 1454 }
1365 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[1] == map2) 1455 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_EAST , false) == map2)
1366 { /* down right */ 1456 { /* down right */
1367 *dx = map1->tile_map[2]->width; 1457 *dx = +map1->tile_map[TILE_SOUTH]->width;
1368 *dy = map1->height; 1458 *dy = +map1->height;
1369 } 1459 }
1370 else if (map1->tile_map[2] && map1->tile_map[2]->tile_map[3] == map2) 1460 else if (map1->tile_map[TILE_SOUTH] && map1->tile_map[TILE_SOUTH]->tile_available (TILE_WEST , false) == map2)
1371 { /* down left */ 1461 { /* down left */
1372 *dx = -map2->width; 1462 *dx = -map2->width;
1373 *dy = map1->height; 1463 *dy = +map1->height;
1374 } 1464 }
1375 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[0] == map2) 1465 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_NORTH, false) == map2)
1376 { /* left up */ 1466 { /* left up */
1377 *dx = -map1->tile_map[3]->width; 1467 *dx = -map1->tile_map[TILE_WEST]->width;
1378 *dy = -map2->height; 1468 *dy = -map2->height;
1379 } 1469 }
1380 else if (map1->tile_map[3] && map1->tile_map[3]->tile_map[2] == map2) 1470 else if (map1->tile_map[TILE_WEST ] && map1->tile_map[TILE_WEST ]->tile_available (TILE_SOUTH, false) == map2)
1381 { /* left down */ 1471 { /* left down */
1382 *dx = -map1->tile_map[3]->width; 1472 *dx = -map1->tile_map[TILE_WEST]->width;
1383 *dy = map1->tile_map[3]->height; 1473 *dy = +map1->tile_map[TILE_WEST]->height;
1384 } 1474 }
1385 else 1475 else
1386 return 0; 1476 return 0;
1387 1477
1388 return 1; 1478 return 1;
… …
1445 object *best = op1; 1535 object *best = op1;
1446 1536
1447 /* If this is multipart, find the closest part now */ 1537 /* If this is multipart, find the closest part now */
1448 if (!(flags & 1) && op1->more) 1538 if (!(flags & 1) && op1->more)
1449 { 1539 {
1450 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1540 int best_distance = idistance (retval->distance_x, retval->distance_y);
1451 1541
1452 /* we just take the offset of the piece to head to figure 1542 /* we just take the offset of the piece to head to figure
1453 * distance instead of doing all that work above again 1543 * distance instead of doing all that work above again
1454 * since the distance fields we set above are positive in the 1544 * since the distance fields we set above are positive in the
1455 * same axis as is used for multipart objects, the simply arithmetic 1545 * same axis as is used for multipart objects, the simply arithmetic
1456 * below works. 1546 * below works.
1457 */ 1547 */
1458 for (object *tmp = op1->more; tmp; tmp = tmp->more) 1548 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1459 { 1549 {
1460 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1550 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); 1551
1462 if (tmpi < best_distance) 1552 if (tmpi < best_distance)
1463 { 1553 {
1464 best_distance = tmpi; 1554 best_distance = tmpi;
1465 best = tmp; 1555 best = tmp;
1466 } 1556 }
1467 } 1557 }
1468 1558
1469 if (best != op1) 1559 if (best != op1)
1470 { 1560 {
1471 retval->distance_x += op1->x - best->x; 1561 retval->distance_x += op1->x - best->x;
1472 retval->distance_y += op1->y - best->y; 1562 retval->distance_y += op1->y - best->y;
1473 } 1563 }
1474 } 1564 }
1475 1565
1476 retval->part = best; 1566 retval->part = best;
1477 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1567 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1478 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1568 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1479 } 1569 }
1480} 1570}
1481 1571
1482/* this is basically the same as get_rangevector above, but instead of 1572/* this is basically the same as get_rangevector above, but instead of
1483 * the first parameter being an object, it instead is the map 1573 * 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 1578 * 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 1579 * for something in the future. Also, since no object is pasted, the best
1490 * field of the rv_vector is set to NULL. 1580 * field of the rv_vector is set to NULL.
1491 */ 1581 */
1492void 1582void
1493get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags) 1583get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1494{ 1584{
1495 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1585 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1496 { 1586 {
1497 /* be conservative and fill in _some_ data */ 1587 /* be conservative and fill in _some_ data */
1498 retval->distance = 100000; 1588 retval->distance = 100000;
1499 retval->distance_x = 32767; 1589 retval->distance_x = 32767;
1500 retval->distance_y = 32767; 1590 retval->distance_y = 32767;
1501 retval->direction = 0; 1591 retval->direction = 0;
1502 retval->part = 0; 1592 retval->part = 0;
1503 } 1593 }
1504 else 1594 else
1505 { 1595 {
1506 retval->distance_x += op2->x - x; 1596 retval->distance_x += op2->x - x;
1507 retval->distance_y += op2->y - y; 1597 retval->distance_y += op2->y - y;
1508 1598
1509 retval->part = 0; 1599 retval->part = 0;
1510 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y)); 1600 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1511 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1601 retval->direction = find_dir_2 (retval->distance_x, retval->distance_y);
1512 } 1602 }
1513} 1603}
1514 1604
1515/* Returns true of op1 and op2 are effectively on the same map 1605/* 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 1606 * (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) 1710split_to_tiles (dynbuf &buf, maptile *m, int x0, int y0, int x1, int y1, int dx, int dy)
1621{ 1711{
1622 // clip to map to the left 1712 // clip to map to the left
1623 if (x0 < 0) 1713 if (x0 < 0)
1624 { 1714 {
1625 if (maptile *tile = m->tile_available (TILE_LEFT, 1)) 1715 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); 1716 split_to_tiles (buf, tile, x0 + tile->width, y0, min (x1 + tile->width, tile->width), y1, dx - tile->width, dy);
1627 1717
1628 if (x1 < 0) // entirely to the left 1718 if (x1 < 0) // entirely to the left
1629 return; 1719 return;
1630 1720
… …
1632 } 1722 }
1633 1723
1634 // clip to map to the right 1724 // clip to map to the right
1635 if (x1 > m->width) 1725 if (x1 > m->width)
1636 { 1726 {
1637 if (maptile *tile = m->tile_available (TILE_RIGHT, 1)) 1727 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); 1728 split_to_tiles (buf, tile, max (x0 - m->width, 0), y0, x1 - m->width, y1, dx + m->width, dy);
1639 1729
1640 if (x0 > m->width) // entirely to the right 1730 if (x0 > m->width) // entirely to the right
1641 return; 1731 return;
1642 1732
… …
1644 } 1734 }
1645 1735
1646 // clip to map above 1736 // clip to map above
1647 if (y0 < 0) 1737 if (y0 < 0)
1648 { 1738 {
1649 if (maptile *tile = m->tile_available (TILE_UP, 1)) 1739 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); 1740 split_to_tiles (buf, tile, x0, y0 + tile->height, x1, min (y1 + tile->height, tile->height), dx, dy - tile->height);
1651 1741
1652 if (y1 < 0) // entirely above 1742 if (y1 < 0) // entirely above
1653 return; 1743 return;
1654 1744
… …
1656 } 1746 }
1657 1747
1658 // clip to map below 1748 // clip to map below
1659 if (y1 > m->height) 1749 if (y1 > m->height)
1660 { 1750 {
1661 if (maptile *tile = m->tile_available (TILE_DOWN, 1)) 1751 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); 1752 split_to_tiles (buf, tile, x0, max (y0 - m->height, 0), x1, y1 - m->height, dx, dy + m->height);
1663 1753
1664 if (y0 > m->height) // entirely below 1754 if (y0 > m->height) // entirely below
1665 return; 1755 return;
1666 1756

Diff Legend

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