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.261 by root, Wed Oct 1 16:04:16 2008 UTC vs.
Revision 1.262 by elmex, Wed Oct 22 19:51:41 2008 UTC

1961 * head of the object should correspond for the entire object. 1961 * head of the object should correspond for the entire object.
1962 */ 1962 */
1963 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 1963 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1964 continue; 1964 continue;
1965 1965
1966 if (ob->blocked (m, pos.x, pos.y)) 1966 if (ob->blocked (pos.m, pos.x, pos.y))
1967 continue; 1967 continue;
1968 1968
1969 altern [index++] = i; 1969 altern [index++] = i;
1970 } 1970 }
1971 1971

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines