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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.240 by root, Mon Apr 5 20:33:13 2010 UTC vs.
Revision 1.244 by root, Tue Apr 6 00:39:26 2010 UTC

         who->statusmsg (format ("I don't know how to apply the %s.", query_name (op)));
         return 0;
     }
 }
-/*
- * Same return value as apply() function.
- */
-bool
-player_apply (object *pl, object *op, int aflag)
-{
-  if (!op->env && (pl->move_type & MOVE_FLYING))
-    {
-      /* player is flying and applying object not in inventory */
-      if (!QUERY_FLAG (pl, FLAG_WIZ) && !(op->move_type & MOVE_FLYING))
-        {
-          pl->failmsg ("But you are floating high above the ground! "
-                       "H<You have to stop levitating first, if you can, either by using your levitation skill, "
-                       "or waiting till the levitation effect wears off.>");
-          return 0;
-        }
-    }
-  pl->contr->last_used = op;
-  return pl->apply (op, aflag);
-}
 /**
  * player_apply_below attempts to apply the object 'below' the player.
  * If the player has an open container, we use that for below, otherwise
  * we use the ground.
  */
    * we don't use a corrupt pointer for the next object, so we get the
    * next object in the stack before applying.  This is can only be a
    * problem if player_apply() has a bug in that it uses the object but does
    * not return a proper value.
    */
-  //TODO: currently looks only at the topmost objetc, no longer at multiple floors
+  //TODO: no longer at multiple floors
   // and also not on move_on floors. what was this for, anyways?
   for (object *next, *tmp = pl->container_ () ? pl->container_ ()->inv : pl->below; tmp; tmp = next)
     {
       next = tmp->below;
+      if (tmp->type == SPELL_EFFECT || tmp->invisible)
+        continue;
       /* If it is visible, player can apply it.
        */
-      if (!tmp->invisible)
-        if (player_apply (pl, tmp, 0))
+      if (pl->apply (tmp))
-          break;
+        break;
-      break;
     }
 }
 /**
  * Unapplies specified item.
 object::apply (object *ob, int aflags)
 {
   if (!ob) // simplifies a lot of callers
     return true;
+  if (contr)
+    {
+      if (!ob->env && (move_type & MOVE_FLYING))
+        {
+          /* player is flying and applying object not in inventory */
+          if (!flag [FLAG_WIZ] && !(ob->move_type & MOVE_FLYING))
+            {
+              failmsg ("But you are floating high above the ground! "
+                       "H<You have to stop levitating first, if you can, either by using your levitation skill, "
+                       "or waiting till the levitation effect wears off.>");
+              return 0;
+            }
+        }
+      contr->last_used = ob;
+    }
   bool want_apply =
       aflags & AP_APPLY   ? true
     : aflags & AP_UNAPPLY ? false
     :                       !ob->flag [FLAG_APPLIED]; // AP_TOGGLE
       // now handle slot exclusions
       if (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);
+              // unapply other slot, because we want to become active
-            apply (oslot, AP_UNAPPLY);
+              apply (oslot, AP_UNAPPLY);
+            }
           // clear item from slot if applied
-          if (!want_apply && *slot == ob)
+          if (!want_apply && current_weapon == ob)
-            {
-              *slot = 0;
-              if (current_weapon == ob)
-                current_weapon = 0;
+            current_weapon = 0;
-            }
         }
     }
   if (ob->flag [FLAG_APPLIED] != want_apply)
     manual_apply (this, ob, aflags);
   if (ob->flag [FLAG_APPLIED] != want_apply)
     return false;
-  if (slot)
+  if (slot && want_apply)
     current_weapon = *slot = ob;
   return true;
 }
                   ));
                 else
                   who->failmsg (format (
                     "You feel as if you wanted to do something funny, but you can't remember what. "
                     "H<The %s skill cannot be readied or used, it is always active.>",
-                    &op->skill, &op->skill
+                    &op->skill
                   ));
                 if (tmp) who->insert (tmp);
                 return 1;
               }
             if (who->contr)
-              who->statusmsg (format (
+              if (op->invisible)
-                op->invisible ? "You can now use the %s skill." : "You ready %s.",
+                who->statusmsg (format ("You can now use the %s skill.", &op->skill));
-                query_name (op),
-                &op->skill
-              ));
+              else
+                who->statusmsg (format ("You ready %s.", query_name (op)));
           }
         SET_FLAG (who, FLAG_READY_SKILL);
         SET_FLAG (op, FLAG_APPLIED);
         change_abil (who, op);

Diff Legend

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

Comparing deliantra/server/server/apply.C (file contents): Revision 1.240 by root, Mon Apr 5 20:33:13 2010 UTC vs. Revision 1.244 by root, Tue Apr 6 00:39:26 2010 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.240 by root, Mon Apr 5 20:33:13 2010 UTC vs.
Revision 1.244 by root, Tue Apr 6 00:39:26 2010 UTC