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.71 by root, Tue Dec 26 20:04:09 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 ();
316 if (op->type == PLAYER) 317 if (op->type == PLAYER)
317 return op; 318 return op;
318 319
319 return 0; 320 return 0;
320 } 321 }
322
323 // "temporary" helper function
324 MTH object *head_ ()
325 {
326 return head ? head : this;
327 }
328
329 // insert object at same map position as 'where'
330 // handles both inventory and map "positions"
331 MTH object *insert_at (object *where, object *originator = 0, int flags = 0);
321 332
322 // returns the mapspace this object is in 333 // returns the mapspace this object is in
323 mapspace &ms () const; 334 mapspace &ms () const;
324 335
325 // fully recursive iterator 336 // fully recursive iterator

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines