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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.5 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.12 by root, Thu Dec 14 00:01:37 2006 UTC

-/*
- * static char *rcsid_item_c =
- *    "$Id: item.C,v 1.5 2006/09/10 13:43:33 root Exp $";
- */
 /*
     CrossFire, A Multiplayer game for X-windows
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    The author can be reached via e-mail to crossfire-devel@real-time.com
+    The author can be reached via e-mail to <crossfire@schmorp.de>
 */
 /**
  * \file
  * Client/server logic.
       /* we remove the check for op->env, because in theory, the object
        * is hopefully in the same place, so the client should preserve
        * order.
        */
     }
   if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
     {
       /* FLAG_CLIENT_SENT is debug only.  We are using it to see where
        * this is happening - we can set a breakpoint here in the debugger
        * and track back the call.
        */
       LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
     }
   sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
   strcpy ((char *) sl.buf, "upditem ");
   sl.len = strlen ((char *) sl.buf);
     {
       if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE))
         esrv_send_face (&pl->contr->socket, op->face->number, 0);
       SockList_AddInt (&sl, op->face->number);
     }
   if (flags & UPD_NAME)
     {
       int len;
       const char *item_p;
       char item_n[MAX_BUF];
       len += strlen (item_n + 1 + len) + 1;
       SockList_AddChar (&sl, (char) len);
       memcpy (sl.buf + sl.len, item_n, len);
       sl.len += len;
     }
   if (flags & UPD_ANIM)
     SockList_AddShort (&sl, op->animation_id);
   if (flags & UPD_ANIMSPEED)
     {
 /** Client wants to examine some object.  So lets do so. */
 void
 ExamineCmd (char *buf, int len, player *pl)
 {
-  long tag = atoi (buf);
+  tag_t tag = atoi (buf);
+  /* If the high bit is set, player examined a pseudo object. */
+  if (tag & 0x80000000)
+    return;
   object *op = esrv_get_ob_from_count (pl->ob, tag);
   if (!op)
     {
       LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
       return;
     }
   examine (pl->ob, op);
 }
 /** Client wants to apply some object.  Lets do so. */
 void
 ApplyCmd (char *buf, int len, player *pl)
 {
-  uint32 tag = atoi (buf);
+  tag_t tag = atoi (buf);
-  object *op = esrv_get_ob_from_count (pl->ob, tag);
   /* sort of a hack, but if the player saves and the player then manually
    * applies a savebed (or otherwise tries to do stuff), we run into trouble.
    */
   if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
       pl->socket.look_position = tag & 0x7fffffff;
       pl->socket.update_look = 1;
       return;
     }
+  object *op = esrv_get_ob_from_count (pl->ob, tag);
   if (!op)
     {
       LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
       return;
     }
   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;
-  pl->mark_count = op->count;
   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.
 look_at (object *op, int dx, int dy)
 {
   object *tmp;
   int flag = 0;
   sint16 x, y;
-  mapstruct *m;
+  maptile *m;
   x = op->x + dx;
   y = op->y + dy;
   if (out_of_map (op->map, x, y))

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.5 by root, Sun Sep 10 13:43:33 2006 UTC vs. Revision 1.12 by root, Thu Dec 14 00:01:37 2006 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.5 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.12 by root, Thu Dec 14 00:01:37 2006 UTC