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.57 by root, Sat Dec 30 15:07:58 2006 UTC vs.
Revision 1.68 by root, Thu Jan 4 16:19:31 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
… …
331 archetype *tmp; 262 archetype *tmp;
332 int flag; 263 int flag;
333 maptile *m1; 264 maptile *m1;
334 sint16 sx, sy; 265 sint16 sx, sy;
335 266
336 if (ob == NULL) 267 if (!ob)
337 { 268 {
338 flag = get_map_flags (m, &m1, x, y, &sx, &sy); 269 flag = get_map_flags (m, &m1, x, y, &sx, &sy);
339 if (flag & P_OUT_OF_MAP) 270 if (flag & P_OUT_OF_MAP)
340 return P_OUT_OF_MAP; 271 return P_OUT_OF_MAP;
341 272
… …
396 327
397 /* sum_weight will go through and calculate what all the containers are 328 /* sum_weight will go through and calculate what all the containers are
398 * carrying. 329 * carrying.
399 */ 330 */
400 sum_weight (container); 331 sum_weight (container);
332}
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;
401} 343}
402 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
… …
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{
1338 maptile *mp = orig_map->find_map (orig_map->tile_path[tile_num]); 1291 maptile *mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1339 mp->load (); 1292
1293 if (!mp)
1294 {
1295 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine
1296 LOG (llevError, "FATAL: cannot load tiled map %s from %s, leaking memory and worse!\n",
1297 &orig_map->tile_path[tile_num], &orig_map->path);
1298 mp = new maptile (1, 1);
1299 mp->alloc ();
1300 mp->in_memory = MAP_IN_MEMORY;
1301 }
1340 1302
1341 int dest_tile = (tile_num + 2) % 4; 1303 int dest_tile = (tile_num + 2) % 4;
1342 1304
1343 orig_map->tile_map[tile_num] = mp; 1305 orig_map->tile_map[tile_num] = mp;
1344 1306
1345 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1307 // optimisation: back-link map to origin map if euclidean
1346 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) 1308 //TODO: non-euclidean maps MUST GO
1309 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1347 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map; 1310 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1348 1311
1349 return mp; 1312 return mp;
1313}
1314
1315static inline void
1316load_and_link (maptile *orig_map, int tile_num)
1317{
1318 find_and_link (orig_map, tile_num)->load_sync ();
1350} 1319}
1351 1320
1352/* this returns TRUE if the coordinates (x,y) are out of 1321/* this returns TRUE if the coordinates (x,y) are out of
1353 * map m. This function also takes into account any 1322 * map m. This function also takes into account any
1354 * tiling considerations, loading adjacant maps as needed. 1323 * tiling considerations, loading adjacant maps as needed.
… …
1371 { 1340 {
1372 if (!m->tile_path[3]) 1341 if (!m->tile_path[3])
1373 return 1; 1342 return 1;
1374 1343
1375 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1344 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1376 load_and_link_tiled_map (m, 3); 1345 find_and_link (m, 3);
1377 1346
1378 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1347 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1379 } 1348 }
1380 1349
1381 if (x >= m->width) 1350 if (x >= m->width)
1382 { 1351 {
1383 if (!m->tile_path[1]) 1352 if (!m->tile_path[1])
1384 return 1; 1353 return 1;
1385 1354
1386 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1355 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1387 load_and_link_tiled_map (m, 1); 1356 find_and_link (m, 1);
1388 1357
1389 return out_of_map (m->tile_map[1], x - m->width, y); 1358 return out_of_map (m->tile_map[1], x - m->width, y);
1390 } 1359 }
1391 1360
1392 if (y < 0) 1361 if (y < 0)
1393 { 1362 {
1394 if (!m->tile_path[0]) 1363 if (!m->tile_path[0])
1395 return 1; 1364 return 1;
1396 1365
1397 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1366 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1398 load_and_link_tiled_map (m, 0); 1367 find_and_link (m, 0);
1399 1368
1400 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1369 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1401 } 1370 }
1402 1371
1403 if (y >= m->height) 1372 if (y >= m->height)
1404 { 1373 {
1405 if (!m->tile_path[2]) 1374 if (!m->tile_path[2])
1406 return 1; 1375 return 1;
1407 1376
1408 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1377 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1409 load_and_link_tiled_map (m, 2); 1378 find_and_link (m, 2);
1410 1379
1411 return out_of_map (m->tile_map[2], x, y - m->height); 1380 return out_of_map (m->tile_map[2], x, y - m->height);
1412 } 1381 }
1413 1382
1414 /* Simple case - coordinates are within this local 1383 /* Simple case - coordinates are within this local
… …
1419 1388
1420/* This is basically the same as out_of_map above, but 1389/* This is basically the same as out_of_map above, but
1421 * instead we return NULL if no map is valid (coordinates 1390 * instead we return NULL if no map is valid (coordinates
1422 * out of bounds and no tiled map), otherwise it returns 1391 * out of bounds and no tiled map), otherwise it returns
1423 * the map as that the coordinates are really on, and 1392 * the map as that the coordinates are really on, and
1424 * updates x and y to be the localized coordinates. 1393 * updates x and y to be the localised coordinates.
1425 * Using this is more efficient of calling out_of_map 1394 * Using this is more efficient of calling out_of_map
1426 * and then figuring out what the real map is 1395 * and then figuring out what the real map is
1427 */ 1396 */
1428maptile * 1397maptile *
1429get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1398maptile::xy_find (sint16 &x, sint16 &y)
1430{ 1399{
1431 if (*x < 0) 1400 if (x < 0)
1432 { 1401 {
1433 if (!m->tile_path[3]) 1402 if (!tile_path[3])
1434 return 0; 1403 return 0;
1435 1404
1436 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1405 find_and_link (this, 3);
1437 load_and_link_tiled_map (m, 3);
1438
1439 *x += m->tile_map[3]->width; 1406 x += tile_map[3]->width;
1440 return (get_map_from_coord (m->tile_map[3], x, y)); 1407 return tile_map[3]->xy_find (x, y);
1441 } 1408 }
1442 1409
1443 if (*x >= m->width) 1410 if (x >= width)
1444 { 1411 {
1445 if (!m->tile_path[1]) 1412 if (!tile_path[1])
1446 return 0; 1413 return 0;
1447 1414
1448 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1415 find_and_link (this, 1);
1449 load_and_link_tiled_map (m, 1);
1450
1451 *x -= m->width; 1416 x -= width;
1452 return (get_map_from_coord (m->tile_map[1], x, y)); 1417 return tile_map[1]->xy_find (x, y);
1453 } 1418 }
1454 1419
1455 if (*y < 0) 1420 if (y < 0)
1456 { 1421 {
1457 if (!m->tile_path[0]) 1422 if (!tile_path[0])
1458 return 0; 1423 return 0;
1459 1424
1460 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1425 find_and_link (this, 0);
1461 load_and_link_tiled_map (m, 0);
1462
1463 *y += m->tile_map[0]->height; 1426 y += tile_map[0]->height;
1464 return (get_map_from_coord (m->tile_map[0], x, y)); 1427 return tile_map[0]->xy_find (x, y);
1465 } 1428 }
1466 1429
1467 if (*y >= m->height) 1430 if (y >= height)
1468 { 1431 {
1469 if (!m->tile_path[2]) 1432 if (!tile_path[2])
1470 return 0; 1433 return 0;
1471 1434
1472 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1435 find_and_link (this, 2);
1473 load_and_link_tiled_map (m, 2);
1474
1475 *y -= m->height; 1436 y -= height;
1476 return (get_map_from_coord (m->tile_map[2], x, y)); 1437 return tile_map[2]->xy_find (x, y);
1477 } 1438 }
1478 1439
1479 /* Simple case - coordinates are within this local 1440 /* Simple case - coordinates are within this local
1480 * map. 1441 * map.
1481 */ 1442 */
1482
1483 m->last_access = runtime;
1484 return m; 1443 return this;
1485} 1444}
1486 1445
1487/** 1446/**
1488 * Return whether map2 is adjacent to map1. If so, store the distance from 1447 * Return whether map2 is adjacent to map1. If so, store the distance from
1489 * map1 to map2 in dx/dy. 1448 * map1 to map2 in dx/dy.
… …
1492adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1451adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1493{ 1452{
1494 if (!map1 || !map2) 1453 if (!map1 || !map2)
1495 return 0; 1454 return 0;
1496 1455
1456 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1457 //fix: compare paths instead (this is likely faster, too!)
1497 if (map1 == map2) 1458 if (map1 == map2)
1498 { 1459 {
1499 *dx = 0; 1460 *dx = 0;
1500 *dy = 0; 1461 *dy = 0;
1501 } 1462 }
… …
1561 } 1522 }
1562 else 1523 else
1563 return 0; 1524 return 0;
1564 1525
1565 return 1; 1526 return 1;
1527}
1528
1529maptile *
1530maptile::xy_load (sint16 &x, sint16 &y)
1531{
1532 maptile *map = xy_find (x, y);
1533
1534 if (map)
1535 map->load_sync ();
1536
1537 return map;
1538}
1539
1540maptile *
1541get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1542{
1543 return m->xy_load (*x, *y);
1566} 1544}
1567 1545
1568/* From map.c 1546/* From map.c
1569 * This is used by get_player to determine where the other 1547 * This is used by get_player to determine where the other
1570 * creature is. get_rangevector takes into account map tiling, 1548 * creature is. get_rangevector takes into account map tiling,

Diff Legend

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