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.121 by root, Sat Aug 25 22:19:26 2007 UTC vs.
Revision 1.126 by root, Fri Sep 7 13:10:30 2007 UTC

… …
408 408
409 return true; 409 return true;
410} 410}
411 411
412bool 412bool
413maptile::_load_objects (const char *path, bool skip_header)
414{
415 object_thawer f (path);
416
417 if (!f)
418 return false;
419
420 f.next ();
421
422 if (skip_header)
423 for (;;)
424 {
425 keyword kw = f.kw;
426 f.skip ();
427 if (kw == KW_end)
428 break;
429 }
430
431 return _load_objects (f);
432}
433
434bool
435maptile::_save_objects (const char *path, int flags) 413maptile::_save_objects (const char *path, int flags)
436{ 414{
437 object_freezer freezer; 415 object_freezer freezer;
438 416
439 if (!_save_objects (freezer, flags)) 417 if (!_save_objects (freezer, flags))
… …
611bool 589bool
612maptile::_load_header (object_thawer &thawer) 590maptile::_load_header (object_thawer &thawer)
613{ 591{
614 for (;;) 592 for (;;)
615 { 593 {
616 thawer.next ();
617
618 switch (thawer.kw) 594 switch (thawer.kw)
619 { 595 {
620 case KW_msg: 596 case KW_msg:
621 thawer.get_ml (KW_endmsg, msg); 597 thawer.get_ml (KW_endmsg, msg);
622 break; 598 break;
… …
677 case KW_tile_path_2: thawer.get (tile_path [1]); break; 653 case KW_tile_path_2: thawer.get (tile_path [1]); break;
678 case KW_tile_path_3: thawer.get (tile_path [2]); break; 654 case KW_tile_path_3: thawer.get (tile_path [2]); break;
679 case KW_tile_path_4: thawer.get (tile_path [3]); break; 655 case KW_tile_path_4: thawer.get (tile_path [3]); break;
680 656
681 case KW_ERROR: 657 case KW_ERROR:
682 set_key (thawer.kw_str, thawer.value); 658 set_key_text (thawer.kw_str, thawer.value);
683 break; 659 break;
684 660
685 case KW_end: 661 case KW_end:
662 thawer.next ();
686 return true; 663 return true;
687 664
688 default: 665 default:
689 if (!thawer.parse_error ("map", 0)) 666 if (!thawer.parse_error ("map", 0))
690 return false; 667 return false;
691 break; 668 break;
692 } 669 }
670
671 thawer.next ();
693 } 672 }
694 673
695 abort (); 674 abort ();
696}
697
698bool
699maptile::_load_header (const char *path)
700{
701 object_thawer thawer (path);
702
703 if (!thawer)
704 return false;
705
706 return _load_header (thawer);
707} 675}
708 676
709/****************************************************************************** 677/******************************************************************************
710 * This is the start of unique map handling code 678 * This is the start of unique map handling code
711 *****************************************************************************/ 679 *****************************************************************************/
… …
889 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) 857 if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
890 break; 858 break;
891 859
892 if (QUERY_FLAG (op, FLAG_IS_FLOOR) 860 if (QUERY_FLAG (op, FLAG_IS_FLOOR)
893 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) 861 || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
894 || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
895 || QUERY_FLAG (op, FLAG_UNIQUE) 862 || QUERY_FLAG (op, FLAG_UNIQUE)
896 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) 863 || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
897 || QUERY_FLAG (op, FLAG_UNPAID) 864 || QUERY_FLAG (op, FLAG_UNPAID)
898 || op->is_alive ()) 865 || op->is_alive ())
899 ; // do not decay 866 ; // do not decay
… …
1629{ 1596{
1630 if (!sound) 1597 if (!sound)
1631 return; 1598 return;
1632 1599
1633 for_all_players (pl) 1600 for_all_players (pl)
1634 if (pl->ob->map == this) 1601 if (pl->observe->map == this)
1635 if (client *ns = pl->ns) 1602 if (client *ns = pl->ns)
1636 { 1603 {
1637 int dx = x - pl->ob->x; 1604 int dx = x - pl->observe->x;
1638 int dy = y - pl->ob->y; 1605 int dy = y - pl->observe->y;
1639 1606
1640 int distance = idistance (dx, dy); 1607 int distance = idistance (dx, dy);
1641 1608
1642 if (distance <= MAX_SOUND_DISTANCE) 1609 if (distance <= MAX_SOUND_DISTANCE)
1643 ns->play_sound (sound, dx, dy); 1610 ns->play_sound (sound, dx, dy);

Diff Legend

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