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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.266 by root, Tue May 25 02:49:11 2010 UTC vs.
Revision 1.267 by root, Fri Jul 2 18:41:42 2010 UTC

 apply_special (object *who, object *op, int aflags)
 {
   int basic_flag = aflags & AP_MODE;
   object *tmp, *tmp2, *skop = NULL;
-  if (who == NULL)
-    {
-      LOG (llevError, "apply_special() from object without environment.\n");
-      return 1;
-    }
-  //TODO: remove these when apply_special is no longer exposed
-  if (op->env != who)
-    return 1;                   /* op is not in inventory */
   /* trying to unequip op */
   if (op->flag [FLAG_APPLIED])
     {
       /* always apply, so no reason to unapply */
       if (basic_flag == AP_APPLY)
         return 0;
-      if (!(aflags & AP_IGNORE_CURSE) && (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED]))
-        {
-          who->failmsgf ("No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED, query_name (op));
-          return 1;
-        }
       return unapply_special (who, op, aflags);
     }
   else if (basic_flag == AP_UNAPPLY)
     return 0;
  * them in this function - they are passed to apply_special
  */
 static bool
 manual_apply (object *who, object *op, int aflag)
 {
-  op = op->head_ ();
-  if (op->flag [FLAG_UNPAID] && !op->flag [FLAG_APPLIED])
-    {
-      if (who->contr)
-        {
-          examine (who, op);
-          //who->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");//TODO remove
-          return 1;
-        }
-      else
-        return 0;             /* monsters just skip unpaid items */
-    }
   if (INVOKE_OBJECT (APPLY, op, ARG_OBJECT (who)))
     return RESULT_INT (0);
   else if (apply_types_inv_only [op->type])
     {
       // special item, using slot system, needs to be in inv
 object::apply (object *ob, int aflags)
 {
   if (!ob) // simplifies a lot of callers
     return true;
+  ob = ob->head_ ();
+  if (ob->flag [FLAG_UNPAID] && !ob->flag [FLAG_APPLIED])
+    {
+      if (contr)
+        {
+          examine (this, ob);
+          //who->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");//TODO remove
+          return 1;
+        }
+      else
+        return 0;             /* monsters just skip unpaid items */
+    }
   if (contr)
     {
       if (!ob->env && (move_type & MOVE_FLYING))
         {
           /* player is flying and applying object not in inventory */
   bool want_apply =
       aflags & AP_APPLY   ? true
     : aflags & AP_UNAPPLY ? false
     :                       !ob->flag [FLAG_APPLIED]; // AP_TOGGLE
+  // cannot unapply cursed items
+  if (!want_apply
+      && (ob->flag [FLAG_CURSED] || ob->flag [FLAG_DAMNED])
+      && ob->flag [FLAG_APPLIED]
+      && !(aflags & AP_IGNORE_CURSE))
+    {
+      failmsgf ("No matter how hard you try, you just can't remove %s." CANNOT_REMOVE_CURSED, ob->query_name ());
+      return 0;
+    }
   object_ptr *slot = 0;
   // detect the slot, if this is a player
   if (contr && !(aflags & AP_NO_SLOT))
           // only one slot can be active
           if (want_apply)
             {
               // clear slot unless we are in it already
               if (*slot != ob)
-                apply (*slot, AP_UNAPPLY);
+                if (!apply (*slot, AP_UNAPPLY))
+                  return false;
               // unapply other slot, because we want to become active
-              apply (oslot, AP_UNAPPLY);
+              if (!apply (oslot, AP_UNAPPLY))
+                return false;
             }
           // clear item from slot if applied
           if (!want_apply && current_weapon == ob)
             current_weapon = 0;

Diff Legend

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

Comparing deliantra/server/server/apply.C (file contents): Revision 1.266 by root, Tue May 25 02:49:11 2010 UTC vs. Revision 1.267 by root, Fri Jul 2 18:41:42 2010 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.266 by root, Tue May 25 02:49:11 2010 UTC vs.
Revision 1.267 by root, Fri Jul 2 18:41:42 2010 UTC