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.76 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.91 by root, Sat Feb 17 23:32:11 2007 UTC

… …
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <global.h>
26#include <funcpoint.h>
27
28#include <loader.h>
29#include <unistd.h> 25#include <unistd.h>
26
27#include "global.h"
28#include "funcpoint.h"
29
30#include "loader.h"
30 31
31#include "path.h" 32#include "path.h"
32 33
33/* 34/*
34 * This makes a path absolute outside the world of Crossfire. 35 * This makes a path absolute outside the world of Crossfire.
… …
67 char *endbuf; 68 char *endbuf;
68 struct stat statbuf; 69 struct stat statbuf;
69 int mode = 0; 70 int mode = 0;
70 71
71 if (prepend_dir) 72 if (prepend_dir)
72 strcpy (buf, create_pathname (name)); 73 assign (buf, create_pathname (name));
73 else 74 else
74 strcpy (buf, name); 75 assign (buf, name);
75 76
76 /* old method (strchr(buf, '\0')) seemd very odd to me - 77 /* old method (strchr(buf, '\0')) seemd very odd to me -
77 * this method should be equivalant and is clearer. 78 * this method should be equivalant and is clearer.
78 * Can not use strcat because we need to cycle through 79 * Can not use strcat because we need to cycle through
79 * all the names. 80 * all the names.
… …
228 229
229 } 230 }
230 return 0; 231 return 0;
231} 232}
232 233
233
234/* 234/*
235 * Returns true if the given object can't fit in the given spot. 235 * Returns true if the given object can't fit in the given spot.
236 * This is meant for multi space objects - for single space objecs, 236 * This is meant for multi space objects - for single space objecs,
237 * just calling get_map_blocked and checking that against movement type 237 * just calling get_map_blocked and checking that against movement type
238 * of object. This function goes through all the parts of the 238 * of object. This function goes through all the parts of the
… …
354{ 354{
355 if (!spaces) 355 if (!spaces)
356 return; 356 return;
357 357
358 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 358 for (mapspace *ms = spaces + size (); ms-- > spaces; )
359 for (object *tmp = ms->bot; tmp; ) 359 for (object *tmp = ms->bot; tmp; tmp = tmp->above)
360 { 360 {
361 object *above = tmp->above;
362
363 /* already multipart - don't do anything more */ 361 /* already multipart - don't do anything more */
364 if (!tmp->head && !tmp->more) 362 if (!tmp->head && !tmp->more)
365 { 363 {
366 /* If there is nothing more to this object, this for loop 364 /* If there is nothing more to this object, this for loop
367 * won't do anything. 365 * won't do anything.
… …
389 * the coding is simpler to just to it here with each part. 387 * the coding is simpler to just to it here with each part.
390 */ 388 */
391 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON); 389 insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE | INS_ABOVE_FLOOR_ONLY | INS_NO_WALK_ON);
392 } 390 }
393 } 391 }
394
395 tmp = above;
396 } 392 }
397} 393}
398 394
399/* 395/*
400 * Loads (ands parses) the objects into a given map from the specified 396 * Loads (ands parses) the objects into a given map from the specified
401 * file pointer. 397 * file pointer.
402 * mapflags is the same as we get with load_original_map
403 */ 398 */
404bool 399bool
405maptile::_load_objects (object_thawer &thawer) 400maptile::_load_objects (object_thawer &f)
406{ 401{
407 int unique; 402 for (;;)
408 object *op, *prev = NULL, *last_more = NULL, *otmp;
409
410 op = object::create ();
411 op->map = this; /* To handle buttons correctly */
412
413 while (int i = load_object (thawer, op, 0))
414 { 403 {
415 /* if the archetype for the object is null, means that we 404 coroapi::cede_every (1000); // cede once in a while
416 * got an invalid object. Don't do anything with it - the game 405
417 * or editor will not be able to do anything with it either. 406 switch (f.kw)
418 */
419 if (op->arch == NULL)
420 { 407 {
421 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 408 case KW_arch:
422 continue; 409 if (object *op = object::read (f, this))
423 }
424
425 switch (i)
426 { 410 {
427 case LL_NORMAL: 411 if (op->inv)
412 sum_weight (op);
413
428 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 414 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
415 }
429 416
430 if (op->inv) 417 continue;
431 sum_weight (op);
432 418
433 prev = op, last_more = op;
434 break;
435
436 case LL_MORE: 419 case KW_EOF:
437 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 420 return true;
438 op->head = prev, last_more->more = op, last_more = op; 421
422 default:
423 if (!f.parse_error ("map file"))
424 return false;
439 break; 425 break;
440 } 426 }
441 427
442 op = object::create (); 428 f.next ();
443 op->map = this;
444 }
445
446 op->destroy ();
447
448#if 0
449 for (i = 0; i < width; i++)
450 for (j = 0; j < height; j++)
451 {
452 unique = 0;
453 /* check for unique items, or unique squares */
454 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
455 {
456 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
457 unique = 1;
458
459 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
460 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
461 }
462 } 429 }
463#endif
464 430
465 return true; 431 return true;
466} 432}
467 433
468void 434void
… …
486 for (object *op = ms->bot; op; op = op->above) 452 for (object *op = ms->bot; op; op = op->above)
487 op->deactivate_recursive (); 453 op->deactivate_recursive ();
488} 454}
489 455
490bool 456bool
491maptile::_save_objects (object_freezer &freezer, int flags) 457maptile::_save_objects (object_freezer &f, int flags)
492{ 458{
493 static int cede_count = 0; 459 static int cede_count = 0;
494 460
495 if (flags & IO_HEADER) 461 if (flags & IO_HEADER)
496 _save_header (freezer); 462 _save_header (f);
497 463
498 if (!spaces) 464 if (!spaces)
499 return false; 465 return false;
500 466
501 for (int i = 0; i < size (); ++i) 467 for (int i = 0; i < size (); ++i)
… …
521 continue; 487 continue;
522 488
523 if (unique || op->flag [FLAG_UNIQUE]) 489 if (unique || op->flag [FLAG_UNIQUE])
524 { 490 {
525 if (flags & IO_UNIQUES) 491 if (flags & IO_UNIQUES)
526 save_object (freezer, op, 1); 492 op->write (f);
527 } 493 }
528 else if (flags & IO_OBJECTS) 494 else if (flags & IO_OBJECTS)
529 save_object (freezer, op, 1); 495 op->write (f);
530 } 496 }
531 } 497 }
532 498
533 return true; 499 return true;
534} 500}
535 501
536bool 502bool
537maptile::_load_objects (const char *path, bool skip_header) 503maptile::_load_objects (const char *path, bool skip_header)
538{ 504{
539 object_thawer thawer (path); 505 object_thawer f (path);
540 506
541 if (!thawer) 507 if (!f)
542 return false; 508 return false;
509
510 f.next ();
543 511
544 if (skip_header) 512 if (skip_header)
545 for (;;) 513 for (;;)
546 { 514 {
547 keyword kw = thawer.get_kv (); 515 keyword kw = f.kw;
548 516 f.skip ();
549 if (kw == KW_end) 517 if (kw == KW_end)
550 break; 518 break;
551
552 thawer.skip_kv (kw);
553 } 519 }
554 520
555 return _load_objects (thawer); 521 return _load_objects (f);
556} 522}
557 523
558bool 524bool
559maptile::_save_objects (const char *path, int flags) 525maptile::_save_objects (const char *path, int flags)
560{ 526{
… …
569maptile::maptile () 535maptile::maptile ()
570{ 536{
571 in_memory = MAP_SWAPPED; 537 in_memory = MAP_SWAPPED;
572 538
573 /* The maps used to pick up default x and y values from the 539 /* The maps used to pick up default x and y values from the
574 * map archetype. Mimic that behaviour. 540 * map archetype. Mimic that behaviour.
575 */ 541 */
576 width = 16; 542 width = 16;
577 height = 16; 543 height = 16;
578 reset_timeout = 0;
579 timeout = 300; 544 timeout = 300;
580 enter_x = 0; 545 max_nrof = 1000; // 1000 items of anything
581 enter_y = 0; 546 max_volume = 2000000; // 2m³
582} 547}
583 548
584maptile::maptile (int w, int h) 549maptile::maptile (int w, int h)
585{ 550{
586 in_memory = MAP_SWAPPED; 551 in_memory = MAP_SWAPPED;
… …
740 { 705 {
741 keyword kw = thawer.get_kv (); 706 keyword kw = thawer.get_kv ();
742 707
743 switch (kw) 708 switch (kw)
744 { 709 {
745 case KW_EOF:
746 LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
747 return false;
748
749 case KW_end:
750 return true;
751
752 default:
753 case KW_ERROR:
754 LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
755 break;
756
757 case KW_msg: 710 case KW_msg:
758 thawer.get_ml (KW_endmsg, msg); 711 thawer.get_ml (KW_endmsg, msg);
759 break; 712 break;
760 713
761 case KW_lore: // CF+ extension 714 case KW_lore: // CF+ extension
… …
793 case KW_sky: thawer.get (sky); break; 746 case KW_sky: thawer.get (sky); break;
794 747
795 case KW_per_player: thawer.get (per_player); break; 748 case KW_per_player: thawer.get (per_player); break;
796 case KW_per_party: thawer.get (per_party); break; 749 case KW_per_party: thawer.get (per_party); break;
797 750
798 case KW_region: get_region_by_name (thawer.get_str ()); break; 751 case KW_region: default_region = region::find (thawer.get_str ()); break;
799 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break; 752 case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
800 753
801 // old names new names 754 // old names new names
802 case KW_hp: case KW_enter_x: thawer.get (enter_x); break; 755 case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
803 case KW_sp: case KW_enter_y: thawer.get (enter_y); break; 756 case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
… …
811 764
812 case KW_tile_path_1: thawer.get (tile_path [0]); break; 765 case KW_tile_path_1: thawer.get (tile_path [0]); break;
813 case KW_tile_path_2: thawer.get (tile_path [1]); break; 766 case KW_tile_path_2: thawer.get (tile_path [1]); break;
814 case KW_tile_path_3: thawer.get (tile_path [2]); break; 767 case KW_tile_path_3: thawer.get (tile_path [2]); break;
815 case KW_tile_path_4: thawer.get (tile_path [3]); break; 768 case KW_tile_path_4: thawer.get (tile_path [3]); break;
769
770 case KW_end:
771 return true;
772
773 default:
774 if (!thawer.parse_error ("map", 0))
775 return false;
776 break;
816 } 777 }
817 } 778 }
818 779
819 abort (); 780 abort ();
820} 781}
… …
872 MAP_OUT (reset_time); 833 MAP_OUT (reset_time);
873 MAP_OUT (reset_timeout); 834 MAP_OUT (reset_timeout);
874 MAP_OUT (fixed_resettime); 835 MAP_OUT (fixed_resettime);
875 MAP_OUT (difficulty); 836 MAP_OUT (difficulty);
876 837
877 if (region) MAP_OUT2 (region, region->name); 838 if (default_region) MAP_OUT2 (region, default_region->name);
878 839
879 if (shopitems) 840 if (shopitems)
880 { 841 {
881 char shop[MAX_BUF]; 842 char shop[MAX_BUF];
882 print_shop_string (this, shop); 843 print_shop_string (this, shop);
… …
933 * Remove and free all objects in the given map. 894 * Remove and free all objects in the given map.
934 */ 895 */
935void 896void
936maptile::clear () 897maptile::clear ()
937{ 898{
899 sfree (regions, size ()), regions = 0;
900 free (regionmap), regionmap = 0;
901
938 if (!spaces) 902 if (spaces)
939 return; 903 {
940
941 for (mapspace *ms = spaces + size (); ms-- > spaces; ) 904 for (mapspace *ms = spaces + size (); ms-- > spaces; )
942 while (object *op = ms->bot) 905 while (object *op = ms->bot)
943 { 906 {
944 if (op->head) 907 if (op->head)
945 op = op->head; 908 op = op->head;
946 909
947 op->destroy_inv (false); 910 op->destroy_inv (false);
948 op->destroy (); 911 op->destroy ();
949 } 912 }
950 913
951 sfree (spaces, size ()), spaces = 0; 914 sfree (spaces, size ()), spaces = 0;
915 }
952 916
953 if (buttons) 917 if (buttons)
954 free_objectlinkpt (buttons), buttons = 0; 918 free_objectlinkpt (buttons), buttons = 0;
955} 919}
956 920
… …
1111void 1075void
1112mapspace::update_ () 1076mapspace::update_ ()
1113{ 1077{
1114 object *tmp, *last = 0; 1078 object *tmp, *last = 0;
1115 uint8 flags = P_UPTODATE, light = 0, anywhere = 0; 1079 uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1116 New_Face *top, *floor, *middle; 1080 facetile *top, *floor, *middle;
1117 object *top_obj, *floor_obj, *middle_obj; 1081 object *top_obj, *floor_obj, *middle_obj;
1118 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0; 1082 MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1119 1083
1120 middle = blank_face; 1084 middle = blank_face;
1121 top = blank_face; 1085 top = blank_face;
… …
1278 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1242 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1279 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1243 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1280 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1244 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1281} 1245}
1282 1246
1247uint64
1248mapspace::volume () const
1249{
1250 uint64 vol = 0;
1251
1252 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1253 vol += op->volume ();
1254
1255 return vol;
1256}
1257
1283/* this updates the orig_map->tile_map[tile_num] value after finding 1258/* this updates the orig_map->tile_map[tile_num] value after finding
1284 * the map. It also takes care of linking back the freshly found 1259 * the map. It also takes care of linking back the freshly found
1285 * maps tile_map values if it tiles back to this one. It returns 1260 * maps tile_map values if it tiles back to this one. It returns
1286 * the value of orig_map->tile_map[tile_num]. 1261 * the value of orig_map->tile_map[tile_num].
1287 */ 1262 */
… …
1450 1425
1451/** 1426/**
1452 * Return whether map2 is adjacent to map1. If so, store the distance from 1427 * Return whether map2 is adjacent to map1. If so, store the distance from
1453 * map1 to map2 in dx/dy. 1428 * map1 to map2 in dx/dy.
1454 */ 1429 */
1455static int 1430int
1456adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy) 1431adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
1457{ 1432{
1458 if (!map1 || !map2) 1433 if (!map1 || !map2)
1459 return 0; 1434 return 0;
1460 1435
… …
1551/* From map.c 1526/* From map.c
1552 * This is used by get_player to determine where the other 1527 * This is used by get_player to determine where the other
1553 * creature is. get_rangevector takes into account map tiling, 1528 * creature is. get_rangevector takes into account map tiling,
1554 * so you just can not look the the map coordinates and get the 1529 * so you just can not look the the map coordinates and get the
1555 * righte value. distance_x/y are distance away, which 1530 * righte value. distance_x/y are distance away, which
1556 * can be negativbe. direction is the crossfire direction scheme 1531 * can be negative. direction is the crossfire direction scheme
1557 * that the creature should head. part is the part of the 1532 * that the creature should head. part is the part of the
1558 * monster that is closest. 1533 * monster that is closest.
1559 * 1534 *
1560 * get_rangevector looks at op1 and op2, and fills in the 1535 * get_rangevector looks at op1 and op2, and fills in the
1561 * structure for op1 to get to op2. 1536 * structure for op1 to get to op2.
… …
1572get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1547get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1573{ 1548{
1574 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1549 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1575 { 1550 {
1576 /* be conservative and fill in _some_ data */ 1551 /* be conservative and fill in _some_ data */
1577 retval->distance = 100000; 1552 retval->distance = 10000;
1578 retval->distance_x = 32767; 1553 retval->distance_x = 10000;
1579 retval->distance_y = 32767; 1554 retval->distance_y = 10000;
1580 retval->direction = 0; 1555 retval->direction = 0;
1581 retval->part = 0; 1556 retval->part = 0;
1582 } 1557 }
1583 else 1558 else
1584 { 1559 {
… …
1589 1564
1590 best = op1; 1565 best = op1;
1591 /* If this is multipart, find the closest part now */ 1566 /* If this is multipart, find the closest part now */
1592 if (!(flags & 0x1) && op1->more) 1567 if (!(flags & 0x1) && op1->more)
1593 { 1568 {
1594 object *tmp;
1595 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1569 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1596 1570
1597 /* we just take the offset of the piece to head to figure 1571 /* we just take the offset of the piece to head to figure
1598 * distance instead of doing all that work above again 1572 * distance instead of doing all that work above again
1599 * since the distance fields we set above are positive in the 1573 * since the distance fields we set above are positive in the
1600 * same axis as is used for multipart objects, the simply arithmetic 1574 * same axis as is used for multipart objects, the simply arithmetic
1601 * below works. 1575 * below works.
1602 */ 1576 */
1603 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1577 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1604 { 1578 {
1605 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1579 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1606 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1580 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1607 if (tmpi < best_distance) 1581 if (tmpi < best_distance)
1608 { 1582 {
… …
1617 retval->distance_y += op1->y - best->y; 1591 retval->distance_y += op1->y - best->y;
1618 } 1592 }
1619 } 1593 }
1620 1594
1621 retval->part = best; 1595 retval->part = best;
1622 retval->distance = idistance (retval->distance_x, retval->distance_y); 1596 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1623 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1597 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1624 } 1598 }
1625} 1599}
1626 1600
1627/* this is basically the same as get_rangevector above, but instead of 1601/* this is basically the same as get_rangevector above, but instead of
… …
1632 * flags has no meaning for this function at this time - I kept it in to 1606 * flags has no meaning for this function at this time - I kept it in to
1633 * be more consistant with the above function and also in case they are needed 1607 * be more consistant with the above function and also in case they are needed
1634 * for something in the future. Also, since no object is pasted, the best 1608 * for something in the future. Also, since no object is pasted, the best
1635 * field of the rv_vector is set to NULL. 1609 * field of the rv_vector is set to NULL.
1636 */ 1610 */
1637
1638void 1611void
1639get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector * retval, int flags) 1612get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags)
1640{ 1613{
1641 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y)) 1614 if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1642 { 1615 {
1643 /* be conservative and fill in _some_ data */ 1616 /* be conservative and fill in _some_ data */
1644 retval->distance = 100000; 1617 retval->distance = 100000;
… …
1681 op->remove (); 1654 op->remove ();
1682 1655
1683 return insert_ob_in_map_at (op, this, originator, flags, x, y); 1656 return insert_ob_in_map_at (op, this, originator, flags, x, y);
1684} 1657}
1685 1658
1659region *
1660maptile::region (int x, int y) const
1661{
1662 if (regions
1663 && regionmap
1664 && !OUT_OF_REAL_MAP (this, x, y))
1665 if (struct region *reg = regionmap [regions [y * width + x]])
1666 return reg;
1667
1668 if (default_region)
1669 return default_region;
1670
1671 return ::region::default_region ();
1672}
1673
1674/* picks a random object from a style map.
1675 * Redone by MSW so it should be faster and not use static
1676 * variables to generate tables.
1677 */
1678object *
1679maptile::pick_random_object () const
1680{
1681 /* while returning a null object will result in a crash, that
1682 * is actually preferable to an infinite loop. That is because
1683 * most servers will automatically restart in case of crash.
1684 * Change the logic on getting the random space - shouldn't make
1685 * any difference, but this seems clearer to me.
1686 */
1687 for (int i = 1000; --i;)
1688 {
1689 object *pick = at (rndm (width), rndm (height)).bot;
1690
1691 // do not prefer big monsters just because they are big.
1692 if (pick->head_ () == pick)
1693 return pick->head_ ();
1694 }
1695
1696 // instead of crashing in the unlikely(?) case, try to return *something*
1697 return get_archetype ("blocked");
1698}
1699

Diff Legend

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