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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.9 by root, Wed Sep 20 21:53:50 2006 UTC vs.
Revision 1.10 by root, Wed Sep 27 00:36:09 2006 UTC

 /** 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

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