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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.234 by root, Sat Apr 3 02:27:24 2010 UTC vs.
Revision 1.240 by root, Mon Apr 5 20:33:13 2010 UTC

     item->nrof *= nr;
   if (converter->flag [FLAG_PRECIOUS])
     SET_FLAG (item, FLAG_UNPAID);
-  if (is_in_shop (converter))
+  if (converter->is_in_shop ())
     {
       // converters on shop floors don't work anymore, bug lets check for it
       // and report in case someone still does it.
       LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n",
            converter->debug_desc ());
       /* this is only used for players */
       rv = teleport (shop_mat, SHOP_MAT, op);
       if (has_unpaid)
         op->contr->play_sound (sound_find ("shop_buy"));
-      else if (is_in_shop (op))
+      else if (op->is_in_shop ())
         op->contr->play_sound (sound_find ("shop_enter"));
       else
         op->contr->play_sound (sound_find ("shop_leave"));
       if (shop_mat->msg)
         op->statusmsg (shop_mat->msg);
       /* This check below is a bit simplistic - generally it should be correct,
        * but there is never a guarantee that the bottom space on the map is
        * actually the shop floor.
        */
-      else if (!rv && !is_in_shop (op))
+      else if (!rv && !op->is_in_shop ())
         {
           opinion = shopkeeper_approval (op->map, op);
           op->statusmsg (
              opinion >= 0.90 ? "The shopkeeper gives you a friendly wave."
       op->failmsg (format ("You are unable to decipher the strange symbols. H<Your %s level is too low, it must be at least %d.>",
                            &tmp->skill, learn_level));
       return;
     }
-  op->statusmsg (format ("The spellbook contains the %s level spell %s.", get_levelnumber (spell->level), &spell->name));
+  op->statusmsg (format ("The spellbook contains the %s level spell %s.", ordinal (spell->level), &spell->name));
   if (!QUERY_FLAG (tmp, FLAG_IDENTIFIED))
     identify (tmp);
   /* I removed the check for special_prayer_mark here - it didn't make
  * being applied.
  *
  * aflag is special (always apply/unapply) flags.  Nothing is done with
  * them in this function - they are passed to apply_special
  */
-int
+static int
 manual_apply (object *who, object *op, int aflag)
 {
   op = op->head_ ();
-  if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
+  if (op->flag [FLAG_UNPAID] && !op->flag [FLAG_APPLIED])
     {
       if (who->type == PLAYER)
         {
           examine (who, op);
           //who->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");//TODO remove
   switch (op->type)
     {
       case SKILL:
         if (player *pl = who->contr)
           if (op->invisible)
-            pl->statusmsg (format ("You can no longer use the skill: %s.", &op->skill));
+            pl->statusmsg (format ("You can no longer use the %s skill.", &op->skill));
           else
             pl->statusmsg (format ("You stop using the %s.", query_name (op)));
         change_abil (who, op);
         who->flag [FLAG_READY_SKILL] = false;
   object_ptr *slot = 0;
   // detect the slot, if this is a player
   if (contr && !(aflags & AP_NO_SLOT))
     {
+      object *oslot;
       switch (ob->type)
         {
           case WEAPON:
             slot = &contr->combat_ob;
+            oslot = contr->ranged_ob;
             break;
           case BOW:
           case RANGED:
           case SPELL:
           case WAND:
           case ROD:
           case HORN:
           case BUILDER:
             slot = &contr->ranged_ob;
+            oslot = contr->combat_ob;
             break;
           // oh, the humanity
           case SKILL:
             if (aflags & AP_NO_SLOT)
             if (skill_flags [ob->subtype] & SF_NEED_ITEM)
               break;
             if (skill_flags [ob->subtype] & SF_COMBAT)
+              {
-              slot = &contr->combat_ob;
+                slot = &contr->combat_ob;
+                oslot = contr->ranged_ob;
+              }
             else if (skill_flags [ob->subtype] & SF_RANGED)
+              {
-              slot = &contr->ranged_ob;
+                slot = &contr->ranged_ob;
+                oslot = contr->combat_ob;
+              }
             break;
         }
+      // now handle slot exclusions
+      if (slot)
+        {
+          // only one slot can be active
+          if (want_apply)
+            apply (oslot, AP_UNAPPLY);
-      // clear item from slot if applied
+          // clear item from slot if applied
-      if (slot && *slot == ob && !want_apply)
+          if (!want_apply && *slot == ob)
-        {
+            {
-          *slot = 0;
+              *slot = 0;
-          if (current_weapon == ob)
+              if (current_weapon == ob)
-            current_weapon = 0;
+                current_weapon = 0;
+            }
         }
     }
   if (ob->flag [FLAG_APPLIED] != want_apply)
     manual_apply (this, ob, aflags);
         //TODO: unapplying should unapply the skill, though
         SET_FLAG (op, FLAG_APPLIED);
         break;
       case SKILL:
-        if (skill_flags [op->subtype] & SF_NEED_ITEM && !(aflags & AP_NO_SLOT))
+        if (!(aflags & AP_NO_SLOT))
           {
+            // skill is used on it's own, as opposed to being a chosen_skill
+            if (skill_flags [op->subtype] & (SF_NEED_ITEM | SF_MANA))
+              {
-            who->failmsg (format (
+                who->failmsg (format (
-              "You feel as if you wanted to do something funny, but you can't remember what. "
+                  "You feel as if you wanted to do something funny, but you can't remember what. "
-              "H<The %s skill needs an item to function, it cannot be used on its own.>",
+                  "H<The %s skill needs something else to function, for example a tool, weapon, rod, or spell. "
+                  "It cannot be used on its own.>",
-              &op->skill
+                  &op->skill
-            ));
+                ));
-            if (tmp) who->insert (tmp);
+                if (tmp) who->insert (tmp);
-            return 1;
+                return 1;
-          }
+              }
-        if (player *pl = who->contr)
+            if (skill_flags [op->subtype] & SF_AUTARK
+                || !(skill_flags [op->subtype] & (SF_COMBAT | SF_RANGED)))
-          {
+              {
-            if (op->invisible)
+                if (skill_flags [op->subtype] & SF_USE)
-              who->statusmsg (format ("Readied skill: %s.", op->skill ? &op->skill : &op->name));
+                  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, instead, try C<use_skill %s>.>",
+                    &op->skill, &op->skill
+                  ));
-            else
+                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
+                  ));
+                if (tmp) who->insert (tmp);
+                return 1;
+              }
+            if (who->contr)
               who->statusmsg (format (
-                "You ready %s."
+                op->invisible ? "You can now use the %s skill." : "You ready %s.",
-                "You can now use the skill: %s.",
                 query_name (op),
                 &op->skill
               ));
           }

Diff Legend

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

Comparing deliantra/server/server/apply.C (file contents): Revision 1.234 by root, Sat Apr 3 02:27:24 2010 UTC vs. Revision 1.240 by root, Mon Apr 5 20:33:13 2010 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.234 by root, Sat Apr 3 02:27:24 2010 UTC vs.
Revision 1.240 by root, Mon Apr 5 20:33:13 2010 UTC