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.56 by root, Sat Dec 30 10:16:10 2006 UTC vs.
Revision 1.70 by root, Thu Jan 4 20:29:45 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;
… …
778 * MSW 2001-07-01 731 * MSW 2001-07-01
779 */ 732 */
780bool 733bool
781maptile::load_header (object_thawer &thawer) 734maptile::load_header (object_thawer &thawer)
782{ 735{
783 char buf[HUGE_BUF], msgbuf[HUGE_BUF], maplorebuf[HUGE_BUF], *key = NULL, *value, *end;
784 int msgpos = 0;
785 int maplorepos = 0;
786
787 for (;;) 736 for (;;)
788 { 737 {
789 keyword kw = thawer.get_kv (); 738 keyword kw = thawer.get_kv ();
790 739
791 switch (kw) 740 switch (kw)
792 { 741 {
793 case KW_EOF: 742 case KW_EOF:
794 LOG (llevError, "%s: end of file while reading map header, aborting header load.", &path); 743 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
795 return false; 744 return false;
796 745
797 case KW_end: 746 case KW_end:
798 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;
799 753
800 case KW_msg: 754 case KW_msg:
801 thawer.get_ml (KW_endmsg, msg); 755 thawer.get_ml (KW_endmsg, msg);
802 break; 756 break;
803 757
… …
854 808
855 case KW_tile_path_1: thawer.get (tile_path [0]); break; 809 case KW_tile_path_1: thawer.get (tile_path [0]); break;
856 case KW_tile_path_2: thawer.get (tile_path [1]); break; 810 case KW_tile_path_2: thawer.get (tile_path [1]); break;
857 case KW_tile_path_3: thawer.get (tile_path [2]); break; 811 case KW_tile_path_3: thawer.get (tile_path [2]); break;
858 case KW_tile_path_4: thawer.get (tile_path [3]); break; 812 case KW_tile_path_4: thawer.get (tile_path [3]); break;
859
860 default:
861 LOG (llevError, "%s: skipping unknown key in map header: %s\n", &path, keyword_str [kw]);
862 break;
863 } 813 }
864 } 814 }
865 815
866 abort (); 816 abort ();
867} 817}
… …
957 if (tile_path [0]) MAP_OUT2 (tile_path_1, tile_path [0]); 907 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]); 908 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]); 909 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]); 910 if (tile_path [3]) MAP_OUT2 (tile_path_4, tile_path [3]);
961 911
962 MAP_OUT2 (end, 0); 912 freezer.put (this);
913 freezer.put (KW_end);
963 914
964 return true; 915 return true;
965} 916}
966 917
967bool 918bool
… …
1283 1234
1284 /* If two top faces are already set, quit processing */ 1235 /* If two top faces are already set, quit processing */
1285 if ((top != blank_face) && (middle != blank_face)) 1236 if ((top != blank_face) && (middle != blank_face))
1286 break; 1237 break;
1287 1238
1288 /* Only show visible faces, unless its the editor - show all */ 1239 /* Only show visible faces */
1289 if (!tmp->invisible || editor) 1240 if (!tmp->invisible)
1290 { 1241 {
1291 /* Fill in top if needed */ 1242 /* Fill in top if needed */
1292 if (top == blank_face) 1243 if (top == blank_face)
1293 { 1244 {
1294 top = tmp->face; 1245 top = tmp->face;
… …
1324 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;
1325 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;
1326 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;
1327} 1278}
1328 1279
1329void
1330set_map_reset_time (maptile *map)
1331{
1332 int timeout = map->reset_timeout;
1333
1334 if (timeout <= 0)
1335 timeout = MAP_DEFAULTRESET;
1336 if (timeout >= MAP_MAXRESET)
1337 timeout = MAP_MAXRESET;
1338
1339 map->reset_time = time (0) + timeout;
1340}
1341
1342/* 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
1343 * 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
1344 * 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
1345 * the value of orig_map->tile_map[tile_num]. It really only does this 1283 * the value of orig_map->tile_map[tile_num].
1346 * so that it is easier for calling functions to verify success.
1347 */ 1284 */
1348static maptile * 1285static inline maptile *
1349load_and_link_tiled_map (maptile *orig_map, int tile_num) 1286find_and_link (maptile *orig_map, int tile_num)
1350{ 1287{
1288 maptile *mp = orig_map->tile_map [tile_num];
1289
1290 if (!mp)
1291 {
1351 maptile *mp = orig_map->find_map (orig_map->tile_path[tile_num]); 1292 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1352 mp->load (); 1293
1294 if (!mp)
1295 {
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",
1298 &orig_map->tile_path[tile_num], &orig_map->path);
1299 mp = new maptile (1, 1);
1300 mp->alloc ();
1301 mp->in_memory = MAP_IN_MEMORY;
1302 }
1303 }
1353 1304
1354 int dest_tile = (tile_num + 2) % 4; 1305 int dest_tile = (tile_num + 2) % 4;
1355 1306
1356 orig_map->tile_map[tile_num] = mp; 1307 orig_map->tile_map [tile_num] = mp;
1357 1308
1358 /* need to do a strcmp here as the orig_map->path is not a shared string */ 1309 // optimisation: back-link map to origin map if euclidean
1359 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] && orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) 1310 //TODO: non-euclidean maps MUST GO
1311 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path)
1360 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;
1361 1313
1362 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 ();
1363} 1321}
1364 1322
1365/* this returns TRUE if the coordinates (x,y) are out of 1323/* this returns TRUE if the coordinates (x,y) are out of
1366 * map m. This function also takes into account any 1324 * map m. This function also takes into account any
1367 * tiling considerations, loading adjacant maps as needed. 1325 * tiling considerations, loading adjacant maps as needed.
… …
1384 { 1342 {
1385 if (!m->tile_path[3]) 1343 if (!m->tile_path[3])
1386 return 1; 1344 return 1;
1387 1345
1388 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)
1389 load_and_link_tiled_map (m, 3); 1347 find_and_link (m, 3);
1390 1348
1391 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);
1392 } 1350 }
1393 1351
1394 if (x >= m->width) 1352 if (x >= m->width)
1395 { 1353 {
1396 if (!m->tile_path[1]) 1354 if (!m->tile_path[1])
1397 return 1; 1355 return 1;
1398 1356
1399 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)
1400 load_and_link_tiled_map (m, 1); 1358 find_and_link (m, 1);
1401 1359
1402 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);
1403 } 1361 }
1404 1362
1405 if (y < 0) 1363 if (y < 0)
1406 { 1364 {
1407 if (!m->tile_path[0]) 1365 if (!m->tile_path[0])
1408 return 1; 1366 return 1;
1409 1367
1410 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)
1411 load_and_link_tiled_map (m, 0); 1369 find_and_link (m, 0);
1412 1370
1413 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);
1414 } 1372 }
1415 1373
1416 if (y >= m->height) 1374 if (y >= m->height)
1417 { 1375 {
1418 if (!m->tile_path[2]) 1376 if (!m->tile_path[2])
1419 return 1; 1377 return 1;
1420 1378
1421 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)
1422 load_and_link_tiled_map (m, 2); 1380 find_and_link (m, 2);
1423 1381
1424 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);
1425 } 1383 }
1426 1384
1427 /* Simple case - coordinates are within this local 1385 /* Simple case - coordinates are within this local
… …
1432 1390
1433/* This is basically the same as out_of_map above, but 1391/* This is basically the same as out_of_map above, but
1434 * instead we return NULL if no map is valid (coordinates 1392 * instead we return NULL if no map is valid (coordinates
1435 * out of bounds and no tiled map), otherwise it returns 1393 * out of bounds and no tiled map), otherwise it returns
1436 * the map as that the coordinates are really on, and 1394 * the map as that the coordinates are really on, and
1437 * updates x and y to be the localized coordinates. 1395 * updates x and y to be the localised coordinates.
1438 * Using this is more efficient of calling out_of_map 1396 * Using this is more efficient of calling out_of_map
1439 * and then figuring out what the real map is 1397 * and then figuring out what the real map is
1440 */ 1398 */
1441maptile * 1399maptile *
1442get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1400maptile::xy_find (sint16 &x, sint16 &y)
1443{ 1401{
1444 if (*x < 0) 1402 if (x < 0)
1445 { 1403 {
1446 if (!m->tile_path[3]) 1404 if (!tile_path[3])
1447 return 0; 1405 return 0;
1448 1406
1449 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1407 find_and_link (this, 3);
1450 load_and_link_tiled_map (m, 3);
1451
1452 *x += m->tile_map[3]->width; 1408 x += tile_map[3]->width;
1453 return (get_map_from_coord (m->tile_map[3], x, y)); 1409 return tile_map[3]->xy_find (x, y);
1454 } 1410 }
1455 1411
1456 if (*x >= m->width) 1412 if (x >= width)
1457 { 1413 {
1458 if (!m->tile_path[1]) 1414 if (!tile_path[1])
1459 return 0; 1415 return 0;
1460 1416
1461 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1417 find_and_link (this, 1);
1462 load_and_link_tiled_map (m, 1);
1463
1464 *x -= m->width; 1418 x -= width;
1465 return (get_map_from_coord (m->tile_map[1], x, y)); 1419 return tile_map[1]->xy_find (x, y);
1466 } 1420 }
1467 1421
1468 if (*y < 0) 1422 if (y < 0)
1469 { 1423 {
1470 if (!m->tile_path[0]) 1424 if (!tile_path[0])
1471 return 0; 1425 return 0;
1472 1426
1473 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1427 find_and_link (this, 0);
1474 load_and_link_tiled_map (m, 0);
1475
1476 *y += m->tile_map[0]->height; 1428 y += tile_map[0]->height;
1477 return (get_map_from_coord (m->tile_map[0], x, y)); 1429 return tile_map[0]->xy_find (x, y);
1478 } 1430 }
1479 1431
1480 if (*y >= m->height) 1432 if (y >= height)
1481 { 1433 {
1482 if (!m->tile_path[2]) 1434 if (!tile_path[2])
1483 return 0; 1435 return 0;
1484 1436
1485 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1437 find_and_link (this, 2);
1486 load_and_link_tiled_map (m, 2);
1487
1488 *y -= m->height; 1438 y -= height;
1489 return (get_map_from_coord (m->tile_map[2], x, y)); 1439 return tile_map[2]->xy_find (x, y);
1490 } 1440 }
1491 1441
1492 /* Simple case - coordinates are within this local 1442 /* Simple case - coordinates are within this local
1493 * map. 1443 * map.
1494 */ 1444 */
1495
1496 m->last_access = runtime;
1497 return m; 1445 return this;
1498} 1446}
1499 1447
1500/** 1448/**
1501 * 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
1502 * map1 to map2 in dx/dy. 1450 * map1 to map2 in dx/dy.
… …
1505adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1453adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1506{ 1454{
1507 if (!map1 || !map2) 1455 if (!map1 || !map2)
1508 return 0; 1456 return 0;
1509 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!)
1510 if (map1 == map2) 1460 if (map1 == map2)
1511 { 1461 {
1512 *dx = 0; 1462 *dx = 0;
1513 *dy = 0; 1463 *dy = 0;
1514 } 1464 }
… …
1574 } 1524 }
1575 else 1525 else
1576 return 0; 1526 return 0;
1577 1527
1578 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);
1579} 1546}
1580 1547
1581/* From map.c 1548/* From map.c
1582 * This is used by get_player to determine where the other 1549 * This is used by get_player to determine where the other
1583 * 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