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.66 by pippijn, Wed Jan 3 00:21:35 2007 UTC vs.
Revision 1.70 by root, Thu Jan 4 20:29:45 2007 UTC

… …
731 * MSW 2001-07-01 731 * MSW 2001-07-01
732 */ 732 */
733bool 733bool
734maptile::load_header (object_thawer &thawer) 734maptile::load_header (object_thawer &thawer)
735{ 735{
736 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
737 int msgpos = 0;
738 int maplorepos = 0;
739
740 for (;;) 736 for (;;)
741 { 737 {
742 keyword kw = thawer.get_kv (); 738 keyword kw = thawer.get_kv ();
743 739
744 switch (kw) 740 switch (kw)
… …
747 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path); 743 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
748 return false; 744 return false;
749 745
750 case KW_end: 746 case KW_end:
751 return true; 747 return true;
748
749 default:
750 case KW_ERROR:
751 LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
752 break;
752 753
753 case KW_msg: 754 case KW_msg:
754 thawer.get_ml (KW_endmsg, msg); 755 thawer.get_ml (KW_endmsg, msg);
755 break; 756 break;
756 757
… …
807 808
808 case KW_tile_path_1: thawer.get (tile_path [0]); break; 809 case KW_tile_path_1: thawer.get (tile_path [0]); break;
809 case KW_tile_path_2: thawer.get (tile_path [1]); break; 810 case KW_tile_path_2: thawer.get (tile_path [1]); break;
810 case KW_tile_path_3: thawer.get (tile_path [2]); break; 811 case KW_tile_path_3: thawer.get (tile_path [2]); break;
811 case KW_tile_path_4: thawer.get (tile_path [3]); break; 812 case KW_tile_path_4: thawer.get (tile_path [3]); break;
812
813 default:
814 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]);
815 break;
816 } 813 }
817 } 814 }
818 815
819 abort (); 816 abort ();
820} 817}
… …
1237 1234
1238 /* If two top faces are already set, quit processing */ 1235 /* If two top faces are already set, quit processing */
1239 if ((top != blank_face) && (middle != blank_face)) 1236 if ((top != blank_face) && (middle != blank_face))
1240 break; 1237 break;
1241 1238
1242 /* Only show visible faces, unless its the editor - show all */ 1239 /* Only show visible faces */
1243 if (!tmp->invisible || editor) 1240 if (!tmp->invisible)
1244 { 1241 {
1245 /* Fill in top if needed */ 1242 /* Fill in top if needed */
1246 if (top == blank_face) 1243 if (top == blank_face)
1247 { 1244 {
1248 top = tmp->face; 1245 top = tmp->face;
… …
1278 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1275 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; 1276 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; 1277 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1281} 1278}
1282 1279
1283/* this updates the orig_map->tile_map[tile_num] value after loading 1280/* 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 1281 * 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 1282 * 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 1283 * the value of orig_map->tile_map[tile_num].
1287 * so that it is easier for calling functions to verify success.
1288 */ 1284 */
1289static maptile * 1285static inline maptile *
1290load_and_link_tiled_map (maptile *orig_map, int tile_num) 1286find_and_link (maptile *orig_map, int tile_num)
1291{ 1287{
1288 maptile *mp = orig_map->tile_map [tile_num];
1289
1290 if (!mp)
1291 {
1292 maptile *mp = orig_map->load_map_sync (orig_map->tile_path [tile_num], orig_map); 1292 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1293 1293
1294 if (!mp || mp->in_memory != MAP_IN_MEMORY) 1294 if (!mp)
1295 { 1295 {
1296 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine 1296 // 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", 1297 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); 1298 &orig_map->tile_path[tile_num], &orig_map->path);
1299 mp = new maptile (1, 1); 1299 mp = new maptile (1, 1);
1300 mp->alloc (); 1300 mp->alloc ();
1301 mp->in_memory = MAP_IN_MEMORY; 1301 mp->in_memory = MAP_IN_MEMORY;
1302 }
1302 } 1303 }
1303 1304
1304 int dest_tile = (tile_num + 2) % 4; 1305 int dest_tile = (tile_num + 2) % 4;
1305 1306
1306 orig_map->tile_map[tile_num] = mp; 1307 orig_map->tile_map [tile_num] = mp;
1307 1308
1308 // optimisation: back-link map to origin map if euclidean 1309 // optimisation: back-link map to origin map if euclidean
1309 //TODO: non-euclidean maps MUST GO 1310 //TODO: non-euclidean maps MUST GO
1310 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) 1311 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; 1312 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1312 1313
1313 return mp; 1314 return mp;
1315}
1316
1317static inline void
1318load_and_link (maptile *orig_map, int tile_num)
1319{
1320 find_and_link (orig_map, tile_num)->load_sync ();
1314} 1321}
1315 1322
1316/* this returns TRUE if the coordinates (x,y) are out of 1323/* this returns TRUE if the coordinates (x,y) are out of
1317 * map m. This function also takes into account any 1324 * map m. This function also takes into account any
1318 * tiling considerations, loading adjacant maps as needed. 1325 * tiling considerations, loading adjacant maps as needed.
… …
1335 { 1342 {
1336 if (!m->tile_path[3]) 1343 if (!m->tile_path[3])
1337 return 1; 1344 return 1;
1338 1345
1339 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1346 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1340 load_and_link_tiled_map (m, 3); 1347 find_and_link (m, 3);
1341 1348
1342 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1349 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1343 } 1350 }
1344 1351
1345 if (x >= m->width) 1352 if (x >= m->width)
1346 { 1353 {
1347 if (!m->tile_path[1]) 1354 if (!m->tile_path[1])
1348 return 1; 1355 return 1;
1349 1356
1350 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1357 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1351 load_and_link_tiled_map (m, 1); 1358 find_and_link (m, 1);
1352 1359
1353 return out_of_map (m->tile_map[1], x - m->width, y); 1360 return out_of_map (m->tile_map[1], x - m->width, y);
1354 } 1361 }
1355 1362
1356 if (y < 0) 1363 if (y < 0)
1357 { 1364 {
1358 if (!m->tile_path[0]) 1365 if (!m->tile_path[0])
1359 return 1; 1366 return 1;
1360 1367
1361 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1368 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1362 load_and_link_tiled_map (m, 0); 1369 find_and_link (m, 0);
1363 1370
1364 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1371 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1365 } 1372 }
1366 1373
1367 if (y >= m->height) 1374 if (y >= m->height)
1368 { 1375 {
1369 if (!m->tile_path[2]) 1376 if (!m->tile_path[2])
1370 return 1; 1377 return 1;
1371 1378
1372 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1379 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1373 load_and_link_tiled_map (m, 2); 1380 find_and_link (m, 2);
1374 1381
1375 return out_of_map (m->tile_map[2], x, y - m->height); 1382 return out_of_map (m->tile_map[2], x, y - m->height);
1376 } 1383 }
1377 1384
1378 /* Simple case - coordinates are within this local 1385 /* Simple case - coordinates are within this local
… …
1388 * updates x and y to be the localised coordinates. 1395 * updates x and y to be the localised coordinates.
1389 * Using this is more efficient of calling out_of_map 1396 * Using this is more efficient of calling out_of_map
1390 * and then figuring out what the real map is 1397 * and then figuring out what the real map is
1391 */ 1398 */
1392maptile * 1399maptile *
1393get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1400maptile::xy_find (sint16 &x, sint16 &y)
1394{ 1401{
1395 if (*x < 0) 1402 if (x < 0)
1396 { 1403 {
1397 if (!m->tile_path[3]) 1404 if (!tile_path[3])
1398 return 0; 1405 return 0;
1399 1406
1400 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1407 find_and_link (this, 3);
1401 load_and_link_tiled_map (m, 3);
1402
1403 *x += m->tile_map[3]->width; 1408 x += tile_map[3]->width;
1404 return (get_map_from_coord (m->tile_map[3], x, y)); 1409 return tile_map[3]->xy_find (x, y);
1405 } 1410 }
1406 1411
1407 if (*x >= m->width) 1412 if (x >= width)
1408 { 1413 {
1409 if (!m->tile_path[1]) 1414 if (!tile_path[1])
1410 return 0; 1415 return 0;
1411 1416
1412 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1417 find_and_link (this, 1);
1413 load_and_link_tiled_map (m, 1);
1414
1415 *x -= m->width; 1418 x -= width;
1416 return (get_map_from_coord (m->tile_map[1], x, y)); 1419 return tile_map[1]->xy_find (x, y);
1417 } 1420 }
1418 1421
1419 if (*y < 0) 1422 if (y < 0)
1420 { 1423 {
1421 if (!m->tile_path[0]) 1424 if (!tile_path[0])
1422 return 0; 1425 return 0;
1423 1426
1424 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1427 find_and_link (this, 0);
1425 load_and_link_tiled_map (m, 0);
1426
1427 *y += m->tile_map[0]->height; 1428 y += tile_map[0]->height;
1428 return (get_map_from_coord (m->tile_map[0], x, y)); 1429 return tile_map[0]->xy_find (x, y);
1429 } 1430 }
1430 1431
1431 if (*y >= m->height) 1432 if (y >= height)
1432 { 1433 {
1433 if (!m->tile_path[2]) 1434 if (!tile_path[2])
1434 return 0; 1435 return 0;
1435 1436
1436 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1437 find_and_link (this, 2);
1437 load_and_link_tiled_map (m, 2);
1438
1439 *y -= m->height; 1438 y -= height;
1440 return (get_map_from_coord (m->tile_map[2], x, y)); 1439 return tile_map[2]->xy_find (x, y);
1441 } 1440 }
1442 1441
1443 /* Simple case - coordinates are within this local 1442 /* Simple case - coordinates are within this local
1444 * map. 1443 * map.
1445 */ 1444 */
1446 return m; 1445 return this;
1447} 1446}
1448 1447
1449/** 1448/**
1450 * Return whether map2 is adjacent to map1. If so, store the distance from 1449 * Return whether map2 is adjacent to map1. If so, store the distance from
1451 * map1 to map2 in dx/dy. 1450 * map1 to map2 in dx/dy.
… …
1454adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1453adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1455{ 1454{
1456 if (!map1 || !map2) 1455 if (!map1 || !map2)
1457 return 0; 1456 return 0;
1458 1457
1458 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1459 //fix: compare paths instead (this is likely faster, too!)
1459 if (map1 == map2) 1460 if (map1 == map2)
1460 { 1461 {
1461 *dx = 0; 1462 *dx = 0;
1462 *dy = 0; 1463 *dy = 0;
1463 } 1464 }
… …
1523 } 1524 }
1524 else 1525 else
1525 return 0; 1526 return 0;
1526 1527
1527 return 1; 1528 return 1;
1529}
1530
1531maptile *
1532maptile::xy_load (sint16 &x, sint16 &y)
1533{
1534 maptile *map = xy_find (x, y);
1535
1536 if (map)
1537 map->load_sync ();
1538
1539 return map;
1540}
1541
1542maptile *
1543get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1544{
1545 return m->xy_load (*x, *y);
1528} 1546}
1529 1547
1530/* From map.c 1548/* From map.c
1531 * This is used by get_player to determine where the other 1549 * This is used by get_player to determine where the other
1532 * creature is. get_rangevector takes into account map tiling, 1550 * creature is. get_rangevector takes into account map tiling,

Diff Legend

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