--- deliantra/server/socket/item.C	2009/11/08 15:11:23	1.83
+++ deliantra/server/socket/item.C	2010/04/03 17:15:19	1.90
@@ -1,9 +1,9 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
  * 
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
@@ -157,7 +157,7 @@
 
   int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
                  : head->anim_speed           ? clamp (head->anim_speed, 1, 255)
-                 :                              1. / clamp (fabs (head->speed), 1./255., 1./1.);
+                 :                              1. / clamp (head->speed, 1./255., 1./1.);
 
   sl << uint8  (anim_speed)
      << uint32 (head->nrof);
@@ -449,12 +449,12 @@
             anim_speed = op->anim_speed;
           else
             {
-              if (fabs (op->speed) < 0.001)
+              if (op->speed < 0.001)
                 anim_speed = 255;
-              else if (fabs (op->speed) >= 1.0)
+              else if (op->speed >= 1.0)
                 anim_speed = 1;
               else
-                anim_speed = (int) (1.0 / fabs (op->speed));
+                anim_speed = 1. / op->speed;
             }
 
           if (anim_speed > 255)
@@ -621,7 +621,7 @@
       return;
     }
 
-  player_apply (pl->ob, op, 0, 0);
+  pl->ob->apply (op, AP_TOGGLE);
 }
 
 /** Client wants to lock some object. Lets do so. */
@@ -691,10 +691,10 @@
           ms.update ();
 
           buf.printf (" map: %s%+d%+d (%+d%+d)\n"
-                      " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; nrof %d, volume %lld\n\n",
+                      " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; items %d, volume %lld\n\n",
                       &pos.m->path, pos.x, pos.y, dx, dy,
                       (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
-                      ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.nrof (), (long long)ms.volume ()
+                      ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume ()
                      );
         }
       else
@@ -716,7 +716,7 @@
               continue;
 
             if (wiz)
-              buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
+              buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ());
             else
               buf.printf (" - %s.\n", query_name (tmp));
 
@@ -774,7 +774,7 @@
        */
       if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
         {
-          int cnt = MAX_ITEM_PER_DROP;
+          int cnt = MAX_ITEM_PER_ACTION;
 
           for (object *current = op->inv; current && cnt--; )
             {