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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.148 by root, Tue Apr 22 04:06:07 2008 UTC vs.
Revision 1.149 by root, Tue Apr 22 07:01:47 2008 UTC

 handle_apply_yield (object *tmp)
 {
   const char *yield;
   yield = get_ob_key_value (tmp, "on_use_yield");
-  if (yield != NULL)
+  if (yield)
-    {
+    get_archetype (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
-      object *drop = get_archetype (yield);
-      if (tmp->env)
-        {
-          drop = insert_ob_in_ob (drop, tmp->env);
-          if (tmp->env->type == PLAYER)
-            esrv_send_item (tmp->env, drop);
-        }
-      else
-        {
-          drop->x = tmp->x;
-          drop->y = tmp->y;
-          insert_ob_in_map (drop, tmp->map, tmp, INS_BELOW_ORIGINATOR);
-        }
-    }
 }
 /**
  * Handles applying a potion.
  */
                                    slot at once! */
   improver->decrease ();
   weapon->last_eat = 0;
   return 1;
 }
 /**
  * Does the dirty job for 'improve weapon' scroll, prepare or add something.
  * This is the new improve weapon code.
  * Returns 0 if it was not able to work for some reason.
   armour->item_power = get_power_from_ench (armour->arch->item_power + armour->magic);
   if (op->type == PLAYER)
     {
       esrv_send_item (op, armour);
       if (QUERY_FLAG (armour, FLAG_APPLIED))
         op->update_stats ();
     }
   improver->decrease ();
   if (tmp)
-    {
+    op->insert (tmp);
-      insert_ob_in_ob (tmp, op);
-      esrv_send_item (op, tmp);
-    }
   return 1;
 }
 /*
       if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
         {
           /*exp_gain *= 2; because they just identified it too */
           SET_FLAG (tmp, FLAG_IDENTIFIED);
-          /* If in a container, update how it looks */
+          if (object *pl = tmp->visible_to ())
-          if (tmp->env)
-            esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
+            esrv_update_item (UPD_FLAGS | UPD_NAME, pl, tmp);
-          else
-            op->contr->ns->floorbox_update ();
         }
       change_exp (op, exp_gain, skill_ob->skill, 0);
       SET_FLAG (tmp, FLAG_NO_SKILL_IDENT);      /* so no more xp gained from this book */
     }
     }
   op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
   if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
-    {
-      identify (tmp);
+    identify (tmp);
-      if (tmp->env)
-        esrv_update_item (UPD_FLAGS | UPD_NAME, op, tmp);
-      else
-        op->contr->ns->floorbox_update ();
-    }
   /* I removed the check for special_prayer_mark here - it didn't make
    * a lot of sense - special prayers are not found in spellbooks, and
    * if the player doesn't know the spell, doesn't make a lot of sense that
    * they would have a special prayer mark.
           if (QUERY_FLAG (op, FLAG_INV_LOCKED))
             SET_FLAG (tmp2, FLAG_INV_LOCKED);
           op->destroy ();
-          insert_ob_in_ob (tmp2, who);
+          who->insert (tmp2);
           who->update_stats ();
-          if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
+          if (who->contr)
             {
-              if (who->contr)
+              if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
                 {
                   who->failmsg ("Oops, it feels deadly cold!");
                   SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
                 }
             }
-          if (who->contr)
-            esrv_send_item (who, tmp2);
         }
         return 1;               /* otherwise, an attempt to drop causes problems */
       case BOW:
     }
   who->update_stats ();
   if (!(aflags & AP_NO_MERGE))
-    {
+    merge_ob (op, 0);
-      object *tmp = merge_ob (op, 0);
-      if (who->contr)
-        {
-          if (tmp)
-            {                   /* it was merged */
-              esrv_del_item (who->contr, op->count);
-              op = tmp;
-            }
-          esrv_send_item (who, op);
-        }
-    }
   return 0;
 }
 /**
         SET_FLAG (tmp2, FLAG_APPLIED);
         if (QUERY_FLAG (op, FLAG_INV_LOCKED))
           SET_FLAG (tmp2, FLAG_INV_LOCKED);
-        insert_ob_in_ob (tmp2, who);
+        who->insert (tmp2);
         /* Remove the old lantern */
         op->destroy ();
         /* insert the portion that was split off */
         if (tmp)
-          {
+          who->insert (tmp);
-            insert_ob_in_ob (tmp, who);
-            if (who->type == PLAYER)
-              esrv_send_item (who, tmp);
-          }
         who->update_stats ();
         if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
           if (who->type == PLAYER)
             {
               who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
               SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
             }
-        if (who->type == PLAYER)
-          esrv_send_item (who, tmp2);
         return 0;
       case SKILL_TOOL:
         // applying a skill tool also readies the skill
     }
   SET_FLAG (op, FLAG_APPLIED);
   if (tmp)
-    tmp = insert_ob_in_ob (tmp, who);
+    who->insert (tmp);
   who->update_stats ();
   /* We exclude spell casting objects.  The fire code will set the
    * been applied flag when they are used - until that point,
           "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>"
         );
         SET_FLAG (op, FLAG_KNOWN_CURSED);
       }
-  if (who->type == PLAYER)
+  if (object *pl = op->visible_to ())
-    {
-      /* if multiple objects were applied, update both slots */
-      if (tmp)
-        esrv_send_item (who, tmp);
-      esrv_send_item (who, op);
+    esrv_send_item (pl, op);
-    }
   return 0;
 }
 int
   item = find_marked_object (who);
   if (item)
     {
       if (lighter->last_eat && lighter->stats.food)
         {                       /* lighter gets used up */
-          /* Split multiple lighters if they're being used up.  Otherwise *
-           * one charge from each would be used up.  --DAMN               */
-          if (lighter->nrof > 1)
-            {
-              object *oneLighter = lighter->clone ();
+          object *oneLighter = lighter->split ();
-              lighter->nrof -= 1;
-              oneLighter->nrof = 1;
-              oneLighter->stats.food--;
+          oneLighter->stats.food--;
-              esrv_send_item (who, lighter);
+          who->insert (oneLighter);
-              oneLighter = insert_ob_in_ob (oneLighter, who);
-              esrv_send_item (who, oneLighter);
-            }
-          else
-            lighter->stats.food--;
         }
       else if (lighter->last_eat)
         {
           /* no charges left in lighter */
           who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
   new_item->nrof = yield;
   pl->statusmsg (format ("You %s the %s.", &transformer->slaying, query_base_name (marked, 0)));
-  insert_ob_in_ob (new_item, pl);
+  pl->insert (new_item);
-  esrv_send_inventory (pl, pl);
   /* Eat up one item */
   marked->decrease ();
   /* Eat one transformer if needed */
   if (transformer->stats.food)

Diff Legend

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

Comparing deliantra/server/server/apply.C (file contents): Revision 1.148 by root, Tue Apr 22 04:06:07 2008 UTC vs. Revision 1.149 by root, Tue Apr 22 07:01:47 2008 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.148 by root, Tue Apr 22 04:06:07 2008 UTC vs.
Revision 1.149 by root, Tue Apr 22 07:01:47 2008 UTC