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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.142 by root, Sun Apr 13 20:21:50 2008 UTC vs.
Revision 1.150 by root, Tue Apr 22 23:50:24 2008 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 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.
  */
       if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
         {
           op->drain_stat ();
           op->update_stats ();
-          decrease_ob (tmp);
+          tmp->decrease ();
           return 1;
         }
       if (!(at = archetype::find (ARCH_DEPLETION)))
         {
           LOG (llevError, "Could not find archetype depletion\n");
           return 0;
         }
       depl = present_arch_in_ob (at, op);
       if (depl)
         {
           for (i = 0; i < NUM_STATS; i++)
           op->update_stats ();
         }
       else
         op->statusmsg ("Your potion had no effect.");
-      decrease_ob (tmp);
+      tmp->decrease ();
       return 1;
     }
   /* improvement potion - only for players */
   if (op->type == PLAYER && (tmp->attacktype & AT_GODPOWER))
             }
           else
             op->statusmsg ("You are fortunate that you are so pathetic.", NDI_DK_ORANGE);
         }
-      decrease_ob (tmp);
+      tmp->decrease ();
       return 1;
     }
   /* A potion that casts a spell.  Healing, restore spellpoint (power potion)
           insert_ob_in_map (fball, op->map, NULL, 0);
         }
       else
         cast_spell (op, tmp, op->facing, tmp->inv, NULL);
-      decrease_ob (tmp);
+      tmp->decrease ();
       /* if youre dead, no point in doing this... */
       if (!QUERY_FLAG (op, FLAG_REMOVED))
         op->update_stats ();
       force->speed_left = -1;
       force = insert_ob_in_ob (force, op);
       CLEAR_FLAG (tmp, FLAG_APPLIED);
       SET_FLAG (force, FLAG_APPLIED);
       change_abil (op, force);
-      decrease_ob (tmp);
+      tmp->decrease ();
       return 1;
     }
   /* Only thing left are the stat potions */
   if (op->type == PLAYER)
    * stat will not be raised by them.  fix_player just clears
    * up all the stats.
    */
   CLEAR_FLAG (tmp, FLAG_APPLIED);
   op->update_stats ();
-  decrease_ob (tmp);
+  tmp->decrease ();
   return 1;
 }
 /****************************************************************************
  * Weapon improvement code follows
     {
       if (strcmp (op->arch->archname, item) == 0)
         {
           if (op->nrof >= nrof)
             {
-              decrease_ob_nr (op, nrof);
+              op->decrease (nrof);
               return;
             }
           else
             {
-              decrease_ob_nr (op, op->nrof);
+              op->decrease (nrof);
               nrof -= op->nrof;
             }
           op = prev;
         }
 static int
 improve_weapon_stat (object *op, object *improver, object *weapon, sint8 &stat, int sacrifice_count, const char *statname)
 {
   stat += sacrifice_count;
   weapon->last_eat++;
-  decrease_ob (improver);
+  improver->decrease ();
   /* So it updates the players stats and the window */
   op->update_stats ();
   op->statusmsg (format (
   sprintf (buf, "%s's %s", &op->name, &weapon->name);
   weapon->name = weapon->name_pl = buf;
   weapon->nrof = 0;             /*  prevents preparing n weapons in the same
                                    slot at once! */
-  decrease_ob (improver);
+  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.
       weapon->weight += 5000;   /* 5 KG's */
       op->statusmsg (format ("Damage has been increased by 5 to %d.", weapon->stats.dam));
       weapon->last_eat++;
       weapon->item_power++;
-      decrease_ob (improver);
+      improver->decrease ();
       return 1;
     }
   if (improver->stats.sp == IMPROVE_WEIGHT)
     {
         weapon->weight = 1;
       op->statusmsg (format ("Weapon weight reduced to %6.1fkg.", (float) weapon->weight / 1000.0));
       weapon->last_eat++;
       weapon->item_power++;
-      decrease_ob (improver);
+      improver->decrease ();
       return 1;
     }
   if (improver->stats.sp == IMPROVE_ENCHANT)
     {
       weapon->magic++;
       weapon->last_eat++;
       op->statusmsg (format ("Weapon magic increased to %d.", weapon->magic));
-      decrease_ob (improver);
+      improver->decrease ();
       weapon->item_power++;
       return 1;
     }
   sacrifice_needed = weapon->stats.Str + weapon->stats.Int + weapon->stats.Dex +
     }
   /* Split objects if needed. Can't insert tmp until the
    * end of this function - otherwise it will just re-merge.
    */
-  if (armour->nrof > 1)
+  tmp = armour->nrof > 1 ? armour->split (armour->nrof - 1) : 0;
-    tmp = get_split_ob (armour, armour->nrof - 1);
-  else
-    tmp = NULL;
   armour->magic++;
   if (!settings.armor_speed_linear)
     {
   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 ();
     }
-  decrease_ob (improver);
+  improver->decrease ();
   if (tmp)
