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.60 by root, Sun Dec 31 10:28:35 2006 UTC vs.
Revision 1.69 by root, Thu Jan 4 16:56:39 2007 UTC

… …
36 * it really should be called create_mapname 36 * it really should be called create_mapname
37 */ 37 */
38const char * 38const char *
39create_pathname (const char *name) 39create_pathname (const char *name)
40{ 40{
41 static char buf[MAX_BUF]; 41 static char buf[8192];
42
43 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
44 * someplace else in the code? msw 2-17-97
45 */
46 if (*name == '/')
47 sprintf (buf, "%s/%s%s", settings.datadir, settings.mapdir, name);
48 else
49 sprintf (buf, "%s/%s/%s", settings.datadir, settings.mapdir, name); 42 snprintf (buf, sizeof (buf), "%s/%s/%s", settings.datadir, settings.mapdir, name);
50 return (buf); 43 return buf;
51}
52
53/*
54 * same as create_pathname, but for the overlay maps.
55 */
56const char *
57create_overlay_pathname (const char *name)
58{
59 static char buf[MAX_BUF];
60
61 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
62 * someplace else in the code? msw 2-17-97
63 */
64 if (*name == '/')
65 sprintf (buf, "%s/%s%s", settings.localdir, settings.mapdir, name);
66 else
67 sprintf (buf, "%s/%s/%s", settings.localdir, settings.mapdir, name);
68 return (buf);
69}
70
71/*
72 * same as create_pathname, but for the template maps.
73 */
74const char *
75create_template_pathname (const char *name)
76{
77 static char buf[MAX_BUF];
78
79 /* Why? having extra / doesn't confuse unix anyplace? Dependancies
80 * someplace else in the code? msw 2-17-97
81 */
82 if (*name == '/')
83 sprintf (buf, "%s/%s%s", settings.localdir, settings.templatedir, name);
84 else
85 sprintf (buf, "%s/%s/%s", settings.localdir, settings.templatedir, name);
86 return (buf);
87}
88
89/*
90 * This makes absolute path to the itemfile where unique objects
91 * will be saved. Converts '/' to '@'. I think it's essier maintain
92 * files than full directory structure, but if this is problem it can
93 * be changed.
94 */
95static const char *
96create_items_path (const char *s)
97{
98 static char buf[MAX_BUF];
99 char *t;
100
101 if (*s == '/')
102 s++;
103
104 sprintf (buf, "%s/%s/", settings.localdir, settings.uniquedir);
105
106 for (t = buf + strlen (buf); *s; s++, t++)
107 if (*s == '/')
108 *t = '@';
109 else
110 *t = *s;
111 *t = 0;
112 return (buf);
113} 44}
114 45
115/* 46/*
116 * This function checks if a file with the given path exists. 47 * This function checks if a file with the given path exists.
117 * -1 is returned if it fails, otherwise the mode of the file 48 * -1 is returned if it fails, otherwise the mode of the file
… …
398 * carrying. 329 * carrying.
399 */ 330 */
400 sum_weight (container); 331 sum_weight (container);
401} 332}
402 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
403/* 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
404 * 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
405 * 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
406 * 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
407 * the more sections and not re-add sections for them. 349 * the more sections and not re-add sections for them.
… …
528 if (!spaces) 470 if (!spaces)
529 return; 471 return;
530 472
531 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 473 for (mapspace *ms = spaces + size (); ms-- > spaces; )
532 for (object *op = ms->bot; op; op = op->above) 474 for (object *op = ms->bot; op; op = op->above)
533 op->activate (1); 475 op->activate_recursive ();
534} 476}
535 477
536void 478void
537maptile::deactivate () 479maptile::deactivate ()
538{ 480{
539 if (!spaces) 481 if (!spaces)
540 return; 482 return;
541 483
542 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 484 for (mapspace *ms = spaces + size (); ms-- > spaces; )
543 for (object *op = ms->bot; op; op = op->above) 485 for (object *op = ms->bot; op; op = op->above)
544 op->deactivate (1); 486 op->deactivate_recursive ();
545} 487}
546 488
547bool 489bool
548maptile::save_objects (object_freezer &freezer, int flags) 490maptile::save_objects (object_freezer &freezer, int flags)
549{ 491{
492 static int cede_count = 0;
493
550 if (flags & IO_HEADER) 494 if (flags & IO_HEADER)
551 save_header (freezer); 495 save_header (freezer);
552 496
553 if (!spaces) 497 if (!spaces)
554 return false; 498 return false;
555 499
556 for (int i = 0; i < size (); ++i) 500 for (int i = 0; i < size (); ++i)
557 { 501 {
502 if (cede_count >= 500)
503 {
504 cede_count = 0;
505 coroapi::cede ();
506 }
507
558 int unique = 0; 508 int unique = 0;
559 for (object *op = spaces [i].bot; op; op = op->above) 509 for (object *op = spaces [i].bot; op; op = op->above)
560 { 510 {
511 // count per-object, but cede only when modification-safe
512 cede_count++;
513
561 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 514 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
562 unique = 1; 515 unique = 1;
563 516
564 if (!op->can_map_save ()) 517 if (!op->can_map_save ())
565 continue; 518 continue;
… …
789 keyword kw = thawer.get_kv (); 742 keyword kw = thawer.get_kv ();
790 743
791 switch (kw) 744 switch (kw)
792 { 745 {
793 case KW_EOF: 746 case KW_EOF:
794 LOG (llevError, "%s: end of file while reading map header, aborting header load.", &path); 747 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
795 return false; 748 return false;
796 749
797 case KW_end: 750 case KW_end:
798 return true; 751 return true;
799 752
… …
957 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 910 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]);
958 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]); 911 if (tile_path [1]) MAP_OUT2 (tile_path_2, tile_path [1]);
959 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]); 912 if (tile_path [2]) MAP_OUT2 (tile_path_3, tile_path [2]);
960 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]); 913 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
961 914
962 MAP_OUT2 (end, 0); 915 freezer.put (this);
916 freezer.put (KW_end);
963 917
964 return true; 918 return true;
965} 919}
966 920
967bool 921bool
… …
1283 1237
1284 /* If two top faces are already set, quit processing */ 1238 /* If two top faces are already set, quit processing */
1285 if ((top != blank_face) && (middle != blank_face)) 1239 if ((top != blank_face) && (middle != blank_face))
1286 break; 1240 break;
1287 1241
1288 /* Only show visible faces, unless its the editor - show all */ 1242 /* Only show visible faces */
1289 if (!tmp->invisible || editor) 1243 if (!tmp->invisible)
1290 { 1244 {
1291 /* Fill in top if needed */ 1245 /* Fill in top if needed */
1292 if (top == blank_face) 1246 if (top == blank_face)
1293 { 1247 {
1294 top = tmp->face; 1248 top = tmp->face;
… …
1324 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;
1325 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;
1326 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;
1327} 1281}
1328 1282
1329/* 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
1330 * 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
1331 * 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
1332 * the value of orig_map->tile_map[tile_num]. It really only does this 1286 * the value of orig_map->tile_map[tile_num].
1333 * so that it is easier for calling functions to verify success.
1334 */ 1287 */
1335static maptile * 1288static inline maptile *
1336load_and_link_tiled_map (maptile *orig_map, int tile_num) 1289find_and_link (maptile *orig_map, int tile_num)
1337{ 1290{
1291 maptile *mp = orig_map->tile_map [tile_num];
1292
1293 if (!mp)
1294 {
1338 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);
1339 1296
1340 if (!mp || mp->in_memory != MAP_IN_MEMORY) 1297 if (!mp)
1341 { 1298 {
1342 // 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
1343 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",
1344 &orig_map->tile_path[tile_num], &orig_map->path); 1301 &orig_map->tile_path[tile_num], &orig_map->path);
1345 mp = new maptile (1, 1); 1302 mp = new maptile (1, 1);
1346 mp->alloc (); 1303 mp->alloc ();
1347 mp->in_memory = MAP_IN_MEMORY; 1304 mp->in_memory = MAP_IN_MEMORY;
1305 }
1348 } 1306 }
1349 1307
1350 int dest_tile = (tile_num + 2) % 4; 1308 int dest_tile = (tile_num + 2) % 4;
1351 1309
1352 orig_map->tile_map[tile_num] = mp; 1310 orig_map->tile_map [tile_num] = mp;
1353 1311
1354 // optimisation: back-link map to origin map if euclidean 1312 // optimisation: back-link map to origin map if euclidean
1355 //TODO: non-euclidean maps MUST GO 1313 //TODO: non-euclidean maps MUST GO
1356 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)
1357 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;
1358 1316
1359 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 ();
1360} 1324}
1361 1325
1362/* this returns TRUE if the coordinates (x,y) are out of 1326/* this returns TRUE if the coordinates (x,y) are out of
1363 * map m. This function also takes into account any 1327 * map m. This function also takes into account any
1364 * tiling considerations, loading adjacant maps as needed. 1328 * tiling considerations, loading adjacant maps as needed.
… …
1381 { 1345 {
1382 if (!m->tile_path[3]) 1346 if (!m->tile_path[3])
1383 return 1; 1347 return 1;
1384 1348
1385 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)
1386 load_and_link_tiled_map (m, 3); 1350 find_and_link (m, 3);
1387 1351
1388 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);
1389 } 1353 }
1390 1354
1391 if (x >= m->width) 1355 if (x >= m->width)
1392 { 1356 {
1393 if (!m->tile_path[1]) 1357 if (!m->tile_path[1])
1394 return 1; 1358 return 1;
1395 1359
1396 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)
1397 load_and_link_tiled_map (m, 1); 1361 find_and_link (m, 1);
1398 1362
1399 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);
1400 } 1364 }
1401 1365
1402 if (y < 0) 1366 if (y < 0)
1403 { 1367 {
1404 if (!m->tile_path[0]) 1368 if (!m->tile_path[0])
1405 return 1; 1369 return 1;
1406 1370
1407 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)
1408 load_and_link_tiled_map (m, 0); 1372 find_and_link (m, 0);
1409 1373
1410 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);
1411 } 1375 }
1412 1376
1413 if (y >= m->height) 1377 if (y >= m->height)
1414 { 1378 {
1415 if (!m->tile_path[2]) 1379 if (!m->tile_path[2])
1416 return 1; 1380 return 1;
1417 1381
1418 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)
1419 load_and_link_tiled_map (m, 2); 1383 find_and_link (m, 2);
1420 1384
1421 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);
1422 } 1386 }
1423 1387
1424 /* Simple case - coordinates are within this local 1388 /* Simple case - coordinates are within this local
… …
1429 1393
1430/* This is basically the same as out_of_map above, but 1394/* This is basically the same as out_of_map above, but
1431 * instead we return NULL if no map is valid (coordinates 1395 * instead we return NULL if no map is valid (coordinates
1432 * out of bounds and no tiled map), otherwise it returns 1396 * out of bounds and no tiled map), otherwise it returns
1433 * the map as that the coordinates are really on, and 1397 * the map as that the coordinates are really on, and
1434 * updates x and y to be the localized coordinates. 1398 * updates x and y to be the localised coordinates.
1435 * Using this is more efficient of calling out_of_map 1399 * Using this is more efficient of calling out_of_map
1436 * and then figuring out what the real map is 1400 * and then figuring out what the real map is
1437 */ 1401 */
1438maptile * 1402maptile *
1439get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1403maptile::xy_find (sint16 &x, sint16 &y)
1440{ 1404{
1441 if (*x < 0) 1405 if (x < 0)
1442 { 1406 {
1443 if (!m->tile_path[3]) 1407 if (!tile_path[3])
1444 return 0; 1408 return 0;
1445 1409
1446 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1410 find_and_link (this, 3);
1447 load_and_link_tiled_map (m, 3);
1448
1449 *x += m->tile_map[3]->width; 1411 x += tile_map[3]->width;
1450 return (get_map_from_coord (m->tile_map[3], x, y)); 1412 return tile_map[3]->xy_find (x, y);
1451 } 1413 }
1452 1414
1453 if (*x >= m->width) 1415 if (x >= width)
1454 { 1416 {
1455 if (!m->tile_path[1]) 1417 if (!tile_path[1])
1456 return 0; 1418 return 0;
1457 1419
1458 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1420 find_and_link (this, 1);
1459 load_and_link_tiled_map (m, 1);
1460
1461 *x -= m->width; 1421 x -= width;
1462 return (get_map_from_coord (m->tile_map[1], x, y)); 1422 return tile_map[1]->xy_find (x, y);
1463 } 1423 }
1464 1424
1465 if (*y < 0) 1425 if (y < 0)
1466 { 1426 {
1467 if (!m->tile_path[0]) 1427 if (!tile_path[0])
1468 return 0; 1428 return 0;
1469 1429
1470 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1430 find_and_link (this, 0);
1471 load_and_link_tiled_map (m, 0);
1472
1473 *y += m->tile_map[0]->height; 1431 y += tile_map[0]->height;
1474 return (get_map_from_coord (m->tile_map[0], x, y)); 1432 return tile_map[0]->xy_find (x, y);
1475 } 1433 }
1476 1434
1477 if (*y >= m->height) 1435 if (y >= height)
1478 { 1436 {
1479 if (!m->tile_path[2]) 1437 if (!tile_path[2])
1480 return 0; 1438 return 0;
1481 1439
1482 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1440 find_and_link (this, 2);
1483 load_and_link_tiled_map (m, 2);
1484
1485 *y -= m->height; 1441 y -= height;
1486 return (get_map_from_coord (m->tile_map[2], x, y)); 1442 return tile_map[2]->xy_find (x, y);
1487 } 1443 }
1488 1444
1489 /* Simple case - coordinates are within this local 1445 /* Simple case - coordinates are within this local
1490 * map. 1446 * map.
1491 */ 1447 */
1492 return m; 1448 return this;
1493} 1449}
1494 1450
1495/** 1451/**
1496 * 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
1497 * map1 to map2 in dx/dy. 1453 * map1 to map2 in dx/dy.
… …
1500adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1456adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1501{ 1457{
1502 if (!map1 || !map2) 1458 if (!map1 || !map2)
1503 return 0; 1459 return 0;
1504 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!)
1505 if (map1 == map2) 1463 if (map1 == map2)
1506 { 1464 {
1507 *dx = 0; 1465 *dx = 0;
1508 *dy = 0; 1466 *dy = 0;
1509 } 1467 }
… …
1569 } 1527 }
1570 else 1528 else
1571 return 0; 1529 return 0;
1572 1530
1573 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);
1574} 1549}
1575 1550
1576/* From map.c 1551/* From map.c
1577 * This is used by get_player to determine where the other 1552 * This is used by get_player to determine where the other
1578 * 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