[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.338 by root, Fri Jul 2 16:24:24 2010 UTC vs.
Revision 1.341 by root, Fri Feb 25 07:23:38 2011 UTC

 object::instantiate ()
 {
   if (!uuid.seq) // HACK
     uuid = UUID::gen ();
-  // TODO: unclean state changes, should nt be done in copy_to AND instantiate
+  // TODO: unclean state changes, should not be done in copy_to AND instantiate
   if (flag [FLAG_RANDOM_SPEED] && speed)
     speed_left = - speed - rndm (); // TODO animation
   else
     speed_left = -1.;
       if (pl && pl->is_player ())
         {
           if (expect_false (pl->contr->combat_ob == this))
             {
-              pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
+              pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
               pl->contr->combat_ob = 0;
               if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
             }
           if (expect_false (pl->contr->ranged_ob == this))
             {
-              pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
+              pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
               pl->contr->ranged_ob = 0;
               if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
             }
           pl->contr->queue_stats_update ();
     return contr->mark;
   else
     return 0;
 }
+// put marked object first in the inventory
+// this is used by identify-like spells so players can influence
+// the order a bit.
+void
+object::splay_marked ()
+{
+  if (object *marked = mark ())
+    splay (marked);
+}

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