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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.69 by root, Tue Dec 26 05:44:15 2006 UTC vs.
Revision 1.70 by root, Tue Dec 26 08:54:59 2006 UTC

… …
267 && op1->name == op2->name 267 && op1->name == op2->name
268 && can_merge_slow (op1, op2); 268 && can_merge_slow (op1, op2);
269 } 269 }
270 270
271 MTH void set_owner (object *owner); 271 MTH void set_owner (object *owner);
272 MTH void set_speed (float speed);
272 273
273 MTH void instantiate () 274 MTH void instantiate ()
274 { 275 {
275 if (!uuid.seq) // HACK 276 if (!uuid.seq) // HACK
276 uuid = gen_uuid (); 277 uuid = gen_uuid ();

Diff Legend

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