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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.80 by root, Thu May 3 04:50:27 2007 UTC vs.
Revision 1.81 by root, Thu May 3 09:26:45 2007 UTC

       return tmp;
   return NULL;
 }
 /**
  * 'op' wants to apply an object, but can't because of other equipment.
  * This should only be called when it is known
  * that there are objects to unapply.  This makes pretty heavy
  * use of get_item_from_body_location.  It makes no intelligent choice
  * another function that does just that.
  */
 int
 unapply_for_ob (object *who, object *op, int aflags)
 {
-  int i;
-  object *tmp = NULL, *last;
   /* If we are applying a shield or weapon, unapply any equipped shield
    * or weapons first - only allowed to use one weapon/shield at a time.
    */
   if (op->type == WEAPON || op->type == SHIELD)
-    {
-      for (tmp = who->inv; tmp; tmp = tmp->below)
+    for (object *tmp = who->inv; tmp; tmp = tmp->below)
-        {
-          if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type)
+      if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type)
-            {
-              if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
+        if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
-                {
+          {
-                  if (aflags & AP_PRINT)
+            if (aflags & AP_PRINT)
-                    new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
+              new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
-                  else
+            else
-                    unapply_special (who, tmp, aflags);
+              unapply_special (who, tmp, aflags);
-                }
+          }
-              else
+        else
-                {
+          {
-                  /* In this case, we want to try and remove a cursed item.
+            /* In this case, we want to try and remove a cursed item.
-                   * While we know it won't work, we want unapply_special to
+             * While we know it won't work, we want unapply_special to
-                   * at least generate the message.
+             * at least generate the message.
-                   */
+             */
-                  new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't\nremove %s.", query_name (tmp));
+            new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp));
-                  return 1;
+            return 1;
-                }
-            }
+          }
+  if (op->is_range ())
+    for (object *tmp = who->inv; tmp; tmp = tmp->below)
+      if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->is_range ())
+        if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED)))
+          {
+            if (aflags & AP_PRINT)
+              new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
+            else
+              unapply_special (who, tmp, aflags);
-        }
+          }
-    }
+        else
+          {
+            /* In this case, we want to try and remove a cursed item.
+             * While we know it won't work, we want unapply_special to
+             * at least generate the message.
+             */
+            new_draw_info_format (NDI_UNIQUE, 0, who, "No matter how hard you try, you just can't remove the %s.", query_name (tmp));
+            return 1;
+          }
-  for (i = 0; i < NUM_BODY_LOCATIONS; i++)
+  for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
     {
       /* this used up a slot that we need to free */
       if (op->body_info[i])
         {
-          last = who->inv;
+          object *last = who->inv;
           /* We do a while loop - may need to remove several items in order
            * to free up enough slots.
            */
           while ((who->body_used[i] + op->body_info[i]) < 0)
             {
-              tmp = get_item_from_body_location (last, i);
+              object *tmp = get_item_from_body_location (last, i);
               if (!tmp)
                 {
 #if 0
                   /* Not a bug - we'll get this if the player has cursed items
                    * equipped.
                    */
                   LOG (llevError, "Can't find object using location %d (%s) on %s\n", i, body_locations[i].save_name, who->name);
 #endif
                   return 1;
                 }
               /* If we are just printing, we don't care about cursed status */
               if ((aflags & AP_IGNORE_CURSE) || (aflags & AP_PRINT) || (!(QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))))
                 {
                   if (aflags & AP_PRINT)
                     new_draw_info (NDI_UNIQUE, 0, who, query_name (tmp));
                    * so it may not be critical (eg, putting on a ring and you have
                    * one cursed ring.)
                    */
                   new_draw_info_format (NDI_UNIQUE, 0, who, "The %s just won't come off", query_name (tmp));
                 }
               last = tmp->below;
             }
           /* if we got here, this slot is freed up - otherwise, if it wasn't freed up, the
            * return in the !tmp would have kicked in.
            */
         }                       /* if op is using this body location */
     }                           /* for body lcoations */
   return 0;
 }
 /**
  * Checks to see if 'who' can apply object 'op'.
   /* Players have 2 'arm's, so they could in theory equip 2 shields or
    * 2 weapons, but we don't want to let them do that.  So if they are
    * trying to equip a weapon or shield, see if they already have one
    * in place and store that way.
    */
