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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.254 by root, Sun Apr 11 00:34:06 2010 UTC vs.
Revision 1.257 by root, Thu Apr 15 00:36:51 2010 UTC

  * then calls improve_weapon to do the dirty work.
  */
 static int
 check_improve_weapon (object *op, object *tmp)
 {
-  object *otmp;
   if (op->type != PLAYER)
     return 0;
   if (!op->flag [FLAG_WIZCAST] && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
     {
       op->failmsg ("Something blocks the magic of the scroll!");
       return 0;
     }
-  otmp = find_marked_object (op);
+  object *otmp = op->mark ();
   if (!otmp)
     {
       op->failmsg ("You need to mark a weapon object. H<Use the mark command or the mark option from the item popup menu.>");
       return 0;
     }
   if (otmp->type != WEAPON && otmp->type != BOW)
     {
       op->failmsg ("Marked item is not a weapon or bow!");
+      return 0;
+    }
+  if (!op->apply (otmp, AP_UNAPPLY))
+    {
+      op->failmsg ("You are unable to take off your weapon to improve it!");
       return 0;
     }
   op->statusmsg ("Applied weapon builder.");
  * changing of physical area right now.
  */
 static int
 improve_armour (object *op, object *improver, object *armour)
 {
-  object *tmp;
   if (armour->magic >= settings.armor_max_enchant)
     {
       op->failmsg ("This armour can not be enchanted any further!");
       return 0;
     }
     }
   /* Split objects if needed. Can't insert tmp until the
    * end of this function - otherwise it will just re-merge.
    */
-  tmp = armour->nrof > 1 ? armour->split (armour->nrof - 1) : 0;
+  object *tmp = armour->nrof > 1 ? armour->split (armour->nrof - 1) : 0;
   armour->magic++;
   if (!settings.armor_speed_linear)
     {
     return 0;
   /* if the player has a marked item, identify that if it needs to be
    * identified. If it doesn't, then go through the player inventory.
    */
-  if (object *marked = find_marked_object (pl))
+  if (object *marked = pl->mark ())
     if (!marked->flag [FLAG_IDENTIFIED] && need_identify (marked))
       {
         if (operate_altar (altar, &money, pl))
           {
             identify (marked);
       int exp_gain = 0;
       /* hard code literacy - tmp->skill points to where the exp
        * should go for anything killed by the spell.
        */
-      skop = find_skill_by_name (op, skill_names[SK_LITERACY]);
+      skop = find_skill_by_name (op, shstr_literacy);
       if (!skop)
         {
-          op->failmsgf ("You are unable to decipher the strange symbols. H<You lack the %s skill.>", &skill_names[SK_LITERACY]);
+          op->failmsgf ("You are unable to decipher the strange symbols. H<You lack the literacy skill.>");
           return;
         }
       if ((exp_gain = calc_skill_exp (op, tmp, skop)))
         change_exp (op, exp_gain, skop->skill, 0);
  * Does some sanity checks, then calls improve_armour.
  */
 static void
 apply_armour_improver (object *op, object *tmp)
 {
-  object *armor;
   if (!op->flag [FLAG_WIZCAST] && (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_NO_MAGIC))
     {
       op->failmsg ("Something blocks the magic of the scroll. H<This area prevents magic effects.>");
       return;
     }
-  armor = find_marked_object (op);
+  object *armor = op->mark ();
   if (!armor)
     {
       op->failmsg ("You need to mark an armor object. Use the right mouse button popup or the mark command to do this.");
       return;
   if (armor->type != ARMOUR
       && armor->type != CLOAK
       && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
     {
       op->failmsg ("Your marked item is not armour!\n");
+      return;
+    }
+  if (!op->apply (armor, AP_UNAPPLY))
+    {
+      op->failmsg ("You are unable to take off your armour to improve it!");
       return;
     }
   op->statusmsg ("Applying armour enchantment.");
   improve_armour (op, tmp, armor);
  * the selected object to "burn". -b.t.
  */
 static void
 apply_lighter (object *who, object *lighter)
 {
-  object *item;
   int is_player_env = 0;
-  item = find_marked_object (who);
+  if (object *item = who->mark ())
-  if (item)
     {
       if (!auto_apply_lighter (who, item, lighter))
         return;
       /* Perhaps we should split what we are trying to light on fire?
  * The 'slaying' field for transformer is used as verb for the action.
  */
 static void
 apply_item_transformer (object *pl, object *transformer)
 {
-  object *marked;
   object *new_item;
   const char *find;
   char *separator;
   int yield;
   char got[MAX_BUF];
   int len;
   if (!pl || !transformer)
     return;
-  marked = find_marked_object (pl);
+  object *marked = pl->mark ();
   if (!marked)
     {
       pl->failmsgf ("Use the %s with what item?", query_name (transformer));
       return;

Diff Legend

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

Comparing deliantra/server/server/apply.C (file contents): Revision 1.254 by root, Sun Apr 11 00:34:06 2010 UTC vs. Revision 1.257 by root, Thu Apr 15 00:36:51 2010 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.254 by root, Sun Apr 11 00:34:06 2010 UTC vs.
Revision 1.257 by root, Thu Apr 15 00:36:51 2010 UTC