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.118 by root, Thu Jan 18 19:42:09 2007 UTC vs.
Revision 1.120 by root, Sun Jan 21 21:28:27 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 ();
677
675 free_key_values (this); 678 free_key_values (this);
676} 679}
677 680
678static int object_count; 681static int object_count;
679 682
… …
1746 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1749 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1747 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1750 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1748 { 1751 {
1749 1752
1750 float 1753 float
1751 diff = tmp->move_slow_penalty * FABS (op->speed); 1754 diff = tmp->move_slow_penalty * fabs (op->speed);
1752 1755
1753 if (op->type == PLAYER) 1756 if (op->type == PLAYER)
1754 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1757 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1755 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1758 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1756 diff /= 4.0; 1759 diff /= 4.0;

Diff Legend

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