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.64 by root, Mon Jan 1 12:28:45 2007 UTC vs.
Revision 1.70 by root, Thu Jan 4 20:29:45 2007 UTC

… …
487} 487}
488 488
489bool 489bool
490maptile::save_objects (object_freezer &freezer, int flags) 490maptile::save_objects (object_freezer &freezer, int flags)
491{ 491{
492 static int cede_count = 0;
493
492 if (flags & IO_HEADER) 494 if (flags & IO_HEADER)
493 save_header (freezer); 495 save_header (freezer);
494 496
495 if (!spaces) 497 if (!spaces)
496 return false; 498 return false;
497 499
498 for (int i = 0; i < size (); ++i) 500 for (int i = 0; i < size (); ++i)
499 { 501 {
502 if (cede_count >= 500)
503 {
504 cede_count = 0;
505 coroapi::cede ();
506 }
507
500 int unique = 0; 508 int unique = 0;
501 for (object *op = spaces [i].bot; op; op = op->above) 509 for (object *op = spaces [i].bot; op; op = op->above)
502 { 510 {
511 // count per-object, but cede only when modification-safe
512 cede_count++;
513
503 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 514 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
504 unique = 1; 515 unique = 1;
505 516
506 if (!op->can_map_save ()) 517 if (!op->can_map_save ())
507 continue; 518 continue;
… …
720 * MSW 2001-07-01 731 * MSW 2001-07-01
721 */ 732 */
722bool 733bool
723maptile::load_header (object_thawer &thawer) 734maptile::load_header (object_thawer &thawer)
724{ 735{
725 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
726 int msgpos = 0;
727 int maplorepos = 0;
728
729 for (;;) 736 for (;;)
730 { 737 {
731 keyword kw = thawer.get_kv (); 738 keyword kw = thawer.get_kv ();
732 739
733 switch (kw) 740 switch (kw)
… …
736 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);
737 return false; 744 return false;
738 745
739 case KW_end: 746 case KW_end:
740 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;
741 753
742 case KW_msg: 754 case KW_msg:
743 thawer.get_ml (KW_endmsg, msg); 755 thawer.get_ml (KW_endmsg, msg);
744 break; 756 break;
745 757
… …
796 808
797 case KW_tile_path_1: thawer.get (tile_path [0]); break; 809 case KW_tile_path_1: thawer.get (tile_path [0]); break;
798 case KW_tile_path_2: thawer.get (tile_path [1]); break; 810 case KW_tile_path_2: thawer.get (tile_path [1]); break;
799 case KW_tile_path_3: thawer.get (tile_path [2]); break; 811 case KW_tile_path_3: thawer.get (tile_path [2]); break;
800 case KW_tile_path_4: thawer.get (tile_path [3]); break; 812 case KW_tile_path_4: thawer.get (tile_path [3]); break;
801
802 default:
803 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]);
804 break;
805 } 813 }
806 } 814 }
807 815
808 abort (); 816 abort ();
809} 817}
… …
1226 1234
1227 /* If two top faces are already set, quit processing */ 1235 /* If two top faces are already set, quit processing */
1228 if ((top != blank_face) && (middle != blank_face)) 1236 if ((top != blank_face) && (middle != blank_face))
1229 break; 1237 break;
1230 1238
1231 /* Only show visible faces, unless its the editor - show all */ 1239 /* Only show visible faces */
1232 if (!tmp->invisible || editor) 1240 if (!tmp->invisible)
1233 { 1241 {
1234 /* Fill in top if needed */ 1242 /* Fill in top if needed */
1235 if (top == blank_face) 1243 if (top == blank_face)
1236 { 1244 {
1237 top = tmp->face; 1245 top = tmp->face;
… …
1267 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;
1268 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;
1269 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;
1270} 1278}
1271 1279
1272/* 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
1273 * 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
1274 * 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
1275 * the value of orig_map->tile_map[tile_num]. It really only does this 1283 * the value of orig_map->tile_map[tile_num].
1276 * so that it is easier for calling functions to verify success.
1277 */ 1284 */
1278static maptile * 1285static inline maptile *
1279load_and_link_tiled_map (maptile *orig_map, int tile_num) 1286find_and_link (maptile *orig_map, int tile_num)
1280{ 1287{
1288 maptile *mp = orig_map->tile_map [tile_num];
1289
1290 if (!mp)
1291 {
1281 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);
1282 1293
1283 if (!mp || mp->in_memory != MAP_IN_MEMORY) 1294 if (!mp)
1284 { 1295 {
1285 // 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
1286 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",
1287 &orig_map->tile_path[tile_num], &orig_map->path); 1298 &orig_map->tile_path[tile_num], &orig_map->path);
1288 mp = new maptile (1, 1); 1299 mp = new maptile (1, 1);
1289 mp->alloc (); 1300 mp->alloc ();
1290 mp->in_memory = MAP_IN_MEMORY; 1301 mp->in_memory = MAP_IN_MEMORY;
1302 }
1291 } 1303 }
1292 1304
1293 int dest_tile = (tile_num + 2) % 4; 1305 int dest_tile = (tile_num + 2) % 4;
1294 1306
1295 orig_map->tile_map[tile_num] = mp; 1307 orig_map->tile_map [tile_num] = mp;
1296 1308
1297 // optimisation: back-link map to origin map if euclidean 1309 // optimisation: back-link map to origin map if euclidean
1298 //TODO: non-euclidean maps MUST GO 1310 //TODO: non-euclidean maps MUST GO
1299 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)
1300 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;
1301 1313
1302 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 ();
1303} 1321}
1304 1322
1305/* this returns TRUE if the coordinates (x,y) are out of 1323/* this returns TRUE if the coordinates (x,y) are out of
1306 * map m. This function also takes into account any 1324 * map m. This function also takes into account any
1307 * tiling considerations, loading adjacant maps as needed. 1325 * tiling considerations, loading adjacant maps as needed.
… …
1324 { 1342 {
1325 if (!m->tile_path[3]) 1343 if (!m->tile_path[3])
1326 return 1; 1344 return 1;
1327 1345
1328 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)
1329 load_and_link_tiled_map (m, 3); 1347 find_and_link (m, 3);
1330 1348
1331 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);
1332 } 1350 }
1333 1351
1334 if (x >= m->width) 1352 if (x >= m->width)
1335 { 1353 {
1336 if (!m->tile_path[1]) 1354 if (!m->tile_path[1])
1337 return 1; 1355 return 1;
1338 1356
1339 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)
1340 load_and_link_tiled_map (m, 1); 1358 find_and_link (m, 1);
1341 1359
1342 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);
1343 } 1361 }
1344 1362
1345 if (y < 0) 1363 if (y < 0)
1346 { 1364 {
1347 if (!m->tile_path[0]) 1365 if (!m->tile_path[0])
1348 return 1; 1366 return 1;
1349 1367
1350 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)
1351 load_and_link_tiled_map (m, 0); 1369 find_and_link (m, 0);
1352 1370
1353 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);
1354 } 1372 }
1355 1373
1356 if (y >= m->height) 1374 if (y >= m->height)
1357 { 1375 {
1358 if (!m->tile_path[2]) 1376 if (!m->tile_path[2])
1359 return 1; 1377 return 1;
1360 1378
1361 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)
1362 load_and_link_tiled_map (m, 2); 1380 find_and_link (m, 2);
1363 1381
1364 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);
1365 } 1383 }
1366 1384
1367 /* Simple case - coordinates are within this local 1385 /* Simple case - coordinates are within this local
… …
1372 1390
1373/* This is basically the same as out_of_map above, but 1391/* This is basically the same as out_of_map above, but
1374 * instead we return NULL if no map is valid (coordinates 1392 * instead we return NULL if no map is valid (coordinates
1375 * out of bounds and no tiled map), otherwise it returns 1393 * out of bounds and no tiled map), otherwise it returns
1376 * the map as that the coordinates are really on, and 1394 * the map as that the coordinates are really on, and
1377 * updates x and y to be the localized coordinates. 1395 * updates x and y to be the localised coordinates.
1378 * Using this is more efficient of calling out_of_map 1396 * Using this is more efficient of calling out_of_map
1379 * and then figuring out what the real map is 1397 * and then figuring out what the real map is
1380 */ 1398 */
1381maptile * 1399maptile *
1382get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1400maptile::xy_find (sint16 &x, sint16 &y)
1383{ 1401{
1384 if (*x < 0) 1402 if (x < 0)
1385 { 1403 {
1386 if (!m->tile_path[3]) 1404 if (!tile_path[3])
1387 return 0; 1405 return 0;
1388 1406
1389 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1407 find_and_link (this, 3);
1390 load_and_link_tiled_map (m, 3);
1391
1392 *x += m->tile_map[3]->width; 1408 x += tile_map[3]->width;
1393 return (get_map_from_coord (m->tile_map[3], x, y)); 1409 return tile_map[3]->xy_find (x, y);
1394 } 1410 }
1395 1411
1396 if (*x >= m->width) 1412 if (x >= width)
1397 { 1413 {
1398 if (!m->tile_path[1]) 1414 if (!tile_path[1])
1399 return 0; 1415 return 0;
1400 1416
1401 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1417 find_and_link (this, 1);
1402 load_and_link_tiled_map (m, 1);
1403
1404 *x -= m->width; 1418 x -= width;
1405 return (get_map_from_coord (m->tile_map[1], x, y)); 1419 return tile_map[1]->xy_find (x, y);
1406 } 1420 }
1407 1421
1408 if (*y < 0) 1422 if (y < 0)
1409 { 1423 {
1410 if (!m->tile_path[0]) 1424 if (!tile_path[0])
1411 return 0; 1425 return 0;
1412 1426
1413 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1427 find_and_link (this, 0);
1414 load_and_link_tiled_map (m, 0);
1415
1416 *y += m->tile_map[0]->height; 1428 y += tile_map[0]->height;
1417 return (get_map_from_coord (m->tile_map[0], x, y)); 1429 return tile_map[0]->xy_find (x, y);
1418 } 1430 }
1419 1431
1420 if (*y >= m->height) 1432 if (y >= height)
1421 { 1433 {
1422 if (!m->tile_path[2]) 1434 if (!tile_path[2])
1423 return 0; 1435 return 0;
1424 1436
1425 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1437 find_and_link (this, 2);
1426 load_and_link_tiled_map (m, 2);
1427
1428 *y -= m->height; 1438 y -= height;
1429 return (get_map_from_coord (m->tile_map[2], x, y)); 1439 return tile_map[2]->xy_find (x, y);
1430 } 1440 }
1431 1441
1432 /* Simple case - coordinates are within this local 1442 /* Simple case - coordinates are within this local
1433 * map. 1443 * map.
1434 */ 1444 */
1435 return m; 1445 return this;
1436} 1446}
1437 1447
1438/** 1448/**
1439 * 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
1440 * map1 to map2 in dx/dy. 1450 * map1 to map2 in dx/dy.
… …
1443adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1453adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1444{ 1454{
1445 if (!map1 || !map2) 1455 if (!map1 || !map2)
1446 return 0; 1456 return 0;
1447 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!)
1448 if (map1 == map2) 1460 if (map1 == map2)
1449 { 1461 {
1450 *dx = 0; 1462 *dx = 0;
1451 *dy = 0; 1463 *dy = 0;
1452 } 1464 }
… …
1512 } 1524 }
1513 else 1525 else
1514 return 0; 1526 return 0;
1515 1527
1516 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);
1517} 1546}
1518 1547
1519/* From map.c 1548/* From map.c
1520 * This is used by get_player to determine where the other 1549 * This is used by get_player to determine where the other
1521 * 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