ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.119 by root, Fri Jan 19 18:06:51 2007 UTC vs.
Revision 1.121 by root, Tue Jan 23 03:17:55 2007 UTC

… …
670 face = blank_face; 670 face = blank_face;
671} 671}
672 672
673object::~object () 673object::~object ()
674{ 674{
675 if (index)
676 unlink (); 675 unlink ();
677 676
678 free_key_values (this); 677 free_key_values (this);
679} 678}
680 679
681static int object_count; 680static int object_count;
… …
690 objects.insert (this); 689 objects.insert (this);
691} 690}
692 691
693void object::unlink () 692void object::unlink ()
694{ 693{
695 assert (index);//D 694 if (!index)
695 return;
696
696 objects.erase (this); 697 objects.erase (this);
697 refcnt_dec (); 698 refcnt_dec ();
698} 699}
699 700
700void 701void
… …
1749 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1750 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1750 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1751 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1751 { 1752 {
1752 1753
1753 float 1754 float
1754 diff = tmp->move_slow_penalty * FABS (op->speed); 1755 diff = tmp->move_slow_penalty * fabs (op->speed);
1755 1756
1756 if (op->type == PLAYER) 1757 if (op->type == PLAYER)
1757 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1758 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1758 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1759 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1759 diff /= 4.0; 1760 diff /= 4.0;

Diff Legend

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