-    {
+    op->insert (tmp);
-      insert_ob_in_ob (tmp, op);
-      esrv_send_item (op, tmp);
-    }
   return 1;
 }
 /*
       converter->play_sound (sound_find ("shop_buy"));
       sint64 cost = (nr * need + item->value - 1) / item->value;
-      decrease_ob_nr (item, cost);
+      item->decrease (cost);
       price_in = cost * item->value;
     }
   else
     {
       converter->play_sound (sound_find ("convert_item"));
       if (need)
         {
           nr = sint64 (item->nrof) / need;
-          decrease_ob_nr (item, nr * need);
+          item->decrease (nr * need);
           price_in = nr * need * item->value;
         }
       else
         {
           price_in = item->value;
           if (!trap->value)
             {
               int tot;
-              for (ab = trap->above, tot = 0; ab != NULL; ab = ab->above)
+              for (ab = trap->above, tot = 0; ab; ab = ab->above)
                 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
-                  tot += (ab->nrof ? ab->nrof : 1) * ab->weight + ab->carrying;
+                  tot += ab->head_ ()->total_weight ();
               if (!(trap->value = (tot > trap->weight) ? 1 : 0))
                 goto leave;
               SET_ANIMATION (trap, trap->value);
       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->play_sound (sound_find ("generic_fail"));
         op->failmsg (format ("You already possess the knowledge held within the %s.", query_name (tmp)));
         break;
       case 1:
-        decrease_ob (tmp);
+        tmp->decrease ();
         op->play_sound (sound_find ("skill_learn"));
         op->statusmsg (format ("You succeed in learning %s", &tmp->skill));
         break;
       default:
-        decrease_ob (tmp);
+        tmp->decrease ();
         op->play_sound (sound_find ("generic_fail"));
         op->failmsg (format ("You fail to learn the knowledge of the %s.\n", query_name (tmp)));
         break;
     }
 }
     }
   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.
     {
       op->contr->play_sound (sound_find ("fumble_spell"));
       op->failmsg ("You fail to learn the spell. H<Wis (priests) or Int (wizards) governs the chance of learning a prayer or spell.>\n");
     }
-  decrease_ob (tmp);
+  tmp->decrease ();
 }
 /**
  * Handles applying a spell scroll.
  */
     identify (tmp);
   op->statusmsg (format ("The scroll of %s turns to dust.", &tmp->inv->name));
   cast_spell (op, tmp, dir, tmp->inv, NULL);
-  decrease_ob (tmp);
+  tmp->decrease ();
 }
 /**
  * Applies a treasure object - by default, chest.  op
  * is the person doing the applying, tmp is the treasure
   object *treas = tmp->inv;
   if (!treas)
     {
       op->statusmsg ("The chest was empty.");
-      decrease_ob (tmp);
+      tmp->decrease ();
       return;
     }
   while (tmp->inv)
     {
       if (op->destroyed () || tmp->destroyed ())
         break;
     }
   if (!tmp->destroyed () && !tmp->inv)
-    decrease_ob (tmp);
+    tmp->decrease ();
 }
 /**
  * op eats food.
  * If player, takes care of messages and dragon special food.
             eat_special_food (op, tmp);
         }
     }
   handle_apply_yield (tmp);
-  decrease_ob (tmp);
+  tmp->decrease ();
 }
 /**
  * A dragon is eating some flesh. If the flesh contains resistances,
  * there is a chance for the dragon's skin to get improved.
       hit_player (op, tmp->stats.hp, tmp, AT_POISON, 1);
     }
   op->stats.food -= op->stats.food / 4;
   handle_apply_yield (tmp);
-  decrease_ob (tmp);
+  tmp->decrease ();
 }
 /**
  * This function return true if the exit is not a 2 ways one or it is 2 ways, valid exit.
  * A valid 2 way exit means:
           CLEAR_FLAG (tmp2, FLAG_APPLIED);
           if (QUERY_FLAG (op, FLAG_INV_LOCKED))
             SET_FLAG (tmp2, FLAG_INV_LOCKED);
+          op->destroy ();
+          who->insert (tmp2);
+          who->update_stats ();
           if (who->contr)
-            esrv_del_item (who->contr, op->count);
-          op->destroy ();
-          insert_ob_in_ob (tmp2, who);
-          who->update_stats ();
-          if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
             {
-              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:
       default:
         who->statusmsg (format ("You unapply %s.", query_name (op)));
         break;
     }
+  if (aflags & AP_NO_MERGE || !merge_ob (op, 0))
+    if (object *pl = op->visible_to ())
+      esrv_send_item (pl, op);
   who->update_stats ();
-  if (!(aflags & AP_NO_MERGE))
-    {
-      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;
 }
 /**
   /* Ok.  We are now at the state where we can apply the new object.
    * Note that we don't have the checks for can_use_...
    * below - that is already taken care of by can_apply_object.
    */
-  if (op->nrof > 1)
+  tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0;
-    tmp = get_split_ob (op, op->nrof - 1);
-  else
-    tmp = 0;
   if (INVOKE_OBJECT (BE_READY, op, ARG_OBJECT (who)) || INVOKE_OBJECT (READY, who, ARG_OBJECT (op)))
     return RESULT_INT (0);
   switch (op->type)
         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 */
-        if (who->type == PLAYER)
-          esrv_del_item (who->contr, op->count);
         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 */
-  decrease_ob_nr (marked, 1);
+  marked->decrease ();
   /* Eat one transformer if needed */
   if (transformer->stats.food)
     if (--transformer->stats.food == 0)
-      decrease_ob_nr (transformer, 1);
+      transformer->decrease ();
 }

Diff Legend

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

Comparing deliantra/server/server/apply.C (file contents): Revision 1.142 by root, Sun Apr 13 20:21:50 2008 UTC vs. Revision 1.150 by root, Tue Apr 22 23:50:24 2008 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.142 by root, Sun Apr 13 20:21:50 2008 UTC vs.
Revision 1.150 by root, Tue Apr 22 23:50:24 2008 UTC