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.339 by root, Fri Jul 2 17:39:23 2010 UTC vs.
Revision 1.341 by root, Fri Feb 25 07:23:38 2011 UTC

667object::instantiate () 667object::instantiate ()
668{ 668{
669 if (!uuid.seq) // HACK 669 if (!uuid.seq) // HACK
670 uuid = UUID::gen (); 670 uuid = UUID::gen ();
671 671
672 // TODO: unclean state changes, should nt be done in copy_to AND instantiate 672 // TODO: unclean state changes, should not be done in copy_to AND instantiate
673 if (flag [FLAG_RANDOM_SPEED] && speed) 673 if (flag [FLAG_RANDOM_SPEED] && speed)
674 speed_left = - speed - rndm (); // TODO animation 674 speed_left = - speed - rndm (); // TODO animation
675 else 675 else
676 speed_left = -1.; 676 speed_left = -1.;
677 677
2816 return contr->mark; 2816 return contr->mark;
2817 else 2817 else
2818 return 0; 2818 return 0;
2819} 2819}
2820 2820
2821// put marked object first in the inventory
2822// this is used by identify-like spells so players can influence
2823// the order a bit.
2824void
2825object::splay_marked ()
2826{
2827 if (object *marked = mark ())
2828 splay (marked);
2829}
2830

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines