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.85 by root, Wed Feb 7 23:50:01 2007 UTC vs.
Revision 1.91 by root, Sat Feb 17 23:32:11 2007 UTC

… …
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{
… …
803 769
804 case KW_end: 770 case KW_end:
805 return true; 771 return true;
806 772
807 default: 773 default:
808 if (!thawer.parse_error (kw, "map", 0)) 774 if (!thawer.parse_error ("map", 0))
809 return false; 775 return false;
810 break; 776 break;
811 } 777 }
812 } 778 }
813 779
… …
1581get_rangevector (object *op1, object *op2, rv_vector * retval, int flags) 1547get_rangevector (object *op1, object *op2, rv_vector * retval, int flags)
1582{ 1548{
1583 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))
1584 { 1550 {
1585 /* be conservative and fill in _some_ data */ 1551 /* be conservative and fill in _some_ data */
1586 retval->distance = 100000; 1552 retval->distance = 10000;
1587 retval->distance_x = 32767; 1553 retval->distance_x = 10000;
1588 retval->distance_y = 32767; 1554 retval->distance_y = 10000;
1589 retval->direction = 0; 1555 retval->direction = 0;
1590 retval->part = 0; 1556 retval->part = 0;
1591 } 1557 }
1592 else 1558 else
1593 { 1559 {
… …
1598 1564
1599 best = op1; 1565 best = op1;
1600 /* If this is multipart, find the closest part now */ 1566 /* If this is multipart, find the closest part now */
1601 if (!(flags & 0x1) && op1->more) 1567 if (!(flags & 0x1) && op1->more)
1602 { 1568 {
1603 object *tmp;
1604 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;
1605 1570
1606 /* 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
1607 * distance instead of doing all that work above again 1572 * distance instead of doing all that work above again
1608 * since the distance fields we set above are positive in the 1573 * since the distance fields we set above are positive in the
1609 * same axis as is used for multipart objects, the simply arithmetic 1574 * same axis as is used for multipart objects, the simply arithmetic
1610 * below works. 1575 * below works.
1611 */ 1576 */
1612 for (tmp = op1->more; tmp != NULL; tmp = tmp->more) 1577 for (object *tmp = op1->more; tmp; tmp = tmp->more)
1613 { 1578 {
1614 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) +
1615 (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);
1616 if (tmpi < best_distance) 1581 if (tmpi < best_distance)
1617 { 1582 {
… …
1626 retval->distance_y += op1->y - best->y; 1591 retval->distance_y += op1->y - best->y;
1627 } 1592 }
1628 } 1593 }
1629 1594
1630 retval->part = best; 1595 retval->part = best;
1631 retval->distance = idistance (retval->distance_x, retval->distance_y); 1596 retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1632 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y); 1597 retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1633 } 1598 }
1634} 1599}
1635 1600
1636/* 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
… …
1704 return default_region; 1669 return default_region;
1705 1670
1706 return ::region::default_region (); 1671 return ::region::default_region ();
1707} 1672}
1708 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;
1709 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