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.72 by root, Sat Jan 13 23:06:12 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
… …
399 * Loads (ands parses) the objects into a given map from the specified 400 * Loads (ands parses) the objects into a given map from the specified
400 * file pointer. 401 * file pointer.
401 * mapflags is the same as we get with load_original_map 402 * mapflags is the same as we get with load_original_map
402 */ 403 */
403bool 404bool
404maptile::load_objects (object_thawer &thawer) 405maptile::_load_objects (object_thawer &thawer)
405{ 406{
406 int unique; 407 int unique;
407 object *op, *prev = NULL, *last_more = NULL, *otmp; 408 object *op, *prev = NULL, *last_more = NULL, *otmp;
408 409
409 op = object::create (); 410 op = object::create ();
… …
485 for (object *op = ms->bot; op; op = op->above) 486 for (object *op = ms->bot; op; op = op->above)
486 op->deactivate_recursive (); 487 op->deactivate_recursive ();
487} 488}
488 489
489bool 490bool
490maptile::save_objects (object_freezer &freezer, int flags) 491maptile::_save_objects (object_freezer &freezer, int flags)
491{ 492{
493 static int cede_count = 0;
494
492 if (flags & IO_HEADER) 495 if (flags & IO_HEADER)
493 save_header (freezer); 496 _save_header (freezer);
494 497
495 if (!spaces) 498 if (!spaces)
496 return false; 499 return false;
497 500
498 for (int i = 0; i < size (); ++i) 501 for (int i = 0; i < size (); ++i)
499 { 502 {
503 if (cede_count >= 500)
504 {
505 cede_count = 0;
506 coroapi::cede ();
507 }
508
500 int unique = 0; 509 int unique = 0;
501 for (object *op = spaces [i].bot; op; op = op->above) 510 for (object *op = spaces [i].bot; op; op = op->above)
502 { 511 {
512 // count per-object, but cede only when modification-safe
513 cede_count++;
514
503 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 515 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
504 unique = 1; 516 unique = 1;
505 517
506 if (!op->can_map_save ()) 518 if (!op->can_map_save ())
507 continue; 519 continue;
… …
518 530
519 return true; 531 return true;
520} 532}
521 533
522bool 534bool
523maptile::load_objects (const char *path, bool skip_header) 535maptile::_load_objects (const char *path, bool skip_header)
524{ 536{
525 object_thawer thawer (path); 537 object_thawer thawer (path);
526 538
527 if (!thawer) 539 if (!thawer)
528 return false; 540 return false;
… …
536 break; 548 break;
537 549
538 thawer.skip_kv (kw); 550 thawer.skip_kv (kw);
539 } 551 }
540 552
541 return load_objects (thawer); 553 return _load_objects (thawer);
542} 554}
543 555
544bool 556bool
545maptile::save_objects (const char *path, int flags) 557maptile::_save_objects (const char *path, int flags)
546{ 558{
547 object_freezer freezer; 559 object_freezer freezer;
548 560
549 if (!save_objects (freezer, flags)) 561 if (!_save_objects (freezer, flags))
550 return false; 562 return false;
551 563
552 return freezer.save (path); 564 return freezer.save (path);
553} 565}
554 566
… …
718 * This could be done in lex (like the object loader), but I think 730 * This could be done in lex (like the object loader), but I think
719 * currently, there are few enough fields this is not a big deal. 731 * currently, there are few enough fields this is not a big deal.
720 * MSW 2001-07-01 732 * MSW 2001-07-01
721 */ 733 */
722bool 734bool
723maptile::load_header (object_thawer &thawer) 735maptile::_load_header (object_thawer &thawer)
724{ 736{
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 (;;) 737 for (;;)
730 { 738 {
731 keyword kw = thawer.get_kv (); 739 keyword kw = thawer.get_kv ();
732 740
733 switch (kw) 741 switch (kw)
… …
736 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path); 744 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
737 return false; 745 return false;
738 746
739 case KW_end: 747 case KW_end:
740 return true; 748 return true;
749
750 default:
751 case KW_ERROR:
752 LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
753 break;
741 754
742 case KW_msg: 755 case KW_msg:
743 thawer.get_ml (KW_endmsg, msg); 756 thawer.get_ml (KW_endmsg, msg);
744 break; 757 break;
745 758
… …
796 809
797 case KW_tile_path_1: thawer.get (tile_path [0]); break; 810 case KW_tile_path_1: thawer.get (tile_path [0]); break;
798 case KW_tile_path_2: thawer.get (tile_path [1]); break; 811 case KW_tile_path_2: thawer.get (tile_path [1]); break;
799 case KW_tile_path_3: thawer.get (tile_path [2]); break; 812 case KW_tile_path_3: thawer.get (tile_path [2]); break;
800 case KW_tile_path_4: thawer.get (tile_path [3]); break; 813 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 } 814 }
806 } 815 }
807 816
808 abort (); 817 abort ();
809} 818}
810 819
811bool 820bool
812maptile::load_header (const char *path) 821maptile::_load_header (const char *path)
813{ 822{
814 object_thawer thawer (path); 823 object_thawer thawer (path);
815 824
816 if (!thawer) 825 if (!thawer)
817 return false; 826 return false;
818 827
819 return load_header (thawer); 828 return _load_header (thawer);
820} 829}
821 830
822/****************************************************************************** 831/******************************************************************************
823 * This is the start of unique map handling code 832 * This is the start of unique map handling code
824 *****************************************************************************/ 833 *****************************************************************************/
… …
847 } 856 }
848 } 857 }
849} 858}
850 859
851bool 860bool
852maptile::save_header (object_freezer &freezer) 861maptile::_save_header (object_freezer &freezer)
853{ 862{
854#define MAP_OUT(k) freezer.put (KW_ ## k, k) 863#define MAP_OUT(k) freezer.put (KW_ ## k, k)
855#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v) 864#define MAP_OUT2(k,v) freezer.put (KW_ ## k, v)
856 865
857 MAP_OUT2 (arch, "map"); 866 MAP_OUT2 (arch, "map");
… …
906 915
907 return true; 916 return true;
908} 917}
909 918
910bool 919bool
911maptile::save_header (const char *path) 920maptile::_save_header (const char *path)
912{ 921{
913 object_freezer freezer; 922 object_freezer freezer;
914 923
915 if (!save_header (freezer)) 924 if (!_save_header (freezer))
916 return false; 925 return false;
917 926
918 return freezer.save (path); 927 return freezer.save (path);
919} 928}
920 929
… …
1226 1235
1227 /* If two top faces are already set, quit processing */ 1236 /* If two top faces are already set, quit processing */
1228 if ((top != blank_face) && (middle != blank_face)) 1237 if ((top != blank_face) && (middle != blank_face))
1229 break; 1238 break;
1230 1239
1231 /* Only show visible faces, unless its the editor - show all */ 1240 /* Only show visible faces */
1232 if (!tmp->invisible || editor) 1241 if (!tmp->invisible)
1233 { 1242 {
1234 /* Fill in top if needed */ 1243 /* Fill in top if needed */
1235 if (top == blank_face) 1244 if (top == blank_face)
1236 { 1245 {
1237 top = tmp->face; 1246 top = tmp->face;
… …
1267 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1276 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; 1277 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; 1278 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1270} 1279}
1271 1280
1272/* this updates the orig_map->tile_map[tile_num] value after loading 1281/* 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 1282 * 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 1283 * 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 1284 * the value of orig_map->tile_map[tile_num].
1276 * so that it is easier for calling functions to verify success.
1277 */ 1285 */
1278static maptile * 1286static inline maptile *
1279load_and_link_tiled_map (maptile *orig_map, int tile_num) 1287find_and_link (maptile *orig_map, int tile_num)
1280{ 1288{
1289 maptile *mp = orig_map->tile_map [tile_num];
1290
1291 if (!mp)
1292 {
1281 maptile *mp = orig_map->load_map_sync (orig_map->tile_path [tile_num], orig_map); 1293 mp = orig_map->find_sync (orig_map->tile_path [tile_num], orig_map);
1282 1294
1283 if (!mp || mp->in_memory != MAP_IN_MEMORY) 1295 if (!mp)
1284 { 1296 {
1285 // emergency mode, manufacture a dummy map, this creates a memleak, but thats fine 1297 // 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", 1298 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); 1299 &orig_map->tile_path[tile_num], &orig_map->path);
1288 mp = new maptile (1, 1); 1300 mp = new maptile (1, 1);
1289 mp->alloc (); 1301 mp->alloc ();
1290 mp->in_memory = MAP_IN_MEMORY; 1302 mp->in_memory = MAP_IN_MEMORY;
1303 }
1291 } 1304 }
1292 1305
1293 int dest_tile = (tile_num + 2) % 4; 1306 int dest_tile = (tile_num + 2) % 4;
1294 1307
1295 orig_map->tile_map[tile_num] = mp; 1308 orig_map->tile_map [tile_num] = mp;
1296 1309
1297 // optimisation: back-link map to origin map if euclidean 1310 // optimisation: back-link map to origin map if euclidean
1298 //TODO: non-euclidean maps MUST GO 1311 //TODO: non-euclidean maps MUST GO
1299 if (orig_map->tile_map[tile_num]->tile_path[dest_tile] == orig_map->path) 1312 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; 1313 orig_map->tile_map[tile_num]->tile_map[dest_tile] = orig_map;
1301 1314
1302 return mp; 1315 return mp;
1316}
1317
1318static inline void
1319load_and_link (maptile *orig_map, int tile_num)
1320{
1321 find_and_link (orig_map, tile_num)->load_sync ();
1303} 1322}
1304 1323
1305/* this returns TRUE if the coordinates (x,y) are out of 1324/* this returns TRUE if the coordinates (x,y) are out of
1306 * map m. This function also takes into account any 1325 * map m. This function also takes into account any
1307 * tiling considerations, loading adjacant maps as needed. 1326 * tiling considerations, loading adjacant maps as needed.
… …
1324 { 1343 {
1325 if (!m->tile_path[3]) 1344 if (!m->tile_path[3])
1326 return 1; 1345 return 1;
1327 1346
1328 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1347 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY)
1329 load_and_link_tiled_map (m, 3); 1348 find_and_link (m, 3);
1330 1349
1331 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y); 1350 return out_of_map (m->tile_map[3], x + m->tile_map[3]->width, y);
1332 } 1351 }
1333 1352
1334 if (x >= m->width) 1353 if (x >= m->width)
1335 { 1354 {
1336 if (!m->tile_path[1]) 1355 if (!m->tile_path[1])
1337 return 1; 1356 return 1;
1338 1357
1339 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1358 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY)
1340 load_and_link_tiled_map (m, 1); 1359 find_and_link (m, 1);
1341 1360
1342 return out_of_map (m->tile_map[1], x - m->width, y); 1361 return out_of_map (m->tile_map[1], x - m->width, y);
1343 } 1362 }
1344 1363
1345 if (y < 0) 1364 if (y < 0)
1346 { 1365 {
1347 if (!m->tile_path[0]) 1366 if (!m->tile_path[0])
1348 return 1; 1367 return 1;
1349 1368
1350 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1369 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY)
1351 load_and_link_tiled_map (m, 0); 1370 find_and_link (m, 0);
1352 1371
1353 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height); 1372 return out_of_map (m->tile_map[0], x, y + m->tile_map[0]->height);
1354 } 1373 }
1355 1374
1356 if (y >= m->height) 1375 if (y >= m->height)
1357 { 1376 {
1358 if (!m->tile_path[2]) 1377 if (!m->tile_path[2])
1359 return 1; 1378 return 1;
1360 1379
1361 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1380 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY)
1362 load_and_link_tiled_map (m, 2); 1381 find_and_link (m, 2);
1363 1382
1364 return out_of_map (m->tile_map[2], x, y - m->height); 1383 return out_of_map (m->tile_map[2], x, y - m->height);
1365 } 1384 }
1366 1385
1367 /* Simple case - coordinates are within this local 1386 /* Simple case - coordinates are within this local
… …
1372 1391
1373/* This is basically the same as out_of_map above, but 1392/* This is basically the same as out_of_map above, but
1374 * instead we return NULL if no map is valid (coordinates 1393 * instead we return NULL if no map is valid (coordinates
1375 * out of bounds and no tiled map), otherwise it returns 1394 * out of bounds and no tiled map), otherwise it returns
1376 * the map as that the coordinates are really on, and 1395 * the map as that the coordinates are really on, and
1377 * updates x and y to be the localized coordinates. 1396 * updates x and y to be the localised coordinates.
1378 * Using this is more efficient of calling out_of_map 1397 * Using this is more efficient of calling out_of_map
1379 * and then figuring out what the real map is 1398 * and then figuring out what the real map is
1380 */ 1399 */
1381maptile * 1400maptile *
1382get_map_from_coord (maptile *m, sint16 *x, sint16 *y) 1401maptile::xy_find (sint16 &x, sint16 &y)
1383{ 1402{
1384 if (*x < 0) 1403 if (x < 0)
1385 { 1404 {
1386 if (!m->tile_path[3]) 1405 if (!tile_path[3])
1387 return 0; 1406 return 0;
1388 1407
1389 if (!m->tile_map[3] || m->tile_map[3]->in_memory != MAP_IN_MEMORY) 1408 find_and_link (this, 3);
1390 load_and_link_tiled_map (m, 3);
1391
1392 *x += m->tile_map[3]->width; 1409 x += tile_map[3]->width;
1393 return (get_map_from_coord (m->tile_map[3], x, y)); 1410 return tile_map[3]->xy_find (x, y);
1394 } 1411 }
1395 1412
1396 if (*x >= m->width) 1413 if (x >= width)
1397 { 1414 {
1398 if (!m->tile_path[1]) 1415 if (!tile_path[1])
1399 return 0; 1416 return 0;
1400 1417
1401 if (!m->tile_map[1] || m->tile_map[1]->in_memory != MAP_IN_MEMORY) 1418 find_and_link (this, 1);
1402 load_and_link_tiled_map (m, 1);
1403
1404 *x -= m->width; 1419 x -= width;
1405 return (get_map_from_coord (m->tile_map[1], x, y)); 1420 return tile_map[1]->xy_find (x, y);
1406 } 1421 }
1407 1422
1408 if (*y < 0) 1423 if (y < 0)
1409 { 1424 {
1410 if (!m->tile_path[0]) 1425 if (!tile_path[0])
1411 return 0; 1426 return 0;
1412 1427
1413 if (!m->tile_map[0] || m->tile_map[0]->in_memory != MAP_IN_MEMORY) 1428 find_and_link (this, 0);
1414 load_and_link_tiled_map (m, 0);
1415
1416 *y += m->tile_map[0]->height; 1429 y += tile_map[0]->height;
1417 return (get_map_from_coord (m->tile_map[0], x, y)); 1430 return tile_map[0]->xy_find (x, y);
1418 } 1431 }
1419 1432
1420 if (*y >= m->height) 1433 if (y >= height)
1421 { 1434 {
1422 if (!m->tile_path[2]) 1435 if (!tile_path[2])
1423 return 0; 1436 return 0;
1424 1437
1425 if (!m->tile_map[2] || m->tile_map[2]->in_memory != MAP_IN_MEMORY) 1438 find_and_link (this, 2);
1426 load_and_link_tiled_map (m, 2);
1427
1428 *y -= m->height; 1439 y -= height;
1429 return (get_map_from_coord (m->tile_map[2], x, y)); 1440 return tile_map[2]->xy_find (x, y);
1430 } 1441 }
1431 1442
1432 /* Simple case - coordinates are within this local 1443 /* Simple case - coordinates are within this local
1433 * map. 1444 * map.
1434 */ 1445 */
1435 return m; 1446 return this;
1436} 1447}
1437 1448
1438/** 1449/**
1439 * Return whether map2 is adjacent to map1. If so, store the distance from 1450 * Return whether map2 is adjacent to map1. If so, store the distance from
1440 * map1 to map2 in dx/dy. 1451 * map1 to map2 in dx/dy.
… …
1443adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1454adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1444{ 1455{
1445 if (!map1 || !map2) 1456 if (!map1 || !map2)
1446 return 0; 1457 return 0;
1447 1458
1459 //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
1460 //fix: compare paths instead (this is likely faster, too!)
1448 if (map1 == map2) 1461 if (map1 == map2)
1449 { 1462 {
1450 *dx = 0; 1463 *dx = 0;
1451 *dy = 0; 1464 *dy = 0;
1452 } 1465 }
… …
1512 } 1525 }
1513 else 1526 else
1514 return 0; 1527 return 0;
1515 1528
1516 return 1; 1529 return 1;
1530}
1531
1532maptile *
1533maptile::xy_load (sint16 &x, sint16 &y)
1534{
1535 maptile *map = xy_find (x, y);
1536
1537 if (map)
1538 map->load_sync ();
1539
1540 return map;
1541}
1542
1543maptile *
1544get_map_from_coord (maptile *m, sint16 *x, sint16 *y)
1545{
1546 return m->xy_load (*x, *y);
1517} 1547}
1518 1548
1519/* From map.c 1549/* From map.c
1520 * This is used by get_player to determine where the other 1550 * This is used by get_player to determine where the other
1521 * creature is. get_rangevector takes into account map tiling, 1551 * creature is. get_rangevector takes into account map tiling,

Diff Legend

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