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.84 by root, Mon Feb 5 01:24:45 2007 UTC vs.
Revision 1.88 by root, Fri Feb 16 19:43:40 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.
… …
396} 397}
397 398
398/* 399/*
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 */ 402 */
403bool 403bool
404maptile::_load_objects (object_thawer &thawer) 404maptile::_load_objects (object_thawer &f)
405{ 405{
406 int unique; 406 for (;;)
407 object *op, *prev = NULL, *last_more = NULL, *otmp;
408
409 op = object::create ();
410 op->map = this; /* To handle buttons correctly */
411
412 while (int i = load_object (thawer, op, 0))
413 { 407 {
414 /* if the archetype for the object is null, means that we 408 coroapi::cede_every (1000); // cede once in a while
415 * got an invalid object. Don't do anything with it - the game 409
416 * or editor will not be able to do anything with it either. 410 switch (f.kw)
417 */
418 if (op->arch == NULL)
419 { 411 {
420 LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)"); 412 case KW_arch:
421 continue; 413 if (object *op = object::read (f))
422 }
423
424 switch (i)
425 { 414 {
426 case LL_NORMAL: 415 if (op->inv)
416 sum_weight (op);
417
427 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD); 418 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ON_TOP | INS_MAP_LOAD);
419 }
428 420
429 if (op->inv) 421 continue;
430 sum_weight (op);
431 422
432 prev = op, last_more = op;
433 break;
434
435 case LL_MORE: 423 case KW_EOF:
436 insert_ob_in_map (op, this, op, INS_NO_MERGE | INS_NO_WALK_ON | INS_ABOVE_FLOOR_ONLY); 424 return true;
437 op->head = prev, last_more->more = op, last_more = op; 425
426 default:
427 if (!f.parse_error ("map file"))
428 return false;
438 break; 429 break;
439 } 430 }
440 431
441 op = object::create (); 432 f.next ();
442 op->map = this;
443 }
444
445 op->destroy ();
446
447#if 0
448 for (i = 0; i < width; i++)
449 for (j = 0; j < height; j++)
450 {
451 unique = 0;
452 /* check for unique items, or unique squares */
453 for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
454 {
455 if (QUERY_FLAG (otmp, FLAG_UNIQUE) || QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
456 unique = 1;
457
458 if (!(mapflags & (MAP_OVERLAY | MAP_PLAYER_UNIQUE) || unique))
459 SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
460 }
461 } 433 }
462#endif
463 434
464 return true; 435 return true;
465} 436}
466 437
467void 438void
… …
485 for (object *op = ms->bot; op; op = op->above) 456 for (object *op = ms->bot; op; op = op->above)
486 op->deactivate_recursive (); 457 op->deactivate_recursive ();
487} 458}
488 459
489bool 460bool
490maptile::_save_objects (object_freezer &freezer, int flags) 461maptile::_save_objects (object_freezer &f, int flags)
491{ 462{
492 static int cede_count = 0; 463 static int cede_count = 0;
493 464
494 if (flags & IO_HEADER) 465 if (flags & IO_HEADER)
495 _save_header (freezer); 466 _save_header (f);
496 467
497 if (!spaces) 468 if (!spaces)
498 return false; 469 return false;
499 470
500 for (int i = 0; i < size (); ++i) 471 for (int i = 0; i < size (); ++i)
… …
520 continue; 491 continue;
521 492
522 if (unique || op->flag [FLAG_UNIQUE]) 493 if (unique || op->flag [FLAG_UNIQUE])
523 { 494 {
524 if (flags & IO_UNIQUES) 495 if (flags & IO_UNIQUES)
525 save_object (freezer, op, 1); 496 op->write (f);
526 } 497 }
527 else if (flags & IO_OBJECTS) 498 else if (flags & IO_OBJECTS)
528 save_object (freezer, op, 1); 499 op->write (f);
529 } 500 }
530 } 501 }
531 502
532 return true; 503 return true;
533} 504}
534 505
535bool 506bool
536maptile::_load_objects (const char *path, bool skip_header) 507maptile::_load_objects (const char *path, bool skip_header)
537{ 508{
538 object_thawer thawer (path); 509 object_thawer f (path);
539 510
540 if (!thawer) 511 if (!f)
541 return false; 512 return false;
513
514 f.next ();
542 515
543 if (skip_header) 516 if (skip_header)
544 for (;;) 517 for (;;)
545 { 518 {
546 keyword kw = thawer.get_kv (); 519 keyword kw = f.kw;
547 520 f.skip ();
548 if (kw == KW_end) 521 if (kw == KW_end)
549 break; 522 break;
550
551 thawer.skip_kv (kw);
552 } 523 }
553 524
554 return _load_objects (thawer); 525 return _load_objects (f);
555} 526}
556 527
557bool 528bool
558maptile::_save_objects (const char *path, int flags) 529maptile::_save_objects (const char *path, int flags)
559{ 530{
… …
568maptile::maptile () 539maptile::maptile ()
569{ 540{
570 in_memory = MAP_SWAPPED; 541 in_memory = MAP_SWAPPED;
571 542
572 /* The maps used to pick up default x and y values from the 543 /* The maps used to pick up default x and y values from the
573 * map archetype. Mimic that behaviour. 544 * map archetype. Mimic that behaviour.
574 */ 545 */
575 width = 16; 546 width = 16;
576 height = 16; 547 height = 16;
577 reset_timeout = 0;
578 timeout = 300; 548 timeout = 300;
579 enter_x = 0; 549 max_nrof = 1000; // 1000 items of anything
580 enter_y = 0; 550 max_volume = 2000000; // 2m³
581} 551}
582 552
583maptile::maptile (int w, int h) 553maptile::maptile (int w, int h)
584{ 554{
585 in_memory = MAP_SWAPPED; 555 in_memory = MAP_SWAPPED;
… …
803 773
804 case KW_end: 774 case KW_end:
805 return true; 775 return true;
806 776
807 default: 777 default:
808 if (!thawer.parse_error (kw, "map", 0)) 778 if (!thawer.parse_error ("map", 0))
809 return false; 779 return false;
810 break; 780 break;
811 } 781 }
812 } 782 }
813 783
… …
1276 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0; 1246 faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;
1277 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0; 1247 faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;
1278 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0; 1248 faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;
1279} 1249}
1280 1250
1251uint64
1252mapspace::volume () const
1253{
1254 uint64 vol = 0;
1255
1256 for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
1257 vol += op->volume ();
1258
1259 return vol;
1260}
1261
1281/* this updates the orig_map->tile_map[tile_num] value after finding 1262/* this updates the orig_map->tile_map[tile_num] value after finding
1282 * the map. It also takes care of linking back the freshly found 1263 * the map. It also takes care of linking back the freshly found
1283 * maps tile_map values if it tiles back to this one. It returns 1264 * maps tile_map values if it tiles back to this one. It returns
1284 * the value of orig_map->tile_map[tile_num]. 1265 * the value of orig_map->tile_map[tile_num].
1285 */ 1266 */
… …
1570get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1551get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1571{ 1552{
1572 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y)) 1553 if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1573 { 1554 {
1574 /* be conservative and fill in _some_ data */ 1555 /* be conservative and fill in _some_ data */
1575 retval->distance = 100000; 1556 retval->distance = 10000;
1576 retval->distance_x = 32767; 1557 retval->distance_x = 10000;
1577 retval->distance_y = 32767; 1558 retval->distance_y = 10000;
1578 retval->direction = 0; 1559 retval->direction = 0;
1579 retval->part = 0; 1560 retval->part = 0;
1580 } 1561 }
1581 else 1562 else
1582 { 1563 {
… …
1587 1568
1588 best = op1; 1569 best = op1;
1589 /* If this is multipart, find the closest part now */ 1570 /* If this is multipart, find the closest part now */
1590 if (!(flags & 0x1) && op1->more) 1571 if (!(flags & 0x1) && op1->more)
1591 { 1572 {
1592 object *tmp;
1593 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi; 1573 int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1594 1574
1595 /* we just take the offset of the piece to head to figure 1575 /* we just take the offset of the piece to head to figure
1596 * distance instead of doing all that work above again 1576 * distance instead of doing all that work above again
1597 * since the distance fields we set above are positive in the 1577 * since the distance fields we set above are positive in the
1598 * same axis as is used for multipart objects, the simply arithmetic 1578 * same axis as is used for multipart objects, the simply arithmetic
1599 * below works. 1579 * below works.
1600 */ 1580 */
1601 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1581 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1602 { 1582 {
1603 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) + 1583 tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1604 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y); 1584 (op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1605 if (tmpi < best_distance) 1585 if (tmpi < best_distance)
1606 { 1586 {
… …
1615 retval->distance_y += op1->y - best->y; 1595 retval->distance_y += op1->y - best->y;
1616 } 1596 }
1617 } 1597 }
1618 1598
1619 retval->part = best; 1599 retval->part = best;
1620 retval->distance = idistance (retval->distance_x, retval->distance_y); 1600 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1621 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1601 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1622 } 1602 }
1623} 1603}
1624 1604
1625/* this is basically the same as get_rangevector above, but instead of 1605/* this is basically the same as get_rangevector above, but instead of
… …
1693 return default_region; 1673 return default_region;
1694 1674
1695 return ::region::default_region (); 1675 return ::region::default_region ();
1696} 1676}
1697 1677
1678

Diff Legend

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