[ViewVC] Diff of: cvs/deliantra/server/common/treasure.C

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.50 by root, Thu Apr 19 16:23:46 2007 UTC vs.
Revision 1.51 by root, Thu Apr 19 16:36:00 2007 UTC

  * start with equipment, but only their abilities).
  */
 static void
 put_treasure (object *op, object *creator, int flags)
 {
-  object *tmp;
   /* Bit of a hack - spells should never be put onto the map.  The entire
    * treasure stuff is a problem - there is no clear idea of knowing
    * this is the original object, or if this is an object that should be created
    * by another object.
    */
   if (flags & GT_ENVIRONMENT && op->type != SPELL)
     {
+      if (ob_blocked (op, creator->map, creator->x, creator->y))
+        op->destroy ();
+      else
+        {
-      SET_FLAG (op, FLAG_OBJ_ORIGINAL);
+          SET_FLAG (op, FLAG_OBJ_ORIGINAL);
-      op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
+          op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
+        }
     }
   else
     {
       op = creator->insert (op);
       if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
         monster_check_apply (creator, op);
-      if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ()))
+      if (flags & GT_UPDATE_INV)
+        if (object *tmp = creator->in_player ())
-        esrv_send_item (tmp, op);
+          esrv_send_item (tmp, op);
     }
 }
 /* if there are change_xxx commands in the treasure, we include the changes
  * in the generated object

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