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.67 by elmex, Wed Jan 3 02:51:09 2007 UTC vs.
Revision 1.69 by root, Thu Jan 4 16:56:39 2007 UTC

… …
1278 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1278 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1279 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1279 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1280 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1280 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1281} 1281}
1282 1282
1283/* this updates the orig_map->tile_map[tile_num] value after loading 1283/* this updates the orig_map->tile_map[tile_num] value after finding
1284 * the map. It also takes care of linking back the freshly loaded 1284 * the map. It also takes care of linking back the freshly found
1285 * maps tile_map values if it tiles back to this one. It returns 1285 * maps tile_map values if it tiles back to this one. It returns
1286 * the value of orig_map->tile_map[tile_num]. It really only does this 1286 * the value of orig_map->tile_map[tile_num].
1287 * so that it is easier for calling functions to verify success.
1288 */ 1287 */
1289static maptile * 1288static inline maptile *
1290load_and_link_tiled_map (maptile *orig_map, int tile_num) 1289find_and_link (maptile *orig_map, int tile_num)
1291{ 1290{
1291 maptile *mp = orig_map->tile_map [tile_num];
1292
1293 if (!mp)
1294 {
1292 maptile *mp = orig_map->load_map_sync (orig_map->tile_path [tile_num], orig_map); 1295 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1293 1296
1294 if (!mp || mp->in_memory != MAP_IN_MEMORY) 1297 if (!mp)
1295 { 1298 {
1296 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine 1299 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1297 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n", 1300 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1298 &orig_map->tile_path[tile_num], &orig_map->path); 1301 &orig_map->tile_path[tile_num], &orig_map->path);
1299 mp = new maptile (1, 1); 1302 mp = new maptile (1, 1);
1300 mp->alloc (); 1303 mp->alloc ();
1301 mp->in_memory = MAP_IN_MEMORY; 1304 mp->in_memory = MAP_IN_MEMORY;
1305 }
1302 } 1306 }
1303 1307
1304 int dest_tile = (tile_num + 2) % 4; 1308 int dest_tile = (tile_num + 2) % 4;
1305 1309
1306 orig_map->tile_map[tile_num] = mp; 1310 orig_map->tile_map [tile_num] = mp;
1307 1311
1308 // optimisation: back-link map to origin map if euclidean 1312 // optimisation: back-link map to origin map if euclidean
1309 //TODO: non-euclidean maps MUST GO 1313 //TODO: non-euclidean maps MUST GO
1310 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) 1314 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1311 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1315 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1312 1316
1313 return mp; 1317 return mp;
1318}
1319
1320static inline void
1321load_and_link (maptile *orig_map, int tile_num)
1322{
1323 find_and_link (orig_map, tile_num)->load_sync ();
1314} 1324}
1315 1325
1316/* this returns TRUE if the coordinates (x,y) are out of 1326/* this returns TRUE if the coordinates (x,y) are out of
1317 * map m. This function also takes into account any 1327 * map m. This function also takes into account any
1318 * tiling considerations, loading adjacant maps as needed. 1328 * tiling considerations, loading adjacant maps as needed.
… …
1335 { 1345 {
1336 if (!m->tile_path[3]) 1346 if (!m->tile_path[3])
1337 return 1; 1347 return 1;
1338 1348
1339 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1349 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1340 load_and_link_tiled_map (m, 3); 1350 find_and_link (m, 3);
1341 1351
1342 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1352 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1343 } 1353 }
1344 1354
1345 if (x >= m->width) 1355 if (x >= m->width)
1346 { 1356 {
1347 if (!m->tile_path[1]) 1357 if (!m->tile_path[1])
1348 return 1; 1358 return 1;
1349 1359
1350 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1360 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1351 load_and_link_tiled_map (m, 1); 1361 find_and_link (m, 1);
1352 1362
1353 return out_of_map (m->tile_map[1], x - m->width, y); 1363 return out_of_map (m->tile_map[1], x - m->width, y);
1354 } 1364 }
1355 1365
1356 if (y < 0) 1366 if (y < 0)
1357 { 1367 {
1358 if (!m->tile_path[0]) 1368 if (!m->tile_path[0])
1359 return 1; 1369 return 1;
1360 1370
1361 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1371 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1362 load_and_link_tiled_map (m, 0); 1372 find_and_link (m, 0);
1363 1373
1364 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1374 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1365 } 1375 }
1366 1376
1367 if (y >= m->height) 1377 if (y >= m->height)
1368 { 1378 {
1369 if (!m->tile_path[2]) 1379 if (!m->tile_path[2])
1370 return 1; 1380 return 1;
1371 1381
1372 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1382 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1373 load_and_link_tiled_map (m, 2); 1383 find_and_link (m, 2);
1374 1384
1375 return out_of_map (m->tile_map[2], x, y - m->height); 1385 return out_of_map (m->tile_map[2], x, y - m->height);
1376 } 1386 }
1377 1387
1378 /* Simple case - coordinates are within this local 1388 /* Simple case - coordinates are within this local
… …
1388 * updates x and y to be the localised coordinates. 1398 * updates x and y to be the localised coordinates.
1389 * Using this is more efficient of calling out_of_map 1399 * Using this is more efficient of calling out_of_map
1390 * and then figuring out what the real map is 1400 * and then figuring out what the real map is
1391 */ 1401 */
1392maptile * 1402maptile *
1393get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1403maptile::xy_find (sint16 &x, sint16 &y)
1394{ 1404{
1395 if (*x < 0) 1405 if (x < 0)
1396 { 1406 {
1397 if (!m->tile_path[3]) 1407 if (!tile_path[3])
1398 return 0; 1408 return 0;
1399 1409
1400 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1410 find_and_link (this, 3);
1401 load_and_link_tiled_map (m, 3);
1402
1403 *x += m->tile_map[3]->width; 1411 x += tile_map[3]->width;
1404 return (get_map_from_coord (m->tile_map[3], x, y)); 1412 return tile_map[3]->xy_find (x, y);
1405 } 1413 }
1406 1414
1407 if (*x >= m->width) 1415 if (x >= width)
1408 { 1416 {
1409 if (!m->tile_path[1]) 1417 if (!tile_path[1])
1410 return 0; 1418 return 0;
1411 1419
1412 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1420 find_and_link (this, 1);
1413 load_and_link_tiled_map (m, 1);
1414
1415 *x -= m->width; 1421 x -= width;
1416 return (get_map_from_coord (m->tile_map[1], x, y)); 1422 return tile_map[1]->xy_find (x, y);
1417 } 1423 }
1418 1424
1419 if (*y < 0) 1425 if (y < 0)
1420 { 1426 {
1421 if (!m->tile_path[0]) 1427 if (!tile_path[0])
1422 return 0; 1428 return 0;
1423 1429
1424 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1430 find_and_link (this, 0);
1425 load_and_link_tiled_map (m, 0);
1426
1427 *y += m->tile_map[0]->height; 1431 y += tile_map[0]->height;
1428 return (get_map_from_coord (m->tile_map[0], x, y)); 1432 return tile_map[0]->xy_find (x, y);
1429 } 1433 }
1430 1434
1431 if (*y >= m->height) 1435 if (y >= height)
1432 { 1436 {
1433 if (!m->tile_path[2]) 1437 if (!tile_path[2])
1434 return 0; 1438 return 0;
1435 1439
1436 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1440 find_and_link (this, 2);
1437 load_and_link_tiled_map (m, 2);
1438
1439 *y -= m->height; 1441 y -= height;
1440 return (get_map_from_coord (m->tile_map[2], x, y)); 1442 return tile_map[2]->xy_find (x, y);
1441 } 1443 }
1442 1444
1443 /* Simple case - coordinates are within this local 1445 /* Simple case - coordinates are within this local
1444 * map. 1446 * map.
1445 */ 1447 */
1446 return m; 1448 return this;
1447} 1449}
1448 1450
1449/** 1451/**
1450 * Return whether map2 is adjacent to map1. If so, store the distance from 1452 * Return whether map2 is adjacent to map1. If so, store the distance from
1451 * map1 to map2 in dx/dy. 1453 * map1 to map2 in dx/dy.
… …
1454adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1456adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1455{ 1457{
1456 if (!map1 || !map2) 1458 if (!map1 || !map2)
1457 return 0; 1459 return 0;
1458 1460
1461 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1462 //fix: compare paths instead (this is likely faster, too!)
1459 if (map1 == map2) 1463 if (map1 == map2)
1460 { 1464 {
1461 *dx = 0; 1465 *dx = 0;
1462 *dy = 0; 1466 *dy = 0;
1463 } 1467 }
… …
1523 } 1527 }
1524 else 1528 else
1525 return 0; 1529 return 0;
1526 1530
1527 return 1; 1531 return 1;
1532}
1533
1534maptile *
1535maptile::xy_load (sint16 &x, sint16 &y)
1536{
1537 maptile *map = xy_find (x, y);
1538
1539 if (map)
1540 map->load_sync ();
1541
1542 return map;
1543}
1544
1545maptile *
1546get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1547{
1548 return m->xy_load (*x, *y);
1528} 1549}
1529 1550
1530/* From map.c 1551/* From map.c
1531 * This is used by get_player to determine where the other 1552 * This is used by get_player to determine where the other
1532 * creature is. get_rangevector takes into account map tiling, 1553 * creature is. get_rangevector takes into account map tiling,

Diff Legend

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