-  if (op->type == WEAPON || op->type == BOW || op->type == SHIELD)
+  if (op->type == WEAPON || op->type == SHIELD)
-    {
-      for (tmp = who->inv; tmp && !ws; tmp = tmp->below)
+    for (tmp = who->inv; tmp && !ws; tmp = tmp->below)
-        {
-          if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == op->type)
+      if (tmp->flag [FLAG_APPLIED] && tmp->type == op->type)
-            {
+        {
-              retval = CAN_APPLY_UNAPPLY;
+          retval = CAN_APPLY_UNAPPLY;
-              ws = tmp;
+          ws = tmp;
-            }
+        }
+  if (op->is_range ())
+    for (tmp = who->inv; tmp && !ws; tmp = tmp->below)
+      if (tmp->flag [FLAG_APPLIED] && tmp->is_range ())
-        }
+        {
-    }
+          retval = CAN_APPLY_UNAPPLY;
+          ws = tmp;
+        }
   for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
     {
       if (op->body_info[i])
         {
               new_draw_info (NDI_UNIQUE, 0, who, "You need to unapply some of the following item(s) or change your applymode:");
               unapply_for_ob (who, op, AP_PRINT);
               return 1;
             }
           else if (who->contr->unapply == unapply_always || !(i & CAN_APPLY_UNAPPLY_CHOICE))
-            {
-              if (unapply_for_ob (who, op, aflags))
+            if (unapply_for_ob (who, op, aflags))
-                return 1;
+              return 1;
-            }
         }
     }
   if (op->skill && op->type != SKILL && op->type != SKILL_TOOL)
     {
   switch (op->type)
     {
       case WEAPON:
         if (!check_weapon_power (who, op->last_eat))
           {
-            new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use.");
+            new_draw_info (NDI_UNIQUE, 0, who, "This weapon is too powerful for you to use.");
             new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
             if (tmp)
               insert_ob_in_ob (tmp, who);
           }
         who->update_stats ();
         if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
-          {
-            if (who->type == PLAYER)
+          if (who->type == PLAYER)
-              {
+            {
-                new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
+              new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
-                SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
+              SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
-              }
+            }
-          }
         if (who->type == PLAYER)
           esrv_send_item (who, tmp2);
         return 0;
               }
             else
               new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.", op->skill ? &op->skill : &op->name);
           }
-          {
         SET_FLAG (op, FLAG_APPLIED);
         change_abil (who, op);
         who->chosen_skill = op;
         SET_FLAG (who, FLAG_READY_SKILL);
         break;
       case BOW:
         if (!check_weapon_power (who, op->last_eat))
           {
-            new_draw_info (NDI_UNIQUE, 0, who, "That item is too powerful for you to use.");
+            new_draw_info (NDI_UNIQUE, 0, who, "That weapon is too powerful for you to use.");
             new_draw_info (NDI_UNIQUE, 0, who, "It would consume your soul!.");
             if (tmp)
               insert_ob_in_ob (tmp, who);
           }
         if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
           {
             new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
-            if (tmp != NULL)
+            if (tmp)
               insert_ob_in_ob (tmp, who);
             return 1;
           }

Diff Legend

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

Comparing deliantra/server/server/apply.C (file contents): Revision 1.80 by root, Thu May 3 04:50:27 2007 UTC vs. Revision 1.81 by root, Thu May 3 09:26:45 2007 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.80 by root, Thu May 3 04:50:27 2007 UTC vs.
Revision 1.81 by root, Thu May 3 09:26:45 2007 UTC