[ViewVC] Diff of: cvs/deliantra/server/socket/item.C

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.11 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.12 by root, Thu Dec 14 00:01:37 2006 UTC

   player_apply (pl->ob, op, 0, 0);
 }
 /** Client wants to apply some object.  Lets do so. */
 void
-LockItem (uint8 * data, int len, player *pl)
+LockItem (uint8 *data, int len, player *pl)
 {
-  int flag, tag;
-  object *op;
-  flag = data[0];
+  int flag = data[0];
-  tag = GetInt_String (data + 1);
+  tag_t tag = net_uint32 (data + 1);
-  op = esrv_get_ob_from_count (pl->ob, tag);
+  object *op = esrv_get_ob_from_count (pl->ob, tag);
   if (!op)
     {
       new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");
       return;
     }
   if (!flag)
     CLEAR_FLAG (op, FLAG_INV_LOCKED);
   else
     SET_FLAG (op, FLAG_INV_LOCKED);
   esrv_update_item (UPD_FLAGS, pl->ob, op);
 }
 /** Client wants to apply some object.  Lets do so. */
 void
 MarkItem (uint8 * data, int len, player *pl)
 {
-  int tag;
+  tag_t tag = net_uint32 (data);
-  object *op;
-  tag = GetInt_String (data);
-  op = esrv_get_ob_from_count (pl->ob, tag);
+  object *op = esrv_get_ob_from_count (pl->ob, tag);
   if (!op)
     {
       new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");
       return;
     }
   pl->mark = op;
   new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op));
 }
 /**
  * look_at prints items on the specified square.
  *
  * [ removed EARTHWALL check and added check for containers inventory.

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