[ViewVC] Diff of: cvs/deliantra/server/include/object.h

Comparing deliantra/server/include/object.h (file contents):
Revision 1.119 by root, Sat May 12 13:27:37 2007 UTC vs.
Revision 1.120 by root, Sat May 12 16:06:42 2007 UTC

…		…
317	&& can_merge_slow (op1, op2);	317	&& can_merge_slow (op1, op2);
318	}	318	}
319		319
320	MTH void set_owner (object *owner);	320	MTH void set_owner (object *owner);
321	MTH void set_speed (float speed);	321	MTH void set_speed (float speed);
322	MTH void set_weapon (object *ob);	322	MTH bool change_weapon (object *ob);
323		323
324	MTH void open_container (object *new_container);	324	MTH void open_container (object *new_container);
325	MTH void close_container ()	325	MTH void close_container ()
326	{	326	{
327	open_container (0);	327	open_container (0);

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