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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.178 by root, Sun Dec 28 15:28:47 2008 UTC vs.
Revision 1.182 by root, Thu Jan 1 11:41:17 2009 UTC

  * matching item.
  **/
 void
 handle_apply_yield (object *tmp)
 {
-  if (shstr yield = tmp->kv (shstr_on_use_yield))
+  if (shstr_tmp yield = tmp->kv (shstr_on_use_yield))
     archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
 }
 /**
  * Handles applying a potion.
 /**
  * This returns the sum of nrof of item (arch name).
  */
 static int
-check_item (object *op, const char *item)
+check_item (object *op, shstr_cmp item)
 {
   int count = 0;
   if (!item)
     return 0;
   for (op = op->below; op; op = op->below)
-    {
-      if (strcmp (op->arch->archname, item) == 0)
+    if (op->arch->archname == item)
-        {
-          if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
+      if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
-              /* Loophole bug? -FD- */  && !QUERY_FLAG (op, FLAG_UNPAID))
+          && /* Loophole bug? -FD- */  !QUERY_FLAG (op, FLAG_UNPAID))
-            {
-              if (op->nrof == 0)        /* this is necessary for artifact sacrifices --FD-- */
-                count++;
-              else
-                count += op->nrof;
+        count += op->number_of ();
-            }
-        }
-    }
   return count;
 }
 /**
  * op is typically the player, which is only
  * really used to determine what space to look at.
  * Modified to only eat 'nrof' of objects.
  */
 static void
-eat_item (object *op, const char *item, uint32 nrof)
+eat_item (object *op, shstr_cmp item, uint32 nrof)
 {
   object *prev;
   prev = op;
   op = op->below;
   while (op)
     {
-      if (strcmp (op->arch->archname, item) == 0)
+      if (op->arch->archname == item)
         {
           if (op->nrof >= nrof)
             {
               op->decrease (nrof);
               return;
  * Handles applying a sign.
  */
 static void
 apply_sign (object *op, object *sign, int autoapply)
 {
+  if (!op->is_player())
+    return;
   if (sign->has_dialogue ())
     {
       op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name));
       return;
     }
         if (victim->type == PLAYER && EXIT_PATH (trap))
           {
             /* Basically, don't show exits leading to random maps the
              * players output.
              */
-            if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2))
+            if (trap->msg && !EXIT_PATH (trap).starts_with ("/!"))
               victim->statusmsg (trap->msg, NDI_NAVY);
             trap->play_sound (trap->sound);
             victim->enter_exit (trap);
           }
         if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp))
           op->failmsg (format ("The %s is closed.", query_name (tmp)));
         else
           {
             /* Don't display messages for random maps. */
-            if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2))
+            if (tmp->msg && !EXIT_PATH (tmp).starts_with ("/!"))
               op->statusmsg (tmp->msg, NDI_NAVY);
             op->enter_exit (tmp);
           }
             return 1;
           }
         //TODO: this obviously fails for players using a shorter prefix
         // i.e. "R" can use Ragnarok's sword.
-        if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
+        if (op->level && !op->name.starts_with (who->name))
           {
             /* if the weapon does not have the name as the character, can't use it. */
             /* (Ragnarok's sword attempted to be used by Foo: won't work) */
             who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
               insert_ob_in_ob (tmp, who);
             return 1;
           }
-        if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
+        if (op->level && !op->name.starts_with (who->name))
           {
             who->failmsg ("The weapon does not recognize you as its owner. "
                            "H<Its name indicates that it belongs to somebody else.>");
             if (tmp)
               insert_ob_in_ob (tmp, who);
             }
           /* insert the randomitems from the change's treasurelist into
            * the player ref: player.c
            */
-          if (change->randomitems != NULL)
+          if (change->randomitems)
             give_initial_items (pl, change->randomitems);
           /* set up the face, for some races. */
           /* first, look for the force object banning
            * changing the face.  Certain races never change face with class.
            */
-          for (walk = pl->inv; walk != NULL; walk = walk->below)
+          for (walk = pl->inv; walk; walk = walk->below)
-            if (!strcmp (walk->name, "NOCLASSFACECHANGE"))
+            if (walk->name == shstr_NOCLASSFACECHANGE)
               flag_change_face = 0;
           if (flag_change_face)
             {
               pl->face                = change->face;
               pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
             }
           /* check the special case of can't use weapons */
           /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
-          if (!strcmp (change->name, "monk"))
+          if (change->name == shstr_monk)
             CLEAR_FLAG (pl, FLAG_USE_WEAPON);
           break;
         }
     }
       pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
       return;
     }
   /* check whether they are compatible or not */
-  find = strstr (marked->slaying, transformer->arch->archname);
+  find = strstr (&marked->slaying, transformer->arch->archname);
   if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
     {
       pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
       return;
     }

Diff Legend

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

Comparing deliantra/server/server/apply.C (file contents): Revision 1.178 by root, Sun Dec 28 15:28:47 2008 UTC vs. Revision 1.182 by root, Thu Jan 1 11:41:17 2009 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.178 by root, Sun Dec 28 15:28:47 2008 UTC vs.
Revision 1.182 by root, Thu Jan 1 11:41:17 2009 UTC