[ViewVC] Diff of: cvs/deliantra/server/server/c

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.25 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.26 by root, Wed Dec 13 01:39:32 2006 UTC

       new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
 #endif
       return;
     }
-  if (op->type == PLAYER)
+  if (op->type == PLAYER && op->contr->last_used == tmp)
-    {
+    op->contr->last_used = tmp->below ? tmp->below
-      if (op->contr->last_used == tmp && op->contr->last_used_id == tmp->count)
+                         : tmp->above ? tmp->above
-        {
+                         : 0;
-          object *n = NULL;
-          if (tmp->below != NULL)
-            n = tmp->below;
-          else if (tmp->above != NULL)
-            n = tmp->above;
-          op->contr->last_used = n;
-          if (n != NULL)
-            op->contr->last_used_id = n->count;
-          else
-            op->contr->last_used_id = 0;
-        }
-    };
   if (op->container)
     {
       if (op->type == PLAYER)
-        {
-          put_object_in_sack (op, op->container, tmp, op->contr->count);
+        put_object_in_sack (op, op->container, tmp, op->contr->count);
-        }
       else
-        {
-          put_object_in_sack (op, op->container, tmp, 0);
+        put_object_in_sack (op, op->container, tmp, 0);
-        };
     }
   else
     {
       if (op->type == PLAYER)
-        {
-          drop_object (op, tmp, op->contr->count);
+        drop_object (op, tmp, op->contr->count);
-        }
       else
-        {
-          drop_object (op, tmp, 0);
+        drop_object (op, tmp, 0);
-        };
     }
   if (op->type == PLAYER)
     op->contr->count = 0;
 }

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