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.63 by root, Mon Jan 1 00:41:02 2007 UTC vs.
Revision 1.70 by root, Thu Jan 4 20:29:45 2007 UTC

… …
329 * carrying. 329 * carrying.
330 */ 330 */
331 sum_weight (container); 331 sum_weight (container);
332} 332}
333 333
334void
335maptile::set_object_flag (int flag, int value)
336{
337 if (!spaces)
338 return;
339
340 for (mapspace *ms = spaces + size (); ms-- > spaces; )
341 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
342 tmp->flag [flag] = value;
343}
344
334/* link_multipart_objects go through all the objects on the map looking 345/* link_multipart_objects go through all the objects on the map looking
335 * for objects whose arch says they are multipart yet according to the 346 * for objects whose arch says they are multipart yet according to the
336 * info we have, they only have the head (as would be expected when 347 * info we have, they only have the head (as would be expected when
337 * they are saved). We do have to look for the old maps that did save 348 * they are saved). We do have to look for the old maps that did save
338 * the more sections and not re-add sections for them. 349 * the more sections and not re-add sections for them.
… …
476} 487}
477 488
478bool 489bool
479maptile::save_objects (object_freezer &freezer, int flags) 490maptile::save_objects (object_freezer &freezer, int flags)
480{ 491{
492 static int cede_count = 0;
493
481 if (flags & IO_HEADER) 494 if (flags & IO_HEADER)
482 save_header (freezer); 495 save_header (freezer);
483 496
484 if (!spaces) 497 if (!spaces)
485 return false; 498 return false;
486 499
487 for (int i = 0; i < size (); ++i) 500 for (int i = 0; i < size (); ++i)
488 { 501 {
502 if (cede_count >= 500)
503 {
504 cede_count = 0;
505 coroapi::cede ();
506 }
507
489 int unique = 0; 508 int unique = 0;
490 for (object *op = spaces [i].bot; op; op = op->above) 509 for (object *op = spaces [i].bot; op; op = op->above)
491 { 510 {
511 // count per-object, but cede only when modification-safe
512 cede_count++;
513
492 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 514 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
493 unique = 1; 515 unique = 1;
494 516
495 if (!op->can_map_save ()) 517 if (!op->can_map_save ())
496 continue; 518 continue;
… …
709 * MSW 2001-07-01 731 * MSW 2001-07-01
710 */ 732 */
711bool 733bool
712maptile::load_header (object_thawer &thawer) 734maptile::load_header (object_thawer &thawer)
713{ 735{
714 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
715 int msgpos = 0;
716 int maplorepos = 0;
717
718 for (;;) 736 for (;;)
719 { 737 {
720 keyword kw = thawer.get_kv (); 738 keyword kw = thawer.get_kv ();
721 739
722 switch (kw) 740 switch (kw)
… …
725 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);
726 return false; 744 return false;
727 745
728 case KW_end: 746 case KW_end:
729 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;
730 753
731 case KW_msg: 754 case KW_msg:
732 thawer.get_ml (KW_endmsg, msg); 755 thawer.get_ml (KW_endmsg, msg);
733 break; 756 break;
734 757
… …
785 808
786 case KW_tile_path_1: thawer.get (tile_path [0]); break; 809 case KW_tile_path_1: thawer.get (tile_path [0]); break;
787 case KW_tile_path_2: thawer.get (tile_path [1]); break; 810 case KW_tile_path_2: thawer.get (tile_path [1]); break;
788 case KW_tile_path_3: thawer.get (tile_path [2]); break; 811 case KW_tile_path_3: thawer.get (tile_path [2]); break;
789 case KW_tile_path_4: thawer.get (tile_path [3]); break; 812 case KW_tile_path_4: thawer.get (tile_path [3]); break;
790
791 default:
792 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]);
793 break;
794 } 813 }
795 } 814 }
796 815
797 abort (); 816 abort ();
798} 817}
… …
1215 1234
1216 /* If two top faces are already set, quit processing */ 1235 /* If two top faces are already set, quit processing */
1217 if ((top != blank_face) && (middle != blank_face)) 1236 if ((top != blank_face) && (middle != blank_face))
1218 break; 1237 break;
1219 1238
1220 /* Only show visible faces, unless its the editor - show all */ 1239 /* Only show visible faces */
1221 if (!tmp->invisible || editor) 1240 if (!tmp->invisible)
1222 { 1241 {
1223 /* Fill in top if needed */ 1242 /* Fill in top if needed */
1224 if (top == blank_face) 1243 if (top == blank_face)
1225 { 1244 {
1226 top = tmp->face; 1245 top = tmp->face;
… …
1256 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;
1257 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;
1258 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;
1259} 1278}
1260 1279
1261/* 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
1262 * 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
1263 * 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
1264 * the value of orig_map->tile_map[tile_num]. It really only does this 1283 * the value of orig_map->tile_map[tile_num].
1265 * so that it is easier for calling functions to verify success.
1266 */ 1284 */
1267static maptile * 1285static inline maptile *
1268load_and_link_tiled_map (maptile *orig_map, int tile_num) 1286find_and_link (maptile *orig_map, int tile_num)
1269{ 1287{
1288 maptile *mp = orig_map->tile_map [tile_num];
1289
1290 if (!mp)
1291 {
1270 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);
1271 1293
1272 if (!mp || mp->in_memory != MAP_IN_MEMORY) 1294 if (!mp)
1273 { 1295 {
1274 // 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
1275 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",
1276 &orig_map->tile_path[tile_num], &orig_map->path); 1298 &orig_map->tile_path[tile_num], &orig_map->path);
1277 mp = new maptile (1, 1); 1299 mp = new maptile (1, 1);
1278 mp->alloc (); 1300 mp->alloc ();
1279 mp->in_memory = MAP_IN_MEMORY; 1301 mp->in_memory = MAP_IN_MEMORY;
1302 }
1280 } 1303 }
1281 1304
1282 int dest_tile = (tile_num + 2) % 4; 1305 int dest_tile = (tile_num + 2) % 4;
1283 1306
1284 orig_map->tile_map[tile_num] = mp; 1307 orig_map->tile_map [tile_num] = mp;
1285 1308
1286 // optimisation: back-link map to origin map if euclidean 1309 // optimisation: back-link map to origin map if euclidean
1287 //TODO: non-euclidean maps MUST GO 1310 //TODO: non-euclidean maps MUST GO
1288 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)
1289 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;
1290 1313
1291 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 ();
1292} 1321}
1293 1322
1294/* this returns TRUE if the coordinates (x,y) are out of 1323/* this returns TRUE if the coordinates (x,y) are out of
1295 * map m. This function also takes into account any 1324 * map m. This function also takes into account any
1296 * tiling considerations, loading adjacant maps as needed. 1325 * tiling considerations, loading adjacant maps as needed.
… …
1313 { 1342 {
1314 if (!m->tile_path[3]) 1343 if (!m->tile_path[3])
1315 return 1; 1344 return 1;
1316 1345
1317 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)
1318 load_and_link_tiled_map (m, 3); 1347 find_and_link (m, 3);
1319 1348
1320 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);
1321 } 1350 }
1322 1351
1323 if (x >= m->width) 1352 if (x >= m->width)
1324 { 1353 {
1325 if (!m->tile_path[1]) 1354 if (!m->tile_path[1])
1326 return 1; 1355 return 1;
1327 1356
1328 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)
1329 load_and_link_tiled_map (m, 1); 1358 find_and_link (m, 1);
1330 1359
1331 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);
1332 } 1361 }
1333 1362
1334 if (y < 0) 1363 if (y < 0)
1335 { 1364 {
1336 if (!m->tile_path[0]) 1365 if (!m->tile_path[0])
1337 return 1; 1366 return 1;
1338 1367
1339 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)
1340 load_and_link_tiled_map (m, 0); 1369 find_and_link (m, 0);
1341 1370
1342 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);
1343 } 1372 }
1344 1373
1345 if (y >= m->height) 1374 if (y >= m->height)
1346 { 1375 {
1347 if (!m->tile_path[2]) 1376 if (!m->tile_path[2])
1348 return 1; 1377 return 1;
1349 1378
1350 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)
1351 load_and_link_tiled_map (m, 2); 1380 find_and_link (m, 2);
1352 1381
1353 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);
1354 } 1383 }
1355 1384
1356 /* Simple case - coordinates are within this local 1385 /* Simple case - coordinates are within this local
… …
1361 1390
1362/* This is basically the same as out_of_map above, but 1391/* This is basically the same as out_of_map above, but
1363 * instead we return NULL if no map is valid (coordinates 1392 * instead we return NULL if no map is valid (coordinates
1364 * out of bounds and no tiled map), otherwise it returns 1393 * out of bounds and no tiled map), otherwise it returns
1365 * the map as that the coordinates are really on, and 1394 * the map as that the coordinates are really on, and
1366 * updates x and y to be the localized coordinates. 1395 * updates x and y to be the localised coordinates.
1367 * Using this is more efficient of calling out_of_map 1396 * Using this is more efficient of calling out_of_map
1368 * and then figuring out what the real map is 1397 * and then figuring out what the real map is
1369 */ 1398 */
1370maptile * 1399maptile *
1371get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1400maptile::xy_find (sint16 &x, sint16 &y)
1372{ 1401{
1373 if (*x < 0) 1402 if (x < 0)
1374 { 1403 {
1375 if (!m->tile_path[3]) 1404 if (!tile_path[3])
1376 return 0; 1405 return 0;
1377 1406
1378 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1407 find_and_link (this, 3);
1379 load_and_link_tiled_map (m, 3);
1380
1381 *x += m->tile_map[3]->width; 1408 x += tile_map[3]->width;
1382 return (get_map_from_coord (m->tile_map[3], x, y)); 1409 return tile_map[3]->xy_find (x, y);
1383 } 1410 }
1384 1411
1385 if (*x >= m->width) 1412 if (x >= width)
1386 { 1413 {
1387 if (!m->tile_path[1]) 1414 if (!tile_path[1])
1388 return 0; 1415 return 0;
1389 1416
1390 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1417 find_and_link (this, 1);
1391 load_and_link_tiled_map (m, 1);
1392
1393 *x -= m->width; 1418 x -= width;
1394 return (get_map_from_coord (m->tile_map[1], x, y)); 1419 return tile_map[1]->xy_find (x, y);
1395 } 1420 }
1396 1421
1397 if (*y < 0) 1422 if (y < 0)
1398 { 1423 {
1399 if (!m->tile_path[0]) 1424 if (!tile_path[0])
1400 return 0; 1425 return 0;
1401 1426
1402 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1427 find_and_link (this, 0);
1403 load_and_link_tiled_map (m, 0);
1404
1405 *y += m->tile_map[0]->height; 1428 y += tile_map[0]->height;
1406 return (get_map_from_coord (m->tile_map[0], x, y)); 1429 return tile_map[0]->xy_find (x, y);
1407 } 1430 }
1408 1431
1409 if (*y >= m->height) 1432 if (y >= height)
1410 { 1433 {
1411 if (!m->tile_path[2]) 1434 if (!tile_path[2])
1412 return 0; 1435 return 0;
1413 1436
1414 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1437 find_and_link (this, 2);
1415 load_and_link_tiled_map (m, 2);
1416
1417 *y -= m->height; 1438 y -= height;
1418 return (get_map_from_coord (m->tile_map[2], x, y)); 1439 return tile_map[2]->xy_find (x, y);
1419 } 1440 }
1420 1441
1421 /* Simple case - coordinates are within this local 1442 /* Simple case - coordinates are within this local
1422 * map. 1443 * map.
1423 */ 1444 */
1424 return m; 1445 return this;
1425} 1446}
1426 1447
1427/** 1448/**
1428 * 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
1429 * map1 to map2 in dx/dy. 1450 * map1 to map2 in dx/dy.
… …
1432adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1453adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1433{ 1454{
1434 if (!map1 || !map2) 1455 if (!map1 || !map2)
1435 return 0; 1456 return 0;
1436 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!)
1437 if (map1 == map2) 1460 if (map1 == map2)
1438 { 1461 {
1439 *dx = 0; 1462 *dx = 0;
1440 *dy = 0; 1463 *dy = 0;
1441 } 1464 }
… …
1501 } 1524 }
1502 else 1525 else
1503 return 0; 1526 return 0;
1504 1527
1505 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);
1506} 1546}
1507 1547
1508/* From map.c 1548/* From map.c
1509 * This is used by get_player to determine where the other 1549 * This is used by get_player to determine where the other
1510 * 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